115

lxw

2023-10-19 2d2e2d34d2d0a3029f4943bbe9b762804dc13095

115

 src/main/java/com/whyc/mapper/PwrdevDataHistoryMapper.java

@@ -16,5 +16,5 @@

    //List<PwrdevDataHistory> getData(@Param("tableName") String tableName);

    List<PwrdevDataHistory> getWeekOrDayData(@Param("tableName") String tableName,Date startTime,Date endTime);
    //List<PwrdevDataHistory> getWeekOrDayData(@Param("tableName") String tableName,Date startTime,Date endTime);
}

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

@@ -93,7 +93,8 @@
            for (String tableName: tableNameList ) {
                int month = calendar_start.get(Calendar.MONTH)+1;
                if (Integer.valueOf(tableName.substring(tableName.length()-2))==month){
                    List<PwrdevDataHistory> listMonth = mapper.getWeekOrDayData(tableName,startTime,endTime);
                    //List<PwrdevDataHistory> listMonth = mapper.getWeekOrDayData(tableName,startTime,endTime);
                    List<PwrdevDataHistory> listMonth = subService.getWeekOrDayData(tableName,startTime,endTime);
                    result.addAll(listMonth);
                }
            }

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

@@ -118,11 +118,13 @@
        Date date1 = null;
        Date date2 = null;
        Date date3 = null;
        Date date4 = null;
        try {
            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");
            date4 = ActionUtil.sdf.parse("2022-06-27 03:47:37");
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -452,7 +454,7 @@
        subService.createTable4BattAlarmDataHistoryByYear("2021_01");*/
        /*97
        List list=pdhmapper.getTableNameList("110000111_2021_06");*/
        /*114*/
        /*114
        List list=new ArrayList();
        for (int i=0;i<4;i++){
            DevalarmDataHistory bh=new DevalarmDataHistory();
@@ -471,7 +473,9 @@
            bh.setAlmSeverity(1);
            list.add(bh);
        }
        subService.insertBatch4DevAlarmDataHistoryByYear("2023_09",list);
        subService.insertBatch4DevAlarmDataHistoryByYear("2023_09",list);*/
        /*115*/
        List list= subService.getWeekOrDayData("tb_pwrdev_historydata_115000003_2022_06",date3,date4);
        return  new Response().setII(1,true,list,null);
    }
}

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

@@ -1721,4 +1721,90 @@
        }
        sqlExecuteService.execute(sql);
    }

    //115-PwrdevDataHistoryService.java;89行
    public List<PwrdevDataHistory> getWeekOrDayData( String tableName,Date startTime,Date endTime){
        String sql=" select * from db_pwrdev_data_history."+tableName+" where record_time>='"+ActionUtil.sdf.format(startTime)+"' and record_time<='"+ActionUtil.sdf.format(endTime)+"' ";
        List<PwrdevDataHistory> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
                List<PwrdevDataHistory> list=new ArrayList<>();
                while (rs.next()){
                    PwrdevDataHistory ph=new PwrdevDataHistory();
                    ph.setNum(rs.getInt("num"));
                    ph.setPowerDeviceId(rs.getInt("PowerDeviceId"));
                    ph.setRecordTime(rs.getTimestamp("record_time"));
                    ph.setAcAcIn1VolA(rs.getFloat("AC_acIn1_volA"));
                    ph.setAcAcIn1VolB(rs.getFloat("AC_acIn1_volB"));
                    ph.setAcAcIn1VolC(rs.getFloat("AC_acIn1_volC"));
                    ph.setAcAcIn1CurrA(rs.getFloat("AC_acIn1_currA"));
                    ph.setAcAcIn1CurrB(rs.getFloat("AC_acIn1_currB"));
                    ph.setAcAcIn1CurrC(rs.getFloat("AC_acIn1_currC"));
                    ph.setAcAcIn2VolA(rs.getFloat("AC_acIn2_volA"));
                    ph.setAcAcIn2VolB(rs.getFloat("AC_acIn2_volB"));
                    ph.setAcAcIn2VolC(rs.getFloat("AC_acIn2_volC"));
                    ph.setAcAcIn2CurrA(rs.getFloat("AC_acIn2_currA"));
                    ph.setAcAcIn2CurrB(rs.getFloat("AC_acIn2_currB"));
                    ph.setAcAcIn2CurrC(rs.getFloat("AC_acIn2_currC"));
                    ph.setAcTemprature(rs.getFloat("AC_temprature"));
                    ph.setAcAcVolHLimit(rs.getFloat("AC_acVolH_Limit"));
                    ph.setAcAcVolLLimit(rs.getFloat("AC_acVolL_Limit"));
                    ph.setAcdcAcIn1VolA(rs.getFloat("ACDC_acIn1_volA"));
                    ph.setAcdcAcIn1VolB(rs.getFloat("ACDC_acIn1_volB"));
                    ph.setAcdcAcIn1VolC(rs.getFloat("ACDC_acIn1_volC"));
                    ph.setAcdcAcIn2VolA(rs.getFloat("ACDC_acIn2_volA"));
                    ph.setAcdcAcIn2VolB(rs.getFloat("ACDC_acIn2_volB"));
                    ph.setAcdcAcIn2VolC(rs.getFloat("ACDC_acIn2_volC"));
                    ph.setAcdcAcOutVolA(rs.getFloat("ACDC_acOut_volA"));
                    ph.setAcdcAcOutVolB(rs.getFloat("ACDC_acOut_volB"));
                    ph.setAcdcAcOutVolC(rs.getFloat("ACDC_acOut_volC"));
                    ph.setAcdcAcOutCurrA(rs.getFloat("ACDC_acOut_currA"));
                    ph.setAcdcAcOutCurrB(rs.getFloat("ACDC_acOut_currB"));
                    ph.setAcdcAcOutCurrC(rs.getFloat("ACDC_acOut_currC"));
                    ph.setAcdcDcOutVol(rs.getFloat("ACDC_dcOut_vol"));
                    ph.setAcdcLoaderCurr(rs.getFloat("ACDC_loader_curr"));
                    ph.setAcdcBattgroup1Vol(rs.getFloat("ACDC_battgroup1_vol"));
                    ph.setAcdcBattgroup1Curr(rs.getFloat("ACDC_battgroup1_curr"));
                    ph.setAcdcBattgroup2Vol(rs.getFloat("ACDC_battgroup2_vol"));
                    ph.setAcdcBattgroup2Curr(rs.getFloat("ACDC_battgroup2_curr"));
                    ph.setAcdcAcdcmTemp(rs.getFloat("ACDC_acdcm_temp"));
                    ph.setAcdcM1OutCurr(rs.getFloat("ACDC_m1_outCurr"));
                    ph.setAcdcM2OutCurr(rs.getFloat("ACDC_m2_outCurr"));
                    ph.setAcdcM3OutCurr(rs.getFloat("ACDC_m3_outCurr"));
                    ph.setAcdcM4OutCurr(rs.getFloat("ACDC_m4_outCurr"));
                    ph.setAcdcM5OutCurr(rs.getFloat("ACDC_m5_outCurr"));
                    ph.setAcdcM6OutCurr(rs.getFloat("ACDC_m6_outCurr"));
                    ph.setAcdcM7OutCurr(rs.getFloat("ACDC_m7_outCurr"));
                    ph.setAcdcM8OutCurr(rs.getFloat("ACDC_m8_outCurr"));
                    ph.setAcdcM9OutCurr(rs.getFloat("ACDC_m9_outCurr"));
                    ph.setAcdcM10OutCurr(rs.getFloat("ACDC_m10_outCurr"));
                    ph.setAcdcM11OutCurr(rs.getFloat("ACDC_m11_outCurr"));
                    ph.setAcdcM12OutCurr(rs.getFloat("ACDC_m12_outCurr"));
                    ph.setAcdcM13OutCurr(rs.getFloat("ACDC_m13_outCurr"));
                    ph.setAcdcM14OutCurr(rs.getFloat("ACDC_m14_outCurr"));
                    ph.setAcdcM15OutCurr(rs.getFloat("ACDC_m15_outCurr"));
                    ph.setAcdcM16OutCurr(rs.getFloat("ACDC_m16_outCurr"));
                    ph.setAcdcChargLimitCurr(rs.getFloat("ACDC_chargLimitCurr"));
                    ph.setAcdcJunChargeVol(rs.getFloat("ACDC_junChargeVol"));
                    ph.setAcdcFloatChargeVol(rs.getFloat("ACDC_floatChargeVol"));
                    ph.setAcdcAcVolHLimit(rs.getFloat("ACDC_acVolH_Limit"));
                    ph.setAcdcAcVolLLimit(rs.getFloat("ACDC_acVolL_Limit"));
                    ph.setAcdcDcOutVolHLimit(rs.getFloat("ACDC_dcOutVolH_Limit"));
                    ph.setAcdcDcOutVolLLimit(rs.getFloat("ACDC_dcOutVolL_Limit"));
                    ph.setDcDcIn1Vol(rs.getFloat("DC_dcIn1_vol"));
                    ph.setDcDcIn2Vol(rs.getFloat("DC_dcIn2_vol"));
                    ph.setDcDcOut1Vol(rs.getFloat("DC_dcOut1_vol"));
                    ph.setDcDcOut1Curr(rs.getFloat("DC_dcOut1_curr"));
                    ph.setDcDcOut2Vol(rs.getFloat("DC_dcOut2_vol"));
                    ph.setDcDcOut2Curr(rs.getFloat("DC_dcOut2_curr"));
                    ph.setDcTemprature(rs.getFloat("DC_temprature"));
                    ph.setDcDcVolHLimit(rs.getFloat("DC_dcVolH_Limit"));
                    ph.setDcDcVolLLimit(rs.getFloat("DC_dcVolL_Limit"));
                    list.add(ph);
                }
                return list;
            }
        });
        return list;
    }
}

 src/main/resources/mapper/PwrdevDataHistoryMapper.xml

@@ -15,8 +15,8 @@
   <!-- <select id="getData" resultType="com.whyc.pojo.PwrdevDataHistory">
        select * from db_pwrdev_data_history.${tableName}
    </select>-->
    <select id="getWeekOrDayData" resultType="com.whyc.pojo.PwrdevDataHistory">
    <!--<select id="getWeekOrDayData" resultType="com.whyc.pojo.PwrdevDataHistory">
        select * from db_pwrdev_data_history.${tableName} where record_time>=#{startTime} and record_time&lt;=#{endTime}
    </select>
    </select>-->

</mapper>