相机台账 判空

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

@@ -110,12 +110,18 @@ public class BaseCameraManagementController extends BaseController {
 //            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
 //            baseCameraManagement.setDeptName(sysDept.getDeptName());
             baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
-            String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-            baseCameraManagement.setInstallMiles(mils);
-            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            baseCameraManagement.setEndMiles(end);
-            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-            baseCameraManagement.setBeginMiles(begin);
+            if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
+                String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+                baseCameraManagement.setInstallMiles(mils);
+            }
+            if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                baseCameraManagement.setEndMiles(end);
+            }
+            if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                baseCameraManagement.setBeginMiles(begin);
+            }
             return AjaxResult.success(baseCameraManagement);
         } else if (!StringUtils.isEmpty(isRelease) && isRelease == 2 && !StringUtils.isEmpty(cameraCode)) {
             MsgAlarm msgAlarm = msgAlarmService.selectByCameraCode(cameraCode);
@@ -185,13 +191,13 @@ public class BaseCameraManagementController extends BaseController {
                 o.setInstallMiles(mils);
                 o.setInstallMileBD(new BigDecimal(o.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
                 String end = "";
-                if(!StringUtils.isEmptySunhh(o.getEndMile())) {
+                if (!StringUtils.isEmptySunhh(o.getEndMile())) {
                     end = AppendUtils.stringAppend(o.getEndMile());
                     o.setEndMiles(end);
                     o.setEndMileBD(new BigDecimal(o.getEndMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
                 }
                 String begin = "";
-                if(!StringUtils.isEmptySunhh(o.getBeginMile())) {
+                if (!StringUtils.isEmptySunhh(o.getBeginMile())) {
                     begin = AppendUtils.stringAppend(o.getBeginMile());
                     o.setBeginMiles(begin);
                     o.setBeginMileBD(new BigDecimal(o.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
@@ -301,10 +307,16 @@ public class BaseCameraManagementController extends BaseController {
                 baseCameraManagement.setEndMile(end.multiply(new BigDecimal("1000")).intValue());
             }
         }
-        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile()) || !StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
-            if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
-                return error("监控范围开始里程位置不能大于监控范围结束里程位置");
-            }
+        Integer beginMile = 0;
+        Integer endMile = 0;
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())){
+            beginMile = baseCameraManagement.getBeginMile();
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())){
+            endMile = baseCameraManagement.getEndMile();
+        }
+        if (beginMile > endMile) {
+            return error("监控范围开始里程位置不能大于监控范围结束里程位置");
         }
         baseCameraManagement.setCreateBy(getUserId());
         baseCameraManagement.setUpdateBy(getUserId());
@@ -372,7 +384,15 @@ public class BaseCameraManagementController extends BaseController {
                 baseCameraManagement.setEndMile(end.multiply(new BigDecimal("1000")).intValue());
             }
         }
-        if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
+        Integer beginMile = 0;
+        Integer endMile = 0;
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())){
+            beginMile = baseCameraManagement.getBeginMile();
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())){
+            endMile = baseCameraManagement.getEndMile();
+        }
+        if (beginMile > endMile) {
             return error("监控范围开始里程位置不能大于监控范围结束里程位置");
         }
         baseCameraManagement.setUpdateBy(getUserId());
@@ -405,12 +425,20 @@ public class BaseCameraManagementController extends BaseController {
 //        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
 //        baseCameraManagement.setDeptName(sysDept.getDeptName());
         baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
-        String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-        baseCameraManagement.setInstallMiles(mils);
-        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-        baseCameraManagement.setEndMiles(end);
-        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-        baseCameraManagement.setBeginMiles(begin);
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
+            String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+            baseCameraManagement.setInstallMiles(mils);
+        }
+        String end = "";
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
+            end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            baseCameraManagement.setEndMiles(end);
+        }
+        String begin = "";
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
+            begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+            baseCameraManagement.setBeginMiles(begin);
+        }
         if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
             baseCameraManagement.setInstallMileBD(new BigDecimal(baseCameraManagement.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
         }
@@ -522,12 +550,20 @@ public class BaseCameraManagementController extends BaseController {
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
             baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
-            String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-            baseCameraManagement.setInstallMiles(mils);
-            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            baseCameraManagement.setEndMiles(end);
-            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-            baseCameraManagement.setBeginMiles(begin);
+            if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
+                String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+                baseCameraManagement.setInstallMiles(mils);
+            }
+            String end = "";
+            if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
+                end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                baseCameraManagement.setEndMiles(end);
+            }
+            String begin = "";
+            if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
+                begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                baseCameraManagement.setBeginMiles(begin);
+            }
         }
         ExcelUtil<BaseCameraManagement> util = new ExcelUtil<>(BaseCameraManagement.class);
         util.exportExcel(response, baseCameraManagementList, "台账管理相机数据");
@@ -813,8 +849,14 @@ public class BaseCameraManagementController extends BaseController {
             BeanUtils.copyProperties(baseCameraManagement, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            String begin = "";
+            if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
+                begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+            }
+            String end = "";
+            if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
+                end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            }
             String endMile = "[" + begin + "]-[" + end + "]";
             msgAlarmResp.setBeginMile(endMile);
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());