系统状态修改

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

@@ -29,6 +29,8 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     int getEquipmentSpeCount(Map<String, Object> map);
 
+    int getSystemAlarmNum(@Param("systemId") Long systemId);
+
     List<Map<String, Object>> getEquipmentCount(@Param("bizOrgCode") String bizOrgCode);
     List<Map<String, Long>> getEquipmentCountBySystemId(@Param("bizOrgCode") String bizOrgCode, @Param("systemIds") List<Long> systemIds);
 

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

@@ -284,15 +284,18 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting
             List<Long> entitySystemIds = Arrays.stream(groupEntity.getSystemIds().split(",")).map(Long::parseLong).collect(Collectors.toList());
             int size = entitySystemIds.size();
             for (int i = 0; i < size; i++) {
+
+
                 Long systemId = entitySystemIds.get(i);
                 JSONObject system = new JSONObject();
                 FireFightingSystemEntity systemEntity = systemMap.get(systemId);
+                int equipmentSpeCount = equipmentSpecificMapper.getSystemAlarmNum(systemId);
                 List<SystemEquipmentRelationEntity> relationEntities = Objects.nonNull(systemEquipmentMap.get(systemId)) ? systemEquipmentMap.get(systemId) : new ArrayList<>();
                 system.put("id", systemId);
                 system.put("code", systemEntity.getCode());
                 system.put("typeCode", systemEntity.getSystemTypeCode());
                 system.put("name", systemEntity.getName());
-                system.put("systemState", systemEntity.getSystemStatus());
+                system.put("systemState", equipmentSpeCount);
                 system.put("systemRunState", systemEntity.getSystemRunState());
                 system.put("protectObject", systemEntity.getProObject());
                 system.put("systemDesc", systemEntity.getSystemDescribe());

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

@@ -3119,4 +3119,14 @@
         indexKey IS NOT NULL
         AND indexKey != ''
     </select>
+    <select id="getSystemAlarmNum" resultType="int">
+        SELECT
+            IF
+                ( count( `wesa`.`equipment_specific_id` ) > 0, 1, 0 )
+        FROM
+            `wl_equipment_specific_alarm` `wesa`
+        WHERE
+            find_in_set( #{systemId}, `wesa`.`system_ids` )
+          AND `wesa`.`status` = 1
+    </select>
 </mapper>
\ No newline at end of file