whycxzp
2024-03-08 943bc39399c78bcf934bbdd1a16598084a3b1f49
src/main/java/com/whyc/service/BattalarmDataService.java
@@ -274,7 +274,7 @@
        int[] alarmParams = {AlarmDaoFactory.Alarm_CapAlarm, AlarmDaoFactory.Alarm_CapChange, AlarmDaoFactory.Alarm_res_Conn, AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID};
        List<BattalarmData> lista = mapper.getRealAlarmListWithLevel1(uId);
        for (BattalarmData battAlarm : lista) {
            battAlarm.setAlarmName(AlarmDaoFactory.getAlarmName(battAlarm.getAlmSignalId()));
            battAlarm.setAlarmName(MessageUtils.getMessage(AlarmDaoFactory.getAlarmName(battAlarm.getAlmSignalId())));
        }
        List<DevalarmData> listd = devalarmDataMapper.getRealAlarmListWithLevel1(uId);
        if (listd != null && listd.size() > 0) {
@@ -294,7 +294,7 @@
                data.setNum(ddata.getNum());
                data.setAlmStartTime(ddata.getAlmStartTime());
                //data.setAlm_signal_id(ddata.getAlm_type());
                data.setAlarmName(AlarmDaoFactory.getdevName(ddata.getAlmType()));
                data.setAlarmName(MessageUtils.getMessage(AlarmDaoFactory.getdevName(ddata.getAlmType())));
                data.setAlmSeverity(ddata.getAlmSeverity());
                lista.add(data);
            }