修改相机台账逻辑修改

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

@@ -218,7 +218,7 @@ public class BaseCameraManagementController extends BaseController {
             lw.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(lw);
-        if (!ObjectUtils.isEmpty(cameraManagement)&& !cameraManagement.getId().equals(baseCameraManagement.getId())) {
+        if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
         int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
@@ -228,7 +228,13 @@ public class BaseCameraManagementController extends BaseController {
         int end = AppendUtils.stringSplit(baseCameraManagement.getEndMiles());
         baseCameraManagement.setEndMile(end);
         baseCameraManagement.setUpdateBy(getUserId());
-        if (baseCameraManagementService.updateById(baseCameraManagement)) {
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+            queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
+        }
+        BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
+        one.setCameraCode(baseCameraManagement.getCameraCode());
+        if (baseCameraManagementService.updateById(baseCameraManagement) && baseDeviceDynamicManagementService.updateById(one)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -399,9 +405,9 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping("/endRecording/{id}")
     public AjaxResult endRecording(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-        log.info("endRecording------------"+baseCameraManagement.getTaskId());
+        log.info("endRecording------------" + baseCameraManagement.getTaskId());
         String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
-        log.info("endRecording------------"+start);
+        log.info("endRecording------------" + start);
         if ("success".equals(start)) {
             baseCameraManagement.setStartRecording(2);
             baseCameraManagement.setTaskId("");
@@ -418,10 +424,10 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping("/startRecording/{id}")
     public AjaxResult startRecording(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-        log.info("startRecording------CameraCode------"+baseCameraManagement.getCameraCode());
-        log.info("startRecording------Channel------"+baseCameraManagement.getChannel());
+        log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
+        log.info("startRecording------Channel------" + baseCameraManagement.getChannel());
         String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
-        log.info("startRecording------------"+start);
+        log.info("startRecording------------" + start);
         if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
             log.info("startRecording 返回成功！！1");
             baseCameraManagement.setStartRecording(1);
@@ -432,7 +438,7 @@ public class BaseCameraManagementController extends BaseController {
         }
         if (baseCameraManagementService.updateById(baseCameraManagement)) {
             return success();
-        }else {
+        } else {
             return error("开启视频录制失败");
         }
     }