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

合并代码

Browse Source
This commit is contained in:
hongawen
2022-12-15 14:00:44 +08:00
parent 339cf9c75e
commit a16f573eae
6 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgMServiceImpl.java
View File

@@ -68,8 +68,8 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
List<RStatEventOrgM> list = statEventOrgMMapper.selectList(new LambdaQueryWrapper<RStatEventOrgM>()
.eq(RStatEventOrgM::getDataType, mainnetData.getId())
.in(RStatEventOrgM::getOrgNo, deptIds)
.ge(param.getStartTime() != null, RStatEventOrgM::getDataDate, param.getStartTime())
.le(param.getEndTime() != null, RStatEventOrgM::getDataDate, param.getEndTime()));
.ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgM::getDataDate, param.getStartTime())
.le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgM::getDataDate, param.getEndTime()));
//初始化指标类型（横向）
List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -219,7 +219,9 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
.collect(Collectors.toMap(DictData::getId, Function.identity()));
//子节点 获取所有得各单位类型
List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<DeptDTO> deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId());
//获取部门id集合
List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
@@ -231,8 +233,8 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
List<RStatEventOrgM> list = statEventOrgMMapper.selectList(new LambdaQueryWrapper<RStatEventOrgM>()
.eq(RStatEventOrgM::getDataType, distributionData.getId())
.in(RStatEventOrgM::getOrgNo, deptIds)
.ge(param.getStartTime() != null, RStatEventOrgM::getDataDate, param.getStartTime())
.le(param.getEndTime() != null, RStatEventOrgM::getDataDate, param.getEndTime()));
.ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgM::getDataDate, param.getStartTime())
.le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgM::getDataDate, param.getEndTime()));
//初始化指标类型（横向）
List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -259,8 +261,8 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
}
//根据监测点类别获取差集
Map<String, List<RStatEventOrgM>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgM::getEventType));
List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
Map<String, List<RStatEventOrgM>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgM::getOrgNo));
List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
.collect(Collectors.toList());
this.assignDept(notDeptList, eventVO, arrayVO);
eventVO.sort(Comparator.comparing(rStatEventMVO -> rStatEventMVO.getSort()));

16
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgQServiceImpl.java
View File

@@ -67,8 +67,8 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
List<RStatEventOrgQ> list = statEventOrgQMapper.selectList(new LambdaQueryWrapper<RStatEventOrgQ>()
.eq(RStatEventOrgQ::getDataType, mainnetData.getId())
.in(RStatEventOrgQ::getOrgNo, deptIds)
.ge(param.getStartTime() != null, RStatEventOrgQ::getDataDate, param.getStartTime())
.le(param.getEndTime() != null, RStatEventOrgQ::getDataDate, param.getEndTime()));
.ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgQ::getDataDate, param.getStartTime())
.le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgQ::getDataDate, param.getEndTime()));
//初始化指标类型（横向）
List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -218,7 +218,9 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
.collect(Collectors.toMap(DictData::getId, Function.identity()));
//子节点 获取所有得各单位类型
List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<DeptDTO> deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId());
//获取部门id集合
List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
Map<String, DeptDTO> deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
@@ -230,8 +232,8 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
List<RStatEventOrgQ> list = statEventOrgQMapper.selectList(new LambdaQueryWrapper<RStatEventOrgQ>()
.eq(RStatEventOrgQ::getDataType, distributionData.getId())
.in(RStatEventOrgQ::getOrgNo, deptIds)
.ge(param.getStartTime() != null, RStatEventOrgQ::getDataDate, param.getStartTime())
.le(param.getEndTime() != null, RStatEventOrgQ::getDataDate, param.getEndTime()));
.ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgQ::getDataDate, param.getStartTime())
.le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgQ::getDataDate, param.getEndTime()));
//初始化指标类型（横向）
List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -258,8 +260,8 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
}
//根据监测点类别获取差集
Map<String, List<RStatEventOrgQ>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgQ::getEventType));
List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
Map<String, List<RStatEventOrgQ>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgQ::getOrgNo));
List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
.collect(Collectors.toList());
this.assignDept(notDeptList, eventVO, arrayVO);
eventVO.sort(Comparator.comparing(rStatEventMVO -> rStatEventMVO.getSort()));

14
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgYServiceImpl.java
View File

@@ -3,7 +3,6 @@ package com.njcn.event.service.majornetwork.Impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,7 +12,6 @@ import com.njcn.event.mapper.majornetwork.RStatEventOrgMMapper;
import com.njcn.event.mapper.majornetwork.RStatEventOrgQMapper;
import com.njcn.event.pojo.param.REventMParam;
import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
import com.njcn.event.pojo.po.RStatEventOrgQ;
import com.njcn.event.pojo.po.RStatEventOrgY;
import com.njcn.event.mapper.majornetwork.RStatEventOrgYMapper;
import com.njcn.event.pojo.vo.DeptLevelVO;
@@ -258,8 +256,8 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
List<RStatEventOrgY> list = statEventOrgYMapper.selectList(new LambdaQueryWrapper<RStatEventOrgY>()
.eq(RStatEventOrgY::getDataType, distributionData.getId())
.in(RStatEventOrgY::getOrgNo, deptIds)
.ge(param.getStartTime() != null, RStatEventOrgY::getDataDate, param.getStartTime())
.le(param.getEndTime() != null, RStatEventOrgY::getDataDate, param.getEndTime()));
.ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgY::getDataDate, param.getStartTime())
.le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgY::getDataDate, param.getEndTime()));
//初始化指标类型（横向）
List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -418,8 +416,8 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
List<RStatEventOrgY> list = statEventOrgYMapper.selectList(new LambdaQueryWrapper<RStatEventOrgY>()
.eq(RStatEventOrgY::getDataType, dictData.getId())
.in(RStatEventOrgY::getOrgNo, deptIds)
.ge(param.getStartTime() != null, RStatEventOrgY::getDataDate, param.getStartTime())
.le(param.getEndTime() != null, RStatEventOrgY::getDataDate, param.getEndTime()));
.ge(StrUtil.isNotBlank(param.getStartTime()), RStatEventOrgY::getDataDate, param.getStartTime())
.le(StrUtil.isNotBlank(param.getEndTime()), RStatEventOrgY::getDataDate, param.getEndTime()));
//初始化指标类型（横向）
List<RArrayVO> arrayVOList = new ArrayList<>();
@@ -446,8 +444,8 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
}
//根据监测点类别获取差集
Map<String, List<RStatEventOrgY>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgY::getEventType));
List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId()))
Map<String, List<RStatEventOrgY>> listMap = value.stream().collect(Collectors.groupingBy(RStatEventOrgY::getOrgNo));
List<DeptDTO> notDeptList = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getCode()))
.collect(Collectors.toList());
this.assignDept(notDeptList, eventVO, arrayVO);
eventVO.sort(Comparator.comparing(rStatEventMVO -> rStatEventMVO.getSort()));