报警信息详情处理报警类型

gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceAlarmServiceImpl.java

@@ -51,6 +51,15 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
         DeviceAlarmVo deviceAlarmVo = new DeviceAlarmVo();
         TDeviceAlarm tDeviceAlarm = tDeviceAlarmMapper.selectTDeviceAlarmById(alarmId);
 
+        if (StringUtils.isNotEmpty(tDeviceAlarm.getAlarmType())) {
+            List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_alarm_type");
+            for (SysDictData sysDictData : sysDictDataList) {
+                if (tDeviceAlarm.getAlarmType().equals(sysDictData.getDictValue())) {
+                    deviceAlarmVo.setAlarmType(sysDictData.getDictLabel());
+                }
+            }
+        }
+
         BeanUtils.copyProperties(tDeviceAlarm, deviceAlarmVo);
 
         if("0".equals(tDeviceAlarm.getDeviceType())){
@@ -111,9 +120,9 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
                     }
                 }
 
+                if (StringUtils.isNotEmpty(alarm.getAlarmType())) {
                     List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_alarm_type");
                     for (SysDictData sysDictData : sysDictDataList) {
-                    if (StringUtils.isNotEmpty(alarm.getAlarmType())) {
                         if (alarm.getAlarmType().equals(sysDictData.getDictValue())) {
                             deviceAlarmVo.setAlarmType(sysDictData.getDictLabel());
                         }