lxw
2023-04-24 e2b4ed00f1a0012236e737a608ecfb2abbfc2eb4
src/main/java/com/whyc/service/BattalarmDataService.java
@@ -337,7 +337,7 @@
    //项目下方的滚动,查询30天的电池告警和设备告警和电源告警
    @Transactional
    public Response getRealAlarm(int uId){
    public Response getRealAlarm(int uId, String lang) {
        Calendar instance = Calendar.getInstance();
        instance.add(Calendar.MONTH,-1);
        Date yesterday = instance.getTime();
@@ -360,7 +360,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.getMessageSocket(AlarmDaoFactory.getdevName(ddata.getAlmType()), lang));
                lista.add(data);
            }
        }