From ff6f10604762dd78a226cb3eaf8ba5a963c93cf9 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Wed, 29 Mar 2023 16:06:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/mapper/TopMsgMapper.java | 4 +- .../device/pq/mapper/mapping/LineMapper.xml | 4 +- .../device/pq/mapper/mapping/TopMagMapper.xml | 6 +- .../pq/service/impl/LineServiceImpl.java | 3 +- .../pojo/influxdb/po/Communicate.java | 49 ++++++++++ .../harmonic/pojo/mysql/po/line/AlarmPO.java | 5 +- .../harmonic/pojo/mysql/po/line/TopMsgPO.java | 4 +- .../mapping/DeviceAbnormaStatisticsMapper.xml | 57 ++++++------ .../DeviceAbnormaStatisticsServiceImpl.java | 90 ++++++++++++++----- 9 files changed, 159 insertions(+), 63 deletions(-) create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/influxdb/po/Communicate.java diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java index 72894ae91..b64d07155 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java @@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface TopMsgMapper { - Page getTopMsg(Page page,@Param("lineGrade") String lineGrade, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); - List getTopMsgDetail(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); + + List getTopMsgDetail(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 55653e41d..504cbf416 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -864,7 +864,9 @@ #{item} and - a.Create_Time between #{startTime} and #{endTime} + a.Create_Time between #{startTime} and #{endTime} + and + b.Run_Flag != 2 ) t ORDER BY flowProportion DESC diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml index f25d347ba..922ec093b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml @@ -5,12 +5,12 @@ SELECT t.*, (t.statisValue)/t.flowMeal flowProportion - FROM - ( - SELECT device.Id AS Id, - device.id AS deviceId, - COUNT(ca.Id) AS alarmCount, - GROUP_CONCAT(ca.Remark) AS alarmDesc, - IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal, - IFNULL(pmf.Actual_Value,0) statisValue - FROM pq_line line - INNER JOIN pq_line vol ON line.pid=vol.id - INNER JOIN pq_line device ON vol.pid=device.id - LEFT JOIN pq_device pd ON device.id=pd.id - LEFT JOIN pq_line_detail pld ON pld.id=line.id - LEFT JOIN cld_alarm ca ON ca.Line_Id=device.id - LEFT JOIN pqs_month_flow pmf ON pmf.Dev_Id=device.id - LEFT JOIN cld_dev_meal c ON device.id = c.line_id - LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id - LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id - WHERE - pd.Dev_Model = 1 - AND - pd.Run_Flag = 0 - AND - pld.Line_Grade is NOT NULL - AND - ca.Occurred_Time between #{startTime} and #{endTime} - GROUP BY deviceId - ) t + FROM + ( + SELECT device.Id AS Id, + device.id AS deviceId, + COUNT(ca.Id) AS alarmCount, + GROUP_CONCAT(ca.Remark) AS alarmDesc, + IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal, + IFNULL(ANY_VALUE(pmf.Actual_Value),0) statisValue, + ANY_VALUE(device.Update_Time) AS updateTime + FROM pq_line line + INNER JOIN pq_line vol ON line.pid=vol.id + INNER JOIN pq_line device ON vol.pid=device.id + LEFT JOIN pq_device pd ON device.id=pd.id + LEFT JOIN pq_line_detail pld ON pld.id=line.id + LEFT JOIN cld_alarm ca ON ca.Line_Id=device.id + LEFT JOIN pqs_month_flow pmf ON pmf.Dev_Id=device.id + LEFT JOIN cld_dev_meal c ON device.id = c.line_id + LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id + LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id + WHERE + pd.Dev_Model = 1 + AND + pd.Run_Flag = 0 + AND + pld.Line_Grade is NOT NULL + AND + ca.Occurred_Time between #{startTime} and #{endTime} + GROUP BY deviceId + ) t ORDER BY flowProportion DESC diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java index 18055bc52..680bb53ac 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java @@ -2,23 +2,20 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.device; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; -import com.njcn.device.pq.pojo.po.Communicate; import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.device.DeviceAbnormaStatisticsMapper; +import com.njcn.prepare.harmonic.pojo.influxdb.po.Communicate; import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmStrategyVO; -import com.njcn.prepare.harmonic.pojo.mysql.po.line.LinePO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.TopMsgPO; import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam; import com.njcn.prepare.harmonic.service.mysql.device.DeviceAbnormalStatisticsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.*; @@ -37,33 +34,31 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist private final InfluxDbUtils influxDbUtils; @Override public boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param) { + Map> comMap = new HashMap<>();Map> devLineMap = new HashMap<>(); // 获取监测点告警 List lineAlarms = deviceAbnormaStatisticsMapper.getAlarmByLines( DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), DateUtil.beginOfDay(DateUtil.parse(param.getEndTime()))); - Map> lineMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(lineAlarms)){ // 根据装置分组 - lineMap = lineAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); + devLineMap = lineAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); } - // 获取设备流量 List deviceAlarms = deviceAbnormaStatisticsMapper.getAlarmByDevice( DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), DateUtil.beginOfDay(DateUtil.parse(param.getEndTime()))); List devs = deviceAlarms.stream().map(AlarmPO::getId).collect(Collectors.toList()); - devs.add("6469e77fda42db12c7ca6620a092f03c"); - Map> comMap = new HashMap<>(); // 获取通信中断信息 - List communicate = getCommunicate(devs, param.getBeginTime(), param.getEndTime()); - if (CollectionUtil.isNotEmpty(communicate)){ - comMap = communicate.stream().collect(Collectors.groupingBy(Communicate::getId)); + List comMsgs = getCommunicate(devs, param.getBeginTime(), param.getEndTime()); + if (CollectionUtil.isNotEmpty(comMsgs)){ + comMap = comMsgs.stream().collect(Collectors.groupingBy(TopMsgPO::getDevId)); } + // 整合监测点告警信息、数据完整性以及监测点等级为设备信息 for (AlarmPO deviceAlarm : deviceAlarms) { - if (!lineMap.containsKey(deviceAlarm.getId())) { + if (!devLineMap.containsKey(deviceAlarm.getId())) { continue; } - AlarmPO lineAlarm = lineMap.get(deviceAlarm.getId()).get(0); + AlarmPO lineAlarm = devLineMap.get(deviceAlarm.getId()).get(0); deviceAlarm.setAlarmCount(deviceAlarm.getAlarmCount() + lineAlarm.getAlarmCount()); if (lineAlarm.getDue().compareTo(BigDecimal.ZERO) == 0) { deviceAlarm.setIntegrity(BigDecimal.ZERO); @@ -73,15 +68,14 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist if (lineAlarm.getLevel() != null) { deviceAlarm.setLevel(lineAlarm.getLevel()); } - if (CollectionUtil.isNotEmpty(comMap)) { - List communicates = comMap.get(deviceAlarm.getId()); - int comOut = communicates.stream().filter(t -> t.getType() == 0).collect(Collectors.toList()).size(); - deviceAlarm.setComOutNum(comOut); - } + TopMsgPO topMsgPO = comMap.get(deviceAlarm.getId()).get(0); + deviceAlarm.setComOutNum(topMsgPO.getComOutCount()); + deviceAlarm.setComOutDesc(String.join(",",topMsgPO.getComOutDesc())); } - Map> levelMap = deviceAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getLevel)); + // 比对告警策略并落表 List alarmStrategyVOS = deviceAbnormaStatisticsMapper.selectAlarmStrategy(); List alarmExceptions = new ArrayList<>(); + Map> levelMap = deviceAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getLevel)); for (AlarmStrategyVO strategyVO : alarmStrategyVOS) { if (!levelMap.containsKey(strategyVO.getAlgoDesc())){ continue; @@ -91,7 +85,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist TopMsgPO topMsg = new TopMsgPO(); topMsg.setDevId(alarmPO.getId()); topMsg.setFlowFlag(1); - topMsg.setComOutCount(alarmPO.getComOutNum() == 0 ? 0 : alarmPO.getComOutNum()); + topMsg.setComOutCount(alarmPO.getComOutNum() == null ? 0 : alarmPO.getComOutNum()); if (alarmPO.getIntegrity().intValue() getCommunicate(List devs, String startTime, String endTime) { + public List getCommunicate(List devs, String startTime, String endTime) { //组装sql语句 StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and "); @@ -126,7 +120,55 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist //获取暂降事件 QueryResult result = influxDbUtils.query(sql); InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); - List communicateList = influxDBResultMapper.toPOJO(result, Communicate.class); - return communicateList; + List communicates = influxDBResultMapper.toPOJO(result, Communicate.class); + List comMsgs = new ArrayList<>(); + if (CollectionUtil.isEmpty(communicates)) { + return comMsgs; + } + Map> comMap = communicates.stream().collect(Collectors.groupingBy(Communicate::getDevId)); + for (Map.Entry> comEntry : comMap.entrySet()) { + TopMsgPO topMsgPO = new TopMsgPO(); List comOutDesc = new ArrayList<>(); + topMsgPO.setDevId(comEntry.getKey()); + // 根据日期排序 + List sortedList = comEntry.getValue().stream().sorted(Comparator.comparing(Communicate::getUpdateTime)).collect(Collectors.toList()); + if (sortedList.size() == 1) { + if (sortedList.get(0).getType() == 0) { + comOutDesc.add(sortedList.get(0).getUpdateTime()+"至"+DateUtil.endOfDay(DateUtil.parse(endTime))); + } else { + comOutDesc.add((DateUtil.beginOfDay(DateUtil.parse(startTime)))+"至"+sortedList.get(0).getUpdateTime()); + } + } else { + switch (sortedList.get(0).getType()) { + case 0: + for (int i = 0; i a.getType() == 0).collect(Collectors.toList()).size()); + comMsgs.add(topMsgPO); + } + return comMsgs; } } From 436529a4abb6faf3d1ab31ce06fc206e9d71e1b7 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 30 Mar 2023 09:13:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E6=9C=9F?= =?UTF-8?q?=E5=BA=9F=E5=BC=83=E4=BB=A3=E7=A0=81=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/executor/handler/HarmComprehensiveAssessJob.java | 1 + .../main/java/com/njcn/executor/handler/HarmDateToDayJob.java | 1 + .../main/java/com/njcn/executor/handler/HarmIntegrityJob.java | 1 + .../main/java/com/njcn/executor/handler/HarmKpiAssessJob.java | 1 + .../main/java/com/njcn/executor/handler/HarmLimitRateJob.java | 1 + .../main/java/com/njcn/executor/handler/HarmLimitTargetJob.java | 1 + .../main/java/com/njcn/executor/handler/HarmOnlineRateJob.java | 1 + .../prepare/harmonic/controller/line/DayDataController.java | 1 + .../harmonic/controller/line/HarmonicGeneralController.java | 1 + .../harmonic/controller/line/HarmonicMetricController.java | 1 + .../prepare/harmonic/controller/line/IntegrityController.java | 1 + .../prepare/harmonic/controller/line/LimitTargetController.java | 1 + .../prepare/harmonic/controller/line/LimitrateController.java | 2 +- .../prepare/harmonic/controller/line/OnlineRateController.java | 1 + 14 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmComprehensiveAssessJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmComprehensiveAssessJob.java index 7cb29bb3e..90e22f8c9 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmComprehensiveAssessJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmComprehensiveAssessJob.java @@ -22,6 +22,7 @@ public class HarmComprehensiveAssessJob { private final HarmonicGeneralFeignClient harmonicGeneralFeignClient; + @Deprecated @XxlJob("comprehensiveAssessHandler") public void comprehensiveAssessHandler(){ diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java index a517e4dce..cc2a27a7a 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java @@ -31,6 +31,7 @@ public class HarmDateToDayJob { private final DayDataFeignClient dayDataFeignClient; + @Deprecated @XxlJob("harmDateToDayJob") public void harmDateToDayJob(){ diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java index 6d93832c1..768433b8b 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java @@ -26,6 +26,7 @@ public class HarmIntegrityJob { private final IntegrityFeignClient integrityFeignClient; + @Deprecated @XxlJob("harmIntegrityJob") public void harmIntegrityJob(){ LineParam lineParam = new LineParam(); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmKpiAssessJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmKpiAssessJob.java index eaa72fff1..eed9ff188 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmKpiAssessJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmKpiAssessJob.java @@ -23,6 +23,7 @@ public class HarmKpiAssessJob { private final HarmonicMetricFeignClient harmonicMetricFeignClient; + @Deprecated @XxlJob("kpiAssessHandler") public void kpiAssessHandler(){ diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java index 9fa8adb52..1035b3746 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java @@ -27,6 +27,7 @@ public class HarmLimitRateJob { private final LimitrateFeignClient limitrateFeignClient; + @Deprecated @XxlJob("harmLimitRateJob") public void harmLimitRateJob(){ diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java index 21a74eba0..96662db4f 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java @@ -25,6 +25,7 @@ public class HarmLimitTargetJob { private final LimitTargetFeignClient limitTargetFeignClient; + @Deprecated @XxlJob("harmLimitTargetJob") public void harmLimitTargetJob(){ LineParam lineParam = new LineParam(); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java index cef287e45..bf31ac379 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java @@ -22,6 +22,7 @@ public class HarmOnlineRateJob { private final OnlineRateFeignClient onlineRateFeignClient; + @Deprecated @XxlJob("harmOnlineRateJob") public void harmOnlineRateJob(){ LineParam lineParam = new LineParam(); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java index c62c457f3..e54b2bddb 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java @@ -45,6 +45,7 @@ public class DayDataController extends BaseController { private final DayDataService dayDataService; + @Deprecated @ApiOperation("day表定时任务") @ApiImplicitParam(value = "jobParam",name = "jobParam",required = true) @PostMapping("dayDataHanlder") diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java index f33f05bee..d8e5805e6 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java @@ -37,6 +37,7 @@ public class HarmonicGeneralController extends BaseController { private final HarmonicGeneralService harmonicGeneralService; + @Deprecated @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/generalData") @ApiOperation("稳态综合评估日数据计算") diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java index ff450e985..a9a6cba72 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java @@ -38,6 +38,7 @@ public class HarmonicMetricController extends BaseController { private final HarmonicMetricService harmonicMetricService; + @Deprecated @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/metricData") @ApiOperation("稳态指标评估日数据计算") diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java index 8470778e4..65fa3614a 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java @@ -38,6 +38,7 @@ public class IntegrityController extends BaseController { private final IntegrityService integrityService; + @Deprecated @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/computeDataIntegrity") @ApiOperation("数据完整性统计") diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java index ec4dcf57b..4f50fd85d 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java @@ -38,6 +38,7 @@ public class LimitTargetController extends BaseController { private final LimitTargetService limitTargetService; + @Deprecated @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLimitTargetData") @ApiOperation("生成limit_target表") diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java index 550bde50f..cf0880bd6 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java @@ -45,7 +45,7 @@ public class LimitrateController extends BaseController { private final LineFeignClient lineFeignClient; - + @Deprecated @ApiOperation("limitrate表定时任务") @ApiImplicitParam(value = "limitRateHanlderParam",name = "limitRateHanlderParam",required = true) @PostMapping("LimitRateHanlder") diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java index 90a1c2a09..8a3d54728 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java @@ -40,6 +40,7 @@ public class OnlineRateController extends BaseController { private final OnlineRateService onlineRateService; + @Deprecated @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getOnlineRateData") @ApiOperation("生成在线率数据") From 346530b0a0afdbc02cc45e80d60b91f7ab110ee1 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Thu, 30 Mar 2023 09:38:47 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/controller/OperationContrController.java | 2 +- .../mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java index 8b5451802..54de9cf04 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java @@ -146,7 +146,7 @@ public class OperationContrController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getDailyDeviceAbnormalStatistics") @ApiOperation("获取终端异常统计") - @ApiImplicitParam(name = "conditionBusinessParam", value = "实体", required = true) + @ApiImplicitParam(name = "param", value = "实体", required = true) public HttpResult> dailyDeviceAbnormalStatistics(@RequestBody PqsParam param) { String methodDescribe = getMethodDescribe("dailyDeviceAbnormalStatistics"); Page result = lineService.dailyDeviceAbnormalStatistics(param); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java index 680bb53ac..488beef46 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java @@ -38,7 +38,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist // 获取监测点告警 List lineAlarms = deviceAbnormaStatisticsMapper.getAlarmByLines( DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), - DateUtil.beginOfDay(DateUtil.parse(param.getEndTime()))); + DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); if (CollectionUtil.isNotEmpty(lineAlarms)){ // 根据装置分组 devLineMap = lineAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); @@ -46,7 +46,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist // 获取设备流量 List deviceAlarms = deviceAbnormaStatisticsMapper.getAlarmByDevice( DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), - DateUtil.beginOfDay(DateUtil.parse(param.getEndTime()))); + DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); List devs = deviceAlarms.stream().map(AlarmPO::getId).collect(Collectors.toList()); // 获取通信中断信息 List comMsgs = getCommunicate(devs, param.getBeginTime(), param.getEndTime()); From d6489cc376a56a90896c722956fd8c227ff4b8d7 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Thu, 30 Mar 2023 10:01:57 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 16 +++--- pqs-advance/pom.xml | 24 --------- .../enums/AlgorithmResponseEnum.java | 6 +-- .../pojo/param/AppProjectAddParm.java | 2 +- .../pojo/param/AppProjectAuditParm.java | 2 +- .../pojo/param/AppProjectQueryParm.java | 2 +- .../pojo/param/AppTopologyDiagramAddParm.java | 4 +- .../param/AppTopologyDiagramAuditParm.java | 2 +- .../AppTopologyDiagramQueryPageParm.java | 37 ++++++++++++++ .../param/AppTopologyDiagramQueryParm.java | 2 +- .../pojo/po/AppLineTopologyDiagramPO.java | 2 +- .../njcn/algorithm}/pojo/po/AppProjectPO.java | 2 +- .../pojo/po/AppTopologyDiagramPO.java | 2 +- .../njcn/algorithm}/pojo/vo/AppProjectVO.java | 2 +- .../pojo/vo/AppTopologyDiagramVO.java | 2 +- .../algorithm-api}/pom.xml | 4 +- .../algorithm-boot}/pom.xml | 8 +-- .../algorithm/AlgorithmBootApplication.java | 6 +-- .../project/AppProjectController.java | 12 ++--- .../project/AppTopologyController.java | 31 ++++++++--- .../LineTopologyDiagramController.java | 26 ++++++++++ .../mapper/AppLineTopologyDiagramMapper.java | 4 +- .../algorithm}/mapper/AppProjectMapper.java | 8 +-- .../mapper/AppTopologyDiagramMapper.java | 4 +- .../mapping/AppLineTopologyDiagramMapper.xml | 4 +- .../mapper/mapping/AppProjectMapper.xml | 4 +- .../mapping/AppTopologyDiagramMapper.xml | 4 +- .../AppLineTopologyDiagramService.java | 4 +- .../algorithm}/service/AppProjectService.java | 12 ++--- .../service/AppTopologyDiagramService.java | 24 ++++++--- .../AppLineTopologyDiagramServiceImpl.java | 8 +-- .../service/impl/AppProjectServiceImpl.java | 24 ++++----- .../impl/AppTopologyDiagramServiceImpl.java | 48 ++++++++++++++---- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/qvvr_balance.dll | Bin .../src/main/resources/qvvr_dll.dll | Bin .../src/main/resources/qvvr_dll_cause.dll | Bin .../src/main/resources/sql20230227dll.sql | 46 +++++++++++++++++ pqs-algorithm/pom.xml | 6 ++- 39 files changed, 270 insertions(+), 126 deletions(-) delete mode 100644 pqs-advance/pom.xml rename pqs-advance/advance-api/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java (75%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/param/AppProjectAddParm.java (97%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/param/AppProjectAuditParm.java (96%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/param/AppProjectQueryParm.java (96%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/param/AppTopologyDiagramAddParm.java (91%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/param/AppTopologyDiagramAuditParm.java (96%) create mode 100644 pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/param/AppTopologyDiagramQueryParm.java (92%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/po/AppLineTopologyDiagramPO.java (95%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/po/AppProjectPO.java (97%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/po/AppTopologyDiagramPO.java (96%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/vo/AppProjectVO.java (97%) rename {pqs-advance/advance-api/main/java/com/njcn/advance => pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm}/pojo/vo/AppTopologyDiagramVO.java (96%) rename {pqs-advance/advance-api => pqs-algorithm/algorithm-api}/pom.xml (94%) rename {pqs-advance/advance-boot => pqs-algorithm/algorithm-boot}/pom.xml (96%) rename pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/AlgorithmBootApplication.java (81%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/controller/project/AppProjectController.java (90%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/controller/project/AppTopologyController.java (67%) create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/LineTopologyDiagramController.java rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/mapper/AppLineTopologyDiagramMapper.java (78%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/mapper/AppProjectMapper.java (91%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/mapper/AppTopologyDiagramMapper.java (78%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/mapper/mapping/AppLineTopologyDiagramMapper.xml (83%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/mapper/mapping/AppProjectMapper.xml (88%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/mapper/mapping/AppTopologyDiagramMapper.xml (87%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/service/AppLineTopologyDiagramService.java (78%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/service/AppProjectService.java (80%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/service/AppTopologyDiagramService.java (60%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/service/impl/AppLineTopologyDiagramServiceImpl.java (67%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/service/impl/AppProjectServiceImpl.java (89%) rename {pqs-advance/advance-boot/src/main/java/com/njcn/advance => pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm}/service/impl/AppTopologyDiagramServiceImpl.java (66%) rename {pqs-advance/advance-boot => pqs-algorithm/algorithm-boot}/src/main/resources/bootstrap.yml (95%) rename {pqs-advance/advance-boot => pqs-algorithm/algorithm-boot}/src/main/resources/qvvr_balance.dll (100%) rename {pqs-advance/advance-boot => pqs-algorithm/algorithm-boot}/src/main/resources/qvvr_dll.dll (100%) rename {pqs-advance/advance-boot => pqs-algorithm/algorithm-boot}/src/main/resources/qvvr_dll_cause.dll (100%) create mode 100644 pqs-algorithm/algorithm-boot/src/main/resources/sql20230227dll.sql diff --git a/pom.xml b/pom.xml index 331adc19f..4afc1017a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ pqs-event pqs-job pqs-job/job-api - pqs-advance pqs-prepare pqs-process pqs-algorithm @@ -42,17 +41,22 @@ - 192.168.1.13 + + 192.168.1.18 - 192.168.1.139 + + 192.168.1.114 - 192.168.1.31 + 192.168.1.13 ${middle.server.url}:18848 - - 415a1c87-33aa-47bd-8e25-13cc456c87ed + + + + fe40a052-d787-48f4-940f-688cabdff26a + ${middle.server.url}:8080 ${service.server.url}:10215 diff --git a/pqs-advance/pom.xml b/pqs-advance/pom.xml deleted file mode 100644 index 8bca4d039..000000000 --- a/pqs-advance/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - pqs - com.njcn - 1.0.0 - - 4.0.0 - - pqs-advance - pom - - advance-api - advance-boot - - - - 8 - 8 - - - \ No newline at end of file diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java similarity index 75% rename from pqs-advance/advance-api/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java index 6967791b6..e3ebb1cd4 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java @@ -1,4 +1,4 @@ -package com.njcn.advance.enums; +package com.njcn.algorithm.enums; import lombok.Getter; @@ -9,7 +9,7 @@ import lombok.Getter; * @date 2021/6/21 */ @Getter -public enum AdvanceResponseEnum { +public enum AlgorithmResponseEnum { /** * A00500 ~ A01550 用于终端模块的枚举 @@ -22,7 +22,7 @@ public enum AdvanceResponseEnum { private final String message; - AdvanceResponseEnum(String code, String message) { + AlgorithmResponseEnum(String code, String message) { this.code = code; this.message = message; } diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAddParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java similarity index 97% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAddParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java index 256011c42..079a83d61 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAddParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAuditParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAuditParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java index 391014461..574af0de4 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAuditParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectQueryParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectQueryParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java index dadb886e8..39eae6958 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectQueryParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAddParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java similarity index 91% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAddParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java index ba0448738..d8e853320 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAddParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,7 +35,7 @@ public class AppTopologyDiagramAddParm { * 项目Id */ @ApiModelProperty(value = "项目Id") - @NotBlank(message="项目Id不能为空！") +// @NotBlank(message="项目Id不能为空！") private String projectId; /** diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAuditParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAuditParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java index bed15da71..d663ba333 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAuditParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java new file mode 100644 index 000000000..4d38c352f --- /dev/null +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java @@ -0,0 +1,37 @@ +package com.njcn.algorithm.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 15:20【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class AppTopologyDiagramQueryPageParm { + + @NotNull(message="当前页不能为空！") + @Min(value = 1, message = "当前页不能为0") + @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) + private Integer currentPage; + /**显示条数*/ + @NotNull(message="显示条数不能为空！") + @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) + private Integer pageSize; + + + @ApiModelProperty(value="拓扑图名称") + private String searchValue; + + + @ApiModelProperty(value="项目Id") + private String projectId; + +} diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramQueryParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java similarity index 92% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramQueryParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java index 77783eb8b..c7bbe37b9 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramQueryParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppLineTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java similarity index 95% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppLineTopologyDiagramPO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java index f7b132599..aff6173ea 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppLineTopologyDiagramPO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.po; +package com.njcn.algorithm.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppProjectPO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java similarity index 97% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppProjectPO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java index 909a2f27e..b95ba6148 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppProjectPO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.po; +package com.njcn.algorithm.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppTopologyDiagramPO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java index c5c649928..f15fbd57b 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppTopologyDiagramPO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.po; +package com.njcn.algorithm.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppProjectVO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java similarity index 97% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppProjectVO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java index 67b87e3e6..31a4e5a16 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppProjectVO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.vo; +package com.njcn.algorithm.pojo.vo; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppTopologyDiagramVO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppTopologyDiagramVO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java index 4d4aed41e..1bd78898f 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppTopologyDiagramVO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.vo; +package com.njcn.algorithm.pojo.vo; import com.njcn.db.bo.BaseEntity; import io.swagger.annotations.ApiModelProperty; diff --git a/pqs-advance/advance-api/pom.xml b/pqs-algorithm/algorithm-api/pom.xml similarity index 94% rename from pqs-advance/advance-api/pom.xml rename to pqs-algorithm/algorithm-api/pom.xml index 959bb63cf..ea461c39d 100644 --- a/pqs-advance/advance-api/pom.xml +++ b/pqs-algorithm/algorithm-api/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - pqs-advance + pqs-algorithm com.njcn 1.0.0 4.0.0 + algorithm-api - advance-api com.njcn diff --git a/pqs-advance/advance-boot/pom.xml b/pqs-algorithm/algorithm-boot/pom.xml similarity index 96% rename from pqs-advance/advance-boot/pom.xml rename to pqs-algorithm/algorithm-boot/pom.xml index 9c6f5d867..5afd48a32 100644 --- a/pqs-advance/advance-boot/pom.xml +++ b/pqs-algorithm/algorithm-boot/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - pqs-advance + pqs-algorithm com.njcn 1.0.0 @@ -48,7 +48,7 @@ com.njcn - advance-api + algorithm-api 1.0.0 compile @@ -60,7 +60,7 @@ - advance-boot + algorithm-boot 8 @@ -68,7 +68,7 @@ - advanceboot + algorithmboot org.apache.maven.plugins diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/AlgorithmBootApplication.java similarity index 81% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/AlgorithmBootApplication.java index dcfd58792..fa54819fd 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/AlgorithmBootApplication.java @@ -1,4 +1,4 @@ -package com.njcn.advance; +package com.njcn.algorithm; /** * @author denghuajun * @version 1.0.0 @@ -15,8 +15,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") public class -AdvanceBootApplication { +AlgorithmBootApplication { public static void main(String[] args) { - SpringApplication.run(AdvanceBootApplication.class, args); + SpringApplication.run(AlgorithmBootApplication.class, args); } } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppProjectController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppProjectController.java similarity index 90% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppProjectController.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppProjectController.java index aed525617..542b68616 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppProjectController.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppProjectController.java @@ -1,11 +1,11 @@ -package com.njcn.advance.controller.project; +package com.njcn.algorithm.controller.project; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.njcn.advance.pojo.param.AppProjectAddParm; -import com.njcn.advance.pojo.param.AppProjectAuditParm; -import com.njcn.advance.pojo.param.AppProjectQueryParm; -import com.njcn.advance.pojo.vo.AppProjectVO; -import com.njcn.advance.service.AppProjectService; +import com.njcn.algorithm.pojo.param.AppProjectAddParm; +import com.njcn.algorithm.pojo.param.AppProjectAuditParm; +import com.njcn.algorithm.pojo.param.AppProjectQueryParm; +import com.njcn.algorithm.pojo.vo.AppProjectVO; +import com.njcn.algorithm.service.AppProjectService; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppTopologyController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppTopologyController.java similarity index 67% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppTopologyController.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppTopologyController.java index a4adae33b..838e3684c 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppTopologyController.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppTopologyController.java @@ -1,10 +1,12 @@ -package com.njcn.advance.controller.project; +package com.njcn.algorithm.controller.project; -import com.njcn.advance.pojo.param.AppTopologyDiagramAddParm; -import com.njcn.advance.pojo.param.AppTopologyDiagramAuditParm; -import com.njcn.advance.pojo.param.AppTopologyDiagramQueryParm; -import com.njcn.advance.pojo.vo.AppTopologyDiagramVO; -import com.njcn.advance.service.AppTopologyDiagramService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramAddParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramAuditParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryPageParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryParm; +import com.njcn.algorithm.pojo.vo.AppTopologyDiagramVO; +import com.njcn.algorithm.service.AppTopologyDiagramService; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -12,6 +14,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -65,10 +68,22 @@ public class AppTopologyController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryAppTopologyDiagram") @ApiOperation("查询拓扑图") - public HttpResult> queryAppTopologyDiagram(@Validated @RequestBody AppTopologyDiagramQueryParm appTopologyDiagramAuditParm){ + @ApiImplicitParam(name = "appTopologyDiagramQueryParm", value = "拓扑图查询参数", required = true) + public HttpResult> queryAppTopologyDiagram(@Validated @RequestBody AppTopologyDiagramQueryParm appTopologyDiagramQueryParm){ String methodDescribe = getMethodDescribe("queryAppTopologyDiagram"); - List appTopologyDiagramVOList = appTopologyDiagramService.queryAppTopologyDiagram(appTopologyDiagramAuditParm); + List appTopologyDiagramVOList = appTopologyDiagramService.queryAppTopologyDiagram(appTopologyDiagramQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appTopologyDiagramVOList, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryTopologyDiagramPage") + @ApiOperation("查询拓扑图分页") + @ApiImplicitParam(name = "appTopologyDiagramQueryPageParm", value = "拓扑图查询参数", required = true) + public HttpResult> queryTopologyDiagramPage(@Validated @RequestBody AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm){ + String methodDescribe = getMethodDescribe("queryTopologyDiagramPage"); + + IPage appTopologyDiagramVOList = appTopologyDiagramService.queryTopologyDiagramPage(appTopologyDiagramQueryPageParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appTopologyDiagramVOList, methodDescribe); } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/LineTopologyDiagramController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/LineTopologyDiagramController.java new file mode 100644 index 000000000..a812f5958 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/LineTopologyDiagramController.java @@ -0,0 +1,26 @@ +package com.njcn.algorithm.controller.project; + +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/3/30 9:02【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Slf4j +@RestController +@RequestMapping("/lineTopologyDiagram") +@Api(tags = " 拓扑图-监测点") +@AllArgsConstructor +public class LineTopologyDiagramController extends BaseController { + + +} diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppLineTopologyDiagramMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppLineTopologyDiagramMapper.java similarity index 78% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppLineTopologyDiagramMapper.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppLineTopologyDiagramMapper.java index 74da788c9..63c007e74 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppLineTopologyDiagramMapper.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppLineTopologyDiagramMapper.java @@ -1,7 +1,7 @@ -package com.njcn.advance.mapper; +package com.njcn.algorithm.mapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.advance.pojo.po.AppLineTopologyDiagramPO; +import com.njcn.algorithm.pojo.po.AppLineTopologyDiagramPO; /** * diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppProjectMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java similarity index 91% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppProjectMapper.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java index 4a9d25ca1..815515ab0 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppProjectMapper.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java @@ -1,10 +1,10 @@ -package com.njcn.advance.mapper; +package com.njcn.algorithm.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.advance.pojo.param.AppProjectQueryParm; -import com.njcn.advance.pojo.po.AppProjectPO; -import com.njcn.advance.pojo.vo.AppProjectVO; +import com.njcn.algorithm.pojo.param.AppProjectQueryParm; +import com.njcn.algorithm.pojo.po.AppProjectPO; +import com.njcn.algorithm.pojo.vo.AppProjectVO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppTopologyDiagramMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppTopologyDiagramMapper.java similarity index 78% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppTopologyDiagramMapper.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppTopologyDiagramMapper.java index 37bbea397..7d9d4056f 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppTopologyDiagramMapper.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppTopologyDiagramMapper.java @@ -1,7 +1,7 @@ -package com.njcn.advance.mapper; +package com.njcn.algorithm.mapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.advance.pojo.po.AppTopologyDiagramPO; +import com.njcn.algorithm.pojo.po.AppTopologyDiagramPO; /** * diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppLineTopologyDiagramMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppLineTopologyDiagramMapper.xml similarity index 83% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppLineTopologyDiagramMapper.xml rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppLineTopologyDiagramMapper.xml index 0ce444a3d..ec8c56fbc 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppLineTopologyDiagramMapper.xml +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppLineTopologyDiagramMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppProjectMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppProjectMapper.xml similarity index 88% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppProjectMapper.xml rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppProjectMapper.xml index e668a176f..c006323ec 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppProjectMapper.xml +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppProjectMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppTopologyDiagramMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppTopologyDiagramMapper.xml similarity index 87% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppTopologyDiagramMapper.xml rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppTopologyDiagramMapper.xml index 8e0d3bdbc..780d11322 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppTopologyDiagramMapper.xml +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppTopologyDiagramMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppLineTopologyDiagramService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppLineTopologyDiagramService.java similarity index 78% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppLineTopologyDiagramService.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppLineTopologyDiagramService.java index 4755e3a3a..8f067121c 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppLineTopologyDiagramService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppLineTopologyDiagramService.java @@ -1,7 +1,7 @@ -package com.njcn.advance.service; +package com.njcn.algorithm.service; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.advance.pojo.po.AppLineTopologyDiagramPO; +import com.njcn.algorithm.pojo.po.AppLineTopologyDiagramPO; /** * * Description: diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppProjectService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppProjectService.java similarity index 80% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppProjectService.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppProjectService.java index 5a40d0cb5..4ca8c8fd2 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppProjectService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppProjectService.java @@ -1,12 +1,12 @@ -package com.njcn.advance.service; +package com.njcn.algorithm.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.advance.pojo.param.AppProjectAddParm; -import com.njcn.advance.pojo.param.AppProjectAuditParm; -import com.njcn.advance.pojo.param.AppProjectQueryParm; -import com.njcn.advance.pojo.po.AppProjectPO; -import com.njcn.advance.pojo.vo.AppProjectVO; +import com.njcn.algorithm.pojo.param.AppProjectAddParm; +import com.njcn.algorithm.pojo.param.AppProjectAuditParm; +import com.njcn.algorithm.pojo.param.AppProjectQueryParm; +import com.njcn.algorithm.pojo.po.AppProjectPO; +import com.njcn.algorithm.pojo.vo.AppProjectVO; /** * diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppTopologyDiagramService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppTopologyDiagramService.java similarity index 60% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppTopologyDiagramService.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppTopologyDiagramService.java index 452f26150..efd0ffcb1 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppTopologyDiagramService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppTopologyDiagramService.java @@ -1,11 +1,13 @@ -package com.njcn.advance.service; +package com.njcn.algorithm.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.advance.pojo.param.AppTopologyDiagramAddParm; -import com.njcn.advance.pojo.param.AppTopologyDiagramAuditParm; -import com.njcn.advance.pojo.param.AppTopologyDiagramQueryParm; -import com.njcn.advance.pojo.po.AppTopologyDiagramPO; -import com.njcn.advance.pojo.vo.AppTopologyDiagramVO; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramAddParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramAuditParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryPageParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryParm; +import com.njcn.algorithm.pojo.po.AppTopologyDiagramPO; +import com.njcn.algorithm.pojo.vo.AppTopologyDiagramVO; import java.util.List; @@ -44,4 +46,12 @@ public interface AppTopologyDiagramService extends IMppService queryAppTopologyDiagram(AppTopologyDiagramQueryParm appTopologyDiagramAuditParm); - } + /** + * @Description: queryTopologyDiagramPage + * @Param: [appTopologyDiagramQueryPageParm] + * @return: com.baomidou.mybatisplus.core.metadata.IPage + * @Author: clam + * @Date: 2023/3/29 + */ + IPage queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm); +} diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppLineTopologyDiagramServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppLineTopologyDiagramServiceImpl.java similarity index 67% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppLineTopologyDiagramServiceImpl.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppLineTopologyDiagramServiceImpl.java index 4798a4e60..f3224e154 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppLineTopologyDiagramServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppLineTopologyDiagramServiceImpl.java @@ -1,9 +1,9 @@ -package com.njcn.advance.service.impl; +package com.njcn.algorithm.service.impl; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; -import com.njcn.advance.mapper.AppLineTopologyDiagramMapper; -import com.njcn.advance.pojo.po.AppLineTopologyDiagramPO; -import com.njcn.advance.service.AppLineTopologyDiagramService; +import com.njcn.algorithm.mapper.AppLineTopologyDiagramMapper; +import com.njcn.algorithm.pojo.po.AppLineTopologyDiagramPO; +import com.njcn.algorithm.service.AppLineTopologyDiagramService; import org.springframework.stereotype.Service; /** diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppProjectServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java similarity index 89% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppProjectServiceImpl.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java index cd6aa71b8..f8b53898e 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppProjectServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java @@ -1,18 +1,18 @@ -package com.njcn.advance.service.impl; +package com.njcn.algorithm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; -import com.njcn.advance.enums.AdvanceResponseEnum; -import com.njcn.advance.mapper.AppProjectMapper; -import com.njcn.advance.pojo.param.*; -import com.njcn.advance.pojo.po.AppProjectPO; -import com.njcn.advance.pojo.vo.AppProjectVO; -import com.njcn.advance.pojo.vo.AppTopologyDiagramVO; -import com.njcn.advance.service.AppProjectService; -import com.njcn.advance.service.AppTopologyDiagramService; +import com.njcn.algorithm.enums.AlgorithmResponseEnum; +import com.njcn.algorithm.mapper.AppProjectMapper; +import com.njcn.algorithm.pojo.param.*; +import com.njcn.algorithm.pojo.po.AppProjectPO; +import com.njcn.algorithm.pojo.vo.AppProjectVO; +import com.njcn.algorithm.pojo.vo.AppTopologyDiagramVO; +import com.njcn.algorithm.service.AppProjectService; +import com.njcn.algorithm.service.AppTopologyDiagramService; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.oss.utils.FileStorageUtil; import lombok.RequiredArgsConstructor; @@ -47,7 +47,7 @@ public class AppProjectServiceImpl extends MppServiceImpl updateWrapper = new UpdateWrapper (); + UpdateWrapper updateWrapper = new UpdateWrapper<> (); updateWrapper.eq ("id",appTopologyDiagramAuditParm.getId ()); boolean update = this.update (appTopologyDiagramPO, updateWrapper); return update; @@ -82,7 +87,7 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl queryAppTopologyDiagram(AppTopologyDiagramQueryParm appTopologyDiagramAuditParm) { - QueryWrapper queryWrapper = new QueryWrapper (); + QueryWrapper queryWrapper = new QueryWrapper<> (); queryWrapper.eq ("status","1"). eq (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getId ()),"id",appTopologyDiagramAuditParm.getId ()). eq (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getProjectId ()),"project_id",appTopologyDiagramAuditParm.getProjectId ()). @@ -96,4 +101,25 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm) { + + Page returnpage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( )); + Page tempPage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( )); + + QueryWrapper queryWrapper = new QueryWrapper<> (); + queryWrapper.eq ("status","1"). + eq (StringUtils.isNotBlank (appTopologyDiagramQueryPageParm.getProjectId ()),"project_id",appTopologyDiagramQueryPageParm.getProjectId ()). + like (StringUtils.isNotBlank (appTopologyDiagramQueryPageParm.getSearchValue ()),"name", appTopologyDiagramQueryPageParm.getSearchValue ()); + tempPage = appTopologyDiagramMapper.selectPage (tempPage, queryWrapper); + List collect = tempPage.getRecords ( ).stream ( ).map (temp -> { + AppTopologyDiagramVO vo = new AppTopologyDiagramVO ( ); + BeanUtils.copyProperties (temp, vo); + vo.setFilePath (fileStorageUtil.getFileUrl (temp.getFilePath ( ))); + return vo; + }).collect (Collectors.toList ( )); + returnpage.setRecords (collect); + return returnpage; + } } diff --git a/pqs-advance/advance-boot/src/main/resources/bootstrap.yml b/pqs-algorithm/algorithm-boot/src/main/resources/bootstrap.yml similarity index 95% rename from pqs-advance/advance-boot/src/main/resources/bootstrap.yml rename to pqs-algorithm/algorithm-boot/src/main/resources/bootstrap.yml index d112d0ad1..9000aeee6 100644 --- a/pqs-advance/advance-boot/src/main/resources/bootstrap.yml +++ b/pqs-algorithm/algorithm-boot/src/main/resources/bootstrap.yml @@ -47,7 +47,7 @@ logging: #mybatis配置信息 mybatis-plus: #别名扫描 - type-aliases-package: com.njcn.advance.pojo + type-aliases-package: com.njcn.algorithm.pojo mqtt: client-id: @artifactId@${random.value} diff --git a/pqs-advance/advance-boot/src/main/resources/qvvr_balance.dll b/pqs-algorithm/algorithm-boot/src/main/resources/qvvr_balance.dll similarity index 100% rename from pqs-advance/advance-boot/src/main/resources/qvvr_balance.dll rename to pqs-algorithm/algorithm-boot/src/main/resources/qvvr_balance.dll diff --git a/pqs-advance/advance-boot/src/main/resources/qvvr_dll.dll b/pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll.dll similarity index 100% rename from pqs-advance/advance-boot/src/main/resources/qvvr_dll.dll rename to pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll.dll diff --git a/pqs-advance/advance-boot/src/main/resources/qvvr_dll_cause.dll b/pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll_cause.dll similarity index 100% rename from pqs-advance/advance-boot/src/main/resources/qvvr_dll_cause.dll rename to pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll_cause.dll diff --git a/pqs-algorithm/algorithm-boot/src/main/resources/sql20230227dll.sql b/pqs-algorithm/algorithm-boot/src/main/resources/sql20230227dll.sql new file mode 100644 index 000000000..c60e22105 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/resources/sql20230227dll.sql @@ -0,0 +1,46 @@ +DROP TABLE IF EXISTS `app_project`; +CREATE TABLE `app_project` ( + `id` varchar(36) NOT NULL COMMENT '项目Id', + `name` varchar(200) NOT NULL COMMENT '项目名称', + `user_id` varchar(100) NOT NULL COMMENT '关联用户Id', + `area_id` varchar(100) NOT NULL COMMENT '地市Id', + `lng` decimal(10,6) NULL COMMENT '中心点经度', + `lat` decimal(10,6) NULL COMMENT '中心点纬度', + `status` tinyint(1) NOT NULL COMMENT '0：删除 1：正常', + `create_by` char(32) NULL COMMENT '创建用户', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` char(32) NULL COMMENT '更新用户', + `update_time` datetime NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='项目表'; + + + +DROP TABLE IF EXISTS `app_topology_diagram`; +CREATE TABLE `app_topology_diagram` ( + `id` varchar(36) Not NULL COMMENT '拓扑图Id' , + `name` varchar(200) Not NULL COMMENT '拓扑图名称' , + `file_size` int Not NULL COMMENT '文件大小(kb)' , + `project_id` varchar(36) NULL COMMENT '项目Id' , + `file_path` varchar(200) Not NULL COMMENT '拓扑图文件路径' , + `status` tinyint(1) NOT NULL COMMENT '0：删除 1：正常', + `create_by` char(32) NULL COMMENT '创建用户', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` char(32) NULL COMMENT '更新用户', + `update_time` datetime NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='项目拓扑图关系表'; + +DROP TABLE IF EXISTS `app_line_topology_diagram`; +CREATE TABLE `app_line_topology_diagram` ( + `id` varchar(36) Not NULL COMMENT '拓扑图Id' , + `line_id` varchar(200) Not NULL COMMENT '拓扑图名称' , + `status` tinyint(1) NOT NULL COMMENT '0：删除 1：正常', + `create_by` char(32) NULL COMMENT '创建用户', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` char(32) NULL COMMENT '更新用户', + `update_time` datetime NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='项目拓扑图关系表'; + + diff --git a/pqs-algorithm/pom.xml b/pqs-algorithm/pom.xml index 8608b4337..1f2277c66 100644 --- a/pqs-algorithm/pom.xml +++ b/pqs-algorithm/pom.xml @@ -10,11 +10,15 @@ 4.0.0 pqs-algorithm + pom + + algorithm-api + algorithm-boot + 8 8 - UTF-8 \ No newline at end of file From 22a374751f5f687a7d469b71eb4d7529b10dd727 Mon Sep 17 00:00:00 2001 From: wurui Date: Thu, 30 Mar 2023 10:44:58 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=B1=A1=E5=8C=BA=E5=9B=BE=E5=89=8D10?= =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=8C=BA=E5=88=86(pq=20pms)?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PollutionSubstationServiceImpl.java | 165 +++++++++++++----- 1 file changed, 125 insertions(+), 40 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java index 995aa2856..1a901f4da 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java @@ -22,22 +22,27 @@ import com.njcn.device.pq.api.SubstationFeignClient; import com.njcn.device.pq.pojo.dto.*; import com.njcn.harmonic.constant.Param; import com.njcn.harmonic.mapper.*; +import com.njcn.harmonic.pojo.dto.PublicDTO; import com.njcn.harmonic.pojo.param.HarmonicPublicParam; import com.njcn.harmonic.pojo.param.PollutionSubstationQuryParam; import com.njcn.harmonic.pojo.po.*; import com.njcn.harmonic.pojo.vo.PollutionSubstationVO; import com.njcn.harmonic.pojo.vo.PollutionVO; import com.njcn.harmonic.service.PollutionSubstationService; +import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.system.enums.DicDataEnum; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import com.njcn.web.utils.RequestUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.influxdb.dto.QueryResult; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -83,6 +88,8 @@ public class PollutionSubstationServiceImpl extends ServiceImpl deviceList = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData(); - List monitorIdList=new ArrayList<>(); - deviceList.forEach(dept -> { - monitorIdList.addAll(dept.getMonitorIdList()); - }); - - if(CollectionUtil.isNotEmpty(monitorIdList)){ - //获取监测点数据 - List lineData = rMpPollutionDPOMapper.selectMaxList ( monitorIdList,pollutionType,searchBeginTime); - - if(CollectionUtil.isEmpty(lineData)){ + if(param.getType()==0){ + param.setServerName(generalInfo.getMicroServiceName()); + List lineList = new ArrayList<>(); + PollutionParamDTO paramDTO = new PollutionParamDTO(); + if (StringUtils.isBlank(RequestUtil.getDeptIndex())) { return list; } - - //获取主网监测点信息 - List data = monitorClient.getMonitorList(monitorIdList).getData(); - Map monitorMap = data.stream().collect(Collectors.toMap(Monitor::getId, Function.identity(), (key1, kye2) -> key1)); - lineData.sort((item1, item2) -> item2.getValue().compareTo(item1.getValue())); - if (lineData.size() > Param.UP_LIMIT) { - lineData = lineData.subList(Param.DOWN_LIMIT, Param.UP_LIMIT); - } - - PollutionLineDTO dto; - for (RMpPollutionDPO lineDatum : lineData) { - if(monitorMap.containsKey(lineDatum.getLineId())){ - Monitor monitor = monitorMap.get(lineDatum.getLineId()); - dto=new PollutionLineDTO(); - dto.setId(monitor.getId()); - dto.setName(monitor.getName()); - dto.setPowerCompany(monitor.getOrgName()); - dto.setSubstation(monitor.getPowerrId()); - dto.setSubstationId(monitor.getPowerrName()); - dto.setBusBar(monitor.getLineName()); - dto.setData(lineDatum.getValue()); - list.add(dto); + List deviceList = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData(); + deviceList.forEach(item -> { + if (!CollectionUtils.isEmpty(item.getLineIndexes())) { + lineList.addAll(item.getLineIndexes()); + } + }); + if (!CollectionUtils.isEmpty(lineList)) { + paramDTO.setLineList(lineList); + list = lineFeignClient.getLineInfo(paramDTO).getData(); + List result = getLineDate(lineList, param.getSearchBeginTime(), param.getSearchEndTime(), param.getStatisticalType().getCode()); + if (!CollectionUtils.isEmpty(result)) { + list.stream().map(list1 -> result.stream().filter(list2 -> Objects.equals(list1.getId(), list2.getId())).findAny().map(m -> { + list1.setData(m.getData()); + return list1; + })).collect(Collectors.toList()); } } + list.sort((item1, item2) -> item2.getData().compareTo(item1.getData())); + if (list.size() > Param.UP_LIMIT) { + return list.subList(Param.DOWN_LIMIT, Param.UP_LIMIT); + } + return list; } - return list; + PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(); + pmsDeviceInfoParam.setDeptIndex(param.getDeptIndex()); + //获取统计类型 + pmsDeviceInfoParam.setStatisticalType(param.getStatisticalType()); + //获取主网台账信息 + List deviceList = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData(); + List monitorIdList=new ArrayList<>(); + deviceList.forEach(dept -> { + monitorIdList.addAll(dept.getMonitorIdList()); + }); + + if(CollectionUtil.isNotEmpty(monitorIdList)){ + //获取监测点数据 + List lineData = rMpPollutionDPOMapper.selectMaxList ( monitorIdList,pollutionType,searchBeginTime); + + if(CollectionUtil.isEmpty(lineData)){ + return list; + } + + //获取主网监测点信息 + List data = monitorClient.getMonitorList(monitorIdList).getData(); + Map monitorMap = data.stream().collect(Collectors.toMap(Monitor::getId, Function.identity(), (key1, kye2) -> key1)); + lineData.sort((item1, item2) -> item2.getValue().compareTo(item1.getValue())); + if (lineData.size() > Param.UP_LIMIT) { + lineData = lineData.subList(Param.DOWN_LIMIT, Param.UP_LIMIT); + } + + PollutionLineDTO dto; + for (RMpPollutionDPO lineDatum : lineData) { + if(monitorMap.containsKey(lineDatum.getLineId())){ + Monitor monitor = monitorMap.get(lineDatum.getLineId()); + dto=new PollutionLineDTO(); + dto.setId(monitor.getId()); + dto.setName(monitor.getName()); + dto.setPowerCompany(monitor.getOrgName()); + dto.setSubstation(monitor.getPowerrId()); + dto.setSubstationId(monitor.getPowerrName()); + dto.setBusBar(monitor.getLineName()); + dto.setData(lineDatum.getValue()); + list.add(dto); + } + } + } + return list; } - + /** + * 功能描述:根据监测点id查询influxDB污染指数 + * + * @param line 监测点集合 + * startTime 开始时间 + * endTime 结束时间 + * type 指标参数 + * @return + * @author xy + * @date 2022/2/21 20:08 + */ + private List getLineDate(List line, String startTime, String endTime, String type) { + List result = new ArrayList<>(); + String quota = ""; + if (Objects.equals(type, DicDataEnum.XBDY_ENUM.getCode())) { + quota = "harmonic_v"; + } else if (Objects.equals(type, DicDataEnum.XBDL_ENUM.getCode())) { + quota = "harmonic_i"; + } + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(Param.TIME).append(" >= '").append(startTime).append(Param.START_TIME).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append(Param.END_TIME).append("' and ("); + for (int i = 0; i < line.size(); i++) { + if (line.size() - i != 1) { + stringBuilder.append(Param.LINE_ID).append("='").append(line.get(i)).append("' or "); + } else { + stringBuilder.append(Param.LINE_ID).append("='").append(line.get(i)).append("')"); + } + } + stringBuilder.append(" group by line_id order by time desc limit 1 tz('Asia/Shanghai')"); + String sql = "SELECT line_id," + quota + " FROM harmonic_pollution where " + stringBuilder; + QueryResult sqlResult = influxDbUtils.query(sql); + List list = sqlResult.getResults().get(0).getSeries(); + if (!CollectionUtils.isEmpty(list)) { + list.forEach(po -> { + String index = po.getTags().get(Param.LINE_ID); + List> valueList = po.getValues(); + if (!CollectionUtils.isEmpty(valueList)) { + for (List value : valueList) { + PublicDTO publicDTO = new PublicDTO(); + Double data = value.get(2) == null ? 0.0 : BigDecimal.valueOf(Double.parseDouble(value.get(2).toString())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + publicDTO.setId(index); + publicDTO.setData(data); + result.add(publicDTO); + } + } + }); + } + return result; + } } From 792dfed16ec355ead9ac836fffca3246aec73735 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 30 Mar 2023 10:49:24 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prepare/harmonic/pojo/po/RStatComassesDPO.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java index 2c96e8498..d209685f7 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java @@ -57,19 +57,19 @@ public class RStatComassesDPO implements Serializable { @TableField(value = "vu_dev5") private Double vuDev5; - @TableField(value = "data_pst1") + @TableField(value = "data_plt1") private Double dataPst1; - @TableField(value = "data_pst2") + @TableField(value = "data_plt2") private Double dataPst2; - @TableField(value = "data_pst3") + @TableField(value = "data_plt3") private Double dataPst3; - @TableField(value = "data_pst4") + @TableField(value = "data_plt4") private Double dataPst4; - @TableField(value = "data_pst5") + @TableField(value = "data_plt5") private Double dataPst5; @TableField(value = "v_unbalance1") From 940e7f4c021bdd5d2f898b437ff9ac697bf67b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 30 Mar 2023 11:50:42 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B6=85=E9=AB=98=E5=8E=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/web/utils/PqsComasses.java | 8 ++-- .../njcn/harmonic/pojo/dto/ComAssessDTO.java | 10 ++--- .../njcn/harmonic/pojo/po/PQSComAssesPO.java | 12 +++--- .../harmonic/utils/HarmonicComAssesUtil.java | 4 +- .../controller/AnalyzeController.java | 32 --------------- .../controller/ComAssessController.java | 1 + .../service/impl/ComAssessServiceImpl.java | 20 +++++----- .../service/impl/THDistortionServiceImpl.java | 3 +- .../handler/HarmAberrationRateJob.java | 2 +- .../harmonic/pojo/dto/PollutionDTO.java | 5 +++ .../controller/line/LimitrateController.java | 2 +- .../mysql/Impl/line/DayDataServiceImpl.java | 2 + .../Impl/line/HarmonicGeneralServiceImpl.java | 40 ++++++++++++++++--- .../mysql/Impl/line/PollutionServiceImpl.java | 12 +++--- 14 files changed, 79 insertions(+), 74 deletions(-) diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java index af6684087..e611b01a5 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java @@ -50,16 +50,16 @@ public class PqsComasses implements Serializable { @Column(name = "data_plt1") private Double dataPlt1; - + //电压闪变等级2 @Column(name = "data_plt2") private Double dataPlt2; - + //电压闪变等级3 @Column(name = "data_plt3") private Double dataPlt3; - + //电压闪变等级4 @Column(name = "data_plt4") private Double dataPlt4; - + //电压闪变等级5 @Column(name = "data_plt5") private Double dataPlt5; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ComAssessDTO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ComAssessDTO.java index cfe34c1a0..98d7b36b5 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ComAssessDTO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ComAssessDTO.java @@ -30,15 +30,15 @@ public class ComAssessDTO { //频率偏差等级5 private Float freqDev5; //电压闪变等级1 - private Float dataPST1; + private Float dataPlT1; //电压闪变等级2 - private Float dataPST2; + private Float dataPlT2; //电压闪变等级3 - private Float dataPST3; + private Float dataPlT3; //电压闪变等级4 - private Float dataPST4; + private Float dataPlT4; //电压闪变等级5 - private Float dataPST5; + private Float dataPlT5; //电压不平衡度等级1 private Float vUnbalance1; //电压不平衡度等级2 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PQSComAssesPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PQSComAssesPO.java index 9d1267a82..812388d35 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PQSComAssesPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PQSComAssesPO.java @@ -50,21 +50,21 @@ public class PQSComAssesPO { //频率偏差等级5 @Column(name = "freq_dev5") private Double freqDev5; - //电压闪变等级1 + @Column(name = "data_plt1") - private Double dataPST1; + private Double dataPlt1; //电压闪变等级2 @Column(name = "data_plt2") - private Double dataPST2; + private Double dataPlt2; //电压闪变等级3 @Column(name = "data_plt3") - private Double dataPST3; + private Double dataPlt3; //电压闪变等级4 @Column(name = "data_plt4") - private Double dataPST4; + private Double dataPlt4; //电压闪变等级5 @Column(name = "data_plt5") - private Double dataPST5; + private Double dataPlt5; //电压不平衡度等级1 @Column(name = "v_unbalance1") private Double vUnbalance1; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java index 550b62d4c..713a3f05a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java @@ -88,7 +88,7 @@ public class HarmonicComAssesUtil { if (getBysxf()) { //G和F得出综合权重A if (getZhqzf()) { - //A[0] = 0.28;A[1] = 0.23;A[2] = 0.13;A[3] = 0.16;A[4] = 0.08;A[5] = 0.12; + A[0] = 0.28f;A[1] = 0.23f;A[2] = 0.13f;A[3] = 0.16f;A[4] = 0.08f;A[5] = 0.12f; for (i = 0; i < GRADE_NUM; i++) { B[i] = 0; for (j = 0; j < ST_QT_NUM; j++) { @@ -123,7 +123,7 @@ public class HarmonicComAssesUtil { //组合二维数组 float f1[][]={{tempPqs.getFreqDev1(),tempPqs.getFreqDev2(),tempPqs.getFreqDev3(),tempPqs.getFreqDev4(),tempPqs.getFreqDev5()} ,{tempPqs.getVTHD1(),tempPqs.getVTHD2(),tempPqs.getVTHD3(),tempPqs.getVTHD4(),tempPqs.getVTHD5(),} - ,{tempPqs.getDataPST1(),tempPqs.getDataPST2(),tempPqs.getDataPST3(),tempPqs.getDataPST4(),tempPqs.getDataPST5()} + ,{tempPqs.getDataPlT1(),tempPqs.getDataPlT2(),tempPqs.getDataPlT3(),tempPqs.getDataPlT4(),tempPqs.getDataPlT5()} ,{tempPqs.getVuDev1(),tempPqs.getVuDev2(),tempPqs.getVuDev3(),tempPqs.getVuDev4(),tempPqs.getVuDev5(),} ,{tempPqs.getVUnbalance1(),tempPqs.getVUnbalance2(),tempPqs.getVUnbalance3(),tempPqs.getVUnbalance4(),tempPqs.getVUnbalance5(),} ,{tempPqs.getEvent1(),tempPqs.getEvent2(),tempPqs.getEvent3(),tempPqs.getEvent4(),tempPqs.getEvent5(),}}; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/AnalyzeController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/AnalyzeController.java index 95933ad3b..febc5dc01 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/AnalyzeController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/AnalyzeController.java @@ -49,39 +49,7 @@ public class AnalyzeController extends BaseController { private final IHarmonicService harmonicService; - /* @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/deptSubstationRelations") - @ApiOperation("污区图-部门变电站关系") - @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult> deptSubstationRelations(@RequestBody HarmonicPublicParam param) { - String methodDescribe = getMethodDescribe("deptSubstationRelations"); - LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); - List list = pollutionService.getDeptSubstationRelations(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getSubstationInfoById") - @ApiOperation("污区图-根据部门获取变电站详情") - @ApiImplicitParam(name = "param", value = "部门参数", required = true) - public HttpResult> getSubstationInfoById(@RequestBody HarmonicPublicParam param) { - String methodDescribe = getMethodDescribe("getSubstationInfoById"); - LogUtil.njcnDebug(log, "{}，部门参数：{}", methodDescribe, param); - List list = pollutionService.getSubstationInfoById(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getLineInfoById") - @ApiOperation("污区图-根据变电站获取监测点详情") - @ApiImplicitParam(name = "param", value = "变电站参数", required = true) - public HttpResult> getLineInfoById(@RequestBody HarmonicPublicParam param) { - String methodDescribe = getMethodDescribe("getLineInfoById"); - LogUtil.njcnDebug(log, "{}，变电站参数：{}", methodDescribe, param); - List list = pollutionService.getLineInfoById(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } -*/ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLineRank") @ApiOperation("污区图-获取前十监测点排名") diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java index adabd13f5..e027b9638 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java @@ -26,6 +26,7 @@ import java.util.List; * @version 1.0.0 * @author: chenchao * @date: 2022/04/21 09:05 + * 对应菜单 谐波系统-区域-电能质量评估 */ @Validated @Slf4j diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java index 0a6f6ea59..2f273065a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java @@ -119,16 +119,16 @@ public class ComAssessServiceImpl implements ComAssessService { comAssessDTO.setFreqDev4(f4); float f5 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); comAssessDTO.setFreqDev5(f5); - float d1 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); - comAssessDTO.setDataPST1(d1); - float d2 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); - comAssessDTO.setDataPST2(d2); - float d3 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); - comAssessDTO.setDataPST3(d3); - float d4 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); - comAssessDTO.setDataPST4(d4); - float d5 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); - comAssessDTO.setDataPST5(d5); + float d1 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT1(d1); + float d2 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT2(d2); + float d3 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT3(d3); + float d4 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT4(d4); + float d5 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); + comAssessDTO.setDataPlT5(d5); float vu1 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); comAssessDTO.setVUnbalance1(vu1); float vu2 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java index 5dcebf600..458c06253 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java @@ -67,8 +67,7 @@ public class THDistortionServiceImpl implements THDistortionService { thDistortionVO.setName(generalDeviceDTO.getName()); if (!CollectionUtils.isEmpty(generalDeviceDTO.getLineIndexes())){ List lineIndexes = generalDeviceDTO.getLineIndexes(); - List monitorList = thDistortionMapper.getLineData(lineIndexes); - // setLineData(monitorList,thDistortionVO); + //查找畸变率 List condition = getCondition(lineIndexes, thDistortionParam.getSearchBeginTime(), thDistortionParam.getSearchEndTime()); thDistortionVO.setDistortion(condition.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159)); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java index c7c1bbeea..60cde679d 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; /** * pqs - * 畸变率 + * 畸变率(mysql) * @author cdf * @date 2022/10/24 */ diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java index a3346355b..ebbe5fa05 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java @@ -50,5 +50,10 @@ public class PollutionDTO { */ private Double vInharm = 0.0; + /** + * 谐波电压含有率污染值 + */ + private Double vHarmonic = 0.0; + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java index cf0880bd6..1fc92331f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java @@ -34,7 +34,7 @@ import java.util.List; * @version V1.0.0 */ @Slf4j -@Api(tags = "监测点数据超限处理") +@Api(tags = "监测点数据超限处理limitRate") @RestController @RequestMapping("limitrate") @RequiredArgsConstructor diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java index 6337f840d..600323826 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.util.CollectionUtils; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.Instant; +import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -532,6 +533,7 @@ public class DayDataServiceImpl implements DayDataService { } + log.info(LocalDateTime.now()+"dayDataJobHandler执行完成!"); } @Override 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 78d68a6c6..4bd29fa33 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 @@ -152,6 +152,12 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl lambdaQuery = new LambdaQueryWrapper<>(); @@ -279,6 +275,10 @@ public class PollutionServiceImpl implements PollutionService { map.put("pollutionType",dictData.getId()); map.put("value",pollution.getVInharm()); } + if ("V_Harmonic".equals(dictData.getCode())){ + map.put("pollutionType",dictData.getId()); + map.put("value",pollution.getVHarmonic()); + } } private void processData(DictData dictData, List processList, Map map){ From 2504c68e9977b7154f4bd7429a39f09ae873bc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 30 Mar 2023 14:23:33 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=B6=85=E9=AB=98=E5=8E=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java index 6a551fc6e..378ae81df 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java @@ -146,6 +146,7 @@ public class DeviceInfoParam implements Serializable { private String searchEndTime; @ApiModelProperty("时间范围标志 0.查询展示天 1.查询展示月") + @Deprecated private Integer timeFlag; @ApiModelProperty("统计类型 1.年 2.季 3.月 4.周 5.天")