历史告警加入告警对应关系名字

whyclxw

2025-06-04 0e9232080ecf8caadbb7712dc914d00823760842

历史告警加入告警对应关系名字

 src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.java

@@ -41,6 +41,9 @@
    @ApiModelProperty(value = "电池告警ID")
    private Integer almId;

    @TableField(exist = false)
    private String almName;

    @ApiModelProperty(value = "告警类型")
    private Integer almSignalId;


 src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java

@@ -41,6 +41,9 @@
    @ApiModelProperty(value = "告警ID")
    private Integer almId;

    @TableField(exist = false)
    private String almName;

    @ApiModelProperty(value = "告警等级")
    private Integer almLevel;


 src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmHistory.java

@@ -38,6 +38,9 @@
    @ApiModelProperty(value = "告警ID")
    private Integer almId;

    @TableField(exist = false)
    private String almName;

    @ApiModelProperty(value = "告警等级")
    private Integer almLevel;


 src/main/java/com/whyc/service/AlarmHisService.java

@@ -1,11 +1,18 @@
package com.whyc.service;

import com.github.pagehelper.PageInfo;
import com.whyc.constant.BattAlarmIdEnum;
import com.whyc.constant.BattSingalIdEnum;
import com.whyc.constant.DevAlarmEnum;
import com.whyc.constant.PowerAlarmEnum;
import com.whyc.dto.AlmHis.BattAlmPar;
import com.whyc.dto.AlmHis.DevAlmPar;
import com.whyc.dto.AlmHis.PwrAlmPar;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
import com.whyc.pojo.db_alarm.BattalarmDataHistory;
import com.whyc.pojo.db_alarm.DevalarmDataHistory;
import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmHistory;
import com.whyc.pojo.db_user.User;
import com.whyc.util.ActionUtil;
import com.whyc.util.MessageUtils;
@@ -34,14 +41,10 @@
        PageInfo<Object> pageInfo = subTablePageInfoUtils.getPageInfoByMonthTable(pageNum, pageSize, almStartTime, almEndTime,
                "db_alarm", "tb_battalarm_data_history", almDto);
        List<Object> list = pageInfo.getList();
        /*for (Object data : list) {
            AlarmRes a = (AlarmRes) data;
            List<BattalarmDataHistory> l = a.getAdataHs();
            for (BattalarmDataHistory adataH : l) {
                adataH.setAlmSignalIdName(AlarmDaoFactory.getAlarmName(adataH.getAlmSignalId()));
                adataH.setAlmLevelName(AlarmDaoFactory.getAlarmType(adataH.getAlmLevel()));
            }
        }*/
        for (Object data : list) {
            BattalarmDataHistory dataH = (BattalarmDataHistory) data;
            dataH.setAlmName(BattSingalIdEnum.getValue(dataH.getAlmSignalId()));
        }
        return new Response().setII(1, list!=null, pageInfo, "电池告警历史记录查询");
    }
    //设备告警历史记录查询
@@ -55,6 +58,11 @@
        almDto.setUid(uid);
        PageInfo<Object> pageInfo = subTablePageInfoUtils.getPageInfoByMonthTable(pageNum, pageSize, almStartTime, almEndTime,
                "db_alarm", "tb_devalarm_data_history", almDto);
        List<Object> list = pageInfo.getList();
        for (Object data : list) {
            DevalarmDataHistory dataH = (DevalarmDataHistory) data;
            dataH.setAlmName(DevAlarmEnum.getValue(dataH.getAlmId()));
        }
        return new Response().setII(1, pageInfo.getList()!=null, pageInfo, "返回结果");
    }
    //电源告警历史记录查询
@@ -71,10 +79,10 @@
        PageInfo<Object> pageInfo = subTablePageInfoUtils.getPageInfo(pageNum, pageSize, almStartTime, almEndTime,
                "db_pwrdev_alarm", "tb_pwrdev_alarm_history", almDto);
        List<Object> list = pageInfo.getList();
        /*for (Object temp : list) {
            PwrdevAlarmHistory p = (PwrdevAlarmHistory) temp;
            p.setAlarmName(AlarmDaoFactory.getAllAlarmName(p.getAlmType()));
        }*/
        for (Object data : list) {
            PwrdevAlarmHistory dataH = (PwrdevAlarmHistory) data;
            dataH.setAlmName(PowerAlarmEnum.getValue(dataH.getAlmId()));
        }
        return new Response<>().setII(1, pageInfo, null, "电源告警历史记录查询");
    }
}

 src/main/java/com/whyc/service/SubTablePageInfoService.java

@@ -317,6 +317,7 @@
                    ph.setNum(rs.getLong("num"));
                    ph.setDevId(rs.getInt("dev_id"));
                    ph.setDevIp(rs.getString("dev_ip"));
                    ph.setAlmId(rs.getInt("alm_id"));
                    ph.setAlmLevel(rs.getInt("alm_level"));
                    ph.setAlmStartTime(rs.getTimestamp("alm_start_time"));
                    ph.setAlmEndTime(rs.getTimestamp("alm_end_time"));