1.确警页面列表接口、告警详情接口 信号分类枚举替换为新的需求信号分类表

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

@@ -133,10 +133,6 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             videoBySpeId = videoMapper.getVideoBySpeId(equipId);
         } else {
             videoBySpeId = videoMapper.getVideoBySpeId(specificAlarm.getEquipmentSpecificId());
-            List<DictionarieValueModel> dict = remoteSecurityService.listDictionaryByDictCode(alarmType);
-            Map<String, String> dictMap = dict.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
-            //specificAlarm.getEquipmentSpecificIndexKey() 取值为告警类型type，兼容之前的页面取值
-            specificAlarm.setEquipmentSpecificIndexName(dictMap.get(specificAlarm.getEquipmentSpecificIndexKey()));
         }
 
         videoBySpeId.forEach(action -> {

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

@@ -209,11 +209,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                     e.printStackTrace();
                 }
                 dataVO.setAlarmEquip(String.valueOf(x.get("fireEquipmentName")));
-                Object type = x.get("type");
-                if (AlarmTypeEnum.HZGJ.getCode().equals(type) || AlarmTypeEnum.GZGJ.getCode().equals(type)
-                        || AlarmTypeEnum.PB.getCode().equals(type)) {
-                    dataVO.setAlarmType(AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
-                }
+                Object alarmType = x.get("alarmType");
+                dataVO.setAlarmType(StringUtil.isNotEmpty(alarmType) ? alarmType.toString() : "");
                 dataVO.setType(String.valueOf(x.get("type")));
                 dataVO.setAlarmInfo(x.get("fireEquipmentName") + dataVO.getAlarmType());
                 dataVO.setEquipSpeId(Long.valueOf(String.valueOf(x.get("fireEquipmentId"))));

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

@@ -75,9 +75,7 @@ import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.ICarPropertyService;
 import com.yeejoin.equipmanage.service.IEquipmentAlarmReportDayService;
-import com.yeejoin.equipmanage.service.IEquipmentDetailService;
 import com.yeejoin.equipmanage.service.IEquipmentIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmLogService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;

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

@@ -17,6 +17,7 @@
 			ala.equipment_specific_id,
 			spe.code AS equipmentSpecificCode,
 			ala.equipment_specific_index_name,
+		    (select  type_name from wl_signal_classify sc where sc.type_code = ala.type limit 1) as equipmentSpecificIndexName,
 			ala.type as equipment_specific_index_key,
 			concat(ala.equipment_specific_name,ala.equipment_specific_index_name) as alarmContent,
 			ala.location AS alarmPlace,

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

@@ -335,6 +335,7 @@
         wlesa.frequency AS frequency,
         wlesal.status AS status,
         wlesal.type AS type,
+        (select  type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as alarmType,
         wlesal.create_date AS createDate,
         wlesal.build_id AS buildId,
         wlesa.recovery_date AS recoveryDate,