修改相机台账管理信息错误信息提示添加

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -244,7 +244,15 @@ public class BaseCameraManagementController extends BaseController {
         }
         BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(lw);
         if (!ObjectUtils.isEmpty(cameraManagement)) {
-            return error("相机编码已存在,不能重复添加");
+            return error("相机台账管理信息相机编码已存在,不能重复添加");
+        }
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+            queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
+        }
+        BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
+        if (!ObjectUtils.isEmpty(one)){
+            return error("设备动态管理表该相机编码已存在,不能重复添加");
         }
         if (!baseCameraManagement.getBeginMiles().matches(PATTERN)){
            return error("监控范围开始里程位置填写格式不正确");
@@ -320,6 +328,9 @@ public class BaseCameraManagementController extends BaseController {
             queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
+        if (ObjectUtils.isEmpty(one)){
+            return error("设备动态管理表没有该相机编码");
+        }
         one.setCameraCode(baseCameraManagement.getCameraCode());
         if (baseCameraManagementService.updateById(baseCameraManagement) && baseDeviceDynamicManagementService.updateById(one)) {
             return AjaxResult.success();