相机修改

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

@@ -155,7 +155,7 @@ public class BaseCameraManagementController extends BaseController {
             BeanUtils.copyProperties(msgAlarm, 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;
@@ -299,6 +299,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("监控相机安装里程位置填写格式不正确");
@@ -313,12 +315,20 @@ 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.getInstallLongitude())){
+                baseCameraManagement.setInstallLongitude(null);
+            }
+            if(!ObjectUtils.isEmpty(baseCameraManagement.getInstallLatitude())){
+                baseCameraManagement.setInstallLatitude(null);
+            }
             baseCameraManagement.setCreateBy(getUserId());
             baseCameraManagement.setUpdateBy(getUserId());
             BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
@@ -385,7 +395,7 @@ public class BaseCameraManagementController extends BaseController {
                 baseCameraManagement.setEndMile((int) (end * 1000));
             }
         }
-        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("监控范围开始里程位置不能大于监控范围结束里程位置");
             }
@@ -449,7 +459,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);
@@ -797,7 +807,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("开启视频录制失败:流不存在");
@@ -868,7 +878,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 + "]";