电池组历史告警查询分开

whyclxw

2025-05-28 b83319baccfa93115782cc85e4d2d4db43c57624

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

@@ -83,7 +83,7 @@
        return num;
    }
    //获取电池组历史告警集合
    public List<BattAlarmRes> getBattAlmHisList(BattAlmPar param){
    public List<BattalarmDataHistory> getBattAlmHisList(BattAlmPar param){
        String sql="select history.battgroup_id,history.num,alm_signal_id,history.mon_num,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time,alm_severity  " +
                "        ,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_batt_inf.battgroup_name  " +
                "        from db_alarm."+param.getRecordYear()+" history,db_station.tb_station_inf,db_station.tb_batt_inf " +
@@ -125,7 +125,7 @@
        }
        sql+="   order by history.alm_start_time desc,history.battgroup_id asc,history.mon_num asc limit "+param.getLimitStart()+","+param.getLimitEnd()+" ";

        List<BattAlarmRes> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
        /*List<BattAlarmRes> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<BattAlarmRes> list=new ArrayList<>();
@@ -173,6 +173,34 @@
                }
                return list;
            }
        });*/
        List<BattalarmDataHistory> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<BattalarmDataHistory> list=new ArrayList<>();
                while (rs.next()){
                    BattalarmDataHistory data=new BattalarmDataHistory();
                    data.setNum(rs.getLong("num"));
                    data.setBattgroupId(rs.getInt("battgroup_id"));
                    data.setAlmSignalId(rs.getInt("alm_signal_id"));
                    data.setMonNum(rs.getInt("mon_num"));
                    data.setAlmValue(rs.getFloat("alm_value"));
                    data.setAlmLevel(rs.getInt("alm_level"));
                    data.setAlmIsConfirmed(rs.getInt("alm_is_confirmed"));
                    data.setAlmConfirmedTime(rs.getTimestamp("alm_confirmed_time"));
                    data.setAlmStartTime(rs.getTimestamp("alm_start_time"));
                    data.setAlmEndTime(rs.getTimestamp("alm_end_time"));
                    data.setAlmSeverity(rs.getInt("alm_severity"));
                    data.setBattgroupId(rs.getInt("battgroup_id"));
                    data.setStationName(rs.getString("station_name"));
                    data.setProvice(rs.getString("provice"));
                    data.setCity(rs.getString("city"));
                    data.setCountry(rs.getString("country"));
                    data.setBattGroupName(rs.getString("battgroup_name"));
                    list.add(data);
                }
                return list;
            }
        });
        return list;
    }