图片上传2

fiveep-controller/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 debug=true
 spring.main.lazy-initialization=false
 spring.main.allow-bean-definition-overriding=true
-temp.basedir=C:/Users/pc/Desktop
+temp.basedir=C:/Users/jichaobo/Desktop
 # application
 server.port=8010
 # mybatis-plus

fiveep-persistence/src/main/resources/mapper/mysql/DeviceMapper.xml

@@ -135,4 +135,6 @@
 
     </select>
 
+
+
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -108,17 +108,21 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
         LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Device::getEnable, 1).eq(Device::getSiteId, siteId);
         List<Device> deviceList = this.list(queryWrapper);
+
+//        LambdaQueryWrapper<DeviceAnalogVariableList> queryWrapperOne = Wrappers.lambdaQuery();
+//        queryWrapperOne.eq(DeviceAnalogVariableList::getStatus, 1).eq(DeviceAnalogVariableList::getSiteId, siteId);
+//        List<DeviceAnalogVariableList> deviceAnalogVariableList = this.list(queryWrapperOne);
+
+
         return deviceList;
     }
 
     @Override
     public void correspondDeviceAdd(Device device) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-//        Device device = correspondDeviceVOT.getDevice();
         device.setEnable(1);
         device.setInstallTime(new Date());
         device.setCreator(user.getUserName());
-//        List<DeviceAnalogVariableList> DeviceAnalogVariableList = correspondDeviceVOT.getDeviceAnalogVariableList();
         this.save(device);
         String deviceCode = device.getDeviceCode();
         Integer siteId = device.getSiteId();
@@ -128,34 +132,11 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
         deviceStatus.setStatusTime(new Date());
         deviceStatus.setSiteId(siteId);
         deviceStatusService.save(deviceStatus);
-
-//        int ID = device.getId();
-//        if (DeviceAnalogVariableList.size() > 0) {
-//            for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
-//                DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
-//                DeviceAnalogVariableList.get(i).setCreateTime(new Date());
-//                DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
-//                DeviceAnalogVariableList.get(i).setStatus(1);
-//                deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));
-//            }
-//        }
     }
 
     @Override
     public void correspondDeviceUpdate(Device device) {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-//        List<DeviceAnalogVariableList> DeviceAnalogVariableList = correspondDeviceVOT.getDeviceAnalogVariableList();
         this.updateById(device);
-//        int ID = correspondDeviceVOT.getDevice().getId();
-//        if (DeviceAnalogVariableList.size() > 0) {
-//            for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
-//                DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
-//                DeviceAnalogVariableList.get(i).setCreateTime(new Date());
-//                DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
-//                DeviceAnalogVariableList.get(i).setStatus(1);
-//                deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));
-//            }
-//        }
     }
 
     @Override