From 7ebc5408238b3ac8a2d53ce4033f33db759c6e53 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 29 Apr 2024 17:23:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=86=80=E5=8C=97=E7=94=B5=E7=BD=91=E4=B8=80?= =?UTF-8?q?=E5=BC=A0=E5=9B=BE=E6=9A=82=E6=80=81=E8=AF=A6=E7=BB=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/majornetwork/GridDiagramEventController.java | 4 ++-- .../service/majornetwork/Impl/RmpEventDetailServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/GridDiagramEventController.java b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/GridDiagramEventController.java index bb5c5c076..cace000e5 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/GridDiagramEventController.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/GridDiagramEventController.java @@ -37,8 +37,8 @@ public class GridDiagramEventController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getEventLevelEvaluation") @ApiOperation("暂态电能质量水平评价") - public HttpResult getSubLineGiveAnAlarm(@RequestBody StatSubstationBizBaseParam param) { - String methodDescribe = getMethodDescribe("getSubLineGiveAnAlarm"); + public HttpResult getEventLevelEvaluation(@RequestBody StatSubstationBizBaseParam param) { + String methodDescribe = getMethodDescribe("getEventLevelEvaluation"); GridDiagramVO eventLevelEvaluation = rmpEventDetailService.getEventLevelEvaluation(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventLevelEvaluation, methodDescribe); } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java index fc3dda697..4d2417159 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java @@ -344,7 +344,7 @@ public class RmpEventDetailServiceImpl extends ServiceImpl data = generalDeviceInfoClient.getPracticalRunDeviceInfo(param.getDeviceInfoParam()).getData(); List lineIds = data.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList()); List list = this.list(new LambdaQueryWrapper() - .select(RmpEventDetailPO::getEventId, RmpEventDetailPO::getEventType, RmpEventDetailPO::getSeverity) + .select(RmpEventDetailPO::getEventId,RmpEventDetailPO::getMeasurementPointId ,RmpEventDetailPO::getEventType, RmpEventDetailPO::getSeverity) .in(CollUtil.isNotEmpty(lineIds), RmpEventDetailPO::getMeasurementPointId, lineIds) .ge(StrUtil.isNotBlank(param.getSearchBeginTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()))) .le(StrUtil.isNotBlank(param.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())))