报警分页添加字段

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

@@ -74,4 +74,9 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      * 状态：1未读；2已读
      */
     private Integer status;
+
+    /**
+     * 报警里程位置
+     */
+    private String alarmMiles;
 }

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

@@ -594,7 +594,7 @@ public class BaseCameraManagementController extends BaseController {
     /**
      * 视频服务树形结构
      *
-     * @param name      线路
+     * @param railwayCode      线路
      * @param lineDir   行别
      * @param mils 里程位置
      * @return
@@ -602,9 +602,9 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("视频服务树形结构")
     @GetMapping("/cameraTree")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-    public AjaxResult cameraTree(@RequestParam(value = "name", required = false) String name,
+    public AjaxResult cameraTree(@RequestParam(value = "railwayCode", required = false) String railwayCode,
                                  @RequestParam(value = "lineDir", required = false) Integer lineDir,
-                                 @RequestParam(value = "beginMile", required = false) String mils) {
+                                 @RequestParam(value = "mils", required = false) String mils) {
         Integer milsInt = null;
         if (!StringUtils.isEmpty(mils)) {
             if (!mils.matches(PATTERN)) {
@@ -612,7 +612,7 @@ public class BaseCameraManagementController extends BaseController {
             }
             milsInt = AppendUtils.stringSplit(mils);
         }
-        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(name, lineDir, milsInt);
+        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(railwayCode, lineDir, milsInt);
         List<CameraTree> children = cameraTree.getChildren();
         children.sort(new Comparator<CameraTree>() {
             @Override

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

@@ -66,6 +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]+)$";
     @Resource
     MsgAlarmService msgAlarmService;
     @Resource
@@ -145,6 +146,14 @@ public class MsgAlarmController extends BaseController {
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
         msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmMiles())){
+            if (!msgAlarmVo.getAlarmMiles().matches(PATTERN)) {
+                return error("里程位置填写格式不正确!");
+            }else {
+                int miles = AppendUtils.stringSplit(msgAlarmVo.getAlarmMiles());
+                msgAlarmVo.setAlarmMile(miles);
+            }
+        }
         IPage<MsgAlarm> page = msgAlarmService.queryPage(msgAlarmVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());