whycxzp
9 小时以前 e5b3e3492a7d5f079cad2ca5958a724cabfec401
src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -5,7 +5,10 @@
import com.whyc.dto.AlmHis.PwrAlmPar;
import com.whyc.dto.AnalysisAlm.ResAnalysis;
import com.whyc.dto.Real.*;
import com.whyc.dto.RealDataStatic.MonDataDto;
import com.whyc.dto.RealDataStatic.ResRealDataAc;
import com.whyc.dto.RealDataStatic.ResRealDataHr;
import com.whyc.dto.RealDataStatic.ResRealDataMon;
import com.whyc.dto.Statistic.ComPareChangeCurve;
import com.whyc.dto.Statistic.ComPareChart;
import com.whyc.dto.Statistic.QuarterPwr7Res;
@@ -700,26 +703,31 @@
        return list;
    }
    //查询电源字段的异动的记录
    public List<Integer> getChangesRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, String value, float upperLimit, float lowerLimit) {
    public List<Object> getPwrChangesRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, String value, float upperLimit, float lowerLimit) {
        String sql=" select  distinct record_datetime,record_num "+
                " from "+tableName+" where record_datetime>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
                "                    and record_datetime<='"+ActionUtil.sdf.format(recordDatetime1)+"'" +
                " and "+value+">"+upperLimit+" or "+value+"<"+lowerLimit+" ";
        sql+="  order by record_num asc";
        List<Integer> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
        List<Object> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<Integer> list=new ArrayList<>();
                List list=new ArrayList<>();
                List numList=new ArrayList<>();
                List timeList=new ArrayList<>();
                while (rs.next()){
                    list.add(rs.getInt("record_num"));
                    numList.add(rs.getInt("record_num"));
                    timeList.add(rs.getString("record_datetime"));
                }
                list.add(numList);
                list.add(timeList);
                return list;
            }
        });
        return list;
    }
    //查询电源字段的异动
    public List<ResRealDataAc> getPropertyChangesByRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, List<Integer> allChangeNums, Map<String, List<String>> propertyInfo) {
    public List<ResRealDataAc> getPwrPropertyChangesByRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, List<Integer> allChangeNums, Map<String, List<String>> propertyInfo) {
        String  propertyStr = propertyInfo.values().stream()
                .flatMap(List::stream)
                .collect(Collectors.joining(","));
@@ -974,21 +982,219 @@
        return list;
    }
    //实时数据统计曲线--核容设备
    public List<ResRealDataAc> getSticRealHrData(BattRealdataId realdata, Integer granularity, Integer maxRecordNum, Integer minRecordNum, Map<String, List<String>> propertyInfo) {
    public List<ResRealDataHr> getSticRealHrData(String tableName, Integer granularity, Date recordDatetime, Date recordDatetime1, Integer maxRecordNum, Integer minRecordNum) {
        String sql=" select distinct record_time,record_num,online_vol,group_vol,group_curr,group_tmp,hjq_tmp,dev_conresist,dev_condvoldp "+
                "               from "+tableName+" " +
                "               where record_time >= '"+ThreadLocalUtil.format(recordDatetime,1)+"' " +
                "               and record_time <= '"+ThreadLocalUtil.format(recordDatetime1,1)+"' "+
                "               and (record_num-"+minRecordNum+")%"+granularity+"=0 or record_num="+maxRecordNum+" or record_num="+minRecordNum ;
        sql+=" order by record_num asc";
        List<ResRealDataHr> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<ResRealDataHr> list=new ArrayList<>();
                while (rs.next()){
                    ResRealDataHr data=new ResRealDataHr();
                    data.setRecordTime(rs.getTimestamp("record_time"));
                    data.setRecordNum(rs.getInt("record_num"));
                    data.setOnlineVol(rs.getFloat("online_vol"));
                    data.setGroupVol(rs.getFloat("group_vol"));
                    data.setGroupCurr(rs.getFloat("group_curr"));
                    data.setGroupTmp(rs.getFloat("group_tmp"));
                    data.setHjqTmp(rs.getFloat("hjq_tmp"));
                    data.setDevConresist(rs.getFloat("dev_conresist"));
                    data.setDevCondvoldp(rs.getFloat("dev_condvoldp"));
                    list.add(data);
                }
                return list;
            }
        });
        return list;
    }
    //查询核容设备字段的异动
    public List<ResRealDataHr> getHrPropertyChangesByRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, List<Integer> allChangeNums) {
        String sql=" select  distinct record_time,record_num,online_vol,group_vol,group_curr,group_tmp,hjq_tmp,dev_conresist,dev_condvoldp "+
                " from "+tableName+" where record_time>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
                "                    and record_time<='"+ActionUtil.sdf.format(recordDatetime1)+"'";
        if (allChangeNums.size() > 0) {
            //去除重复项
            List<Integer> uniqueList = allChangeNums.stream()
                    .distinct()
                    .collect(Collectors.toList());
            //拼接生成sql
            String changeNumsStr = uniqueList.stream()
                    .map(String::valueOf)
                    .collect(Collectors.joining(","));
            sql += " and record_num in (" + changeNumsStr + ")";
        }
        sql += " order by record_num asc  ";
        List<ResRealDataHr> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<ResRealDataHr> list=new ArrayList<>();
                while (rs.next()){
                    ResRealDataHr data=new ResRealDataHr();
                    data.setRecordTime(rs.getTimestamp("record_time"));
                    data.setRecordNum(rs.getInt("record_num"));
                    data.setOnlineVol(rs.getFloat("online_vol"));
                    data.setGroupVol(rs.getFloat("group_vol"));
                    data.setGroupCurr(rs.getFloat("group_curr"));
                    data.setGroupTmp(rs.getFloat("group_tmp"));
                    data.setHjqTmp(rs.getFloat("hjq_tmp"));
                    data.setDevConresist(rs.getFloat("dev_conresist"));
                    data.setDevCondvoldp(rs.getFloat("dev_condvoldp"));
                    list.add(data);
                }
                return list;
            }
        });
        return list;
    }
    //实时数据统计曲线--蓄电池组
    public List<ResRealDataMon> getSticRealMonData(String tableName, Integer granularity, Date recordDatetime, Date recordDatetime1, Integer maxRecordNum, Integer minRecordNum) {
        String sql=" select distinct battgroup_id,record_time,record_num,mon_num,mon_vol,mon_tmp,mon_res,mon_jh_curr "+
                "               from "+tableName+" " +
                "               where record_time >= '"+ThreadLocalUtil.format(recordDatetime,1)+"' " +
                "               and record_time <= '"+ThreadLocalUtil.format(recordDatetime1,1)+"' "+
                "               and (record_num-"+minRecordNum+")%"+granularity+"=0 or record_num="+maxRecordNum+" or record_num="+minRecordNum ;
        sql+=" order by record_num,mon_num asc ";
        List<ResRealDataMon> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<ResRealDataMon> result = new ArrayList<>();
                Map<String, ResRealDataMon> map = new HashMap<>();
                while (rs.next()) {
                    Integer battgroupId = rs.getInt("battgroup_id");
                    Date recordTime = rs.getTimestamp("record_time");
                    Integer recordNum = rs.getInt("record_num");
                    // 构建唯一键(battgroupId + recordNum)
                    String key = battgroupId + "_" + recordNum;
                    ResRealDataMon data = map.get(key);
                    if (data == null) {
                        data = new ResRealDataMon();
                        data.setRecordTime(recordTime);
                        data.setRecordNum(recordNum);
                        data.setMonList(new ArrayList<>());
                        map.put(key, data);
                        result.add(data);
                    }
                    // 将单体数据封装到 monList 中
                    MonDataDto monData = new MonDataDto();
                    monData.setMonNum(rs.getInt("mon_num"));
                    monData.setMonVol(rs.getFloat("mon_vol"));
                    monData.setMonTmp(rs.getFloat("mon_tmp"));
                    monData.setMonRes(rs.getFloat("mon_res"));
                    monData.setMonJhCurr(rs.getFloat("mon_jh_curr"));
                    data.getMonList().add(monData);
                }
                return result;
            }
        });
        return list;
    }
    //查询核容设备/单体字段的异动的记录
    public List<Object> getBattChangesRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, String value, float upperLimit, float lowerLimit) {
        String sql=" select  distinct record_time,record_num "+
                " from "+tableName+" where record_time>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
                "                    and record_time<='"+ActionUtil.sdf.format(recordDatetime1)+"'" +
                " and "+value+">"+upperLimit+" or "+value+"<"+lowerLimit+" ";
        sql+="  order by record_num asc";
        List<Object> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List list=new ArrayList<>();
                List numList=new ArrayList<>();
                List timeList=new ArrayList<>();
                while (rs.next()){
                    numList.add(rs.getInt("record_num"));
                    timeList.add(rs.getString("record_time"));
                }
                list.add(numList);
                list.add(timeList);
                return list;
            }
        });
        return list;
    }
    //查询电池组单体字段的异动
    public List<ResRealDataMon> getMonPropertyChangesByRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, List<Integer> allChangeNums) {
        String sql=" select  distinct battgroup_id,record_time,record_num,mon_num,mon_vol,mon_tmp,mon_res,mon_jh_curr "+
                " from "+tableName+" where record_time>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
                "                    and record_time<='"+ActionUtil.sdf.format(recordDatetime1)+"'";
        if (allChangeNums.size() > 0) {
            //去除重复项
            List<Integer> uniqueList = allChangeNums.stream()
                    .distinct()
                    .collect(Collectors.toList());
            //拼接生成sql
            String changeNumsStr = uniqueList.stream()
                    .map(String::valueOf)
                    .collect(Collectors.joining(","));
            sql += " and record_num in (" + changeNumsStr + ")";
        }
        sql += " order by record_num,mon_num asc  ";
        List<ResRealDataMon> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<ResRealDataMon> result = new ArrayList<>();
                Map<String, ResRealDataMon> map = new HashMap<>();
                while (rs.next()) {
                    Integer battgroupId = rs.getInt("battgroup_id");
                    Date recordTime = rs.getTimestamp("record_time");
                    Integer recordNum = rs.getInt("record_num");
                    // 构建唯一键(battgroupId + recordNum)
                    String key = battgroupId + "_" + recordNum;
                    ResRealDataMon data = map.get(key);
                    if (data == null) {
                        data = new ResRealDataMon();
                        data.setRecordTime(recordTime);
                        data.setRecordNum(recordNum);
                        data.setMonList(new ArrayList<>());
                        map.put(key, data);
                        result.add(data);
                    }
                    // 将单体数据封装到 monList 中
                    MonDataDto monData = new MonDataDto();
                    monData.setMonNum(rs.getInt("mon_num"));
                    monData.setMonVol(rs.getFloat("mon_vol"));
                    monData.setMonTmp(rs.getFloat("mon_tmp"));
                    monData.setMonRes(rs.getFloat("mon_res"));
                    monData.setMonJhCurr(rs.getFloat("mon_jh_curr"));
                    data.getMonList().add(monData);
                }
                return result;
            }
        });
        return list;
    }
    //查询电池组字段的异动
    public List<ResRealDataAc> getBattPropertyChangesByRecordNum(String tableName, Date recordDatetime, Date recordDatetime1, List<Integer> allChangeNums, Map<String, List<String>> propertyInfo) {
        String  propertyStr = propertyInfo.values().stream()
                .flatMap(List::stream)
                .collect(Collectors.joining(","));
        String sql=" select distinct record_time, "+propertyStr+" "+
                "               from db_data_history.tb_batt_realdata_"+realdata.getTableName()+" " +
                "               where record_time >= '"+ThreadLocalUtil.format(realdata.getRecordTime(),1)+"' " +
                "               and record_time <= '"+ThreadLocalUtil.format(realdata.getRecordTime1(),1)+"' "+
                "               and (record_num-"+minRecordNum+")%"+granularity+"=0 or record_num="+maxRecordNum+" or record_num="+minRecordNum ;
        String sql=" select  distinct record_time,record_num, "+propertyStr+
                " from "+tableName+" where record_time>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
                "                    and record_time<='"+ActionUtil.sdf.format(recordDatetime1)+"'";
        if (allChangeNums.size() > 0) {
            //去除重复项
            List<Integer> uniqueList = allChangeNums.stream()
                    .distinct()
                    .collect(Collectors.toList());
            //拼接生成sql
            String changeNumsStr = uniqueList.stream()
                    .map(String::valueOf)
                    .collect(Collectors.joining(","));
            sql += " and record_num in (" + changeNumsStr + ")";
        }
        sql += " order by record_time asc";
        List<ResRealDataAc> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<ResRealDataAc> list=new ArrayList<>();
                while (rs.next()){
                    ResRealDataAc data=new ResRealDataAc();
                    data.setRecordNum(rs.getInt("record_num"));
                    data.setRecordDatetime(rs.getTimestamp("record_time"));
                    Map<String,Map<String,Float>>dataMap=new HashMap<>();
                    for (Map.Entry<String, List<String>> entry : propertyInfo.entrySet()) {
@@ -1009,6 +1215,8 @@
        });
        return list;
    }
    //系统概览获取前N笔核容设备信息
    public List<RealDateDTO> getBattDevData100(String tableName, Integer granularity, Date recordDatetime, Date recordDatetime1,Integer maxRecordNum,Integer minRecordNum) {
        String sql=" select record_time, group_vol, online_vol,group_curr, load_curr,record_num  " +