item：消防系统接口通用化，新增通用消防系统设备分类设备状态接口

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

@@ -168,9 +168,18 @@ public class FireFightingSystemController extends AbstractBaseController {
     //查询系统下设备状态
     @RequestMapping(value = "/alarmSystem/info", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation("通过id查询消防系统信息")
-    public List<Map<String,Object>> getEquip() {
-        return fireFightingSystemService.getEquip();
+    @ApiOperation("通过systemCode查询消防系统信息")
+    public List<Map<String,Object>> getEquip(@RequestParam(required = false) String systemCode) {
+        return fireFightingSystemService.getEquip(systemCode);
+    }
+
+    //查询系统下设备状态
+    @RequestMapping(value = "/getFireSystemEquipStatusList", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("通过systemCode、设备分类编码字符串查询消防系统信息")
+    public List<Map<String,Object>> getFireSystemEquipStatusList(@RequestParam(required = false) String systemCode,
+                                                                 @RequestParam(required = false) String categoryCodes) {
+        return fireFightingSystemService.getFireSystemEquipStatusList(systemCode, categoryCodes);
     }
 
 

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

@@ -642,10 +642,11 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> selectAllDays();
 
-    List<Map<String, Object>> getEquip();
+    List<Map<String, Object>> getEquip(String systemCode);
+
+    List<Map<String, Object>> getFireSystemEquipStatusList(String systemCode, String categoryCodes);
 
     List<Map<String, Object>> selectPressureDetails(@Param("bizOrgCode") String bizOrgCode);
 
     Map<String, Object> selectEquipmentSpecificById(@Param("id") String id);
-
 }

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

@@ -171,7 +171,10 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      */
     FireFightingSystemEntity getDetailByCode(String systemCode);
 
-    List<Map<String,Object>> getEquip();
+    List<Map<String,Object>> getEquip(String systemCode);
+
+    List<Map<String, Object>> getFireSystemEquipStatusList(String systemCode, String categoryCodes);
+
     /**
      * 集成页面系统数据
      *

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

@@ -977,22 +977,61 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public List<Map<String, Object>> getEquip() {
-        List<Map<String, Object>> list = fireFightingSystemMapper.getEquip();
+    public List<Map<String, Object>> getEquip(String systemCode) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getEquip(systemCode);
         List<Map<String, Object>> resList = new ArrayList<>();
         int i = 1;
         if (0 < list.size()) {
             for (Map<String, Object> m : list) {
+                List<Map<String, Object>> list1 = new ArrayList();
                 Map<String, Object> map = new HashMap<>();
+                Map<String, Object> statusMap = new HashMap<>();
                 map.put("key", i);
                 map.put("name", m.get("equipmentName"));
-                map.put("equipmentCode", m.get("equipmentCode"));
-                map.put("code", m.get("code"));
-                map.put("value", m.get("flag"));
-                map.put("unit", "");
+                map.put("code", m.get("equipmentCode"));
+                map.put("systemTypeCode", systemCode);
+                map.put("img", m.get("shbzImg"));
+                statusMap.put("name", m.get("status"));
+                if ("正常".equals(String.valueOf(m.get("status")))) {
+                    statusMap.put("level", "success");
+                } else {
+                    statusMap.put("level", "warning");
+                }
+                list1.add(statusMap);
+                map.put("status", list1);
                 resList.add(map);
                 i++;
+            };
+        }
+        return resList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getFireSystemEquipStatusList(String systemCode, String categoryCodes) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getFireSystemEquipStatusList(systemCode, categoryCodes);
+        List<Map<String, Object>> resList = new ArrayList<>();
+        int i = 1;
+        if (0 < list.size()) {
+            for (Map<String, Object> m : list) {
+                List<Map<String, Object>> list1 = new ArrayList();
+                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> statusMap = new HashMap<>();
+                map.put("key", i);
+                map.put("name", m.get("name"));
+                map.put("code", m.get("code"));
+                map.put("systemTypeCode", systemCode);
+                map.put("img", m.get("shbzImg"));
+                statusMap.put("name", m.get("status"));
+                if ("正常".equals(String.valueOf(m.get("status")))) {
+                    statusMap.put("level", "success");
+                } else {
+                    statusMap.put("level", "warning");
                 }
+                list1.add(statusMap);
+                map.put("status", list1);
+                resList.add(map);
+                i++;
+            };
         }
         return resList;
     }

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

@@ -5614,20 +5614,54 @@
                     WHEN 0 THEN
                         '正常' ELSE '异常'
                     END
-                ) flag
+                ) `status`,
+            wle.shbz_img shbzImg
         FROM
             wl_equipment_specific AS spe
                 LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, spe.system_id )
                 LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
                 LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
-                LEFT JOIN wl_stock_detail AS wlsd ON wlsd.equipment_detail_id = det.id
         WHERE
             fs.system_type_code IS NOT NULL
-            AND fs.system_type_code = 'fireAlarmSys'
-            AND wlsd.`status` = 1
+            <if test="systemCode != null and systemCode != ''">
+                AND fs.system_type_code = #{systemCode}
+            </if>
         GROUP BY det.`code`
     </select>
 
+    <select id="getFireSystemEquipStatusList" resultType="java.util.Map">
+        SELECT
+            spe.id,
+            spe.`name`,
+            spe.`code`,
+            (
+                CASE
+                    ( SELECT count(*) FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = spe.id AND STATUS = 1 )
+                    WHEN 0 THEN
+                        '正常' ELSE '异常'
+                    END
+                ) `status`,
+            wle.shbz_img shbzImg
+        FROM
+            wl_equipment_specific AS spe
+                LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, spe.system_id )
+                LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
+                LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
+        WHERE
+            fs.system_type_code IS NOT NULL
+            <if test="systemCode != null and systemCode != ''">
+                AND fs.system_type_code = #{systemCode}
+            </if>
+            <if test="categoryCodes != null and categoryCodes.split(',').length >0">
+                AND
+                <foreach collection="categoryCodes.split(',')" item="item" index="index" open="(" close=")" separator=" OR ">
+                    LOCATE(#{item}, det.`code`) > 0
+                </foreach>
+            </if>
+        GROUP BY spe.id
+        ORDER BY spe.id
+    </select>
+
     <select id="selectPressureDetails" resultType="java.util.Map">
         SELECT
             ed.`name`,