相机台账管理分页修改

business-service/src/main/java/com/ozs/entity/vo/BaseCameraManagementVo.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;
 import java.util.List;
 
 /**
@@ -44,6 +46,14 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
      */
     private Integer endMile;
 
+
+    @TableField(exist = false)
+    private BigDecimal beginMileBD;
+
+
+    @TableField(exist = false)
+    private BigDecimal endMileBD;
+
     /**
      * 监控范围开始里程位置字符串形式
      */

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

@@ -198,11 +198,15 @@ 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.getBeginMile())) {
-            baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMileBD())) {
+            if (baseCameraManagementVo.getBeginMileBD().toString().matches(PATTERN)) {
+                baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMileBD().multiply(new BigDecimal("1000")).intValue());
+            }
         }
-        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
-            baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMileBD())) {
+            if (baseCameraManagementVo.getEndMileBD().toString().matches(PATTERN)) {
+                baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMileBD().multiply(new BigDecimal("1000")).intValue());
+            }
         }
         IPage<BaseCameraManagement> page = baseCameraManagementService.queryPage(baseCameraManagementVo);
         page.setTotal(page.getTotal());