From b103141a54d06df77c20b76834fe254e75660578 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 12 Dec 2025 17:33:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GridDiagramServiceImpl.java | 27 ++++++++++++------- .../impl/WarningLeafletServiceImpl.java | 6 +++-- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java index f129645fd..85f572846 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java @@ -90,12 +90,13 @@ public class GridDiagramServiceImpl implements GridDiagramService { List deptIds = deptFeignClient.getDepSonIdByDeptId(param.getId()).getData(); GridDiagramVO.City City = new GridDiagramVO.City(); //在线监测问题 - List lineWarningList = lineWarningService.list(new LambdaQueryWrapper() + List lineWarning = lineWarningService.list(new LambdaQueryWrapper() .in(LineWarning::getDeptId, deptIds) .isNotNull(LineWarning::getStep) .ge(StrUtil.isNotBlank(param.getStartTime()), LineWarning::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime()))) .le(StrUtil.isNotBlank(param.getEndTime()), LineWarning::getCreateTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))) ); + List lineWarningList = lineWarning.stream().map(LineWarning::getLeafletId).distinct().collect(Collectors.toList()); //用户投诉问题(添加出来就是有问题的) List userComplaintList = userComplaintPOService.list(new LambdaQueryWrapper() .and(x->x .in(SupervisionUserComplaintPO::getDutyOrgId, deptIds) @@ -103,6 +104,7 @@ public class GridDiagramServiceImpl implements GridDiagramService { .ge(StrUtil.isNotBlank(param.getStartTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime()))) .le(StrUtil.isNotBlank(param.getEndTime()), SupervisionUserComplaintPO::getCreateTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime())))) .or(x->x.eq(SupervisionUserComplaintPO::getDealState,0) + .in(SupervisionUserComplaintPO::getDutyOrgId, deptIds) .eq(SupervisionUserComplaintPO::getState, DataStateEnum.ENABLE.getCode()) ) @@ -130,20 +132,23 @@ public class GridDiagramServiceImpl implements GridDiagramService { //根据问题单id查询已关联工单 List problemIds = userComplaintList.stream().map(SupervisionUserComplaintPO::getId).collect(Collectors.toList()); problemIds.addAll(surveyTestList.stream().map(SurveyTest::getId).collect(Collectors.toList())); - problemIds.addAll(lineWarningList.stream().map(LineWarning::getId).collect(Collectors.toList())); + problemIds.addAll(lineWarningList); problemIds.addAll(runWarningsIds); List list =new ArrayList<>(); if (CollUtil.isNotEmpty(problemIds)) { list.addAll(warningLeafletService.list(new LambdaQueryWrapper() - .in(WarningLeaflet::getProblemId, problemIds) + .and(x->x + .in(WarningLeaflet::getProblemId, problemIds) + .or() + .in(WarningLeaflet::getId, problemIds) + ) .in(WarningLeaflet::getState, 1)) ); } //在线监测问题 GridDiagramVO warnVo=new GridDiagramVO(); - List warn = list.stream().filter(x -> lineWarningList.stream().map(LineWarning::getId) - .collect(Collectors.toList()).contains(x.getProblemId())).collect(Collectors.toList()); + List warn = list.stream().filter(x -> lineWarningList.contains(x.getId())).collect(Collectors.toList()); warnVo.setAbnormalNum(lineWarningList.size()); warnVo.setAssociatedNum(warn.size()); warnVo.setConversionNum(warnVo.getAbnormalNum() == 0 ? 0.0f : NumberUtil.round(warn.size() * 100.0 / warnVo.getAbnormalNum(), 2).floatValue()); @@ -205,13 +210,13 @@ public class GridDiagramServiceImpl implements GridDiagramService { gridDiagramVO.setOrgName(deptDTO.getName()); } //在线监测问题 - List lineWarningList = lineWarningService.list(new LambdaQueryWrapper() + List lineWarning = lineWarningService.list(new LambdaQueryWrapper() .in(LineWarning::getDeptId, ids) .isNotNull(LineWarning::getStep) .ge(StrUtil.isNotBlank(baseParam.getStartTime()), LineWarning::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(baseParam.getStartTime()))) .le(StrUtil.isNotBlank(baseParam.getEndTime()), LineWarning::getCreateTime, DateUtil.endOfDay(DateUtil.parse(baseParam.getEndTime()))) ); - + List lineWarningList = lineWarning.stream().map(LineWarning::getLeafletId).distinct().collect(Collectors.toList()); gridDiagramVO.setOnLineNum(lineWarningList.size()); //用户投诉问题(添加出来就是有问题的) List userComplaintList = userComplaintPOService.list(new LambdaQueryWrapper() @@ -252,13 +257,17 @@ public class GridDiagramServiceImpl implements GridDiagramService { //根据问题单id查询已关联工单 List problemIds = userComplaintList.stream().map(SupervisionUserComplaintPO::getId).collect(Collectors.toList()); problemIds.addAll(surveyTestList.stream().map(SurveyTest::getId).collect(Collectors.toList())); - problemIds.addAll(lineWarningList.stream().map(LineWarning::getLeafletId).collect(Collectors.toList())); + problemIds.addAll(lineWarningList); problemIds.addAll(runWarningsIds); if (CollUtil.isNotEmpty(problemIds)) { List list = warningLeafletService.list(new LambdaQueryWrapper() - .in(WarningLeaflet::getProblemId, problemIds) + .and(x->x + .in(WarningLeaflet::getProblemId, problemIds) + .or() + .in(WarningLeaflet::getId, problemIds) + ) .in(WarningLeaflet::getState, 1) ); gridDiagramVO.setAssociatedNum(list.size()); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java index 558939b36..5c5ef24fe 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java @@ -263,12 +263,14 @@ public class WarningLeafletServiceImpl extends ServiceImpl