修改系统图消防信息卡片bug

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

@@ -16,6 +16,7 @@ import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.vo.*;
+import org.apache.ibatis.annotations.Param;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -296,4 +297,6 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
     void updateEquipQrCode( List<Map<String, String>> ids, String status);
 
     String getEquipRealtimeSignal(long id);
+
+    EquipmentSpecific getEquipSpecificEntityByCode(String code);
 }

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

@@ -32,6 +32,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.yeejoin.equipmanage.service.impl.MqttReceiveServiceImpl.equipmentSpecificMapper;
+
 /**
  * 服务实现类
  *
@@ -352,6 +354,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
     public EquipmentDate getEquipmentBasicInformation(Long id, Long stockDetailId) {
         EquipmentDate equipmentDate = new EquipmentDate();
         EquipmentSpecific equipmentSpecific = equipmentSpecificService.getById(id);
+        EquipmentSpecific specific = equipmentSpecificService.getEquipSpecificEntityByCode(equipmentSpecific.getCode());
+        equipmentSpecific.setEquipCondition(specific.getEquipCondition());
         equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode());
         EquipmentDetail equipmentDetail = this.getOneById(equipmentSpecific.getEquipmentDetailId());
         StockDetail stockDetail = null;

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

@@ -2217,4 +2217,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     public String getEquipRealtimeSignal(long id) {
         return equipmentSpecificMapper.selectEquipRealtimeSignal(id);
     }
+
+    @Override
+    public EquipmentSpecific getEquipSpecificEntityByCode(String code) {
+        return equipmentSpecificMapper.getEquipSpecificEntityByCode(code);
+    }
 }

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

@@ -6226,13 +6226,9 @@
         SELECT
             spec.id,
             spec.`name`,
+            spec.`code` AS speCode,
             spec.position,
-            CASE
-            spec.equip_status
-            WHEN '0' THEN
-            '正常'
-            ELSE '异常'
-            END AS equipStatus,
+            (SELECT IF(SUM(IF(a.equipment_specific_index_value = 'true', 1, 0)) > 0, '异常', '正常' ) FROM wl_equipment_specific_alarm a WHERE a.equipment_specific_id = spec.id) AS equipStatus,
             IFNULL(detail.standard, '') AS standard
         FROM
             wl_equipment_specific spec