Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.技术监督修改

Browse Source
This commit is contained in:
wr
2025-12-12 17:33:04 +08:00
parent a6d2d6ed47
commit b103141a54
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
View File

@@ -90,12 +90,13 @@ public class GridDiagramServiceImpl implements GridDiagramService {
List<String> deptIds = deptFeignClient.getDepSonIdByDeptId(param.getId()).getData();
GridDiagramVO.City City = new GridDiagramVO.City();
//在线监测问题
List<LineWarning> lineWarningList = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
List<LineWarning> lineWarning = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
.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<String> lineWarningList = lineWarning.stream().map(LineWarning::getLeafletId).distinct().collect(Collectors.toList());
//用户投诉问题(添加出来就是有问题的)
List<SupervisionUserComplaintPO> userComplaintList = userComplaintPOService.list(new LambdaQueryWrapper<SupervisionUserComplaintPO>()
.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<String> 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<WarningLeaflet> list =new ArrayList<>();
if (CollUtil.isNotEmpty(problemIds)) {
list.addAll(warningLeafletService.list(new LambdaQueryWrapper<WarningLeaflet>()
.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<WarningLeaflet> warn = list.stream().filter(x -> lineWarningList.stream().map(LineWarning::getId)
.collect(Collectors.toList()).contains(x.getProblemId())).collect(Collectors.toList());
List<WarningLeaflet> 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<LineWarning> lineWarningList = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
List<LineWarning> lineWarning = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
.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<String> lineWarningList = lineWarning.stream().map(LineWarning::getLeafletId).distinct().collect(Collectors.toList());
gridDiagramVO.setOnLineNum(lineWarningList.size());
//用户投诉问题(添加出来就是有问题的)
List<SupervisionUserComplaintPO> userComplaintList = userComplaintPOService.list(new LambdaQueryWrapper<SupervisionUserComplaintPO>()
@@ -252,13 +257,17 @@ public class GridDiagramServiceImpl implements GridDiagramService {
//根据问题单id查询已关联工单
List<String> 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<WarningLeaflet> list = warningLeafletService.list(new LambdaQueryWrapper<WarningLeaflet>()
.in(WarningLeaflet::getProblemId, problemIds)
.and(x->x
.in(WarningLeaflet::getProblemId, problemIds)
.or()
.in(WarningLeaflet::getId, problemIds)
)
.in(WarningLeaflet::getState, 1)
);
gridDiagramVO.setAssociatedNum(list.size());

6
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
View File

@@ -263,12 +263,14 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
this.lambdaUpdate().set(WarningLeaflet::getStatus, status).eq(WarningLeaflet::getId, businessKey).update();
WarningLeaflet one = this.lambdaQuery().eq(WarningLeaflet::getId, businessKey).one();
//如果审核通过且problem_type不是在线监测的（1：技术监督管理；2：在线监测超标问题；3：用户投诉；4：现场测试超标）,将对应能质量问题改成已解决，所有的预告警单改成已解决
if (status == 2 && one.getProblemType() != 2) {
if (status == 2 ) {
//多次的预告警单是删除
this.lambdaUpdate().set(WarningLeaflet::getDealState, DealStateEnum.RESOLVED.getCode())
.eq(WarningLeaflet::getId, businessKey)
.eq(WarningLeaflet::getProblemId, one.getProblemId()).update();
updatePowerProblem(one.getProblemType(), one.getProblemId());
if(one.getProblemType() != 2){
updatePowerProblem(one.getProblemType(), one.getProblemId());
}
}
}