修改装备bug

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

@@ -16,10 +16,7 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
-import com.yeejoin.equipmanage.common.enums.AlarmCleanTypeEnum;
-import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
-import com.yeejoin.equipmanage.common.enums.AlarmTypeEnum;
-import com.yeejoin.equipmanage.common.enums.TopicEnum;
+import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.Token;
@@ -112,6 +109,9 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Autowired
     private EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
 
+    @Autowired
+    private ISignalClassifyService signalClassifyService;
+
 
 
 
@@ -129,6 +129,11 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             return res;
         }
         EquipmentSpecificAlarmLog specificAlarm = confirmAlarmMapper.getDetailsById(alarmId, equipId);
+        if (!ObjectUtils.isEmpty(specificAlarm.getConfirmType())) {
+            String handleTypeName = ConfirmAlamEnum.getTypeByCode(String.valueOf(specificAlarm.getConfirmType()));
+            specificAlarm.setConfirmTypeName(StringUtil.isNotEmpty(handleTypeName)
+                    ? handleTypeName : signalClassifyService.getTypeNameByCode(String.valueOf(specificAlarm.getConfirmType())).getTypeName());
+        }
         List<AlamVideoVO> videoBySpeId;
         if (specificAlarm == null) {
             videoBySpeId = videoMapper.getVideoBySpeId(equipId);