台区列表查询和通信设备克隆接口修改1

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -179,8 +179,12 @@ public class DeviceController {
                                            @RequestParam String oldDeviceCode,
                                            @RequestParam(required = false) String deviceName
     ) {
-        deviceService.variableCloning(type, newDeviceCode, oldDeviceCode, deviceName);
-        return ApiResult.success();
+       Integer pd = deviceService.variableCloning(type, newDeviceCode, oldDeviceCode, deviceName);
+       if (pd==1){
+           return ApiResult.error("BIZ-0003","设备编号重复");
+       }else {
+           return ApiResult.success();
+       }
     }
 
 

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

@@ -24,6 +24,7 @@
         <where>
             and b.enable = 1
         </where>
+        GROUP BY a.id desc
         ) AS o ON s.id = o.idone
         <where>
             s.enable = 1
@@ -31,7 +32,7 @@
                 and s.platform_area_name LIKE CONCAT(CONCAT('%', #{platformAreaName}), '%')
             </if>
         </where>
-        GROUP BY s.id desc
+        order by s.id desc
         <if test="startCurrent != null and size !=0">
             LIMIT #{startCurrent},
             #{size}

fiveep-service/src/main/java/com/bizmatics/service/DeviceService.java

@@ -56,7 +56,7 @@ public interface DeviceService extends CrudService<Device> {
 
     CommonPage<Device> videoMonitoringDeviceList(String deviceName, Integer deviceType, Integer siteId, Integer size, Integer current);
 
-    void variableCloning(Integer type, String newDeviceCode, String oldDeviceCode, String deviceName);
+    Integer variableCloning(Integer type, String newDeviceCode, String oldDeviceCode, String deviceName);
 
     List<Device> deviceListOne(Integer siteId,Integer deviceType);
 

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

@@ -224,58 +224,65 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     }
 
     @Override
-    public void variableCloning(Integer type, String newDeviceCode, String oldDeviceCode, String deviceName) {
+    public Integer variableCloning(Integer type, String newDeviceCode, String oldDeviceCode, String deviceName) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         //查询出旧设备配置
         LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Device::getEnable, 1).eq(Device::getDeviceCode, oldDeviceCode);
         List<Device> deviceList = this.list(queryWrapper);
-
+        Integer pd = 0;
         if (type == 1) {
-            //设备表新增
-            Device device = new Device();
-            device.setEnable(1);
-            device.setInstallTime(new Date());
-            device.setCreator(user.getUserName());
-            device.setDeviceCode(newDeviceCode);
-            device.setDeviceName(deviceName);
-            device.setFloor(deviceList.get(0).getFloor());
-            device.setSiteId(deviceList.get(0).getSiteId());
-            device.setDeviceAddress(deviceList.get(0).getDeviceAddress());
-            device.setDeviceType(deviceList.get(0).getDeviceType());
-            device.setSim(deviceList.get(0).getSim());
-            this.save(device);
-            Integer deviceId = device.getId();
-            String deviceCode = device.getDeviceCode();
-            Integer siteId = device.getSiteId();
-            //设备状态表新增
-            DeviceStatus deviceStatus = new DeviceStatus();
-            deviceStatus.setDeviceStatus(1);
-            deviceStatus.setDeviceCode(deviceCode);
-            deviceStatus.setStatusTime(new Date());
-            deviceStatus.setSiteId(siteId);
-            deviceStatusService.save(deviceStatus);
-            //变量配置查询
-            LambdaQueryWrapper<DeviceAnalogVariableList> queryWrapperOne = Wrappers.lambdaQuery();
-            queryWrapperOne.eq(DeviceAnalogVariableList::getStatus, 1).eq(DeviceAnalogVariableList::getCommunicationEquipment, deviceList.get(0).getId());
-            List<DeviceAnalogVariableList> deviceAnalogVariableList = deviceAnalogVariableListService.list(queryWrapperOne);
-            if (deviceAnalogVariableList.size() > 0) {
-                for (int i = 0; i < deviceAnalogVariableList.size(); i++) {
-                    DeviceAnalogVariableList deviceAnalogVariableListOne = new DeviceAnalogVariableList();
-                    deviceAnalogVariableListOne.setDeviceCode(newDeviceCode);
-                    deviceAnalogVariableListOne.setVariableName(deviceAnalogVariableList.get(i).getVariableName());
-                    deviceAnalogVariableListOne.setVariableCoding(deviceAnalogVariableList.get(i).getVariableCoding());
-                    deviceAnalogVariableListOne.setMonitoringEquipment(0);
-                    deviceAnalogVariableListOne.setCommunicationEquipment(deviceId);
-                    deviceAnalogVariableListOne.setDataAddress(deviceAnalogVariableList.get(i).getDataAddress());
-                    deviceAnalogVariableListOne.setDataType(deviceAnalogVariableList.get(i).getDataType());
-                    deviceAnalogVariableListOne.setCoefficient(deviceAnalogVariableList.get(i).getCoefficient());
-                    deviceAnalogVariableListOne.setSaveCycle(deviceAnalogVariableList.get(i).getSaveCycle());
-                    deviceAnalogVariableListOne.setDataArea(deviceAnalogVariableList.get(i).getDataArea());
-                    deviceAnalogVariableListOne.setCreator(user.getUserName());
-                    deviceAnalogVariableListOne.setCreateTime(new Date());
-                    deviceAnalogVariableListOne.setStatus(1);
-                    deviceAnalogVariableListService.save(deviceAnalogVariableListOne);
+            LambdaQueryWrapper<Device> queryWrapperFour = Wrappers.lambdaQuery();
+            queryWrapperFour.eq(Device::getEnable, 1).eq(Device::getDeviceCode, newDeviceCode);
+            List<Device> deviceListrFour = this.list(queryWrapper);
+            if (deviceListrFour.size()>0){
+                pd = 1;
+            }else {
+                //设备表新增
+                Device device = new Device();
+                device.setEnable(1);
+                device.setInstallTime(new Date());
+                device.setCreator(user.getUserName());
+                device.setDeviceCode(newDeviceCode);
+                device.setDeviceName(deviceName);
+                device.setFloor(deviceList.get(0).getFloor());
+                device.setSiteId(deviceList.get(0).getSiteId());
+                device.setDeviceAddress(deviceList.get(0).getDeviceAddress());
+                device.setDeviceType(deviceList.get(0).getDeviceType());
+                device.setSim(deviceList.get(0).getSim());
+                this.save(device);
+                Integer deviceId = device.getId();
+                String deviceCode = device.getDeviceCode();
+                Integer siteId = device.getSiteId();
+                //设备状态表新增
+                DeviceStatus deviceStatus = new DeviceStatus();
+                deviceStatus.setDeviceStatus(1);
+                deviceStatus.setDeviceCode(deviceCode);
+                deviceStatus.setStatusTime(new Date());
+                deviceStatus.setSiteId(siteId);
+                deviceStatusService.save(deviceStatus);
+                //变量配置查询
+                LambdaQueryWrapper<DeviceAnalogVariableList> queryWrapperOne = Wrappers.lambdaQuery();
+                queryWrapperOne.eq(DeviceAnalogVariableList::getStatus, 1).eq(DeviceAnalogVariableList::getCommunicationEquipment, deviceList.get(0).getId());
+                List<DeviceAnalogVariableList> deviceAnalogVariableList = deviceAnalogVariableListService.list(queryWrapperOne);
+                if (deviceAnalogVariableList.size() > 0) {
+                    for (int i = 0; i < deviceAnalogVariableList.size(); i++) {
+                        DeviceAnalogVariableList deviceAnalogVariableListOne = new DeviceAnalogVariableList();
+                        deviceAnalogVariableListOne.setDeviceCode(newDeviceCode);
+                        deviceAnalogVariableListOne.setVariableName(deviceAnalogVariableList.get(i).getVariableName());
+                        deviceAnalogVariableListOne.setVariableCoding(deviceAnalogVariableList.get(i).getVariableCoding());
+                        deviceAnalogVariableListOne.setMonitoringEquipment(0);
+                        deviceAnalogVariableListOne.setCommunicationEquipment(deviceId);
+                        deviceAnalogVariableListOne.setDataAddress(deviceAnalogVariableList.get(i).getDataAddress());
+                        deviceAnalogVariableListOne.setDataType(deviceAnalogVariableList.get(i).getDataType());
+                        deviceAnalogVariableListOne.setCoefficient(deviceAnalogVariableList.get(i).getCoefficient());
+                        deviceAnalogVariableListOne.setSaveCycle(deviceAnalogVariableList.get(i).getSaveCycle());
+                        deviceAnalogVariableListOne.setDataArea(deviceAnalogVariableList.get(i).getDataArea());
+                        deviceAnalogVariableListOne.setCreator(user.getUserName());
+                        deviceAnalogVariableListOne.setCreateTime(new Date());
+                        deviceAnalogVariableListOne.setStatus(1);
+                        deviceAnalogVariableListService.save(deviceAnalogVariableListOne);
+                    }
                 }
             }
         } else {
@@ -320,6 +327,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
                 }
             }
         }
+        return pd;
     }
 
 

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

@@ -108,11 +108,13 @@ public class PlatformAreaServiceImpl extends AbstractCrudService<PlatformAreaMap
             platformArea.setEnable(platformAreaVoSite.get(i).getEnable());
             platformArea.setSiteCount(platformAreaVoSite.get(i).getSiteCount());
             if (platformAreaVoDevice.size()>0){
+                Integer deviceCount = 0;
                 for (int j = 0; j < platformAreaVoDevice.size(); j++) {
                     if (platformAreaVoSite.get(i).getId()==platformAreaVoDevice.get(j).getId()){
-                        platformArea.setDeviceCount(platformAreaVoDevice.get(j).getDeviceCount());
+                        deviceCount = deviceCount + platformAreaVoDevice.get(j).getDeviceCount();
                     }
                 }
+                platformArea.setDeviceCount(deviceCount);
             }else {
                 platformArea.setDeviceCount(0);
             }