From b5d442e93eef020f45566c3ca15c299d6c75d1e5 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 7 Sep 2023 14:51:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BE=9D=E8=B5=96=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 86 +++++++----- pqs-common/common-core/pom.xml | 9 +- pqs-common/common-web/pom.xml | 5 - pqs-device/common-device-biz/pom.xml | 7 - pqs-device/device-boot/pom.xml | 2 +- pqs-device/pms-device/pms-device-boot/pom.xml | 18 --- pqs-harmonic/harmonic-api/pom.xml | 8 -- .../njcn/harmonic/pojo/po}/PqsComasses.java | 2 +- pqs-harmonic/harmonic-boot/pom.xml | 18 --- .../service/impl/AssesServiceImpl.java | 4 +- .../service/impl/CustomReportServiceImpl.java | 123 ++++++++++-------- .../com/njcn/harmonic/util}/ComAssesUtil.java | 4 +- pqs-influx/pom.xml | 23 +--- pqs-prepare/prepare-boot/pom.xml | 9 -- pqs-process/process-boot/pom.xml | 12 ++ 15 files changed, 153 insertions(+), 177 deletions(-) rename {pqs-common/common-web/src/main/java/com/njcn/web/utils => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po}/PqsComasses.java (98%) rename {pqs-common/common-web/src/main/java/com/njcn/web/utils => pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/util}/ComAssesUtil.java (99%) diff --git a/pom.xml b/pom.xml index 58269087a..ba3db2716 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ - + 192.168.1.13 127.0.0.1 @@ -49,7 +49,8 @@ ${middle.server.url}:18848 - + + fd74182b-1fce-4dba-afa7-2623b0376205 ${middle.server.url}:8080 @@ -63,14 +64,14 @@ njcn common-microservice - + site 1.8 8 8 2.3.12.RELEASE - + Hoxton.SR12 2.2.7.RELEASE 5.7.9 @@ -90,6 +91,7 @@ 2.3 0.9.1 11.2 + 4.9.0 1.6.4 2.3.2 1.68 @@ -105,9 +107,6 @@ 2.3.0 1.2.7 4.4.0 - 0.5.3 - 4.8.1 - 8.2.1 1.7.0-Hoxton @@ -335,35 +334,62 @@ easypoi-spring-boot-starter ${easypoi.version} - - - me.tongfei - progressbar - ${progressbar.version} - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - io.minio - minio - ${minio.version} - - - com.squareup.okhttp3 - okhttp - - - com.baomidou dynamic-datasource-spring-boot-starter ${dynamic-datasource.version} - + + com.squareup.okhttp3 + logging-interceptor + ${okhttp3.version} + + + com.squareup.okhttp3 + mockwebserver + ${okhttp3.version} + + + com.squareup.okhttp3 + okcurl + ${okhttp3.version} + + + com.squareup.okhttp3 + okhttp + ${okhttp3.version} + + + com.squareup.okhttp3 + okhttp-dnsoverhttps + ${okhttp3.version} + + + com.squareup.okhttp3 + okhttp-sse + ${okhttp3.version} + + + com.squareup.okhttp3 + okhttp-testing-support + ${okhttp3.version} + + + com.squareup.okhttp3 + okhttp-tls + ${okhttp3.version} + + + com.squareup.okhttp3 + okhttp-urlconnection + ${okhttp3.version} + + + org.influxdb + influxdb-java + 2.22 + diff --git a/pqs-common/common-core/pom.xml b/pqs-common/common-core/pom.xml index 850547f92..cfca7d7ac 100644 --- a/pqs-common/common-core/pom.xml +++ b/pqs-common/common-core/pom.xml @@ -107,6 +107,13 @@ - + + com.squareup.okhttp3 + okhttp + + + com.squareup.okhttp3 + logging-interceptor + \ No newline at end of file diff --git a/pqs-common/common-web/pom.xml b/pqs-common/common-web/pom.xml index 429062075..0a011962b 100644 --- a/pqs-common/common-web/pom.xml +++ b/pqs-common/common-web/pom.xml @@ -69,11 +69,6 @@ com.nimbusds nimbus-jose-jwt - - org.influxdb - influxdb-java - - \ No newline at end of file diff --git a/pqs-device/common-device-biz/pom.xml b/pqs-device/common-device-biz/pom.xml index c06a3a41d..9bdb5fe96 100644 --- a/pqs-device/common-device-biz/pom.xml +++ b/pqs-device/common-device-biz/pom.xml @@ -59,13 +59,6 @@ com.njcn pqs-influx 0.0.1-SNAPSHOT - - - - com.squareup.okhttp3 - * - - diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index 8ef1c1113..31b3226c9 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -26,7 +26,7 @@ pq-device-boot ${project.version} - - - com.squareup.okhttp3 - okhttp - 4.8.1 - - - - com.squareup.okhttp3 - logging-interceptor - 4.8.1 diff --git a/pqs-harmonic/harmonic-api/pom.xml b/pqs-harmonic/harmonic-api/pom.xml index 46f38cced..f865a4f43 100644 --- a/pqs-harmonic/harmonic-api/pom.xml +++ b/pqs-harmonic/harmonic-api/pom.xml @@ -52,13 +52,6 @@ com.njcn pqs-influx 0.0.1-SNAPSHOT - - - - com.squareup.okhttp3 - * - - com.njcn @@ -66,7 +59,6 @@ 1.0.0 compile - com.github.jeffreyning mybatisplus-plus diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PqsComasses.java similarity index 98% rename from pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PqsComasses.java index e611b01a5..36ce43e44 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PqsComasses.java @@ -1,4 +1,4 @@ -package com.njcn.web.utils; +package com.njcn.harmonic.pojo.po; import lombok.Data; diff --git a/pqs-harmonic/harmonic-boot/pom.xml b/pqs-harmonic/harmonic-boot/pom.xml index d20f08edd..eae5879d4 100644 --- a/pqs-harmonic/harmonic-boot/pom.xml +++ b/pqs-harmonic/harmonic-boot/pom.xml @@ -57,24 +57,6 @@ com.njcn common-oss ${project.version} - - - com.squareup.okhttp3 - okhttp - - - - - - com.squareup.okhttp3 - okhttp - 4.8.1 - - - - com.squareup.okhttp3 - logging-interceptor - 4.8.1 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 7c99e53a7..21a4d4e96 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 @@ -5,10 +5,10 @@ import cn.hutool.core.date.DateUtil; import com.njcn.device.pq.pojo.param.PulicTimeStatisParam; import com.njcn.harmonic.mapper.RStatComassesDMapper; import com.njcn.harmonic.pojo.po.PQSComAssesPO; +import com.njcn.harmonic.pojo.po.PqsComasses; import com.njcn.harmonic.pojo.vo.AssesVO; import com.njcn.harmonic.service.AssesService; -import com.njcn.web.utils.ComAssesUtil; -import com.njcn.web.utils.PqsComasses; +import com.njcn.harmonic.util.ComAssesUtil; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java index 84fb5559b..00c4bd57b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java @@ -191,25 +191,25 @@ public class CustomReportServiceImpl implements CustomReportService { @Override public List deviceUnitTree() { List dictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEVICE_UNIT.getCode()).getData(); - Map unit=new HashMap<>(); + Map unit = new HashMap<>(); List list = dictData.stream().map(DictData::getCode).collect(Collectors.toList()); - List info=new ArrayList<>(); - List treeVOS=new ArrayList<>(); + List info = new ArrayList<>(); + List treeVOS = new ArrayList<>(); ReportTreeVO reportTreeVO; for (String s : list) { - treeVOS=new ArrayList<>(); + treeVOS = new ArrayList<>(); //有效值 - if(s.equals(DicDataEnum.EFFECTIVE.getCode())){ - reportTreeVO=new ReportTreeVO(); - reportTreeVO.setName("$"+s+"#i$"); + if (s.equals(DicDataEnum.EFFECTIVE.getCode())) { + reportTreeVO = new ReportTreeVO(); + reportTreeVO.setName("$" + s + "#i$"); reportTreeVO.setShowName(DicDataEnum.EFFECTIVE.getName()); treeVOS.add(reportTreeVO); - reportTreeVO=new ReportTreeVO(); - reportTreeVO.setName("$"+s+"#v$"); + reportTreeVO = new ReportTreeVO(); + reportTreeVO.setName("$" + s + "#v$"); reportTreeVO.setShowName(DicDataEnum.EFFECTIVE.getName()); treeVOS.add(reportTreeVO); - reportTreeVO=new ReportTreeVO(); + reportTreeVO = new ReportTreeVO(); reportTreeVO.setName(s); reportTreeVO.setShowName(DicDataEnum.EFFECTIVE.getName()); reportTreeVO.setChildren(treeVOS); @@ -300,7 +300,7 @@ public class CustomReportServiceImpl implements CustomReportService { //报表日期 .eq(ExcelRpt::getDataDate, reportSearchParam.getStartTime()); try { - List excelRpts = excelRptMapper.selectList(lambdaQuery); + List excelRpts = excelRptMapper.selectList(lambdaQuery); if (CollUtil.isNotEmpty(excelRpts)) { fileStorageUtil.downloadStream(response, excelRpts.get(0).getContent()); } else { @@ -429,7 +429,7 @@ public class CustomReportServiceImpl implements CustomReportService { //根据content，获取v值并进行处理 List reportTemplateDTOList = new ArrayList<>(); JSONArray jsonArray; - try(InputStream fileStream = fileStorageUtil.getFileStream(excelRptTemp.getContent())) { + try (InputStream fileStream = fileStorageUtil.getFileStream(excelRptTemp.getContent())) { //通过文件服务器获取 jsonArray = new JSONArray(new JSONTokener(fileStream, new JSONConfig())); jsonArray.forEach(item -> { @@ -486,7 +486,7 @@ public class CustomReportServiceImpl implements CustomReportService { } else if (InfluxDbSqlConstant.AVG.equalsIgnoreCase(data.getStatMethod())) { assSql(data, sql, endList, InfluxDbSqlConstant.AVG, reportSearchParam); } else if (InfluxDbSqlConstant.CP95.equalsIgnoreCase(data.getStatMethod())) { - assSql(data, sql, endList, InfluxDbSqlConstant.CP95, reportSearchParam); + assSql(data, sql, endList, InfluxDbSqlConstant.PERCENTILE, reportSearchParam); } }); } @@ -510,19 +510,22 @@ public class CustomReportServiceImpl implements CustomReportService { String v = son.getStr("v"); //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$ if (v.charAt(0) == '$' && v.contains("#")) { - String str = assMap.get(v.replace("$", "")).get(0).getValue(); - //没有值，赋"/" - if (StringUtils.isBlank(str)) { - str = "/"; + String str = ""; + if(Objects.nonNull(assMap.get(v.replace("$", "")))){ + str = assMap.get(v.replace("$", "")).get(0).getValue(); + //没有值，赋"/" + if (StringUtils.isBlank(str)) { + str = "/"; + } + son.set("v", str); } - son.set("v", str); } //解决数据单位问题 @指标#类型@ if (v.charAt(0) == '@' && v.contains("#")) { String replace = v.replace("@", ""); - if(unit.containsKey(replace)){ + if (unit.containsKey(replace)) { son.set("v", unit.get(replace)); - }else{ + } else { son.set("v", "/"); } @@ -553,54 +556,55 @@ public class CustomReportServiceImpl implements CustomReportService { /** * 数据单位信息 + * * @param lineID * @return */ - private Map unitMap(String lineID){ + private Map unitMap(String lineID) { PqsDeviceUnit deviceUnit = deviceUnitClient.lineUnitDetail(lineID).getData(); List dictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEVICE_UNIT.getCode()).getData(); - Map unit=new HashMap<>(); + Map unit = new HashMap<>(); List list = dictData.stream().map(DictData::getCode).collect(Collectors.toList()); for (String s : list) { //有效值 - if(s.equals(DicDataEnum.EFFECTIVE.getCode())){ - unit.put(s+"#i",deviceUnit.getIeffective()); - unit.put(s+"#v",deviceUnit.getLineVoltage()); + if (s.equals(DicDataEnum.EFFECTIVE.getCode())) { + unit.put(s + "#i", deviceUnit.getIeffective()); + unit.put(s + "#v", deviceUnit.getLineVoltage()); } //功率 - if(s.equals(DicDataEnum.POWER.getCode())){ - unit.put(s+"#p",deviceUnit.getTotalActiveP()); - unit.put(s+"#q",deviceUnit.getTotalNoP()); - unit.put(s+"#s",deviceUnit.getTotalViewP()); + if (s.equals(DicDataEnum.POWER.getCode())) { + unit.put(s + "#p", deviceUnit.getTotalActiveP()); + unit.put(s + "#q", deviceUnit.getTotalNoP()); + unit.put(s + "#s", deviceUnit.getTotalViewP()); } //畸变率 - if(s.equals(DicDataEnum.DISTORTION.getCode())){ - unit.put(s+"#v",deviceUnit.getVdistortion()); + if (s.equals(DicDataEnum.DISTORTION.getCode())) { + unit.put(s + "#v", deviceUnit.getVdistortion()); } //电压偏差 - if(s.equals(DicDataEnum.VOLTAGE.getCode())){ - unit.put(s+"#v",deviceUnit.getVoltageDev()); + if (s.equals(DicDataEnum.VOLTAGE.getCode())) { + unit.put(s + "#v", deviceUnit.getVoltageDev()); } //频率 - if(s.equals(DicDataEnum.UNIT_FREQUENCY.getCode())){ - unit.put(s+"#freq",deviceUnit.getUnitFrequency()); - unit.put(s+"#freqDev",deviceUnit.getUnitFrequencyDev()); + if (s.equals(DicDataEnum.UNIT_FREQUENCY.getCode())) { + unit.put(s + "#freq", deviceUnit.getUnitFrequency()); + unit.put(s + "#freqDev", deviceUnit.getUnitFrequencyDev()); } //三项不平衡度 - if(s.equals(DicDataEnum.UNBALANCE.getCode())){ - unit.put(s+"#v","%"); - unit.put(s+"#vPos",deviceUnit.getPositiveV()); - unit.put(s+"#vNeg",deviceUnit.getNoPositiveV()); - unit.put(s+"#vZero",deviceUnit.getNoPositiveV()); - unit.put(s+"#i","%"); - unit.put(s+"#iPos","A"); - unit.put(s+"#iNeg","A"); - unit.put(s+"#iZero","A"); + if (s.equals(DicDataEnum.UNBALANCE.getCode())) { + unit.put(s + "#v", "%"); + unit.put(s + "#vPos", deviceUnit.getPositiveV()); + unit.put(s + "#vNeg", deviceUnit.getNoPositiveV()); + unit.put(s + "#vZero", deviceUnit.getNoPositiveV()); + unit.put(s + "#i", "%"); + unit.put(s + "#iPos", "A"); + unit.put(s + "#iNeg", "A"); + unit.put(s + "#iZero", "A"); } //基波 - if(s.equals(DicDataEnum.FUND.getCode())){ - unit.put(s+"#i",deviceUnit.getIfund()); - unit.put(s+"#v",deviceUnit.getVfundEffective()); + if (s.equals(DicDataEnum.FUND.getCode())) { + unit.put(s + "#i", deviceUnit.getIfund()); + unit.put(s + "#v", deviceUnit.getVfundEffective()); } } @@ -616,7 +620,7 @@ public class CustomReportServiceImpl implements CustomReportService { //sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai') //cp95函数特殊处理 PERCENTILE(field_key, N) - if (InfluxDbSqlConstant.CP95.equals(method)) { + if (InfluxDbSqlConstant.PERCENTILE.equals(method)) { sql.append(method) .append(InfluxDbSqlConstant.LBK) .append(data.getTemplateName()) @@ -660,11 +664,13 @@ public class CustomReportServiceImpl implements CustomReportService { } //频率和频率偏差仅统计T相 - if(data.getTemplateName().equals("freq_dev") || data.getTemplateName().equals("freq")){ + if (data.getTemplateName().equals("freq_dev") || data.getTemplateName().equals("freq")) { sql.append(InfluxDbSqlConstant.AND) .append(InfluxDBTableConstant.PHASIC_TYPE) .append(InfluxDbSqlConstant.EQ) - .append(InfluxDBTableConstant.PHASE_TYPE_T); + .append(InfluxDbSqlConstant.QM) + .append(InfluxDBTableConstant.PHASE_TYPE_T) + .append(InfluxDbSqlConstant.QM); } //时间范围处理 sql @@ -675,12 +681,21 @@ public class CustomReportServiceImpl implements CustomReportService { sql.append(InfluxDbSqlConstant.TZ); + if (data.getTemplateName().equals("freq_dev") || data.getTemplateName().equals("freq")) { + System.out.println(sql); + } + + //根据不同的库表赋值 - StatisticalDataDTO statisticalDataDTO = commonService.selectBySql(sql); - data.setValue(String.format("%.3f",statisticalDataDTO.getValue())); + StatisticalDataDTO statisticalDataDTO = commonService.selectBySql(sql); + if (Objects.isNull(statisticalDataDTO)) { + data.setValue("/"); + } else { + + data.setValue(String.format("%.3f", statisticalDataDTO.getValue())); + } endList.add(data); } - } diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/util/ComAssesUtil.java similarity index 99% rename from pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/util/ComAssesUtil.java index e3ae32e17..699406c5d 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/util/ComAssesUtil.java @@ -1,6 +1,8 @@ -package com.njcn.web.utils; +package com.njcn.harmonic.util; +import com.njcn.harmonic.pojo.po.PqsComasses; +import com.njcn.web.utils.FloatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/pqs-influx/pom.xml b/pqs-influx/pom.xml index 204bd243a..68a1cfb22 100644 --- a/pqs-influx/pom.xml +++ b/pqs-influx/pom.xml @@ -17,42 +17,21 @@ 8 + com.njcn influxdb-springboot-starter 1.0.0 - - - com.squareup.okhttp3 - okhttp - - - com.squareup.okhttp3 - logging-interceptor - - - - - com.squareup.okhttp3 - okhttp - 4.9.0 - - - com.squareup.okhttp3 - logging-interceptor - 4.9.0 com.njcn system-api 1.0.0 - compile com.njcn cs-device-api 1.0.0 - compile diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml index c53d96a6e..519d84ae8 100644 --- a/pqs-prepare/prepare-boot/pom.xml +++ b/pqs-prepare/prepare-boot/pom.xml @@ -115,15 +115,6 @@ common-oss ${project.version} - - - - com.squareup.okhttp3 - okhttp - 4.8.1 - - - com.njcn prepare-api diff --git a/pqs-process/process-boot/pom.xml b/pqs-process/process-boot/pom.xml index c4aebed81..49539d5fe 100644 --- a/pqs-process/process-boot/pom.xml +++ b/pqs-process/process-boot/pom.xml @@ -113,6 +113,18 @@ http-client 1.1.5.11 + + + + com.yomahub + liteflow-spring-boot-starter + 2.10.7 + + + com.yomahub + liteflow-rule-nacos + 2.10.7 +