修改水池弹框bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/PoolStatisticController.java

@@ -228,12 +228,19 @@ public class PoolStatisticController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取水池信息", notes = "获取水池信息")
     public ResponseModel getWaterInfo(CommonPageable commonPageable, @RequestParam(required = false) String bizOrgCode,
-                                      @RequestParam(required = false) String stationOrder, @RequestParam(required = false) String stateOrder) {
+                                      @RequestParam(required = false) String stationOrder,
+                                      @RequestParam(required = false) String stateOrder,
+                                      @RequestParam(required = false) String status) {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
         }
+        if ("normal".equalsIgnoreCase(status)) {
+            status = "0";
+        } else if ("abnormal".equalsIgnoreCase(status)) {
+            status = "1";
+        }
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
-        Page<Map<String, Object>> page1 = fireFightingSystemMapper.getWaterInfoList(page, bizOrgCode, stationOrder, stateOrder);
+        Page<Map<String, Object>> page1 = fireFightingSystemMapper.getWaterInfoList(page, bizOrgCode, stationOrder, stateOrder, status);
         List<Map<String, Object>> res = page1.getRecords();
         if (!res.isEmpty()) {
             List<Map<String, Object>> infoList = fireFightingSystemMapper.getWaterInfoByBizOrgName(bizOrgCode);
@@ -245,17 +252,17 @@ public class PoolStatisticController {
                 Map<String, Object> transResult = UnitTransformUtil.transformValues(String.valueOf(m.get("nowLevel")),
                         String.valueOf(m.get("unit")), String.valueOf(m.get("minLevel")), String.valueOf(m.get("maxLevel")));
                 m.put("nowLevel", transResult.get("nowValue"));
-                if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
-                    if (IndexStatusEnum.LOW.getKey().equals(String.valueOf(transResult.get("status")))) {
-                        m.put("status", 1);
-                    } else if (IndexStatusEnum.HIGH.getKey().equals(String.valueOf(transResult.get("status")))) {
-                        m.put("status", 1);
-                    } else {
-                        m.put("status", 0);
-                    }
-                } else {
-                    m.put("status", 0);
-                }
+//                if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
+//                    if (IndexStatusEnum.LOW.getKey().equals(String.valueOf(transResult.get("status")))) {
+//                        m.put("status", 1);
+//                    } else if (IndexStatusEnum.HIGH.getKey().equals(String.valueOf(transResult.get("status")))) {
+//                        m.put("status", 1);
+//                    } else {
+//                        m.put("status", 0);
+//                    }
+//                } else {
+//                    m.put("status", 0);
+//                }
                 m.put("abs", transResult.get("abs"));
                 if (!String.valueOf(transResult.get("abs")).equals("--") && !ObjectUtils.isEmpty(m.get("volume"))) {
                     BigDecimal divide = new BigDecimal(100);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -356,7 +356,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      * @param bizOrgCode
      * @return
      */
-    Page<Map<String, Object>> getWaterInfoList(Page page, @Param("bizOrgCode") String bizOrgCode, @Param("stationOrder") String stationOrder, @Param("stateOrder") String stateOrder);
+    Page<Map<String, Object>> getWaterInfoList(Page page, @Param("bizOrgCode") String bizOrgCode, @Param("stationOrder") String stationOrder, @Param("stateOrder") String stateOrder, @Param("status") String status);
 
     /**
      * 水源信息统计

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -5022,11 +5022,11 @@
     </select>
 
     <select id="getWaterInfoList" resultType="java.util.Map">
+        SELECT * FROM (
         select
         *,
         (
         CASE
-
         WHEN nowLevel IS NOT NULL
         AND maxLevel IS NOT NULL
         AND nowLevel - maxLevel > 0 THEN
@@ -5035,11 +5035,11 @@
         AND minLevel IS NOT NULL
         AND nowLevel != '--'
         AND nowLevel - minLevel >= 0 THEN
-        '2'
+        '0'
         WHEN nowLevel IS NOT NULL
         AND minLevel IS NOT NULL AND nowLevel != '--'
         AND minLevel - nowLevel > 0 THEN
-        '0' ELSE '4'
+        '1' ELSE '0'
         END
         ) AS `status`
         from (
@@ -5147,11 +5147,17 @@
         r.sequence_nbr
         ) a
         )) b
+        )c
+        <where>
+            <if test="status != null and status != ''">
+                c.`status` = #{status}
+            </if>
+        </where>
         <if test="stationOrder!=null and stationOrder!=''">
-            ORDER BY CONVERT(bizOrgName USING gbk) ASC
+            ORDER BY CONVERT(c.bizOrgName USING gbk) ASC
         </if>
         <if test="stationOrder = null or stationOrder =''">
-            ORDER BY CONVERT(bizOrgName USING gbk) DESC
+            ORDER BY CONVERT(c.bizOrgName USING gbk) DESC
         </if>
     </select>