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

1.公共方法新增变电站信息查询

Browse Source 
2.调整技术监督变电站查询方法
This commit is contained in:
wr
2024-03-21 13:23:47 +08:00
parent 72bb397cbf
commit 082b27720b
19 changed files with 254 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
View File

@@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
import com.njcn.device.biz.pojo.dto.SubGetBase;
import com.njcn.device.biz.pojo.param.SubstationParam;
import com.njcn.device.pms.api.StatationStatClient;
import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
import com.njcn.device.pms.pojo.po.StatationStat;
@@ -71,7 +74,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
private final RGeneralSurveyPlanDetailMapper rGeneralSurveyPlanDetailMapper;
private final DeptFeignClient deptFeignClient;
private final FileStorageUtil fileStorageUtil;
private final StatationStatClient statationStatClient;
private final CommTerminalGeneralClient commTerminalGeneralClient;
private final DicDataFeignClient dicDataFeignClient;
private final RSurveyCycleMapper rSurveyCycleMapper;
private final RSurveyPlanConfigService rSurveyPlanConfigService;
@@ -120,16 +123,16 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
rGeneralSurveyPlanDetailService.remove(queryWrapper);
List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetailList = new ArrayList<>();
PmsStatationStatInfoParam param =new PmsStatationStatInfoParam();
SubstationParam param =new SubstationParam();
param.setPowerIds(rGeneralSurveyPlanAddParm.getSubIds());
List<StatationStat> stationList = statationStatClient.getPowerInfo(param).getData();
for (StatationStat stat : stationList) {
List<SubGetBase> stationList = commTerminalGeneralClient.tagOrIdGetSub(param).getData();
for (SubGetBase stat : stationList) {
RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail();
rGeneralSurveyPlanDetail.setPlanNo(rGeneralSurveyPlanAddParm.getPlanNo());
rGeneralSurveyPlanDetail.setOrgNo(stat.getOrgId());
rGeneralSurveyPlanDetail.setOrgName(stat.getOrgName());
rGeneralSurveyPlanDetail.setSubId(stat.getPowerId());
rGeneralSurveyPlanDetail.setSubName(stat.getPowerName());
rGeneralSurveyPlanDetail.setSubId(stat.getId());
rGeneralSurveyPlanDetail.setSubName(stat.getName());
/*目前时间与计划开始时间，结束时间一致*/
rGeneralSurveyPlanDetail.setGeneralSurveyStartTime(rGeneralSurveyPlanAddParm.getPlanStartTime());
rGeneralSurveyPlanDetail.setGeneralSurveyTime(rGeneralSurveyPlanAddParm.getPlanStartTime());
@@ -424,7 +427,8 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
@Override
public RGeneralSurveyPlanAddParm querySubStatation(Integer statetionNum) {
/*查询所有电站并过滤已经参加当期普测电站*/
List<StatationStat> list = statationStatClient.getPowerInfo(new PmsStatationStatInfoParam()).getData();
List<SubGetBase> list = commTerminalGeneralClient.tagOrIdGetSub(null).getData();
/**查出当前周期id**/
QueryWrapper<RSurveyCyclePO> rSurveyCyclePOQueryWrapper = new QueryWrapper();
@@ -447,8 +451,8 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
List<String> finalSubIds = subIds;
List<StatationStat> filterList = list.stream().filter(temp -> !finalSubIds.contains(temp.getPowerId())).collect(Collectors.toList());
List<StatationStat> addList = new ArrayList<>();
List<SubGetBase> filterList = list.stream().filter(temp -> !finalSubIds.contains(temp.getId())).collect(Collectors.toList());
List<SubGetBase> addList = new ArrayList<>();
List<RSurveyPlanConfigPO> rSurveyPlanConfigPOList = rSurveyPlanConfigService.list();
Map<String, RSurveyPlanConfigPO> orgIdMap = rSurveyPlanConfigPOList.stream().
@@ -459,7 +463,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
BeanUtils.copyProperties(temp, deptSubstationVO);
/*如果存在电站占比配置随机抽出配置电站个数*/
if (orgIdMap.containsKey(temp.getId())) {
List<StatationStat> collect = filterList.stream().filter(statationStat -> Objects.
List<SubGetBase> collect = filterList.stream().filter(statationStat -> Objects.
equals(statationStat.getOrgId(), temp.getId())).collect(Collectors.toList());
RSurveyPlanConfigPO rSurveyPlanConfigPO = orgIdMap.get(temp.getId());
//向上取整
@@ -467,7 +471,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
statetionNum);
if (collect.size() >= v) {
Collections.shuffle(collect);
List<StatationStat> lastList = collect.stream().limit(v).collect(Collectors.toList());
List<SubGetBase> lastList = collect.stream().limit(v).collect(Collectors.toList());
addList.addAll(lastList);
} else {
addList.addAll(collect);
@@ -479,13 +483,13 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
if (statetionNum > addList.size()) {
/*取差集，当通过比例抽取变电站不够时 重差集里取*/
List<StatationStat> collect = filterList.stream().filter(o -> !addList.contains(o)).collect(Collectors.toList());
List<SubGetBase> collect = filterList.stream().filter(o -> !addList.contains(o)).collect(Collectors.toList());
int differenceCount = statetionNum - addList.size();
Collections.shuffle(collect);
List<StatationStat> lastList = collect.stream().limit(differenceCount).collect(Collectors.toList());
List<SubGetBase> lastList = collect.stream().limit(differenceCount).collect(Collectors.toList());
addList.addAll(lastList);
}
List<String> result = addList.stream().map(StatationStat::getPowerId).collect(Collectors.toList());
List<String> result = addList.stream().map(SubGetBase::getId).collect(Collectors.toList());
RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm = new RGeneralSurveyPlanAddParm();
rGeneralSurveyPlanAddParm.setSubIds(result);
return rGeneralSurveyPlanAddParm;
@@ -547,16 +551,16 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
BeanUtils.copyProperties(temp, deptSubstationVO);
deptSubstationVO.setDisabled(true);
deptSubstationVO.setFlag(true);
PmsStatationStatInfoParam param =new PmsStatationStatInfoParam();
SubstationParam param =new SubstationParam();
param.setOrgIds(Arrays.asList(temp.getCode()));
List<StatationStat> list1 = statationStatClient.getPowerInfo(param).getData();
List<SubGetBase> list1 = commTerminalGeneralClient.tagOrIdGetSub(param).getData();
List<DeptSubstationVO> children = deptSubstationVO.getChildren();
List<DeptSubstationVO> collect = list1.stream().map(statationStat -> {
DeptSubstationVO deptSubstationVO1 = new DeptSubstationVO();
deptSubstationVO1.setId(statationStat.getPowerId());
deptSubstationVO1.setId(statationStat.getId());
deptSubstationVO1.setPid(temp.getId());
deptSubstationVO1.setName(statationStat.getPowerName());
if (finalSubIds.contains(statationStat.getPowerId())) {
deptSubstationVO1.setName(statationStat.getName());
if (finalSubIds.contains(statationStat.getId())) {
deptSubstationVO1.setDisabled(true);
}
deptSubstationVO1.setFlag(true);