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

代码合并终

Browse Source
This commit is contained in:
雨木c
2023-02-06 13:32:26 +08:00
parent 4f64623dbd
commit 51041ad52d
8 changed files with 108 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml
View File

@@ -47,7 +47,7 @@
SELECT
monitoring_object,
area_pq_event_type,
TRUNCATE ( SUM( total_monitor_num )/ count( total_monitor_num ), 2 ) AS totalMonitorNum
TRUNCATE ( SUM( total_monitor_num )/ count( total_monitor_num ), 0 ) AS totalMonitorNum
FROM
r_stat_org_pv_power_quality_m
<where>

59
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java
View File

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.harmonic.utils.DeptUtil;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO;
@@ -44,6 +45,7 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
private final DeptFeignClient deptFeignClient;
private final DicDataFeignClient dicDataFeignClient;
private final RStatOrgMMapper rStatOrgMMapper;
private static final String XIONG_AN_CITY="雄安新区";
@Override
public List<RStatOrgVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
@@ -95,6 +97,12 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
List<OverviewVO.GroupVO> info =new ArrayList<>();
//查询配网信息
DictData dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
//获取监测点类别
List<DictData> monitorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_SORT.getCode()).getData();
Map<String, DictData> dictDataMap = monitorType.stream()
.collect(Collectors.toMap(DictData::getId, Function.identity()));
//获取部门数据
List<DeptDTO> subDeptListCode = getSubDeptListCode(param.getId());
List<String> deptListCode = subDeptListCode.stream().map(DeptDTO::getCode).collect(Collectors.toList());
@@ -114,19 +122,52 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
if(deptMap.containsKey(key)){
OverviewVO.GroupVO groupVO=new OverviewVO.GroupVO();
String name = deptMap.get(key).getName();
groupVO.setMonitorSort(name.replace("供电公司","市"));
List<OverviewVO.StatOrgVO> statOrgVOS =new ArrayList<>();
OverviewVO.StatOrgVO statOrgVO;
for (RStatOrgM statOrgM : value) {
statOrgVO=new OverviewVO.StatOrgVO();
statOrgVO.setMeasurementTypeClass(statOrgM.getMeasurementTypeClass());
statOrgVO.setEffectiveMeasurementAccrued(statOrgM.getEffectiveMeasurementAccrued());
statOrgVOS.add(statOrgVO);
String replace = name.replace("供电公司","");
if(XIONG_AN_CITY.equals(replace)){
groupVO.setCity(XIONG_AN_CITY);
}else{
groupVO.setCity(replace+"市");
}
groupVO.setOneLine(0);
groupVO.setTwoLine(0);
groupVO.setThreeLine(0);
for (RStatOrgM statOrgM : value) {
if (dictDataMap.containsKey(statOrgM.getMeasurementTypeClass())) {
DictData data = dictDataMap.get(statOrgM.getMeasurementTypeClass());
//一类监测点
if(DicDataEnum.LINE_ONE.getCode().equals(data.getCode())){
groupVO.setOneLine(statOrgM.getEffectiveMeasurementAccrued());
}
//二类监测点
if(DicDataEnum.LINE_TWO.getCode().equals(data.getCode())){
groupVO.setTwoLine(statOrgM.getEffectiveMeasurementAccrued());
}
//三类监测点
if(DicDataEnum.LINE_THREE.getCode().equals(data.getCode())){
groupVO.setThreeLine(statOrgM.getEffectiveMeasurementAccrued());
}
}
}
groupVO.setSubset(statOrgVOS);
info.add(groupVO);
}
});
List<DeptDTO> deptDTOS = subDeptListCode.stream().filter(r -> !orgNoMap.containsKey(r.getId()))
.collect(Collectors.toList());
OverviewVO.GroupVO groupVO;
for (DeptDTO deptDTO : deptDTOS) {
groupVO=new OverviewVO.GroupVO();
String replace = deptDTO.getName().replace("供电公司","");
if(XIONG_AN_CITY.equals(replace)){
groupVO.setCity(XIONG_AN_CITY);
}else{
groupVO.setCity(replace+"市");
}
groupVO.setOneLine(0);
groupVO.setTwoLine(0);
groupVO.setThreeLine(0);
info.add(groupVO);
}
return info;
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java
View File

@@ -178,7 +178,7 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl<RStatOrgPvPow
}
}
}
//数据库查询
//数据库查询（里面有聚合查询，直接舍弃小数部分）
List<OverviewVO.VoltageVO> voltageVOS = rStatOrgPvPowerQualityMMapper.selectVoltage(Arrays.asList(dept.getCode()), typeID,param);
Map<String, List<OverviewVO.VoltageVO>> voltageMap = voltageVOS.stream().collect(