Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentIndex.java

@@ -123,4 +123,7 @@ public class EquipmentIndex extends BaseEntity {
     @TableField(value = "emergency_level_describe")
     private String emergencyLevelDescribe;
 
+    @TableField(value = "unit")
+    private String unit;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -180,6 +180,7 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @TableField(exist = false)
     private String UUID;
 
-
+    @TableField(value = "unit")
+    private String unit;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/IndexStatusEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author keyong
+ * @title: UnitEnum
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/1/13 20:44
+ */
+@Getter
+@AllArgsConstructor
+public enum IndexStatusEnum {
+
+    LOW("0",  "液位低", ""),
+    NORMAL("1", "正常", ""),
+    HIGH("2", "液位高", "");
+
+    private String key;
+
+    private String describe1;
+
+    private String describe2;
+
+    public static IndexStatusEnum getEnumByKey(String key) {
+        IndexStatusEnum statusEnum = null;
+        for (IndexStatusEnum u : IndexStatusEnum.values()) {
+            if (u.getKey().equals(key)) {
+                statusEnum = u;
+                break;
+            }
+        }
+        return statusEnum;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/UnitEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author keyong
+ * @title: UnitEnum
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/1/13 20:44
+ */
+@Getter
+@AllArgsConstructor
+public enum UnitEnum {
+
+    M("m", "米", ""),
+    DM("dm", "分米", ""),
+    CM("cm", "厘米", "");
+
+    private String key;
+
+    private String name;
+
+    private String description;
+
+    public static UnitEnum getEnum(String key) {
+        UnitEnum unitEnum = null;
+        for (UnitEnum u : UnitEnum.values()) {
+            if (u.getKey().equals(key)) {
+                unitEnum = u;
+                break;
+            }
+        }
+        return unitEnum;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/UnitTransformUtil.java

+package com.yeejoin.equipmanage.common.utils;
+
+import com.yeejoin.equipmanage.common.enums.UnitEnum;
+import lombok.extern.slf4j.Slf4j;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author
+ * @title: UnitTransformUtil
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/1/13 20:43
+ */
+@Slf4j
+public class UnitTransformUtil {
+
+    public static Map<String, Object> transformValues(String currentValue, String currentUnit, String minValue, String maxValue) {
+        Map<String, Object> map = new HashMap<>();
+        if (UnitEnum.CM.getKey().equalsIgnoreCase(currentUnit) || UnitEnum.CM.getName().equals(currentUnit)){
+            BigDecimal divide = new BigDecimal(100);
+            if (StringUtil.isNotEmpty(currentValue) && !"--".equals(currentValue)){
+                BigDecimal nowLevel = new BigDecimal(currentValue);
+                map.put("nowValue", nowLevel.divide(divide,2,BigDecimal.ROUND_HALF_UP));
+
+                BigDecimal nowVal = new BigDecimal(currentValue).divide(divide,2,BigDecimal.ROUND_HALF_UP);
+                // status 中 0 表示过低；1 表示正常；2 表示过高
+                if (StringUtil.isNotEmpty(minValue) && !"--".equals(minValue) && StringUtil.isNotEmpty(maxValue)
+                        && !"--".equals(maxValue) && !"null".equalsIgnoreCase(minValue)&& !"--".equals(maxValue) && !"null".equalsIgnoreCase(maxValue)) {
+                    if (nowVal.compareTo(new BigDecimal(minValue)) < 0) {
+                        map.put("status", "0");
+                        map.put("abs", nowVal.divide(new BigDecimal(maxValue),2,BigDecimal.ROUND_HALF_UP).movePointRight(2));
+                    } else if (nowVal.compareTo(new BigDecimal(maxValue)) == 1) {
+                        map.put("status", "2");
+                        map.put("abs", 100);
+                    } else {
+                        map.put("status", "1");
+                        map.put("abs", nowVal.divide(new BigDecimal(maxValue),2,BigDecimal.ROUND_HALF_UP).movePointRight(2));
+                    }
+                } else {
+                    map.put("status", "--");
+                    map.put("abs", "--");
+                }
+            } else {
+                map.put("nowValue", "--");
+                map.put("status", "--");
+                map.put("abs", "--");
+            }
+
+        } else if (UnitEnum.DM.getKey().equalsIgnoreCase(currentUnit) || UnitEnum.DM.getName().equals(currentUnit)) {
+            BigDecimal divide = new BigDecimal(10);
+            if (StringUtil.isNotEmpty(currentValue) && !"--".equals(currentValue)){
+                BigDecimal nowLevel = new BigDecimal(currentValue);
+                map.put("nowValue",nowLevel.divide(divide,2,BigDecimal.ROUND_HALF_UP));
+
+                BigDecimal nowVal = new BigDecimal(currentValue).divide(divide,2,BigDecimal.ROUND_HALF_UP);
+                // status 中 0 表示过低；1 表示正常；2 表示过高
+                if (StringUtil.isNotEmpty(minValue) && !"--".equals(minValue) && StringUtil.isNotEmpty(maxValue)
+                        && !"--".equals(maxValue) && !"null".equalsIgnoreCase(minValue)&& !"--".equals(maxValue) && !"null".equalsIgnoreCase(maxValue)) {
+                    if (nowVal.compareTo(new BigDecimal(minValue)) < 0) {
+                        map.put("status", "0");
+                        map.put("abs", nowVal.divide(new BigDecimal(maxValue),2,BigDecimal.ROUND_HALF_UP).movePointRight(2));
+                    } else if (nowVal.compareTo(new BigDecimal(maxValue)) == 1) {
+                        map.put("status", "2");
+                        map.put("abs", 100);
+                    } else {
+                        map.put("status", "1");
+                        map.put("abs", nowVal.divide(new BigDecimal(maxValue),2,BigDecimal.ROUND_HALF_UP).movePointRight(2));
+                    }
+                } else {
+                    map.put("status", "--");
+                    map.put("abs", "--");
+                }
+            } else {
+                map.put("nowValue", "--");
+                map.put("status", "--");
+                map.put("abs", "--");
+            }
+        } else {
+            BigDecimal nowVal = new BigDecimal(0);
+            if (StringUtil.isNotEmpty(currentValue)) {
+                nowVal = new BigDecimal(currentValue);
+                map.put("nowValue", nowVal);
+            } else {
+                map.put("nowValue", "--");
+            }
+            // status 中 0 表示过低；1 表示正常；2 表示过高
+            if (StringUtil.isNotEmpty(currentValue) && !"--".equals(currentValue)
+                    && StringUtil.isNotEmpty(minValue) && !"--".equals(minValue)
+                    && StringUtil.isNotEmpty(maxValue) && !"--".equals(maxValue) && StringUtil.isNotEmpty(currentUnit)
+                    && !"null".equalsIgnoreCase(minValue)&& !"--".equals(maxValue) && !"null".equalsIgnoreCase(maxValue)) {
+                if (nowVal.compareTo(new BigDecimal(minValue)) < 0) {
+                    map.put("status", "0");
+                    map.put("abs", nowVal.divide(new BigDecimal(maxValue),2,BigDecimal.ROUND_HALF_UP).movePointRight(2));
+                } else if (nowVal.compareTo(new BigDecimal(maxValue)) == 1) {
+                    map.put("status", "2");
+                    map.put("abs", 100);
+                } else {
+                    map.put("status", "1");
+                    map.put("abs", nowVal.divide(new BigDecimal(maxValue),2,BigDecimal.ROUND_HALF_UP).movePointRight(2));
+                }
+            } else {
+                map.put("status", "--");
+                map.put("abs", "--");
+            }
+        }
+        return map;
+    }
+}

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.equipmanage.common.enums.IndexStatusEnum;
 import com.yeejoin.equipmanage.common.utils.*;
 import com.yeejoin.equipmanage.config.PersonIdentify;
 import com.yeejoin.equipmanage.fegin.IotFeign;
@@ -73,7 +74,22 @@ public class SupervisionConfigureController extends AbstractBaseController {
             bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
         }
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
-        return CommonResponseUtil.success(fireFightingSystemMapper.getWaterInfoBySuper(page, bizOrgCode));
+        Page<Map<String, Object>> page1 = fireFightingSystemMapper.getWaterInfoBySuper(page, bizOrgCode);
+        List<Map<String, Object>> res = page1.getRecords();
+        if (0 < res.size()) {
+            for (Map<String, Object> m : res) {
+                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"))))) {
+                    m.put("status", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
+                } else {
+                    m.put("status", "--");
+                }
+                m.put("abs", transResult.get("abs"));
+            }
+        }
+        return CommonResponseUtil.success(page1);
     }
 
     @PersonIdentify

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.equipmanage.common.enums.IndexStatusEnum;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
+import com.yeejoin.equipmanage.common.utils.StringUtil;
+import com.yeejoin.equipmanage.common.utils.UnitTransformUtil;
 import com.yeejoin.equipmanage.mapper.EmergencyMapper;
 import com.yeejoin.equipmanage.service.IEmergencyService;
 import org.apache.commons.compress.utils.Lists;
@@ -51,17 +54,19 @@ public class EmergencyServiceImpl implements IEmergencyService {
     @Override
     public List<Map<String, Object>> getCAFSWaterTankInfo() {
         List<Map<String, Object>> list = emergencyMapper.getCAFSWaterTankInfo();
-//        List<Map<String, Object>> res = new ArrayList();
-//        if (0 < list.size()) {
-//            list.forEach(x -> {
-//                Map<String, Object> map = new HashMap<>();
-//                map.put("key", x.get("specificId"));
-//                map.put("code", x.get("code"));
-//                map.put("name", x.get("name"));
-//                map.put("value", x.get("specificId"));
-//                map.put("key", x.get("specificId"));
-//            });
-//        }
+        if (0 < list.size()) {
+            for (Map<String, Object> m : list) {
+                Map<String, Object> transResult = UnitTransformUtil.transformValues(String.valueOf(m.get("value")),
+                        String.valueOf(m.get("unit")), String.valueOf(m.get("minLevel")), String.valueOf(m.get("maxLevel")));
+                m.put("value", transResult.get("nowValue"));
+                if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
+                    m.put("statusDesc", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
+                } else {
+                    m.put("statusDesc", "--");
+                }
+                m.put("sxyl", transResult.get("abs"));
+            }
+        }
         return Optional.ofNullable(list).orElse(Lists.newArrayList());
     }
 
@@ -82,7 +87,22 @@ public class EmergencyServiceImpl implements IEmergencyService {
 
     @Override
     public Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page) {
-        return emergencyMapper.selectFoamTank(page);
+        Page<Map<String, Object>> page1 = emergencyMapper.selectFoamTank(page);
+        List<Map<String, Object>> res = page1.getRecords();
+        if (0 < res.size()) {
+            for (Map<String, Object> m : res) {
+                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"))))) {
+                    m.put("status", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
+                } else {
+                    m.put("status", "--");
+                }
+                m.put("abs", transResult.get("abs"));
+            }
+        }
+        return page1;
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1577,6 +1577,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             equipmentSpecificIndex.setIsAlarm(index.getIsAlarm());
             equipmentSpecificIndex.setEmergencyLevel(index.getEmergencyLevel());
             equipmentSpecificIndex.setEmergencyLevelDescribe(index.getEmergencyLevelDescribe());
+            equipmentSpecificIndex.setUnit(index.getUnit());
             equipmentSpecificIndices.add(equipmentSpecificIndex);
         });
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/controller/DocLibraryResource.java

@@ -84,15 +84,9 @@ public class DocLibraryResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "知识库卡片信息")
     @RequestMapping(value = "/card", method = RequestMethod.GET)
-    public ResponseModel<Object> queryDocCard(HttpServletRequest request,
-                                               @RequestParam(value = "offset") Integer offset,
-                                               @RequestParam(value = "end") Integer end,
-                                               @RequestParam(value = "filterByCollection") String filterByCollection,
-                                               @RequestParam(value = "directoryId", required = false) Long directoryId,
-                                               @RequestParam(value = "docTitle", required = false) String docTitle,
-                                               @RequestParam(value = "createTimeLeft", required = false) String createTimeLeft,
-                                               @RequestParam(value = "createTimeRight", required = false) String createTimeRight) {
-        return ResponseHelper.buildResponse(docLibraryService.queryCardList());
+    public ResponseModel<Object> queryDocCard( @RequestParam(value = "id", required = false) Long id,
+                                               @RequestParam(value = "ids", required = false) List<Long> ids) {
+        return ResponseHelper.buildResponse(docLibraryService.queryCardList(id , ids));
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/dao/DocContentMapper.java

@@ -29,7 +29,7 @@ public interface DocContentMapper extends BaseMapper<KnowledgeDocContent> {
 
     List<Map<String,Object>> queryDocBaseInfoList(Map<String, Object> paramMap);
 
-    List<Map<String,Object>> queryDocCardList();
+    List<Map<String,Object>> queryDocCardList(@Param("id")Long id, @Param("ids") List<Long> ids);
 
     List<Map<String,Object>> queryCardCount();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocLibraryService.java

@@ -181,12 +181,20 @@ public class DocLibraryService {
         return page;
     }
 
-    public Map<String,Object> queryCardList(){
-        List<Map<String, Object>> content = docContentService.getBaseMapper().queryDocCardList();
+    public Map<String,Object> queryCardList(Long id, List<Long> ids){
+        List<Map<String, Object>> content = docContentService.getBaseMapper().queryDocCardList(id, ids);
         List<Map<String, Object>> countMap = docContentService.getBaseMapper().queryCardCount();
-        Map<String, Object> resultMap = new HashMap<>();
+        Map<String, Object> resultMap = new HashMap<>(2);
         resultMap.put("content",content);
-        countMap.forEach(e->resultMap.put(e.get("directoryName").toString(),e.get("num")));
+        List<Map<String, Object>> list = new ArrayList<>();
+        countMap.forEach(e-> {
+            Map<String, Object> map = new HashMap<>(2);
+            map.put("value",e.get("num"));
+            map.put("name",e.get("categoryName"));
+            map.put("id",e.get("id"));
+            list.add(map);
+        });
+        resultMap.put("count", list);
         return resultMap;
     }
 

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -719,4 +719,26 @@
         </sql>
     </changeSet>
 
+    <changeSet author="keyong" id="1673609612-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_index" columnName="unit"/>
+            </not>
+        </preConditions>
+        <comment>新增属性字段 unit</comment>
+        <sql>
+            alter table `wl_equipment_specific_index` add column `unit` varchar(50) DEFAULT NULL COMMENT '指标单位(冗余字段)';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1673609612-2">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="wl_equipment_specific_index" />
+        </preConditions>
+        <comment>sync field</comment>
+        <sql>
+            UPDATE wl_equipment_specific_index wesi
+            SET wesi.unit = ( SELECT unit FROM wl_equipment_index wei WHERE wei.id = wesi.equipment_index_id );
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file

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

@@ -40,49 +40,25 @@
         SELECT
         wes.id AS specificId,
         wes.`name`,
-        a.statusDesc,
-        a.sxyl,
         a.`value`,
         wes.`code`,
-        a.sxrj
+        a.sxrj,
+        a.`unit`,
+        a.minLevel,
+        a.maxLevel
         FROM
         wl_equipment_specific wes
         LEFT JOIN (
         SELECT
         wlesi.equipment_specific_id,
         IFNULL(wlesi.`value`, '--') AS `value`,
-        CASE
-        WHEN wlesi.`value` IS NULL THEN
-        '--'
-        WHEN wlesi.`value` - ( SELECT IFNULL( wfie.field_value, 0 ) FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'maxLevel' ) > 0 THEN
-        '液位高'
-        WHEN wlesi.`value` - ( SELECT IFNULL( wfie.field_value, 0 ) FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'minLevel' ) < 0 THEN
-        '液位低' ELSE '正常'
-        END AS statusDesc,
+        wlesi.`unit`,
+        (SELECT wfie.field_value FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'maxLevel') AS maxLevel,
+        (SELECT IFNULL( wfie.field_value, 0 ) FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'minLevel') AS minLevel,
         CASE
         WHEN ( SELECT IFNULL( wfie.field_value, 0 ) FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'volume' ) <![CDATA[<>]]> 0 THEN
         CONCAT(( SELECT field_value FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'volume' ),'m³') ELSE '--m³'
-        END AS sxrj,
-        CASE
-        WHEN wlesi.`value` IS NULL THEN
-        '--' ELSE
-        IF
-        (
-        wlesi.`value` - ( SELECT IFNULL( field_value, 0 ) FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'maxLevel' ) &gt; 0,
-        100,
-        ROUND(abs(
-        (
-        wlesi.`value` /
-        IF
-        (
-        ( SELECT IFNULL( field_value, 0 ) FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'maxLevel' ) = 0,
-        1,
-        ( SELECT IFNULL( field_value, 0 ) FROM wl_form_instance_equip wfie WHERE wfie.instance_id = wlesi.equipment_specific_id AND field_name = 'maxLevel' )
-        )
-        )
-        ) * 100, 2)
-        )
-        END AS sxyl
+        END AS sxrj
         FROM
         wl_equipment_specific_index wlesi
         WHERE
@@ -169,36 +145,40 @@
             temp.name,
             temp.nowLevel,
             temp.volume,
-            CASE
-                WHEN ( temp.nowLevel = '--' ) THEN
-                    '--'
-                WHEN ( temp.minLevel - temp.nowLevel > 0 ) THEN
-                    '液位低'
-                WHEN ( temp.nowLevel - temp.maxLevel > 0) THEN
-                    '液位高' ELSE '正常'
-                END AS status,
-            CASE
-                WHEN ( temp.nowLevel = '--' ) THEN
-                    '--' ELSE format(
-                    IF
-                        (
-                                (
-                                        abs( ( ( temp.nowLevel ) / IF ( temp.maxLevel = 0, 1, temp.maxLevel ) ) ) * 100
-                                    ) > 100,
-                                100,
-                                (
-                                        abs( ( ( temp.nowLevel ) / IF ( temp.maxLevel = 0, 1, temp.maxLevel ) ) ) * 100
-                                    )
-                        ),
-                    2
-                )
-                END AS abs
+            temp.unit,
+            temp.minLevel,
+            temp.maxLevel
+--             CASE
+--                 WHEN ( temp.nowLevel = '--' ) THEN
+--                     '--'
+--                 WHEN ( temp.minLevel - temp.nowLevel > 0 ) THEN
+--                     '液位低'
+--                 WHEN ( temp.nowLevel - temp.maxLevel > 0) THEN
+--                     '液位高' ELSE '正常'
+--                 END AS status,
+--             CASE
+--                 WHEN ( temp.nowLevel = '--' ) THEN
+--                     '--' ELSE format(
+--                     IF
+--                         (
+--                                 (
+--                                         abs( ( ( temp.nowLevel ) / IF ( temp.maxLevel = 0, 1, temp.maxLevel ) ) ) * 100
+--                                     ) > 100,
+--                                 100,
+--                                 (
+--                                         abs( ( ( temp.nowLevel ) / IF ( temp.maxLevel = 0, 1, temp.maxLevel ) ) ) * 100
+--                                     )
+--                         ),
+--                     2
+--                 )
+--                 END AS abs
         FROM
             (
                 SELECT
                     wes.id,
                     wes.name,
                     IFNULL( ( SELECT value FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'CAFS_FoamTank_FoamTankLevel' ), '--' ) AS nowLevel,
+                    IFNULL( ( SELECT unit FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'CAFS_FoamTank_FoamTankLevel' ), '--' ) AS unit,
                     IFNULL(( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'maxLevel' ) , 0 )AS maxLevel,
                     IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minLevel' ), 0 ) AS minLevel,
                     IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'volume' ), 0 ) AS volume

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

@@ -4631,47 +4631,8 @@
         r.`name`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
-        (
-        CASE
-
-        WHEN max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ) IS NULL THEN
-        '--'
-        WHEN max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ) >= IFNULL( rp.min_water_level, 0 )
-        AND rp.max_water_level IS NULL THEN
-        '100'
-        WHEN max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ) < IFNULL( rp.min_water_level, 0 )
-        AND rp.max_water_level IS NULL THEN
-        '--' ELSE IFNULL((
-        FORMAT(
-        abs(
-        IFNULL(
-        max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ),
-        IFNULL( rp.min_water_level, 0 )) /
-        IF
-        (
-        IFNULL( rp.max_water_level, 0 ) = 0,
-        1,
-        IFNULL( rp.max_water_level, 0 ))) * 100,
-        2
-        )
-        ),
-        0
-        )
-        END
-        ) AS levelAbs,
         IFNULL(max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel' THEN ei.`value` END ),'--')  AS nowLevel,
-        (
-        CASE
-
-        WHEN max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ) IS NULL
-        OR rp.min_water_level IS NULL THEN
-        '--'
-        WHEN IFNULL(
-        max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ),
-        IFNULL( rp.min_water_level, 0 )) < IFNULL( rp.min_water_level, 0 ) THEN
-        '缺水' ELSE '正常'
-        END
-        ) AS levelStatus,
+        IFNULL(CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' THEN ei.`unit` END,'--')  AS 'unit',
         IFNULL( rp.volume, 0 ) AS volume,
         ec.image,
         r.resource_type,
@@ -4696,47 +4657,8 @@
         a.`name`,
         a.minLevel,
         a.maxLevel,
-        (
-        CASE
-
-        WHEN a.nowLevel IS NULL THEN
-        '--'
-        WHEN a.nowLevel >= IFNULL( a.minLevel, 0 )
-        AND a.maxLevel IS NULL THEN
-        '100'
-        WHEN IFNULL( a.minLevel, 0 ) > a.nowLevel
-        AND a.maxLevel IS NULL THEN
-        '--' ELSE IFNULL((
-        FORMAT(
-        abs(
-        IFNULL(
-        a.nowLevel,
-        IFNULL( a.minLevel, 0 )) /
-        IF
-        (
-        IFNULL( a.maxLevel, 0 ) = 0,
-        1,
-        IFNULL( a.maxLevel, 0 ))) * 100,
-        2
-        )
-        ),
-        0
-        )
-        END
-        ) AS levelAbs,
         IFNULL( a.nowLevel, '--' ) nowLevel,
-        (
-        CASE
-
-        WHEN a.nowLevel IS NULL
-        OR a.minLevel IS NULL THEN
-        '--'
-        WHEN IFNULL( a.minLevel, 0 ) > IFNULL(
-        a.nowLevel,
-        IFNULL( a.minLevel, 0 )) THEN
-        '缺水' ELSE '正常'
-        END
-        ) AS levelStatus,
+        a.`unit`,
         a.volume,
         a.image,
         a.resource_type,
@@ -4748,12 +4670,20 @@
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
         (select
-        FORMAT(avg(IFNULL(ei.`value`,0)), 2)
+        avg(IFNULL(ei.`value`,0))
         from
         wl_equipment_specific_index ei
         where
         (ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel')
         and FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS nowLevel,
+        (select
+            ei.unit
+        from
+        wl_equipment_specific_index ei
+        where
+            -- or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel' 此处由于单位会出现多个，所以无法确定选择哪一个，所以此处默认用一个指标的单位进行单位换算
+        ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel'
+        and FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS 'unit',
         IFNULL( rp.volume, 0 ) AS volume,
         ec.image,
         r.resource_type,
@@ -4776,7 +4706,7 @@
         ) a
         )) b
         ORDER BY
-        levelStatus DESC,sequence_nbr DESC
+        sequence_nbr DESC
     </select>
 
     <select id="getFoamTankBySuper" resultType="java.util.Map">

amos-boot-system-knowledgebase/src/main/resources/mapper/KnowledgeDocContentMapper.xml

@@ -253,70 +253,44 @@
         SELECT SEQUENCE_NBR FROM knowledge_doc_content WHERE DOC_STATUS = "PUBLISHED"
     </select>
 
-    <select id="queryDocCardList"  resultType="map">
+    <select id="queryDocCardList" parameterType="map" resultType="map">
         SELECT
-            SEQUENCE_NBR sequenceNbr,
-            REC_DATE recDate,
-            DOC_STATUS docStatus,
-            CREATE_TIME createTime,
-            USER_ID userId,
-            AUDIT_STATUS auditStatus,
-            REJECTION_COMMENT rejectionComment,
-            AUDITOR_USER_ID auditorUserId,
-            ORG_CODE orgCode,
-            DOC_TITLE docTitle,
-            DIRECTORY_ID directoryId,
-            ( SELECT kdc.CATEGORY_NAME FROM knowledge_doc_category kdc WHERE kdc.SEQUENCE_NBR = DIRECTORY_ID ) directoryName,
-            releaseDate,
-            excuteDate,
-            IFNULL( collectNum, 0 ) collectNum,
-            IFNULL( quoteNum, 0 ) quoteNum,
-            IFNULL( collect, "UNCOLLECT" ) collect
+            kdc.SEQUENCE_NBR id,
+            kdc.DOC_TITLE title,
+            cat.CATEGORY_NAME categoryName
         FROM
-            knowledge_doc_content doct
-                LEFT JOIN (
-                SELECT
-                    INSTANCE_ID,
-                    MAX( CASE FIELD_NAME WHEN 'releaseDate' THEN FIELD_VALUE ELSE NULL END ) AS releaseDate,
-                    MAX( CASE FIELD_NAME WHEN 'excuteDate' THEN FIELD_VALUE ELSE NULL END ) AS excuteDate
-                FROM
-                    knowledge_dynamics_value
-                GROUP BY
-                    INSTANCE_ID
-            ) fieldt ON doct.SEQUENCE_NBR = fieldt.INSTANCE_ID
-                LEFT JOIN ( SELECT ENTITY_ID, COUNT( 1 ) collectNum FROM knowledge_interaction_record WHERE OPERATE_TYPE = "COLLECT" GROUP BY ENTITY_ID ) coll ON doct.SEQUENCE_NBR = coll.ENTITY_ID
-                LEFT JOIN ( SELECT ENTITY_ID, OPERATE_COUNT quoteNum FROM knowledge_interaction_count WHERE OPERATE_TYPE = "PUBLISH" AND ENTITY_TYPE = "DOC" ) quot ON doct.SEQUENCE_NBR = quot.ENTITY_ID
-                LEFT JOIN ( SELECT ENTITY_ID, OPERATE_TYPE collect FROM knowledge_interaction_record WHERE OPERATE_TYPE = "COLLECT" AND USER_ID = 3780967 ) favor ON doct.SEQUENCE_NBR = favor.ENTITY_ID
+            knowledge_doc_content kdc LEFT JOIN knowledge_doc_category cat ON cat.SEQUENCE_NBR = kdc.DIRECTORY_ID
         WHERE
-            DOC_STATUS = 'PUBLISHED'
-        ORDER BY
-            directoryName DESC,
-            create_time DESC
+        kdc.DOC_STATUS = "PUBLISHED"
+        <if test="id != null and id != ''">
+            AND  cat.PARENT_ID =  #{id}
+        </if>
+        <if test="ids != null and ids.size > 0">
+            AND  cat.PARENT_ID not in
+            <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        ORDER BY kdc.CREATE_TIME DESC
     </select>
 
     <select id="queryCardCount" resultType="map">
         SELECT
-
-            ( SELECT kdc.CATEGORY_NAME FROM knowledge_doc_category kdc WHERE kdc.SEQUENCE_NBR = DIRECTORY_ID ) directoryName,
-            COUNT(SEQUENCE_NBR) as num
-        FROM
-            knowledge_doc_content doct
-                LEFT JOIN (
+            SEQUENCE_NBR id,
+            CATEGORY_NAME categoryName,
+            (
             SELECT
-                    INSTANCE_ID,
-                    MAX( CASE FIELD_NAME WHEN 'releaseDate' THEN FIELD_VALUE ELSE NULL END ) AS releaseDate,
-                    MAX( CASE FIELD_NAME WHEN 'excuteDate' THEN FIELD_VALUE ELSE NULL END ) AS excuteDate
+                COUNT( doc.SEQUENCE_NBR )
             FROM
-                    knowledge_dynamics_value
-                GROUP BY
-                    INSTANCE_ID
-            ) fieldt ON doct.SEQUENCE_NBR = fieldt.INSTANCE_ID
-                LEFT JOIN ( SELECT ENTITY_ID, COUNT( 1 ) collectNum FROM knowledge_interaction_record WHERE OPERATE_TYPE = "COLLECT" GROUP BY ENTITY_ID ) coll ON doct.SEQUENCE_NBR = coll.ENTITY_ID
-                LEFT JOIN ( SELECT ENTITY_ID, OPERATE_COUNT quoteNum FROM knowledge_interaction_count WHERE OPERATE_TYPE = "PUBLISH" AND ENTITY_TYPE = "DOC" ) quot ON doct.SEQUENCE_NBR = quot.ENTITY_ID
-                LEFT JOIN ( SELECT ENTITY_ID, OPERATE_TYPE collect FROM knowledge_interaction_record WHERE OPERATE_TYPE = "COLLECT"  ) favor ON doct.SEQUENCE_NBR = favor.ENTITY_ID
+                knowledge_doc_content doc
+                LEFT JOIN knowledge_doc_category kdc ON kdc.SEQUENCE_NBR = doc.DIRECTORY_ID
+            WHERE
+                kdc.PARENT_ID = k.SEQUENCE_NBR
+            ) num
+        FROM
+            knowledge_doc_category k
         WHERE
-            DOC_STATUS = 'PUBLISHED'
-        GROUP BY DIRECTORY_ID
+            PARENT_ID = 0
 
     </select>
 </mapper>