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

pms技术监督bug修改

Browse Source
This commit is contained in:
cdf
2024-03-15 13:22:03 +08:00
parent 3e193efc4b
commit 6226658dc3
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java
View File

@@ -53,7 +53,9 @@ import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.DictData; import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient; import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.api.UserFeignClient;
import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.po.Dept;
import com.njcn.user.pojo.po.User;
import com.njcn.web.factory.PageFactory; import com.njcn.web.factory.PageFactory;
import com.njcn.web.utils.RequestUtil; import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -113,7 +115,6 @@ public class ThsSuperviseServiceImpl extends ServiceImpl<ThsSuperviseMapper, Ths
private final FileStorageUtil fileStorageUtil; private final FileStorageUtil fileStorageUtil;
private final ThsAlarmFormworkMapper thsAlarmFormworkMapper; private final ThsAlarmFormworkMapper thsAlarmFormworkMapper;
private static final String DESCRIPTION = "description";
private final IFlowDefinitionService iFlowDefinitionService; private final IFlowDefinitionService iFlowDefinitionService;
@@ -125,12 +126,13 @@ public class ThsSuperviseServiceImpl extends ServiceImpl<ThsSuperviseMapper, Ths
private final IFlowDefinitionService flowDefinitionService; private final IFlowDefinitionService flowDefinitionService;
private final ThsDeptMonitorMapper thsDeptMonitorMapper;
private final CommTerminalGeneralClient commTerminalGeneralClient; private final CommTerminalGeneralClient commTerminalGeneralClient;
private final RStatLimitRateDClient rStatLimitRateDClient; private final RStatLimitRateDClient rStatLimitRateDClient;
private final UserFeignClient userFeignClient;
/** /**
* 构建技术监督名称 * 构建技术监督名称
@@ -470,13 +472,29 @@ public class ThsSuperviseServiceImpl extends ServiceImpl<ThsSuperviseMapper, Ths
@Override @Override
public ThsSuperviseVo superviseIndex(SuperviseDto superviseDto) { public ThsSuperviseVo superviseIndex(SuperviseDto superviseDto) {
List<SuperviseVo> querySuperviseList = thsSuperviseMapper.querySuperviseList(superviseDto); List<SuperviseVo> querySuperviseList = thsSuperviseMapper.querySuperviseList(superviseDto);
ThsSuperviseVo thsSuperviseVo = new ThsSuperviseVo(); ThsSuperviseVo thsSuperviseVo = new ThsSuperviseVo();
if (CollectionUtil.isNotEmpty(querySuperviseList)) { if (CollectionUtil.isNotEmpty(querySuperviseList)) {
List<String> userIds = querySuperviseList.stream().filter(item->Objects.nonNull(item.getModifyUser())).map(SuperviseVo::getModifyUser).distinct().collect(Collectors.toList());
List<User> userList = userFeignClient.getUserByIdList(userIds).getData();
Map<String,User> userMap = userList.stream().collect(Collectors.toMap(User::getId,Function.identity()));
List<String> deptIds = querySuperviseList.stream().map(SuperviseVo::getDeptId).distinct().collect(Collectors.toList());
List<Dept> deptList = deptFeignClient.getDeptInfoListByIds(deptIds).getData();
Map<String,Dept> deptMap = deptList.stream().collect(Collectors.toMap(Dept::getId,Function.identity()));
for (SuperviseVo superviseVo : querySuperviseList) { for (SuperviseVo superviseVo : querySuperviseList) {
superviseVo.setCompanyName(deptFeignClient.getDeptById(superviseVo.getDeptId()).getData().getName());
superviseVo.setModifyUser(userMap.get(superviseVo.getModifyUser()).getName());
superviseVo.setCompanyName(deptMap.get(superviseVo.getDeptId()).getName());
//处理预警类型 //处理预警类型
Date modifyTime = superviseVo.getModifyTime(); Date modifyTime = superviseVo.getModifyTime();