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())))