66
lxw
2023-10-18 83dd955cdd9b8f34fcfd9152eff71740a919eca2
66
3个文件已修改
92 ■■■■ 已修改文件
src/main/java/com/whyc/controller/StandardFeatureCurveController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/StandardFeatureCurveService.java 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/SubTablePageInfoService.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/StandardFeatureCurveController.java
@@ -49,7 +49,6 @@
    @ApiOperation("测试mybatisDb")
    @GetMapping("testTableDb")
    public Response testTableDb(){
       List list = service.testTableDb();
        return new Response().setII(1,true,list,null);
        return service.testTableDb();
    }
}
src/main/java/com/whyc/service/StandardFeatureCurveService.java
@@ -2,6 +2,7 @@
import cn.hutool.json.JSONUtil;
import com.whyc.dto.InterfaceParam;
import com.whyc.dto.Response;
import com.whyc.dto.StandardFeatureCurve;
import com.whyc.dto.paramter.AlarmPar;
import com.whyc.dto.paramter.DevAlarmPar;
@@ -109,13 +110,13 @@
        List<StandardFeatureCurve> list = sqlExecuteService.executeQuery(sql);
        return  list;
    }*/
    public List testTableDb() {
    public Response testTableDb() {
        Date date1 = null;
        Date date2 = null;
        Date date3 = null;
        try {
            date1 = ActionUtil.sdf.parse("2023-09-19 10:00:09" );
            date2 = ActionUtil.sdf.parse("2023-09-26 06:52:56");
            date1 = ActionUtil.sdf.parse("2023-03-27 10:10:01" );
            date2 = ActionUtil.sdf.parse("2023-03-31 14:36:55");
            date3 = ActionUtil.sdf.parse("2022-06-25 03:47:37");
        } catch (ParseException e) {
@@ -392,8 +393,36 @@
        list.add(flag);*/
        /*58
        subService.createTable4PowerAlarmHistoryByYear("2019");*/
        /*63*/
        List list=subService.getList_adj(1002,"tb_pwrdev_alarm_param_115000001");
        return  list;
        /*63
        List list=subService.getList_adj(1002,"tb_pwrdev_alarm_param_115000001");*/
        /*66 2023-03-27 10:10:01 2023-03-31 14:36:55*/
        AlarmPar param=new AlarmPar();
        param.setRecordYear("tb_battalarm_data_history_2023_03");
        param.setAlmIdOne(119001);
        param.setAlmIdTwo(119002);
        param.setAlmIdThree(119003);
        param.setAlmIdFour(119004);
        param.setAlmIdFive(119005);
        param.setAlmIdSix(119006);
        param.setAlmIdSeven(1190011);
        param.setAlmIdEight(1190012);
        param.setAlmSignalIdOne(0);
        param.setAlmSignalIdTwo(1);
        param.setAlmLevelOne(1);
        param.setAlmLevelTwo(2);
        param.setAlmLevelThree(3);
        param.setAlmLevelFour(4);
        param.setStationname("");
        param.setStationname1("");
        param.setAlmStartTime(date1);
        param.setAlmStartTime1(date2);
        param.setBattGroupId(0);
        param.setUId(1002);
        param.setLimitStart(0);
        param.setLimitEnd(100);
        int count= subService.getCount(param);
        List list=new ArrayList();
        list.add(count);
        return  new Response().setII(1,true,list,null);
    }
}
src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -943,7 +943,7 @@
        sqlExecuteService.execute(sql);
    }
    //29-SubTablePageInfoUtils.java;104行
    //29,65-SubTablePageInfoUtils.java;104行
    public int getCountForTX(PwrdevAlarmHistory param){
        String sql="select  count(distinct alarm.num) as number from db_pwrdev_alarm."+param.getRecordYear()+" alarm,db_pwrdev_inf.tb_pwrdev_inf inf " +
                "  where alarm.PowerDeviceId = inf.PowerDeviceId ";
@@ -1046,7 +1046,7 @@
        return  list;
    }
    //34,51-SubTablePageInfoUtils.java;121行
    //34,51,64-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 ";
@@ -1461,4 +1461,48 @@
        });
        return list;
    }
    //66-SubTablePageInfoUtils.java;80行
    public int getCount(AlarmPar param){
        String sql="select count(distinct history.num) as number " +
                "        from db_alarm."+param.getRecordYear()+" history,db_battinf.tb_battinf " +
                "        where  history.battgroupid=db_battinf.tb_battinf.battgroupid " +
                "        and alm_id in("+param.getAlmIdOne()+","+param.getAlmIdTwo()+",  "+param.getAlmIdThree()+  ",  "+param.getAlmIdFour()+  ",  "+param.getAlmIdFive()+  ",  "+param.getAlmIdSix()+  ",  "+param.getAlmIdSeven()+  ",  "+param.getAlmIdEight()+  ")  " +
                "        and alm_signal_id%2 in("+param.getAlmSignalIdOne()+","+param.getAlmSignalIdTwo()+")  " +
                "        and alm_level in(  "+param.getAlmLevelOne()+  ",  "+param.getAlmLevelTwo()+  ",  "+param.getAlmLevelThree()+  ",  "+param.getAlmLevelFour()+  ")  " +
                "        and alm_start_time>='"+ActionUtil.sdf.format(param.getAlmStartTime())+"' and alm_start_time <='"+ActionUtil.sdf.format(param.getAlmStartTime1())+"'  " +
                "        and db_battinf.tb_battinf.stationname1 like '%"+param.getStationname1()+"%'  " +
                "        and db_battinf.tb_battinf.stationname like '%"+param.getStationname()+"%' ";
        if(param.getBattGroupId()==0){
            sql+=" and db_battinf.tb_battinf.battgroupid!="+param.getBattGroupId()+" ";
        }else{
            sql+=" and db_battinf.tb_battinf.battgroupid="+param.getBattGroupId()+" ";
        }
        sql+=" and history.BattGroupId  " +
                "            in(select distinct db_battinf.tb_battinf.battgroupid from  " +
                "            db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf  " +
                "            where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId  " +
                "            and  " +
                "            db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
                "            and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid="+param.getUId()+"  " +
                "            )";
        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;
    }
}