修改里程判断

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

@@ -1,6 +1,7 @@
 package com.ozs.service.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 import java.io.Serializable;
@@ -43,4 +44,14 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
      * 监控范围结束里程位置
      */
     private Integer endMile;
+
+    /**
+     * 监控范围开始里程位置字符串形式
+     */
+    private String beginMiles;
+
+    /**
+     * 监控范围结束里程位置字符串形式
+     */
+    private String endMiles;
 }

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

@@ -42,12 +42,12 @@ public class MsgAlarmVo extends PageVo implements Serializable {
     /**
      * 监控范围开始里程位置
      */
-    private String beginMile;
+    private Integer beginMile;
 
     /**
      * 监控范围结束里程位置
      */
-    private String endMile;
+    private Integer endMile;
 
     /**
      * 开始报警时间
@@ -79,4 +79,13 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      * 报警里程位置
      */
     private String alarmMiles;
+    /**
+     * 监控范围开始里程位置字符串形式
+     */
+    private String beginMiles;
+
+    /**
+     * 监控范围结束里程位置字符串形式
+     */
+    private String endMiles;
 }

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

@@ -83,7 +83,7 @@ import java.util.stream.Stream;
 @RequestMapping("/service/baseCameraManagement")
 @Slf4j
 public class BaseCameraManagementController extends BaseController {
-    public static final String PATTERN = "^K([0-9]+)\\+([0-9]{1,3})$";
+    public static final String PATTERN = "(^K|^k)([0-9]+)\\+([0-9]{1,3})$";
     @Resource
     BaseCameraManagementService baseCameraManagementService;
     @Resource
@@ -184,6 +184,22 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMiles())) {
+            if (!baseCameraManagementVo.getBeginMiles().matches(PATTERN)) {
+                return error("监控范围开始里程位置填写格式不正确");
+            } else {
+                int begin = AppendUtils.stringSplit(baseCameraManagementVo.getBeginMiles());
+                baseCameraManagementVo.setBeginMile(begin);
+            }
+        }
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMiles())) {
+            if (!baseCameraManagementVo.getEndMiles().matches(PATTERN)) {
+                return error("监控范围结束里程位置填写格式不正确");
+            } else {
+                int end = AppendUtils.stringSplit(baseCameraManagementVo.getEndMiles());
+                baseCameraManagementVo.setEndMile(end);
+            }
+        }
         IPage<BaseCameraManagement> page = baseCameraManagementService.queryPage(baseCameraManagementVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
@@ -671,6 +687,9 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult endRecording(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+        if (ObjectUtils.isEmpty(baseCameraManagement)){
+            return error("查不到该ID的相机台账数据!!!");
+        }
         log.info("endRecording------------" + baseCameraManagement.getTaskId());
         String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
         log.info("endRecording------------" + start);
@@ -678,11 +697,16 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagement.setStartRecording(2);
             baseCameraManagement.setTaskId("");
             baseCameraManagement.setUpdateBy(getUserId());
-            if (baseCameraManagementService.updateById(baseCameraManagement)) {
-                return success();
-            }
+        }else {
+            baseCameraManagement.setStartRecording(2);
+            baseCameraManagement.setTaskId("");
+            baseCameraManagement.setUpdateBy(getUserId());
+            log.error("关闭视频录制异常日志如下:"+start);
+        }
+        if (baseCameraManagementService.updateById(baseCameraManagement)) {
+            return success();
         }
-        return error("关闭视频录制失败");
+        return error();
     }
 
 

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

@@ -66,7 +66,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/service/msgAlarm")
 public class MsgAlarmController extends BaseController {
     private static final Logger log = LoggerFactory.getLogger(MsgAlarmController.class);
-    public static final String PATTERN = "^K([0-9]+)\\+([0-9]{1,3})$";
+    public static final String PATTERN = "(^K|^k)([0-9]+)\\+([0-9]{1,3})$";
     @Resource
     MsgAlarmService msgAlarmService;
     @Resource
@@ -154,6 +154,22 @@ public class MsgAlarmController extends BaseController {
                 msgAlarmVo.setAlarmMile(miles);
             }
         }
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginMiles())) {
+            if (!msgAlarmVo.getBeginMiles().matches(PATTERN)) {
+                return error("监控范围开始里程位置填写格式不正确");
+            } else {
+                int begin = AppendUtils.stringSplit(msgAlarmVo.getBeginMiles());
+                msgAlarmVo.setBeginMile(begin);
+            }
+        }
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMiles())) {
+            if (!msgAlarmVo.getEndMiles().matches(PATTERN)) {
+                return error("监控范围结束里程位置填写格式不正确");
+            } else {
+                int end = AppendUtils.stringSplit(msgAlarmVo.getEndMiles());
+                msgAlarmVo.setEndMile(end);
+            }
+        }
         IPage<MsgAlarm> page = msgAlarmService.queryPage(msgAlarmVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
@@ -185,7 +201,7 @@ public class MsgAlarmController extends BaseController {
                 o.setEndMile(end);
                 String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
                 o.setBeginMile(begin);
-                o.setAlarmCount((int) msgAlarmFrequencyService.count() + 1);
+                o.setAlarmCount((int) msgAlarmFrequencyService.count());
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);