Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
@@ -168,9 +169,40 @@ 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 bizOrgCode,
+                                             @RequestParam(required = false) String systemCode) {
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+                if (StringUtils.isEmpty(bizOrgCode)) {
+                    return Lists.newArrayList();
+                }
+            }
+        }
+        return fireFightingSystemService.getEquip(bizOrgCode, systemCode);
+    }
+
+    //查询系统下设备状态
+    @RequestMapping(value = "/getFireSystemEquipStatusList", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("通过systemCode、设备分类编码字符串查询消防系统信息")
+    public List<Map<String,Object>> getFireSystemEquipStatusList(@RequestParam(required = false) String bizOrgCode,
+                                                                 @RequestParam(required = false) String systemCode,
+                                                                 @RequestParam(required = false) String categoryCodes) {
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+                if (StringUtils.isEmpty(bizOrgCode)) {
+                    return Lists.newArrayList();
+                }
+            }
+        }
+        return fireFightingSystemService.getFireSystemEquipStatusList(bizOrgCode, 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 bizOrgCode, String systemCode);
+
+    List<Map<String, Object>> getFireSystemEquipStatusList(String bizOrgCode, 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 bizOrgCode, String systemCode);
+
+    List<Map<String, Object>> getFireSystemEquipStatusList(String bizOrgCode, 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 bizOrgCode, String systemCode) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getEquip(bizOrgCode, 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("name", m.get("name"));
                 map.put("code", m.get("code"));
-                map.put("value", m.get("flag"));
-                map.put("unit", "");
+                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 bizOrgCode, String systemCode, String categoryCodes) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getFireSystemEquipStatusList(bizOrgCode, 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;
     }
@@ -2073,6 +2112,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
     @Override
     public List<Map<String, Object>> getSystemAlarmInfoList(String startDate, String endDate) {
+        if (!StringUtil.isNotEmpty(startDate)) {
+            startDate = null;
+        }
+        if (!StringUtil.isNotEmpty(endDate)) {
+            endDate = null;
+        }
         return fireFightingSystemMapper.getSystemAlarmInfoList(startDate, endDate);
     }
 

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

@@ -206,7 +206,6 @@
                     wl_equipment_specific wes
                 WHERE
                     wes.equipment_code LIKE concat( '920319', '%' )
-                  AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
             ) temp
     </select>
 

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

@@ -4116,7 +4116,7 @@
     </select>
     <select id="selectAlarms" resultType="java.lang.Integer">
         SELECT
-        COUNT(1)
+            SUM(index_true_num)
         FROM
         wl_equipment_alarm_report_day report
         LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids )
@@ -4449,7 +4449,9 @@
         LEFT JOIN wl_equipment_detail detail ON spec.equipment_detail_id = detail.id
         LEFT JOIN wl_equipment equipment ON equipment.id =detail.equipment_id
         left join f_fire_fighting_system s on FIND_IN_SET(s.id,spec.system_id)
-        where spec.system_id = #{systemId} AND equipment.is_iot = 1
+        where
+        FIND_IN_SET(#{systemId},spec.system_id)
+         AND equipment.is_iot = 1
         GROUP BY code,s.id, name ORDER BY system_id, code ) a) as  a1
         GROUP BY a1.system_id
         ) as b
@@ -5296,7 +5298,7 @@
         FROM
         `f_fire_fighting_system` `fs`
         where
-            fs.system_type_code IS NOT NULL
+            fs.system_type_code IS NOT NULL AND LENGTH(trim(fs.system_type_code)) != 0 AND fs.system_type_code != 'otherSys'
     </select>
 
     <select id="getSystemCountInfo" resultType="java.util.Map">
@@ -5605,27 +5607,66 @@
     <select id="getEquip" resultType="java.util.Map">
         SELECT
             spe.id,
-            det.`name` equipmentName,
+            wle.`name`,
+            wle.`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="bizOrgCode != null and bizOrgCode != ''">
+                AND spe.biz_org_code like concat(#{bizOrgCode}, '%')
+            </if>
+            <if test="systemCode != null and systemCode != ''">
+                AND fs.system_type_code = #{systemCode}
+            </if>
+        GROUP BY wle.`code`
+    </select>
+
+    <select id="getFireSystemEquipStatusList" resultType="java.util.Map">
+        SELECT
+            spe.id,
+            spe.`name`,
             spe.`code`,
-            det.`code` equipmentCode,
             (
                 CASE
                     ( SELECT count(*) FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = spe.id AND STATUS = 1 )
                     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
-        GROUP BY det.`code`
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND spe.biz_org_code like concat(#{bizOrgCode}, '%')
+            </if>
+            <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">