whycxzp
2023-07-27 2cd3c864603eaba1fc19b19a6e70d02e1665b184
历史告警去重
7个文件已修改
47 ■■■■■ 已修改文件
src/main/java/com/whyc/mapper/BattalarmDataHistoryMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/DevalarmDataHistoryMapper.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/PwrdevAlarmHistoryMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/util/SubTablePageInfoUtils.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattalarmDataHistoryMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/DevalarmDataHistoryMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PwrdevAlarmHistoryMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattalarmDataHistoryMapper.java
@@ -28,7 +28,7 @@
    //查询分级告警的个数
    int serchByLevel(@Param("alarmLevel") int alarmLevel, @Param("uId") int uId);
    List<Integer> getLevelSubList(int uId, String tableName);
    List<BattalarmDataHistory> getLevelSubList(int uId, String tableName);
    List<BattalarmDataHistory> getDataBeforeRetentionMonth(@Param("retentionTime") Date retentionTime);
src/main/java/com/whyc/mapper/DevalarmDataHistoryMapper.java
@@ -3,6 +3,8 @@
import com.whyc.dto.InterfaceParam;
import com.whyc.dto.paramter.DevAlarmPar;
import com.whyc.dto.result.AlarmRes;
import com.whyc.pojo.BattalarmData;
import com.whyc.pojo.BattalarmDataHistory;
import com.whyc.pojo.DevalarmDataHistory;
import org.apache.ibatis.annotations.Param;
@@ -28,5 +30,5 @@
    List<DevalarmDataHistory> getDataBeforeRetentionMonth(@Param("retentionTime") Date retentionTime);
    List<Integer> getLevelSubList(int uId, String tableName);
    List<BattalarmDataHistory> getLevelSubList(int uId, String tableName);
}
src/main/java/com/whyc/mapper/PwrdevAlarmHistoryMapper.java
@@ -1,5 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.BattalarmDataHistory;
import com.whyc.pojo.DevalarmDataHistory;
import com.whyc.pojo.PwrdevAlarmHistory;
import org.apache.ibatis.annotations.Param;
@@ -30,6 +31,6 @@
    List<PwrdevAlarmHistory> getDataBeforeRetentionMonth(@Param("retentionTime") Date retentionTime);
    List<Integer> getLevelSubList(int uId, String tableName, List<Integer> almTypes);
    List<BattalarmDataHistory> getLevelSubList(int uId, String tableName, List<Integer> almTypes);
}
src/main/java/com/whyc/util/SubTablePageInfoUtils.java
@@ -7,9 +7,7 @@
import com.whyc.dto.paramter.DevAlarmPar;
import com.whyc.dto.result.AlarmRes;
import com.whyc.mapper.*;
import com.whyc.pojo.DevalarmDataHistory;
import com.whyc.pojo.PwrdevAlarmHistory;
import com.whyc.pojo.UserLog;
import com.whyc.pojo.*;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -258,16 +256,18 @@
        List<String> tableList = getTableList(dbName, tableLike, regex);
        List<Integer> levelList = new LinkedList();
        for (String tableName : tableList) {
            List<BattalarmDataHistory> levelInfoSubList;
            List<Integer> levelSubList;
            if(tableLike.equals("tb_battalarm_data_history")) {
                levelSubList = battAlarmDataHistoryMapper.getLevelSubList(uId, tableName);
                levelInfoSubList = battAlarmDataHistoryMapper.getLevelSubList(uId, tableName);
            }
            else if(tableLike.equals("tb_devalarm_data_history")){
                levelSubList = devAlarmDataHistoryMapper.getLevelSubList(uId, tableName);
                levelInfoSubList = devAlarmDataHistoryMapper.getLevelSubList(uId, tableName);
            }
            else{
                levelSubList = powerAlarmHistoryMapper.getLevelSubList(uId, tableName,almTypes);
                levelInfoSubList = powerAlarmHistoryMapper.getLevelSubList(uId, tableName,almTypes);
            }
            levelSubList = levelInfoSubList.stream().map(BattalarmDataHistory::getAlmLevel).collect(Collectors.toList());
            levelList.addAll(levelSubList);
        }
        //分为四级查询个数
src/main/resources/mapper/BattalarmDataHistoryMapper.xml
@@ -91,7 +91,8 @@
    <select id="getCount" resultType="java.lang.Integer">
        select
            count(*)
            <!--count(*)-->
        count(distinct history.num)
        from db_alarm.${recordYear} history,db_battinf.tb_battinf
        <where>
            history.battgroupid=db_battinf.tb_battinf.battgroupid
@@ -199,8 +200,9 @@
    <select id="getDataBeforeRetentionMonth" resultType="com.whyc.pojo.BattalarmDataHistory">
        select *,DATE_FORMAT(alm_start_time,"%Y")  as recordYear from db_alarm.tb_battalarm_data_history where alm_start_time &lt; #{retentionTime};
    </select>
    <select id="getLevelSubList" resultType="java.lang.Integer">
        select alm_level
    <select id="getLevelSubList" resultType="com.whyc.pojo.BattalarmDataHistory">
        <!--select alm_level-->
        SELECT distinct history.num,history.alm_level
        from db_alarm.${tableName} history,
        db_battinf.tb_battinf
        where history.battgroupid = db_battinf.tb_battinf.battgroupid
src/main/resources/mapper/DevalarmDataHistoryMapper.xml
@@ -55,7 +55,8 @@
    </select>
    <select id="getCount" resultType="java.lang.Integer">
        SELECT count(*)
        <!--SELECT count(*)-->
        SELECT count(distinct history.num)
        FROM db_alarm.${recordYear} history,db_battinf.tb_battinf
        <where>
            history.dev_id=db_battinf.tb_battinf.FbsDeviceId
@@ -191,8 +192,9 @@
    <select id="getDataBeforeRetentionMonth" resultType="com.whyc.pojo.DevalarmDataHistory">
        select *,DATE_FORMAT(alm_start_time,"%Y")  as recordYear from db_alarm.tb_devalarm_data_history where alm_start_time &lt; #{retentionTime};
    </select>
    <select id="getLevelSubList" resultType="java.lang.Integer">
        SELECT alm_level
    <select id="getLevelSubList" resultType="com.whyc.pojo.BattalarmDataHistory">
        <!--SELECT alm_level-->
        SELECT distinct history.num,history.alm_level
        FROM db_alarm.${tableName} history,
        db_battinf.tb_battinf
        where history.dev_id = db_battinf.tb_battinf.FbsDeviceId
src/main/resources/mapper/PwrdevAlarmHistoryMapper.xml
@@ -50,7 +50,7 @@
    </select>
    <select id="getCount" resultType="java.lang.Integer">
        select  count(*) from db_pwrdev_alarm.${recordYear} alarm,db_pwrdev_inf.tb_pwrdev_inf inf
        select  count(distinct alarm.num) from db_pwrdev_alarm.${recordYear} alarm,db_pwrdev_inf.tb_pwrdev_inf inf
        <where>
            alarm.PowerDeviceId = inf.PowerDeviceId
            <if test="stationName1!=null ">
@@ -218,7 +218,7 @@
    </select>
    <select id="getCountForTX" resultType="integer">
        select count(*) from db_pwrdev_alarm.${recordYear} alarm,db_pwrdev_inf.tb_pwrdev_inf
        select count(distinct alarm.num) from db_pwrdev_alarm.${recordYear} alarm,db_pwrdev_inf.tb_pwrdev_inf
        inf
        <where>
            alarm.PowerDeviceId = inf.PowerDeviceId
@@ -334,8 +334,10 @@
    <select id="getDataBeforeRetentionMonth" resultType="com.whyc.pojo.PwrdevAlarmHistory">
        select *,DATE_FORMAT(alm_start_time,"%Y")  as recordYear from db_pwrdev_alarm.tb_pwrdev_alarm_history where alm_start_time &lt; #{retentionTime};
    </select>
    <select id="getLevelSubList" resultType="java.lang.Integer">
        select alm_level from db_pwrdev_alarm.${tableName} alarm,db_pwrdev_inf.tb_pwrdev_inf
    <select id="getLevelSubList" resultType="com.whyc.pojo.BattalarmDataHistory">
        <!--select alm_level -->
        SELECT distinct history.num,history.alm_level
        from db_pwrdev_alarm.${tableName} alarm,db_pwrdev_inf.tb_pwrdev_inf
        inf
        <where>
            alarm.PowerDeviceId = inf.PowerDeviceId