From e0ac80822aafc373e15345f5acd08cc17283c17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Mon, 18 Sep 2023 15:13:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/biz/commApi/CommLineClient.java | 2 ++ .../biz/pojo/dto/CommLineDetailDTO.java | 21 +++++++++++++++++++ .../ledgerManger/CommTerminalController.java | 14 +++++++++++++ .../ledgerManger/CommTerminalService.java | 3 +++ .../impl/CommTerminalServiceImpl.java | 9 ++++++++ pqs-prepare/prepare-boot/pom.xml | 6 ------ .../controller/line/DayDataController.java | 6 +++++- .../controller/line/IntegrityController.java | 4 ++-- .../controller/line/LimitrateController.java | 9 +++++--- .../mysql/Impl/line/DayDataServiceImpl.java | 1 + .../mysql/Impl/line/IntegrityServiceImpl.java | 4 ++-- .../mysql/Impl/line/LimitRateService.java | 8 +++---- .../service/mysql/line/IntegrityService.java | 2 +- 13 files changed, 70 insertions(+), 19 deletions(-) create mode 100644 pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/CommLineDetailDTO.java diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java index 152f1d33b..41643d12c 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java @@ -17,4 +17,6 @@ import org.springframework.cloud.openfeign.FeignClient; fallbackFactory = CommTerminalGeneralClientFallbackFactory.class) public interface CommLineClient { + + } diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/CommLineDetailDTO.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/CommLineDetailDTO.java new file mode 100644 index 000000000..c3ec5022a --- /dev/null +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/CommLineDetailDTO.java @@ -0,0 +1,21 @@ +package com.njcn.device.biz.pojo.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * pqs + * + * @author cdf + * @date 2023/9/18 + */ +@Data +public class CommLineDetailDTO { + + @ApiModelProperty(value = "监测点id") + private String monitorId; + + @ApiModelProperty(value = "监测点数据统计间隔") + private Integer interval; + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java index 272c081fe..06cc73cb7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java @@ -230,6 +230,20 @@ public class CommTerminalController extends BaseController { } + /** + * 获取实际，投运，谐波系统 的监测点 + * @author cdf + * @date 2023/9/18 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getRunMonitorList") + @ApiOperation("获取实际，投运，谐波系统 的监测点") + public HttpResult> getRunMonitorList() { + String methodDescribe = getMethodDescribe("getRunMonitorList"); + List result = commTerminalService.getOneMonitorIds(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + /** * 用于返回pq 还是pms系统 * @author cdf diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java index 2f725c6fb..427a643ae 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java @@ -87,6 +87,9 @@ public interface CommTerminalService { List getOneMonitorIds(); + List getRunMonitorList(); + + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index 3b4bc5296..3a1865694 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -510,4 +510,13 @@ public class CommTerminalServiceImpl implements CommTerminalService { return monitorList.stream().map(Monitor::getId).collect(Collectors.toList()); } + @Override + public List getRunMonitorList() { + DictData dictData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(),DicDataEnum.RUN.getName()).getData(); + if(Objects.isNull(dictData)){ + throw new BusinessException("监测点状态字典为空"); + } + return null; + } + } diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml index 519d84ae8..8a711c7b5 100644 --- a/pqs-prepare/prepare-boot/pom.xml +++ b/pqs-prepare/prepare-boot/pom.xml @@ -28,12 +28,6 @@ com.njcn common-core ${project.version} - - - org.springframework.boot - spring-boot-starter-logging - - com.njcn 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 f6581d172..f1d85e329 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 @@ -5,6 +5,8 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; +import com.njcn.device.pq.api.GeneralDeviceInfoClient; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.DayDataService; @@ -45,6 +47,8 @@ public class DayDataController extends BaseController { private final DayDataService dayDataService; + private final CommTerminalGeneralClient commTerminalGeneralClient; + @Deprecated @ApiOperation("day表定时任务") @ApiImplicitParam(value = "jobParam",name = "jobParam",required = true) @@ -81,7 +85,7 @@ public class DayDataController extends BaseController { String methodDescribe = getMethodDescribe("dataToDayHandler"); List indexLists = new ArrayList<> (); if(CollectionUtils.isEmpty (jobParam.getLineIds())){ - indexLists = lineFeignClient.getLineList().getData(); + indexLists = commTerminalGeneralClient.getRunMonitorIds().getData(); } else{ indexLists = jobParam.getLineIds(); } 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 65fa3614a..058b4f27b 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,7 +38,7 @@ public class IntegrityController extends BaseController { private final IntegrityService integrityService; - @Deprecated + /* @Deprecated @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/computeDataIntegrity") @ApiOperation("数据完整性统计") @@ -47,7 +47,7 @@ public class IntegrityController extends BaseController { String methodDescribe = getMethodDescribe("computeDataIntegrity"); String out = integrityService.computeDataIntegrity(lineParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); - } + }*/ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/dataIntegrity") 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 1fc92331f..f42815744 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 @@ -5,6 +5,7 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.Impl.line.LimitRateService; @@ -45,7 +46,9 @@ public class LimitrateController extends BaseController { private final LineFeignClient lineFeignClient; - @Deprecated + private final CommTerminalGeneralClient commTerminalGeneralClient; + + /* @Deprecated @ApiOperation("limitrate表定时任务") @ApiImplicitParam(value = "limitRateHanlderParam",name = "limitRateHanlderParam",required = true) @PostMapping("LimitRateHanlder") @@ -68,7 +71,7 @@ public class LimitrateController extends BaseController { } else { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe); } - } + }*/ @ApiOperation("生成limitRate表(MySQL入库)") @ApiImplicitParam(value = "limitRateHanlderParam",name = "limitRateHanlderParam",required = true) @@ -80,7 +83,7 @@ public class LimitrateController extends BaseController { String methodDescribe = getMethodDescribe("limitRate"); List indexLists = new ArrayList<> (); if(CollectionUtils.isEmpty (limitRateHanlderParam.getLineIds ())){ - indexLists = lineFeignClient.getLineList ( ).getData ( ); + indexLists = commTerminalGeneralClient.getRunMonitorIds ().getData ( ); }else{ indexLists = limitRateHanlderParam.getLineIds (); } 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 2ac088a5f..72c951137 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 @@ -564,6 +564,7 @@ public class DayDataServiceImpl implements DayDataService { List dataPltPOList = new ArrayList<> (); for (String lineIndex : indexLists) { + /*生成dayV表*/ List dataV = getDataV(lineIndex, startTime, endTime); if (!CollectionUtils.isEmpty(dataV)) { diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java index 80be0d8b6..34ad3ace3 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java @@ -48,7 +48,7 @@ public class IntegrityServiceImpl extends MppServiceImpl lineDetailList; @@ -80,7 +80,7 @@ public class IntegrityServiceImpl extends MppServiceImpl