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

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

@@ -179,12 +179,8 @@ public class DeviceController {
                                            @RequestParam String oldDeviceCode,
                                            @RequestParam(required = false) String deviceName
     ) {
-       Integer pd = deviceService.variableCloning(type, newDeviceCode, oldDeviceCode, deviceName);
-       if (pd==1){
-           return ApiResult.error("BIZ-0003","设备编号重复");
-       }else {
-           return ApiResult.success();
-       }
+        deviceService.variableCloning(type, newDeviceCode, oldDeviceCode, deviceName);
+        return ApiResult.success();
     }
 
 
@@ -220,6 +216,7 @@ public class DeviceController {
 
     /**
      * 设备管理-通信设备-导出
+     *
      * @param deviceName 设备名称
      * @return
      */

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);
 
-    Integer variableCloning(Integer type, String newDeviceCode, String oldDeviceCode, String deviceName);
+    void 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,7 +224,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     }
 
     @Override
-    public Integer variableCloning(Integer type, String newDeviceCode, String oldDeviceCode, String deviceName) {
+    public void variableCloning(Integer type, String newDeviceCode, String oldDeviceCode, String deviceName) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         //查询出旧设备配置
         LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
@@ -236,7 +236,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
             queryWrapperFour.eq(Device::getEnable, 1).eq(Device::getDeviceCode, newDeviceCode);
             List<Device> deviceListrFour = this.list(queryWrapper);
             if (deviceListrFour.size()>0){
-                pd = 1;
+                throw new BusinessException("设备编号重复");
             }else {
                 //设备表新增
                 Device device = new Device();
@@ -327,7 +327,6 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
                 }
             }
         }
-        return pd;
     }