diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AssesServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AssesServiceImpl.java index a4f7330c2..5aee8e996 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AssesServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AssesServiceImpl.java @@ -59,52 +59,6 @@ public class AssesServiceImpl implements AssesService { float synData; if (!lineList.isEmpty()) { -// //组装sql语句 -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append(InfluxDBPublicParam.START_TIME).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append(InfluxDBPublicParam.END_TIME).append("' and ("); -// //sql语句 -// stringBuilder.append(InfluxDBPublicParam.LINE_ID + "='").append(lineList).append("')"); -// stringBuilder.append(" group by " + InfluxDBPublicParam.LINE_ID).append(" "); -// stringBuilder.append(InfluxDBPublicParam.TIME_ZONE); -// String sql = "SELECT" + -// " MEAN(freq_dev1) AS freq_dev1," + -// " MEAN(freq_dev2) AS freq_dev2," + -// " MEAN(freq_dev3) AS freq_dev3," + -// " MEAN(freq_dev4) AS freq_dev4," + -// " MEAN(freq_dev5) AS freq_dev5," + -// " MEAN(vu_dev1) AS vu_dev1," + -// " MEAN(vu_dev2) AS vu_dev2," + -// " MEAN(vu_dev3) AS vu_dev3," + -// " MEAN(vu_dev4) AS vu_dev4," + -// " MEAN(vu_dev5) AS vu_dev5," + -// " MEAN(data_plt1) AS data_plt1," + -// " MEAN(data_plt2) AS data_plt2," + -// " MEAN(data_plt3) AS data_plt3," + -// " MEAN(data_plt4) AS data_plt4," + -// " MEAN(data_plt5) AS data_plt5," + -// " MEAN(v_unbalance1) AS v_unbalance1," + -// " MEAN(v_unbalance2) AS v_unbalance2," + -// " MEAN(v_unbalance3) AS v_unbalance3," + -// " MEAN(v_unbalance4) AS v_unbalance4," + -// " MEAN(v_unbalance5) AS v_unbalance5," + -// " MEAN(v_thd1) AS v_thd1," + -// " MEAN(v_thd2) AS v_thd2," + -// " MEAN(v_thd3) AS v_thd3," + -// " MEAN(v_thd4) AS v_thd4," + -// " MEAN(v_thd5) AS v_thd5," + -// " MEAN(event1) AS event1," + -// " MEAN(event2) AS event2," + -// " MEAN(event3) AS event3," + -// " MEAN(event4) AS event4," + -// " MEAN(event5) AS event5" + -// " FROM" + -// " pqs_comasses" + -// " where " + stringBuilder.toString(); -// //结果集 -// QueryResult result = influxDbUtils.query(sql); -// //处理结果集 -// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); -// List communicateList = influxDBResultMapper.toPOJO(result, PqsComasses.class); List avgCount = rStatComassesDMapper.getAvgCount(Arrays.asList(lineList), DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(), DateUtil.beginOfDay(DateUtil.parse(endTime)).toString()); diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java index 1b1ec8d37..11c90e1c0 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java @@ -18,6 +18,9 @@ public class LineParam { @ApiModelProperty(name = "lineIds",value = "监测点索引集合") private List lineIds; + /** + * 区分配网I II III 类监测点 + */ @ApiModelProperty(name = "lineType",value = "监测点类型") private Integer lineType; @@ -29,6 +32,9 @@ public class LineParam { @NotBlank(message = "时间不可为空") private String dataDate; + /** + * 标识从那个库里查询数据 + */ @ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb 2:mysql）") private Integer dataSource; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java index f5b6ae9f0..3813d5cd4 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java @@ -87,44 +87,49 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl fields = getGeneralData(lineId,time); - rStatComassesDpo.setFreqDev1(Objects.isNull(fields.get("freq_dev1"))?0.0:Double.parseDouble(fields.get("freq_dev1").toString())); - rStatComassesDpo.setFreqDev2(Objects.isNull(fields.get("freq_dev2"))?0.0:Double.parseDouble(fields.get("freq_dev2").toString())); - rStatComassesDpo.setFreqDev3(Objects.isNull(fields.get("freq_dev3"))?0.0:Double.parseDouble(fields.get("freq_dev3").toString())); - rStatComassesDpo.setFreqDev4(Objects.isNull(fields.get("freq_dev4"))?0.0:Double.parseDouble(fields.get("freq_dev4").toString())); - rStatComassesDpo.setFreqDev5(Objects.isNull(fields.get("freq_dev5"))?0.0:Double.parseDouble(fields.get("freq_dev5").toString())); + if(CollUtil.isNotEmpty(fields)) { + rStatComassesDpo.setFreqDev1(Objects.isNull(fields.get("freq_dev1")) ? 0.0 : Double.parseDouble(fields.get("freq_dev1").toString())); + rStatComassesDpo.setFreqDev2(Objects.isNull(fields.get("freq_dev2")) ? 0.0 : Double.parseDouble(fields.get("freq_dev2").toString())); + rStatComassesDpo.setFreqDev3(Objects.isNull(fields.get("freq_dev3")) ? 0.0 : Double.parseDouble(fields.get("freq_dev3").toString())); + rStatComassesDpo.setFreqDev4(Objects.isNull(fields.get("freq_dev4")) ? 0.0 : Double.parseDouble(fields.get("freq_dev4").toString())); + rStatComassesDpo.setFreqDev5(Objects.isNull(fields.get("freq_dev5")) ? 0.0 : Double.parseDouble(fields.get("freq_dev5").toString())); - rStatComassesDpo.setVuDev1(Objects.isNull(fields.get("vu_dev1"))?0.0:Double.parseDouble(fields.get("vu_dev1").toString())); - rStatComassesDpo.setVuDev2(Objects.isNull(fields.get("vu_dev2"))?0.0:Double.parseDouble(fields.get("vu_dev2").toString())); - rStatComassesDpo.setVuDev3(Objects.isNull(fields.get("vu_dev3"))?0.0:Double.parseDouble(fields.get("vu_dev3").toString())); - rStatComassesDpo.setVuDev4(Objects.isNull(fields.get("vu_dev4"))?0.0:Double.parseDouble(fields.get("vu_dev4").toString())); - rStatComassesDpo.setVuDev5(Objects.isNull(fields.get("vu_dev5"))?0.0:Double.parseDouble(fields.get("vu_dev5").toString())); + rStatComassesDpo.setVuDev1(Objects.isNull(fields.get("vu_dev1")) ? 0.0 : Double.parseDouble(fields.get("vu_dev1").toString())); + rStatComassesDpo.setVuDev2(Objects.isNull(fields.get("vu_dev2")) ? 0.0 : Double.parseDouble(fields.get("vu_dev2").toString())); + rStatComassesDpo.setVuDev3(Objects.isNull(fields.get("vu_dev3")) ? 0.0 : Double.parseDouble(fields.get("vu_dev3").toString())); + rStatComassesDpo.setVuDev4(Objects.isNull(fields.get("vu_dev4")) ? 0.0 : Double.parseDouble(fields.get("vu_dev4").toString())); + rStatComassesDpo.setVuDev5(Objects.isNull(fields.get("vu_dev5")) ? 0.0 : Double.parseDouble(fields.get("vu_dev5").toString())); - rStatComassesDpo.setDataPst1(Objects.isNull(fields.get("data_pst1"))?0.0:Double.parseDouble(fields.get("data_pst1").toString())); - rStatComassesDpo.setDataPst2(Objects.isNull(fields.get("data_pst2"))?0.0:Double.parseDouble(fields.get("data_pst2").toString())); - rStatComassesDpo.setDataPst3(Objects.isNull(fields.get("data_pst3"))?0.0:Double.parseDouble(fields.get("data_pst3").toString())); - rStatComassesDpo.setDataPst4(Objects.isNull(fields.get("data_pst4"))?0.0:Double.parseDouble(fields.get("data_pst4").toString())); - rStatComassesDpo.setDataPst5(Objects.isNull(fields.get("data_pst5"))?0.0:Double.parseDouble(fields.get("data_pst5").toString())); + rStatComassesDpo.setDataPst1(Objects.isNull(fields.get("data_pst1")) ? 0.0 : Double.parseDouble(fields.get("data_pst1").toString())); + rStatComassesDpo.setDataPst2(Objects.isNull(fields.get("data_pst2")) ? 0.0 : Double.parseDouble(fields.get("data_pst2").toString())); + rStatComassesDpo.setDataPst3(Objects.isNull(fields.get("data_pst3")) ? 0.0 : Double.parseDouble(fields.get("data_pst3").toString())); + rStatComassesDpo.setDataPst4(Objects.isNull(fields.get("data_pst4")) ? 0.0 : Double.parseDouble(fields.get("data_pst4").toString())); + rStatComassesDpo.setDataPst5(Objects.isNull(fields.get("data_pst5")) ? 0.0 : Double.parseDouble(fields.get("data_pst5").toString())); - rStatComassesDpo.setVUnbalance1(Objects.isNull(fields.get("v_unbalance1"))?0.0:Double.parseDouble(fields.get("v_unbalance1").toString())); - rStatComassesDpo.setVUnbalance2(Objects.isNull(fields.get("v_unbalance2"))?0.0:Double.parseDouble(fields.get("v_unbalance2").toString())); - rStatComassesDpo.setVUnbalance3(Objects.isNull(fields.get("v_unbalance3"))?0.0:Double.parseDouble(fields.get("v_unbalance3").toString())); - rStatComassesDpo.setVUnbalance4(Objects.isNull(fields.get("v_unbalance4"))?0.0:Double.parseDouble(fields.get("v_unbalance4").toString())); - rStatComassesDpo.setVUnbalance5(Objects.isNull(fields.get("v_unbalance5"))?0.0:Double.parseDouble(fields.get("v_unbalance5").toString())); + rStatComassesDpo.setVUnbalance1(Objects.isNull(fields.get("v_unbalance1")) ? 0.0 : Double.parseDouble(fields.get("v_unbalance1").toString())); + rStatComassesDpo.setVUnbalance2(Objects.isNull(fields.get("v_unbalance2")) ? 0.0 : Double.parseDouble(fields.get("v_unbalance2").toString())); + rStatComassesDpo.setVUnbalance3(Objects.isNull(fields.get("v_unbalance3")) ? 0.0 : Double.parseDouble(fields.get("v_unbalance3").toString())); + rStatComassesDpo.setVUnbalance4(Objects.isNull(fields.get("v_unbalance4")) ? 0.0 : Double.parseDouble(fields.get("v_unbalance4").toString())); + rStatComassesDpo.setVUnbalance5(Objects.isNull(fields.get("v_unbalance5")) ? 0.0 : Double.parseDouble(fields.get("v_unbalance5").toString())); - rStatComassesDpo.setVThd1(Objects.isNull(fields.get("v_thd1"))?0.0:Double.parseDouble(fields.get("v_thd1").toString())); - rStatComassesDpo.setVThd2(Objects.isNull(fields.get("v_thd2"))?0.0:Double.parseDouble(fields.get("v_thd2").toString())); - rStatComassesDpo.setVThd3(Objects.isNull(fields.get("v_thd3"))?0.0:Double.parseDouble(fields.get("v_thd3").toString())); - rStatComassesDpo.setVThd4(Objects.isNull(fields.get("v_thd4"))?0.0:Double.parseDouble(fields.get("v_thd4").toString())); - rStatComassesDpo.setVThd5(Objects.isNull(fields.get("v_thd5"))?0.0:Double.parseDouble(fields.get("v_thd5").toString())); + rStatComassesDpo.setVThd1(Objects.isNull(fields.get("v_thd1")) ? 0.0 : Double.parseDouble(fields.get("v_thd1").toString())); + rStatComassesDpo.setVThd2(Objects.isNull(fields.get("v_thd2")) ? 0.0 : Double.parseDouble(fields.get("v_thd2").toString())); + rStatComassesDpo.setVThd3(Objects.isNull(fields.get("v_thd3")) ? 0.0 : Double.parseDouble(fields.get("v_thd3").toString())); + rStatComassesDpo.setVThd4(Objects.isNull(fields.get("v_thd4")) ? 0.0 : Double.parseDouble(fields.get("v_thd4").toString())); + rStatComassesDpo.setVThd5(Objects.isNull(fields.get("v_thd5")) ? 0.0 : Double.parseDouble(fields.get("v_thd5").toString())); - rStatComassesDpo.setEvent1(Objects.isNull(fields.get("event1"))?0.0:Double.parseDouble(fields.get("event1").toString())); - rStatComassesDpo.setEvent2(Objects.isNull(fields.get("event2"))?0.0:Double.parseDouble(fields.get("event2").toString())); - rStatComassesDpo.setEvent3(Objects.isNull(fields.get("event3"))?0.0:Double.parseDouble(fields.get("event3").toString())); - rStatComassesDpo.setEvent4(Objects.isNull(fields.get("event4"))?0.0:Double.parseDouble(fields.get("event4").toString())); - rStatComassesDpo.setEvent5(Objects.isNull(fields.get("event5"))?0.0:Double.parseDouble(fields.get("event5").toString())); - list.add(rStatComassesDpo); + rStatComassesDpo.setEvent1(Objects.isNull(fields.get("event1")) ? 0.0 : Double.parseDouble(fields.get("event1").toString())); + rStatComassesDpo.setEvent2(Objects.isNull(fields.get("event2")) ? 0.0 : Double.parseDouble(fields.get("event2").toString())); + rStatComassesDpo.setEvent3(Objects.isNull(fields.get("event3")) ? 0.0 : Double.parseDouble(fields.get("event3").toString())); + rStatComassesDpo.setEvent4(Objects.isNull(fields.get("event4")) ? 0.0 : Double.parseDouble(fields.get("event4").toString())); + rStatComassesDpo.setEvent5(Objects.isNull(fields.get("event5")) ? 0.0 : Double.parseDouble(fields.get("event5").toString())); + list.add(rStatComassesDpo); + } + } + + if(CollUtil.isNotEmpty(list)){ + this.saveOrUpdateBatchByMultiId(list,50); } - this.saveOrUpdateBatchByMultiId(list,50); } private Map getGeneralData(String lineId, String date){ @@ -152,12 +157,6 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl fields = getMetricData(lineId,time); - rStatAssesDpo.setVuDev(Double.parseDouble(fields.get("vu_dev").toString())); - rStatAssesDpo.setFreqDev(Double.parseDouble(fields.get("freq_dev").toString())); - rStatAssesDpo.setDataPlt(Double.parseDouble(fields.get("data_plt").toString())); - rStatAssesDpo.setVUnbalanceCp95(Double.parseDouble(fields.get("v_unbalance_cp95").toString())); - rStatAssesDpo.setVThdCp95(Double.parseDouble(fields.get("v_thd_cp95").toString())); - list.add(rStatAssesDpo); + if(CollUtil.isNotEmpty(fields)) { + RStatAssesDPO rStatAssesDpo = new RStatAssesDPO(); + rStatAssesDpo.setTime(dateOut); + rStatAssesDpo.setLineId(lineId); + rStatAssesDpo.setVuDev(Double.parseDouble(fields.get("vu_dev").toString())); + rStatAssesDpo.setFreqDev(Double.parseDouble(fields.get("freq_dev").toString())); + rStatAssesDpo.setDataPlt(Double.parseDouble(fields.get("data_plt").toString())); + rStatAssesDpo.setVUnbalanceCp95(Double.parseDouble(fields.get("v_unbalance_cp95").toString())); + rStatAssesDpo.setVThdCp95(Double.parseDouble(fields.get("v_thd_cp95").toString())); + list.add(rStatAssesDpo); + } + } + if(CollUtil.isNotEmpty(list)){ + this.saveOrUpdateBatchByMultiId(list,50); } - this.saveOrUpdateBatchByMultiId(list,50); } private Map getMetricData(String lineId,String date){ @@ -106,11 +111,13 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl vUn = resultMapper.toPOJO(vUnResult, DataVPO.class); List plt = resultMapper.toPOJO(pltResult, DataPltPO.class); Map outMap = new HashMap<>(); - outMap.put("vu_dev",(vuDev.size()>0)?vuDev.stream().collect(Collectors.averagingDouble(DataVPO::getVuDev)):0.0); - outMap.put("v_thd_cp95",(vThd.size()>0)?vThd.get(0).getMean():0.0); - outMap.put("freq_dev",(freqDev.size()>0)?freqDev.stream().collect(Collectors.averagingDouble(DataVPO::getFreqDev)):0.0); - outMap.put("v_unbalance_cp95",(vUn.size()>0)?vUn.get(0).getMean():0.0); - outMap.put("data_plt",(plt.size()>0)?plt.get(0).getMean():0.0); + if(CollUtil.isNotEmpty(vuDev) || CollUtil.isNotEmpty(vThd) || CollUtil.isNotEmpty(freqDev) || CollUtil.isNotEmpty(vUn) || CollUtil.isNotEmpty(plt)){ + outMap.put("vu_dev",(vuDev.size()>0)?vuDev.stream().collect(Collectors.averagingDouble(DataVPO::getVuDev)):0.0); + outMap.put("v_thd_cp95",(vThd.size()>0)?vThd.get(0).getMean():0.0); + outMap.put("freq_dev",(freqDev.size()>0)?freqDev.stream().collect(Collectors.averagingDouble(DataVPO::getFreqDev)):0.0); + outMap.put("v_unbalance_cp95",(vUn.size()>0)?vUn.get(0).getMean():0.0); + outMap.put("data_plt",(plt.size()>0)?plt.get(0).getMean():0.0); + } return outMap; }