报警信息分页修改

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

@@ -1,9 +1,11 @@
 package com.ozs.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * <p>
@@ -67,6 +69,9 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      */
     private Integer alarmMile;
 
+    @TableField(exist = false)
+    private BigDecimal alarmMileBD;
+
     /**
      * 监控范围开始里程位置
      */

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

@@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -44,6 +46,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/service/msgAlarm")
 public class MsgAlarmController extends BaseController {
+    public static final String PATTERN = "^(\\d+.\\d{1,3}|\\d+)$";
     private static final Logger log = LoggerFactory.getLogger(MsgAlarmController.class);
     @Resource
     MsgAlarmService msgAlarmService;
@@ -153,6 +156,13 @@ public class MsgAlarmController extends BaseController {
         if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
             msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
         }
+        if (!StringUtils.isEmptySunhh(msgAlarmVo.getAlarmMileBD())) {
+            if (!msgAlarmVo.getAlarmMileBD().toString().matches(PATTERN)) {
+                return error("监控范围开始里程位置填写格式不正确");
+            } else {
+                msgAlarmVo.setAlarmMile(msgAlarmVo.getAlarmMileBD().multiply(new BigDecimal("1000")).intValue());
+            }
+        }
         IPage<MsgAlarm> page = msgAlarmService.queryPage(msgAlarmVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());