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

business-service/src/main/java/com/ozs/service/entity/BaseCameraManagement.java

@@ -131,14 +131,12 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 详情监控相机安装里程位置字符串形式
      */
     @TableField(exist = false)
-    @Excel(name = "监控相机安装里程位置")
     private String installs;
 
     /**
      * 详情监控范围开始里程位置字符串形式
      */
     @TableField(exist = false)
-    @Excel(name = "监控范围开始里程位置")
     private String begins;
 
     /**

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

@@ -44,6 +44,8 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
      * 监控范围结束里程位置
      */
     private Double endMile;
+    
+    private Double installMile;
 
     /**
      * 监控范围开始里程位置字符串形式

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

@@ -38,6 +38,9 @@
             <if test="endMile != null and endMile != 0">
                 and a.end_mile &lt;=#{endMile}
             </if>
+            <if test="installMile != null and installMile != 0">
+                and a.install_mile =#{installMile}
+            </if>
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">

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

@@ -189,6 +189,9 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
             baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
         }
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getInstallMile())) {
+            baseCameraManagementVo.setInstallMile(baseCameraManagementVo.getInstallMile() * 1000);
+        }
         IPage<BaseCameraManagement> page = baseCameraManagementService.queryPage(baseCameraManagementVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());