合并代码

This commit is contained in:
2022-12-07 10:52:13 +08:00
parent cdf75aaea1
commit 60c2779fe0
156 changed files with 6242 additions and 644 deletions

View File

@@ -1,6 +1,7 @@
package com.njcn.event.service.distribution.Impl;
import cn.hutool.core.collection.CollUtil;
import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.device.pms.api.PwMonitorClient;
import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
@@ -74,9 +75,9 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
// 创建集合封装查询数据
List<RStatOrgPO> rStatOrgPO = new ArrayList<>();
// 判断条件
switch (param.getType()) {
switch (param.getType().toString()) {
// 年
case 1:
case BizParamConstant.STAT_BIZ_YEAR:
rStatOrgPO = pwRStatOrgMapper.getYearInfo(
deptIdList,
param.getStartTime(),
@@ -84,7 +85,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
distributionPoint);
break;
// 季
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
rStatOrgPO = pwRStatOrgMapper.getQuarterInfo(
deptIdList,
param.getStartTime(),
@@ -92,7 +93,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
distributionPoint);
break;
// 月
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
rStatOrgPO = pwRStatOrgMapper.getMonthInfo(
deptIdList,
param.getStartTime(),
@@ -153,9 +154,9 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
// 获取配网id
String distributionPoint = getDistributionPoint();
// 判断条件
switch (param.getType()) {
switch (param.getType().toString()) {
// 年
case 1:
case BizParamConstant.STAT_BIZ_YEAR:
rStatEventOrgVOList = pwRStatOrgClassifiedMapper.getYearInfo(
deptIdList,
param.getStartTime(),
@@ -163,7 +164,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
distributionPoint);
break;
// 季
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
rStatEventOrgVOList = pwRStatOrgClassifiedMapper.getQuarterInfo(
deptIdList,
param.getStartTime(),
@@ -171,7 +172,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
distributionPoint);
break;
// 月
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
rStatEventOrgVOList = pwRStatOrgClassifiedMapper.getMonthInfo(
deptIdList,
param.getStartTime(),

View File

@@ -2,6 +2,7 @@ package com.njcn.event.service.majornetwork.Impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.device.pms.api.MonitorClient;
import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
import com.njcn.device.pms.api.StatationStatClient;
@@ -87,16 +88,16 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
// 创建返回集合
List<RStatOrgVO> result = new ArrayList<>();
// 类型1年 2季度 3月份 4日
switch (param.getType()) {
case 1:
switch (param.getType().toString()) {
case BizParamConstant.STAT_BIZ_YEAR:
// 获取年区域暂态指标统计
result = rStatOrgMapper.getYearRStatOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
break;
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
// 获取季区域暂态指标统计
result = rStatOrgMapper.getQuarterRStatOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
break;
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
// 获取月区域暂态指标统计
result = rStatOrgMapper.getMonthRStatOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
break;
@@ -145,16 +146,16 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
// 创建集合封装查询数据
List<RStatEventOrgPO> temp = new ArrayList<>();
// 类型1年 2季度 3月份 4日
switch (param.getType()) {
case 1:
switch (param.getType().toString()) {
case BizParamConstant.STAT_BIZ_YEAR:
// 获取年区域暂态指标分类统计表
temp = rStatEventOrgMapper.getYearRStatEventOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
break;
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
// 获取季区域暂态指标分类统计表
temp = rStatEventOrgMapper.getQuarterRStatEventOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
break;
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
// 获取月区域暂态指标分类统计表
temp = rStatEventOrgMapper.getMonthRStatEventOrgInfoInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
break;
@@ -265,16 +266,16 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
List<RStatSubstationVO> result = new ArrayList<>();
// 类型1年 2季度 3月份 4日
switch (param.getType()) {
case 1:
switch (param.getType().toString()) {
case BizParamConstant.STAT_BIZ_YEAR:
// 获取年变电站暂态指标分类统计表
result = rStatSubstationMapper.getYearInfo(powerIds, param.getStartTime(), param.getEndTime());
break;
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
// 获取季变电站暂态指标分类统计表
result = rStatSubstationMapper.getQuarterInfo(powerIds, param.getStartTime(), param.getEndTime());
break;
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
// 获取月变电站暂态指标分类统计表
result = rStatSubstationMapper.getMonthInfo(powerIds, param.getStartTime(), param.getEndTime());
break;