相机修改

business-service/src/main/java/com/ozs/service/entity/BaseCameraManagement.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -45,6 +46,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 测点名称
      */
     @Excel(name = "测点名称")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String measurePointName;
 
     /**
@@ -85,12 +87,14 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 监视相机经度
      */
     @Excel(name = "监视相机经度")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String installLongitude;
 
     /**
      * 监视相机纬度
      */
     @Excel(name = "监视相机纬度")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String installLatitude;
     
     /**
@@ -124,11 +128,13 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 监控范围开始里程位置
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer beginMile;
 
     /**
      * 监控范围结束里程位置
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer endMile;
 
     /**
@@ -197,6 +203,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 相机序列号
      */
     @Excel(name = "序列号")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String cameraSn;
     
     @Excel(name = "备注")

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

@@ -2,6 +2,7 @@ package com.ozs.web.controller.accountmanagment;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
@@ -299,8 +300,6 @@ public class BaseCameraManagementController extends BaseController {
                     double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
                     baseCameraManagement.setBeginMile((int) (begin * 1000));
                 }
-            } else {
-                baseCameraManagement.setBeginMile(null);
             }
             if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
                 return error("监控相机安装里程位置填写格式不正确");
@@ -315,20 +314,12 @@ public class BaseCameraManagementController extends BaseController {
                     double end = Double.parseDouble(baseCameraManagement.getEndMiles());
                     baseCameraManagement.setEndMile((int) (end * 1000));
                 }
-            } else {
-                baseCameraManagement.setEndMile(null);
             }
             if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
                 if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
                     return error("监控范围开始里程位置不能大于监控范围结束里程位置");
                 }
             }
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getInstallLongitude())){
-                baseCameraManagement.setInstallLongitude(null);
-            }
-            if(!ObjectUtils.isEmpty(baseCameraManagement.getInstallLatitude())){
-                baseCameraManagement.setInstallLatitude(null);
-            }
             baseCameraManagement.setCreateBy(getUserId());
             baseCameraManagement.setUpdateBy(getUserId());
             BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
@@ -380,6 +371,8 @@ public class BaseCameraManagementController extends BaseController {
                 double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
                 baseCameraManagement.setBeginMile((int) (begin * 1000));
             }
+        }else {
+            baseCameraManagement.setBeginMile(null);
         }
         if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
             return error("监控相机安装里程位置填写格式不正确");
@@ -394,12 +387,26 @@ public class BaseCameraManagementController extends BaseController {
                 double end = Double.parseDouble(baseCameraManagement.getEndMiles());
                 baseCameraManagement.setEndMile((int) (end * 1000));
             }
+        }else {
+            baseCameraManagement.setEndMile(null);
         }
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
             if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
                 return error("监控范围开始里程位置不能大于监控范围结束里程位置");
             }
         }
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getInstallLatitude())){
+            baseCameraManagement.setInstallLatitude(null);
+        }
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getInstallLongitude())){
+            baseCameraManagement.setInstallLongitude(null);
+        }
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getMeasurePointName())){
+            baseCameraManagement.setMeasurePointName(null);
+        }
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraSn())){
+            baseCameraManagement.setCameraSn(null);
+        }
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
         baseCameraManagement.setUpdateBy(getUserId());
         baseCameraManagement.setCreateBy(management.getCreateBy());
@@ -413,7 +420,9 @@ public class BaseCameraManagementController extends BaseController {
             return error("设备动态管理表没有该相机编码");
         }
         one.setCameraCode(baseCameraManagement.getCameraCode());
-        if (baseCameraManagementService.updateById(baseCameraManagement) && baseDeviceDynamicManagementService.updateById(one)) {
+        LambdaUpdateWrapper<BaseCameraManagement> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(BaseCameraManagement::getId,baseCameraManagement.getId());
+        if (baseCameraManagementService.update(baseCameraManagement,wrapper) && baseDeviceDynamicManagementService.updateById(one)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -459,7 +468,7 @@ public class BaseCameraManagementController extends BaseController {
         }
         String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         baseCameraManagement.setInstalls(mils);
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
             String en = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
             String beg = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
             baseCameraManagement.setBegins(beg + "~" + en);
@@ -807,7 +816,7 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagement.setUpdateBy(getUserId());
         } else if (start.startsWith("recorder")) {
             baseCameraManagement.setStartRecording(1);
-            baseCameraManagement.setTaskId(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel() + "/flv");
+            baseCameraManagement.setTaskId(baseCameraManagement.getCameraCode()+"/"+baseCameraManagement.getChannel()+"/flv");
             baseCameraManagementService.updateById(baseCameraManagement);
         } else if (start.startsWith("Stream")) {
             return error("开启视频录制失败:流不存在");
@@ -878,7 +887,7 @@ public class BaseCameraManagementController extends BaseController {
             BeanUtils.copyProperties(baseCameraManagement, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
                 String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
                 String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
                 String endMile = "[" + begin + "]-[" + end + "]";