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

bug修改

Browse Source
This commit is contained in:
cdf
2024-06-05 19:59:21 +08:00
parent db5112e82b
commit 7491af7907
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
View File

@@ -148,13 +148,6 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
DateUtil.endOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchEndTime()))); DateUtil.endOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchEndTime())));
queryWrapper.orderByDesc("supervision_temp_line_report.Update_Time"); queryWrapper.orderByDesc("supervision_temp_line_report.Update_Time");
Page<SupervisionTempLineReportVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineReportQuery), PageFactory.getPageSize(supervisionTempLineReportQuery)), queryWrapper); Page<SupervisionTempLineReportVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineReportQuery), PageFactory.getPageSize(supervisionTempLineReportQuery)), queryWrapper);
page.getRecords().stream().forEach(temp->{
// temp.setOrgName((deptFeignClient.getDeptById(temp.getOrgId()).getData().getName()));
//处理特殊字段，用户名、部门名
UserVO userVO = userFeignClient.getUserById(temp.getReporter()).getData();
temp.setReporter(userVO.getName());
temp.setOrgName(deptFeignClient.getDeptById(temp.getOrgId()).getData().getName());
});
return page; return page;
} }
@@ -186,7 +179,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
BeanUtils.copyProperties(byId,vo); BeanUtils.copyProperties(byId,vo);
//处理特殊字段，用户名、部门名 //处理特殊字段，用户名、部门名
UserVO userVO = userFeignClient.getUserById(vo.getReporter()).getData(); UserVO userVO = userFeignClient.getUserById(vo.getCreateBy()).getData();
vo.setReporter(userVO.getName()); vo.setReporter(userVO.getName());
vo.setOrgName(deptFeignClient.getDeptById(vo.getOrgId()).getData().getName()); vo.setOrgName(deptFeignClient.getDeptById(vo.getOrgId()).getData().getName());
vo.setLoadType(dictTreeFeignClient.queryById(vo.getLoadType()).getData().getName()); vo.setLoadType(dictTreeFeignClient.queryById(vo.getLoadType()).getData().getName());

36
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -406,27 +406,29 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void updateUserStatus(String lineId, Integer userStatus) { public void updateUserStatus(String lineId, Integer userStatus) {
SupervisionTempLineReport supervisionTempLineReport = supervisionTempLineReportMapper.selectById(lineId); SupervisionTempLineReport supervisionTempLineReport = supervisionTempLineReportMapper.selectById(lineId);
String userId = supervisionTempLineReport.getUserId(); if(Objects.nonNull(supervisionTempLineReport)) {
UserReportPO userReportPO = this.baseMapper.selectById(userId); String userId = supervisionTempLineReport.getUserId();
//如果目前的干扰源用户状态>userStatus则不修改，如果将干扰源用户状态改为3退运，则必须其下的监测点都退运才能修改 UserReportPO userReportPO = this.baseMapper.selectById(userId);
if (userReportPO.getUserStatus() < userStatus) { //如果目前的干扰源用户状态>userStatus则不修改，如果将干扰源用户状态改为3退运，则必须其下的监测点都退运才能修改
if (userStatus == 3) { if (userReportPO.getUserStatus() < userStatus) {
List<SupervisionTempLineReport> supervisionTempLineReports = supervisionTempLineReportMapper.selectList(new QueryWrapper<SupervisionTempLineReport>().lambda().eq(SupervisionTempLineReport::getUserId, userId)); if (userStatus == 3) {
List<String> lineIds = supervisionTempLineReports.stream().map(SupervisionTempLineReport::getId).collect(Collectors.toList()); List<SupervisionTempLineReport> supervisionTempLineReports = supervisionTempLineReportMapper.selectList(new QueryWrapper<SupervisionTempLineReport>().lambda().eq(SupervisionTempLineReport::getUserId, userId));
List<LineDetail> data = lineFeignClient.getLineDetail(lineIds).getData(); List<String> lineIds = supervisionTempLineReports.stream().map(SupervisionTempLineReport::getId).collect(Collectors.toList());
List<Integer> collect1 = data.stream().filter(temp -> !Objects.equals(temp.getId(), lineId)) List<LineDetail> data = lineFeignClient.getLineDetail(lineIds).getData();
.map(LineDetail::getRunFlag) List<Integer> collect1 = data.stream().filter(temp -> !Objects.equals(temp.getId(), lineId))
.filter(temp -> !Objects.equals(temp, 2)) .map(LineDetail::getRunFlag)
.collect(Collectors.toList()); .filter(temp -> !Objects.equals(temp, 2))
if (CollectionUtil.isEmpty(data)) { .collect(Collectors.toList());
if (CollectionUtil.isEmpty(data)) {
userReportPO.setUserStatus(userStatus);
}
} else {
userReportPO.setUserStatus(userStatus); userReportPO.setUserStatus(userStatus);
}
} else {
userReportPO.setUserStatus(userStatus);
}
} }
this.updateById(userReportPO);
} }
this.updateById(userReportPO);
} }
@Override @Override