PwrdevAlarmHistoryAction/getHistoryAllPage2添加 PowerDeviceName

whyclxw

2024-03-19 9abf2f3fb65832385715f049340ced78e4de22f4

PwrdevAlarmHistoryAction/getHistoryAllPage2添加
PowerDeviceName

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

@@ -114,7 +114,7 @@

    //3,53,54,77,102,127,136-SubTablePageInfoUtils.java;72行 211行,445行
    public List<PwrdevAlarmHistory> getListForTX(PwrdevAlarmHistory data){
        String sql="select  alarm.*,inf.StationName,inf.StationName1,inf.StationName2,inf.StationName3,inf.StationName5 " +
        String sql="select  alarm.*,inf.StationName,inf.StationName1,inf.StationName2,inf.StationName3,inf.StationName5,inf.PowerDeviceName " +
        " from db_pwrdev_alarm."+data.getRecordYear()+" alarm,db_pwrdev_inf.tb_pwrdev_inf inf " +
        " where alarm.PowerDeviceId = inf.PowerDeviceId ";
        if(data.getStationName1()!=null){
@@ -180,6 +180,7 @@
                    ph.setNum(rs.getLong("num"));
                    ph.setRecordId(rs.getLong("record_id"));
                    ph.setPowerDeviceId(rs.getLong("PowerDeviceId"));
                    ph.setPowerDeviceName(rs.getString("PowerDeviceName"));
                    ph.setAlmType(rs.getInt("alm_type"));
                    ph.setAlmLevel(rs.getInt("alm_level"));
                    ph.setAlmSource(rs.getInt("alm_source"));