whyclxw
2025-05-27 1344fc0c324fe2cb2b090efda8e7c4128da1c30b
电池,设备,电源历史告警
3个文件已修改
46 ■■■■■ 已修改文件
src/main/java/com/whyc/service/SubTablePageInfoService.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/util/MathUtil.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/util/SubTablePageInfoUtils.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -27,11 +27,11 @@
    public int getBattAlmHisCount(BattAlmPar param){
        String sql="select count(distinct history.num) as number " +
                "        from db_alarm."+param.getRecordYear()+" history,db_station.tb_station_inf,db_station.tb_batt_inf " +
                "        where  history.battgroup_id=tb_battinf.battgroup_id " +
                "        where  history.battgroup_id=tb_batt_inf.battgroup_id " +
                 "       and tb_batt_inf.station_id=tb_station_inf.station_id " +
                "        and alm_start_time>='"+ThreadLocalUtil.format(param.getAlmStartTime(),1)+"' and alm_start_time <='"+ThreadLocalUtil.format(param.getAlmEndTime(),1)+"'  " ;
        if(param.getProvice()!=null){
            sql+=" and tb_station_inf.province='"+param.getProvice()+"' ";
            sql+=" and tb_station_inf.provice='"+param.getProvice()+"' ";
        }
        if(param.getCity()!=null){
            sql+=" and tb_station_inf.city='"+param.getCity()+"' ";
@@ -87,11 +87,11 @@
        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 " +
                "        where  history.battgroup_id=tb_battinf.battgroup_id " +
                "        where  history.battgroup_id=tb_batt_inf.battgroup_id " +
                "       and tb_batt_inf.station_id=tb_station_inf.station_id " +
                "        and alm_start_time>='"+ThreadLocalUtil.format(param.getAlmStartTime(),1)+"' and alm_start_time <='"+ThreadLocalUtil.format(param.getAlmEndTime(),1)+"'  " ;
        if(param.getProvice()!=null){
            sql+=" and tb_station_inf.province='"+param.getProvice()+"' ";
            sql+=" and tb_station_inf.provice='"+param.getProvice()+"' ";
        }
        if(param.getCity()!=null){
            sql+=" and tb_station_inf.city='"+param.getCity()+"' ";
@@ -184,7 +184,7 @@
                " and tb_batt_inf.station_id=tb_station_inf.station_id "+
                " and alm_start_time>='"+ThreadLocalUtil.format(param.getAlmStartTime(),1)+"' and alm_start_time <='"+ThreadLocalUtil.format(param.getAlmEndTime(),1)+"'  " ;
        if(param.getProvice()!=null){
            sql+=" and tb_station_inf.province='"+param.getProvice()+"' ";
            sql+=" and tb_station_inf.provice='"+param.getProvice()+"' ";
        }
        if(param.getCity()!=null){
            sql+=" and tb_station_inf.city='"+param.getCity()+"' ";
@@ -237,14 +237,14 @@
    }
    //获取设备历史告警集合
    public List getDevAlmHisList(DevAlmPar param){
        String sql="SELECT  history.num,dev_id,dev_ip,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,alm_severity, " +
        String sql="SELECT  history.*, " +
                "   tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_batt_inf.dev_name  " +
                "   FROM db_alarm."+param.getRecordYear()+" history,db_station.tb_batt_inf,db_station.tb_station_inf " +
                " where  history.dev_id=tb_batt_inf.dev_id "+
                " and tb_batt_inf.station_id=tb_station_inf.station_id "+
                " and alm_start_time>='"+ThreadLocalUtil.format(param.getAlmStartTime(),1)+"' and alm_start_time <='"+ThreadLocalUtil.format(param.getAlmEndTime(),1)+"'  " ;
        if(param.getProvice()!=null){
            sql+=" and tb_station_inf.province='"+param.getProvice()+"' ";
            sql+=" and tb_station_inf.provice='"+param.getProvice()+"' ";
        }
        if(param.getCity()!=null){
            sql+=" and tb_station_inf.city='"+param.getCity()+"' ";
@@ -312,7 +312,7 @@
                "  and  tb_power_inf.station_id=tb_station_inf.station_id "+
                " and alm_start_time>='"+ThreadLocalUtil.format(param.getAlmStartTime(),1)+"' and alm_start_time <='"+ThreadLocalUtil.format(param.getAlmEndTime(),1)+"'  " ;
        if(param.getProvice()!=null){
            sql+=" and tb_station_inf.province='"+param.getProvice()+"' ";
            sql+=" and tb_station_inf.provice='"+param.getProvice()+"' ";
        }
        if(param.getCity()!=null){
            sql+=" and tb_station_inf.city='"+param.getCity()+"' ";
@@ -324,11 +324,11 @@
            sql+=" and tb_station_inf.station_name like '%"+param.getStationName()+"%' ";
        }
        if(param.getAlmLevel()!=null){
            sql+=" and history.alm_level="+param.getAlmLevel()+" ";
            sql+=" and alarm.alm_level="+param.getAlmLevel()+" ";
        }
        List<Integer> almIds=param.getAlmIds();
        if(almIds!=null&&almIds.size()>0){
            sql+=" and history.alm_id in ( ";
            sql+=" and alarm.alm_id in ( ";
            for (int i=0;i<almIds.size();i++) {
                sql+=almIds.get(i);
                if(i!=(almIds.size()-1)){
@@ -373,7 +373,7 @@
                "  and  tb_power_inf.station_id=tb_station_inf.station_id "+
                " and alm_start_time>='"+ThreadLocalUtil.format(param.getAlmStartTime(),1)+"' and alm_start_time <='"+ThreadLocalUtil.format(param.getAlmEndTime(),1)+"'  " ;
        if(param.getProvice()!=null){
            sql+=" and tb_station_inf.province='"+param.getProvice()+"' ";
            sql+=" and tb_station_inf.provice='"+param.getProvice()+"' ";
        }
        if(param.getCity()!=null){
            sql+=" and tb_station_inf.city='"+param.getCity()+"' ";
@@ -385,11 +385,11 @@
            sql+=" and tb_station_inf.station_name like '%"+param.getStationName()+"%' ";
        }
        if(param.getAlmLevel()!=null){
            sql+=" and history.alm_level="+param.getAlmLevel()+" ";
            sql+=" and alarm.alm_level="+param.getAlmLevel()+" ";
        }
        List<Integer> almIds=param.getAlmIds();
        if(almIds!=null&&almIds.size()>0){
            sql+=" and history.alm_id in ( ";
            sql+=" and alarm.alm_id in ( ";
            for (int i=0;i<almIds.size();i++) {
                sql+=almIds.get(i);
                if(i!=(almIds.size()-1)){
@@ -414,6 +414,7 @@
                    PwrdevAlarmHistory ph=new PwrdevAlarmHistory();
                    ph.setNum(rs.getLong("num"));
                    ph.setPowerId(rs.getInt("power_id"));
                    ph.setAlmId(rs.getInt("alm_id"));
                    ph.setPowerName(rs.getString("power_name"));
                    ph.setAlmLevel(rs.getInt("alm_level"));
                    ph.setAlmStartTime(rs.getTimestamp("alm_start_time"));
src/main/java/com/whyc/util/MathUtil.java
@@ -298,6 +298,5 @@
            }
        }
        return resultMap;
    }
}
src/main/java/com/whyc/util/SubTablePageInfoUtils.java
@@ -46,17 +46,10 @@
        Set<String> tableYearKeySet = queryTimeForSubTables.keySet();
        for (String tableYear : tableYearKeySet) {
            List<Date> queryTime = queryTimeForSubTables.get(tableYear);
            String tableName;
            if(!tableYear.equals("default")){
                //数值
                tableName = tablePrefix+"_"+tableYear;
                String existTableName = commonMapper.existTable(dbName, tableName);
                if(existTableName == null){
                    continue;
                }
            }else{
                tableName = tablePrefix;
            String tableName=tablePrefix+"_"+tableYear;;
            String existTableName = commonMapper.existTable(dbName, tableName);
            if(existTableName == null){
                continue;
            }
            //====== 根据不同类型类型对象对应调整 ======
             if(pojo instanceof PwrAlmPar) {
@@ -147,7 +140,6 @@
        CountDownLatch latch = new CountDownLatch(tableYearListInDB.size());
        for (String tableYear : tableYearListInDB) {
            List<Date> queryTime = queryTimeForSubTables.get(tableYear);
            String tableName;
            if(!tableYear.equals("default")){
                //数值
@@ -156,7 +148,6 @@
                tableName = tablePrefix;
            }
            pool.execute(()-> {
                //====== 根据不同类型类型对象对应调整 ======
                if (pojo instanceof BattAlmPar) { //电池告警历史
                    BattAlmPar param = new BattAlmPar();
@@ -175,7 +166,6 @@
                    param.setRecordYear(tableName);
                    int currentCount = subService.getDevAlmHisCount(param);
                    queryCountMap.put(tableYear, currentCount);
                }
                latch.countDown();