电源告警实时和历史

whycxzp

2025-03-24 69269100c2d0018fcd6a37e3ee2c95fac56d5689

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

@@ -89,8 +89,7 @@
    }
    //电池告警历史实时
    public List<BattAlarmHistory> getBattHisList(BattAlarmHistory battAlarmHistory) {
        String sql="SELECT * FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " +
                " where 1=1";
        String sql="SELECT history.*,power_inf.power_name,power_inf.binf_name as battGroupName FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history,db_batt.power_inf where history.binf_id=power_inf.binf_id ";
        if(battAlarmHistory.getAlmLevel()!=null){
            sql+=" and history.alm_level="+ battAlarmHistory.getAlmLevel();
        }
@@ -115,6 +114,8 @@
                    data.setAlmId(rs.getInt("alm_id"));
                    data.setAlmLevel(rs.getInt("alm_level"));
                    data.setAlmValue(rs.getInt("alm_value"));
                    data.setPowerName(rs.getString("power_name"));
                    data.setBattGroupName(rs.getString("battGroupName"));
                    list.add(data);
                }
                return list;
@@ -157,8 +158,7 @@
    }
    //电源告警历史实时
    public List<PowerAlarmHistory> getPowerHisList(PowerAlarmHistory powerAlarmHistory) {
        String sql="SELECT * FROM db_power_alarm."+ powerAlarmHistory.getRecordYear()+" history " +
                " where 1=1";
        String sql="SELECT history.*,power_inf.power_name FROM db_power_alarm."+ powerAlarmHistory.getRecordYear()+" history,db_batt.power_inf where history.power_id = power_inf.power_id ";
        if(powerAlarmHistory.getAlmLevel()!=null){
            sql+= " and history.alm_level="+ powerAlarmHistory.getAlmLevel();
        }
@@ -182,6 +182,7 @@
                    data.setAlmId(rs.getInt("alm_id"));
                    data.setAlmLevel(rs.getInt("alm_level"));
                    data.setAlmValue(rs.getInt("alm_value"));
                    data.setPowerName(rs.getString("power_name"));
                    list.add(data);
                }
                return list;