Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

business-service/src/main/java/com/ozs/entity/vo/BaseCameraManagementVo.java

@@ -4,6 +4,7 @@ import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -52,4 +53,6 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
      * 监控范围结束里程位置字符串形式
      */
     private String endMiles;
+
+    private List<Long> ids;
 }

business-service/src/main/resources/mapper/BaseCameraManagementMapper.xml

@@ -21,6 +21,12 @@
             <if test="endMile != null and endMile != 0">
                 and end_mile &lt;= #{endMile}
             </if>
+            <if test="ids != null and ids.size>0">
+                and a.id in
+                <foreach item="items" collection="ids" separator="," open="(" close=")" index="">
+                    #{items}
+                </foreach>
+            </if>
         </where>
     </select>
 

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);
@@ -184,12 +190,18 @@ public class BaseCameraManagementController extends BaseController {
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
                 o.setInstallMiles(mils);
                 o.setInstallMileBD(new BigDecimal(o.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
-                String 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 = AppendUtils.stringAppend(o.getBeginMile());
-                o.setBeginMiles(begin);
-                o.setBeginMileBD(new BigDecimal(o.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
+                String end = "";
+                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())) {
+                    begin = AppendUtils.stringAppend(o.getBeginMile());
+                    o.setBeginMiles(begin);
+                    o.setBeginMileBD(new BigDecimal(o.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
+                }
                 o.setLineDirStr(o.getLineDir() == 1 ? "上行" : "下行");
                 o.setMilesRange(begin + "-" + end);
                 o.setLongitudeAndLatitude(o.getInstallLongitude() + "," + o.getInstallLongitude());
@@ -286,18 +298,26 @@ public class BaseCameraManagementController extends BaseController {
                 baseCameraManagement.setInstallMile(install.multiply(new BigDecimal("1000")).intValue());
             }
         }
-        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMileBD())) {
-            if (!baseCameraManagement.getInstallMileBD().toString().matches(PATTERN)) {
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMileBD())) {
+            if (!baseCameraManagement.getEndMileBD().toString().matches(PATTERN)) {
                 return error("监控范围结束里程位置填写格式不正确");
             } else {
-                BigDecimal end = baseCameraManagement.getInstallMileBD().setScale(3, RoundingMode.HALF_UP);
+                BigDecimal end = baseCameraManagement.getEndMileBD().setScale(3, RoundingMode.HALF_UP);
                 // double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
                 baseCameraManagement.setEndMile(end.multiply(new BigDecimal("1000")).intValue());
             }
         }
-        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());
         BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
@@ -345,6 +365,8 @@ public class BaseCameraManagementController extends BaseController {
                 // BigDecimal begin = BigDecimal.parseDouble(baseCameraManagement.getBeginMile().toString());
                 baseCameraManagement.setBeginMile(begin.multiply(new BigDecimal("1000")).intValue());
             }
+        } else {
+            baseCameraManagement.setBeginMile(0);
         }
         if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMileBD())) {
             if (!baseCameraManagement.getInstallMileBD().toString().matches(PATTERN)) {
@@ -354,19 +376,31 @@ public class BaseCameraManagementController extends BaseController {
                 // double install = Double.parseDouble(baseCameraManagement.getInstallMile().toString());
                 baseCameraManagement.setInstallMile(install.multiply(new BigDecimal("1000")).intValue());
             }
+        } else {
+            baseCameraManagement.setInstallMile(0);
         }
-        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMileBD())) {
-            if (!baseCameraManagement.getInstallMileBD().toString().matches(PATTERN)) {
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMileBD())) {
+            if (!baseCameraManagement.getEndMileBD().toString().matches(PATTERN)) {
                 return error("监控范围结束里程位置填写格式不正确");
             } else {
-                BigDecimal end = baseCameraManagement.getInstallMileBD().setScale(3, RoundingMode.HALF_UP);
+                BigDecimal end = baseCameraManagement.getEndMileBD().setScale(3, RoundingMode.HALF_UP);
                 // double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
                 baseCameraManagement.setEndMile(end.multiply(new BigDecimal("1000")).intValue());
             }
+        } else {
+            baseCameraManagement.setEndMile(0);
         }
-        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.setUpdateBy(getUserId());
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
@@ -397,12 +431,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));
         }
@@ -514,12 +556,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, "台账管理相机数据");
@@ -805,8 +855,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());