34

lxw

2023-10-17 db0c1ec71e28b489a873f11d8bf93d14188d10b6

34

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

@@ -115,8 +115,8 @@
        Date date1 = null;
        Date date2 = null;
        try {
            date1 = ActionUtil.sdf.parse("2020-03-22 15:11:23" );
            date2 = ActionUtil.sdf.parse("2020-03-22 15:11:23");
            date1 = ActionUtil.sdf.parse("2023-03-01 14:08:02" );
            date2 = ActionUtil.sdf.parse("2023-03-01 16:40:45");
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -277,7 +277,22 @@
        int count=subService.getCountForTX(data);
        List list=new ArrayList();
        list.add(count);*/
        List list=subService.searchAll("tb_pwrdev_alarm_param_110000001");
        /*32
        List list=subService.searchAll("tb_pwrdev_alarm_param_110000001");*/
        /*34*/
        InterfaceParam param=new InterfaceParam();
        param.setRecordYear("tb_devalarm_data_history_2023_03");
        param.setStartTime(date1);
        param.setEndTime(date2);
        List devList=new ArrayList();
        devList.add(618500017);
        devList.add(481500011);
        param.setDeviceIds(devList);
        param.setLimitStart(0);
        param.setLimitEnd(10);
        int count=subService.getCountForInterface(param);
        List list=new ArrayList();
        list.add(count);
        return  list;
    }
}

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

@@ -24,7 +24,7 @@
public class SubTablePageInfoService {
    @Autowired
    private MybatisSqlExecuteService sqlExecuteService;
    //2,7-SubTablePageInfoUtils.java;201行
    //2,7,33-SubTablePageInfoUtils.java;201行
    public List<PwrdevAlarmHistory> getList2(PwrdevAlarmHistory data){
        String sql="select  alarm.*,inf.StationName,inf.StationName1,inf.StationName2,inf.StationName3,inf.StationName5 " +
            " from db_pwrdev_alarm."+data.getRecordYear()+" alarm,db_pwrdev_inf.tb_pwrdev_inf inf " +
@@ -1020,7 +1020,7 @@
    }

    //32-PwrdevAlarmService.java;189行
    List<PwrdevAlarmParam> searchAll(String tableName){
    public List<PwrdevAlarmParam> searchAll(String tableName){
        String sql="select * from db_pwrdev_alarm."+tableName;
        List<PwrdevAlarmParam> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
@@ -1043,4 +1043,44 @@
        });
        return  list;
    }

    //34-SubTablePageInfoUtils.java;121行
    public int getCountForInterface(InterfaceParam param){
        String sql="SELECT  count(*) as number FROM db_alarm."+param.getRecordYear()+" history,db_battinf.tb_battinf " +
                " where history.dev_id=db_battinf.tb_battinf.FbsDeviceId ";
        if(param.getDeviceIds()!=null&&param.getDeviceIds().size()>0){
            sql+=" and history.dev_id in( ";
            for (int i=0;i<param.getDeviceIds().size();i++) {
                sql+=param.getDeviceIds().get(i);
                if(i!=(param.getDeviceIds().size()-1)){
                    sql+=",";
                }
            }
            sql+=")";
        }
        if(param.getStartTime()!=null){
            sql+=" and alm_start_time  >='"+ActionUtil.sdf.format(param.getStartTime())+"' ";
        }
        if(param.getEndTime()!=null){
            sql+=" and alm_start_time  <='"+ActionUtil.sdf.format(param.getEndTime())+"' ";
        }
        List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                LinkedList<Object> temp = new LinkedList<>();
                try {
                    while (rs.next())
                        temp.add(rs.getInt("number"));
                } catch (SQLException e) {
                    e.printStackTrace();
                }
                return temp;
            }
        });
        int num =0;
        if(list!=null){
            num= (int) list.get(0);
        }
        return num;
    }
}

 src/main/java/com/whyc/util/SubTablePageInfoUtils.java

@@ -127,7 +127,8 @@
                    param.setStartTime(queryTime.get(0));
                    param.setEndTime(queryTime.get(1));
                    param.setRecordYear(tableName);
                    int currentCount = devAlarmDataHistoryMapper.getCountForInterface(param);
                    //int currentCount = devAlarmDataHistoryMapper.getCountForInterface(param);
                    int currentCount = subService.getCountForInterface(param);
                    queryCountMap.put(tableYear,currentCount);
                }
            }
@@ -363,7 +364,8 @@
                        param.setStartTime(queryTime.get(0));
                        param.setEndTime(queryTime.get(1));
                        param.setRecordYear(tableName);
                        int currentCount = devAlarmDataHistoryMapper.getCountForInterface(param);
                        //int currentCount = devAlarmDataHistoryMapper.getCountForInterface(param);
                        int currentCount = subService.getCountForInterface(param);
                        queryCountMap.put(tableYear, currentCount);
                    }
                }