src/main/java/com/whyc/controller/StatisticController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BatttestdataInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/SubTablePageInfoService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/util/ActionUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/PowerPropertyParamMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/StatisticController.java
@@ -90,7 +90,7 @@ } @ApiOperation(value = "优良电源数量统计(1.2.7)") @PostMapping("getPwr7Statistic") public Response getPwr7Statistic(@RequestBody Pwr7Stic stic){ public Response getPwr7Statistic(@RequestBody Pwr7Stic stic) throws NoSuchFieldException, IllegalAccessException { User uinf= ActionUtil.getUser(); stic.setUid(uinf.getId()); return battTinfService.getPwr7Statistic(stic); src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -939,7 +939,7 @@ return new Response().setII(1,reslist.size()>0,pageInfo,"电池组电池性能统计(未放电,优秀,劣化,损坏)统计(1.2.8/9/10)"); } //优良电源数量统计(1.2.7) public Response getPwr7Statistic(Pwr7Stic stic) { public Response getPwr7Statistic(Pwr7Stic stic) throws NoSuchFieldException, IllegalAccessException { Date inuseTimeStart =new Date(); if(stic.getInuseYear()==1){ //投入使用时间条件筛选 src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.lang.reflect.Field; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; @@ -90,7 +91,7 @@ return new Response().setIII(1,datalist.size()>0,datalist,modelCfg,"获取半小时内直流输出统计"); } //1.2.7优良电源统计上一季度的电源某一属性和参数阈值超过的次数 public Integer getPwrQuarter7(Integer powerId,Integer powerType) { public Integer getPwrQuarter7(Integer powerId,Integer powerType) throws NoSuchFieldException, IllegalAccessException { Map<String,Integer> map=new HashMap<>(); //获取优良电源性能统计在平台上的时间参数设置表 ApptimeParam apptimeParam=apptimeParamService.getPwrPerformanceStrartTime(powerId); @@ -98,12 +99,12 @@ List<String> datelist=ActionUtil.getDateListBetweenDates(apptimeParam.getParamValue(), new Date()); //获取电源优良判断的标准参数值 List<PowerPropertyParam> paramList=propertyParamService.getPwrStandardParam(powerType); Map<String,Float> paramValues=new HashMap<>(); /*Map<String,Float> paramValues=new HashMap<>(); for (PowerPropertyParam param : paramList) { paramValues.put(param.getPropertyName()+"_upper", param.getBasisVal()*param.getAlarmLimithUpper()); paramValues.put(param.getPropertyName()+"_lower", param.getBasisVal()*param.getAlarmLimitlLower()); map.put(param.getPropertyName(), 0); } }*/ for (int i=0;i<datelist.size();i++) { String date=datelist.get(i); String tableName ="db_data_history.tb_pwrdev_historydata_"+powerId+"_"+date; @@ -115,7 +116,7 @@ List<QuarterPwr7Res> datalist=subTablePageInfoService.getPwrQuarter7(tableName); // 遍历 dataList 并比较属性值 for (QuarterPwr7Res data : datalist) { if(paramValues.get("acin1_vola_upper")!=null){ /*if(paramValues.get("acin1_vola_upper")!=null){ if ((data.getAcin1Vola() > paramValues.get("acin1_vola_upper"))||(data.getAcin1Vola() < paramValues.get("acin1_vola_lower"))) { map.put("acin1_vola", map.get("acin1_vola") + 1); } @@ -134,6 +135,16 @@ if ((data.getDcoutCurr() > paramValues.get("dcout_curr_upper")) || (data.getDcoutCurr() < paramValues.get("dcout_curr_lower"))) { map.put("dcout_curr", map.get("dcout_curr") + 1); } }*/ for (int j=0;j<paramList.size();j++) { PowerPropertyParam param = paramList.get(j); String propertyName = ActionUtil.toCamelCase(param.getPropertyName()); Field field = QuarterPwr7Res.class.getDeclaredField(propertyName); field.setAccessible(true); // 如果字段是私有的,需要设置为可访问 Float value = (Float) field.get(data); if ((value > (param.getBasisVal()*param.getAlarmLimithUpper()))||(value <(param.getBasisVal()*param.getAlarmLimitlLower()))) { map.put(param.getPropertyName(), map.get(param.getPropertyName())==null?0:map.get(param.getPropertyName())+ 1); } } } } src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -794,7 +794,7 @@ } //1.2.7优良电源统计上一季度的电源某一属性和参数阈值超过的次数 public List<QuarterPwr7Res> getPwrQuarter7(String tableName) { String sql=" select distinct record_datetime,acin1_vola,acout_curra,dcout_vol,dcout_curr " + String sql=" select distinct * " + " from "+tableName+" " ; sql+=" order by record_datetime asc"; List<QuarterPwr7Res> list = sqlExecuteService.executeQuery_call(sql, new CallBack() { src/main/java/com/whyc/util/ActionUtil.java
@@ -29,6 +29,7 @@ public static String time_yyyyMMddHHmmss = "yyyy-MM-dd HH:mm:ss"; public static String time_yyyyMMdd = "yyyy-MM-dd"; public static String time_yyyyMM = "yyyy-MM"; public static String time_yyyy_MM = "yyyy_MM"; public static String time_yyyyMMdd_HH_mm_ss = "yyyy-MM-dd_HH_mm_ss"; public static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); public static SimpleDateFormat sdfwithOutday = new SimpleDateFormat("yyyy_MM"); @@ -647,7 +648,7 @@ List<String> dateList = new ArrayList<>(); LocalDate currentDate = startDate; DateTimeFormatter formatter = DateTimeFormatter.ofPattern(ActionUtil.time_yyyyMM); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(ActionUtil.time_yyyy_MM); while (!currentDate.isAfter(endDate)) { String formattedDate = currentDate.format(formatter); dateList.add(formattedDate); @@ -655,11 +656,27 @@ } return dateList; } // 匹配 "_" 后跟一个字母(小写或大写) public static String toCamelCase(String input) { // 匹配 "_" 后跟一个字母(小写或大写) Pattern pattern = Pattern.compile("_(\\w)"); Matcher matcher = pattern.matcher(input); StringBuffer result = new StringBuffer(); while (matcher.find()) { // 将匹配到的字母转为大写,并替换掉前面的下划线 matcher.appendReplacement(result, matcher.group(1).toUpperCase()); } matcher.appendTail(result); return result.toString(); } public static void main(String[] args) throws ParseException { List<String> dateList =getDateListBetweenDates(ActionUtil.sdf.parse("2025-01-01 00:00:00"),new Date()); /*List<String> dateList =getDateListBetweenDates(ActionUtil.sdf.parse("2025-01-01 00:00:00"),new Date()); for (String date : dateList) { System.out.println(date); } }*/ System.out.println(toCamelCase("user_name_and_age")); } } src/main/resources/mapper/PowerPropertyParamMapper.xml
@@ -8,5 +8,6 @@ from db_param.tb_power_property_param,db_pwrdev_alarm.tb_pwrdev_alarm_param_stand where tb_power_property_param.property_name=tb_pwrdev_alarm_param_stand.property_name and tb_power_property_param.power_type=#{powerType} and tb_power_property_param.field_en=1 </select> </mapper>