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

单位暂态算法调整

Browse Source
This commit is contained in:
wr
2024-02-23 15:21:48 +08:00
parent dcdc23feea
commit ea6b951b11
9 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/PwRStatOrgClassifiedMapper.java
View File

@@ -26,6 +26,7 @@ public interface PwRStatOrgClassifiedMapper {
* @return 配网区域暂态事件分类统计（年）
*/
List<RStatEventOrgPO> getYearInfo(@Param("deptIdList") List<String> deptIdList,
@Param("ids") List<String> ids,
@Param("startTime") String startTime,
@Param("endTime") String endTime,
@Param("distributionPoint")String distributionPoint);
@@ -40,6 +41,7 @@ public interface PwRStatOrgClassifiedMapper {
* @return 配网区域暂态事件分类统计（月）
*/
List<RStatEventOrgPO> getQuarterInfo(@Param("deptIdList") List<String> deptIdList,
@Param("ids") List<String> ids,
@Param("startTime") String startTime,
@Param("endTime") String endTime,
@Param("distributionPoint") String distributionPoint);
@@ -54,6 +56,7 @@ public interface PwRStatOrgClassifiedMapper {
* @return 配网区域暂态事件分类统计（月）
*/
List<RStatEventOrgPO> getMonthInfo(@Param("deptIdList") List<String> deptIdList,
@Param("ids") List<String> ids,
@Param("startTime") String startTime,
@Param("endTime") String endTime,
@Param("distributionPoint") String distributionPoint);

6
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgClassifiedMapper.xml
View File

@@ -24,6 +24,12 @@
<sql id="query_where">
rso.data_type = #{distributionPoint}
AND rseo.data_type = #{distributionPoint}
<if test="ids != null and ids.size > 0">
AND rso.measurement_type_class IN
<foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
AND rso.org_no IN
<foreach collection="deptIdList" item="item" open="(" close=")" separator=",">
#{item}

10
pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwRStatOrgServiceImpl.java
View File

@@ -148,7 +148,12 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
@Override
public List<PwRStatEventOrgVO> getPwRStatOrgClassified(PwUniversalFrontEndParam param) {
List<DeptDTO> deptDTOList = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData();
if(CollUtil.isEmpty(param.getMonitorSort())){
//监测点对象标签
List<DictData> dataList = dicDataFeignClient.getDicDataByTypeCode(
DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
param.setMonitorSort(dataList.stream().map(DictData::getId).collect(Collectors.toList()));
}
// 创建集合封装返回数据
List<PwRStatEventOrgVO> result = new ArrayList<>();
// 取出单位id
@@ -163,6 +168,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
case BizParamConstant.STAT_BIZ_YEAR:
rStatEventOrgVOList = pwRStatOrgClassifiedMapper.getYearInfo(
deptIdList,
param.getMonitorSort(),
param.getStartTime(),
param.getEndTime(),
distributionPoint);
@@ -171,6 +177,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
case BizParamConstant.STAT_BIZ_QUARTER:
rStatEventOrgVOList = pwRStatOrgClassifiedMapper.getQuarterInfo(
deptIdList,
param.getMonitorSort(),
param.getStartTime(),
param.getEndTime(),
distributionPoint);
@@ -179,6 +186,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
case BizParamConstant.STAT_BIZ_MONTH:
rStatEventOrgVOList = pwRStatOrgClassifiedMapper.getMonthInfo(
deptIdList,
param.getMonitorSort(),
param.getStartTime(),
param.getEndTime(),
distributionPoint);

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

@@ -140,6 +140,12 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
if (CollectionUtil.isEmpty(deptDTOList)) {
return Collections.emptyList();
}
if(CollUtil.isEmpty(param.getMonitorSort())){
//监测点对象标签
List<DictData> dataList = dicDataFeignClient.getDicDataByTypeCode(
DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
param.setMonitorSort(dataList.stream().map(DictData::getId).collect(Collectors.toList()));
}
// 取出单位code
List<String> deptCode = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
if (CollectionUtil.isEmpty(deptCode)) {