相机修改

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

@@ -292,11 +292,13 @@ public class BaseCameraManagementController extends BaseController {
             if (!ObjectUtils.isEmpty(one)) {
                 return error("设备动态管理表该相机编码已存在,不能重复添加");
             }
-            if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
-                return error("监控范围开始里程位置填写格式不正确");
-            } else {
-                double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
-                baseCameraManagement.setBeginMile((int) (begin * 1000));
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
+                if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+                    return error("监控范围开始里程位置填写格式不正确");
+                } else {
+                    double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
+                    baseCameraManagement.setBeginMile((int) (begin * 1000));
+                }
             }
             if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
                 return error("监控相机安装里程位置填写格式不正确");
@@ -304,14 +306,18 @@ public class BaseCameraManagementController extends BaseController {
                 double install = Double.parseDouble(baseCameraManagement.getInstallMiles());
                 baseCameraManagement.setInstallMile((int) (install * 1000));
             }
-            if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
-                return error("监控范围结束里程位置填写格式不正确");
-            } else {
-                double end = Double.parseDouble(baseCameraManagement.getEndMiles());
-                baseCameraManagement.setEndMile((int) (end * 1000));
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles())) {
+                if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+                    return error("监控范围结束里程位置填写格式不正确");
+                } else {
+                    double end = Double.parseDouble(baseCameraManagement.getEndMiles());
+                    baseCameraManagement.setEndMile((int) (end * 1000));
+                }
             }
-            if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
-                return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
+                if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
+                    return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+                }
             }
             baseCameraManagement.setCreateBy(getUserId());
             baseCameraManagement.setUpdateBy(getUserId());
@@ -357,11 +363,13 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
-        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
-            return error("监控范围开始里程位置填写格式不正确");
-        } else {
-            double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
-            baseCameraManagement.setBeginMile((int) (begin * 1000));
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
+            if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+                return error("监控范围开始里程位置填写格式不正确");
+            } else {
+                double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
+                baseCameraManagement.setBeginMile((int) (begin * 1000));
+            }
         }
         if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
             return error("监控相机安装里程位置填写格式不正确");
@@ -369,14 +377,18 @@ public class BaseCameraManagementController extends BaseController {
             double install = Double.parseDouble(baseCameraManagement.getInstallMiles());
             baseCameraManagement.setInstallMile((int) (install * 1000));
         }
-        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
-            return error("监控范围结束里程位置填写格式不正确");
-        } else {
-            double end = Double.parseDouble(baseCameraManagement.getEndMiles());
-            baseCameraManagement.setEndMile((int) (end * 1000));
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles())) {
+            if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+                return error("监控范围结束里程位置填写格式不正确");
+            } else {
+                double end = Double.parseDouble(baseCameraManagement.getEndMiles());
+                baseCameraManagement.setEndMile((int) (end * 1000));
+            }
         }
-        if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
-            return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMiles())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMiles())) {
+            if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
+                return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+            }
         }
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
         baseCameraManagement.setUpdateBy(getUserId());