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

1.算法调整

Browse Source
This commit is contained in:
wr
2024-03-12 16:09:21 +08:00
parent df07c79ac8
commit 209393ad3c
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java
View File

@@ -141,14 +141,14 @@ public class SubStationExecutor extends BaseExecutor{
public void rUploadSubStatisticalDataProcess(NodeComponent bindCmp) { public void rUploadSubStatisticalDataProcess(NodeComponent bindCmp) {
String tag = bindCmp.getTag(); String tag = bindCmp.getTag();
CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = bindCmp.getRequestData(); CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = bindCmp.getRequestData();
if (tag.equalsIgnoreCase("r_upload_substation_statistical_data_d")) { if (tag.equalsIgnoreCase("r_upload_substation_statistical_data_m")) {
//月表 //月表
rUploadSubstationStatisticalDataDService.insertSubStatisticalDataDay(bindCmp.getRequestData()); rUploadSubstationStatisticalDataDService.insertSubStatisticalDataMonth(bindCmp.getRequestData());
} else if (tag.equalsIgnoreCase("r_upload_substation_statistical_data_m")) { } else if (tag.equalsIgnoreCase("r_upload_substation_statistical_data_y")) {
//数据补招不执行非日表算法 //数据补招不执行非日表算法
if (!calculatedParam.isRepair()) { if (!calculatedParam.isRepair()) {
//年算法 //年算法
rUploadSubstationStatisticalDataDService.insertSubStatisticalDataMonth(bindCmp.getRequestData()); rUploadSubstationStatisticalDataDService.insertSubStatisticalDataYear(bindCmp.getRequestData());
} }
} }
} }

7
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java
View File

@@ -159,8 +159,8 @@ public class IRDimBusGlobalDController extends BaseController {
baseParam.setRepair(false); baseParam.setRepair(false);
baseParam.setDataDate(statisticDate); baseParam.setDataDate(statisticDate);
set.add("r_upload_substation_statistical_data_d");
set.add("r_upload_substation_statistical_data_m"); set.add("r_upload_substation_statistical_data_m");
set.add("r_upload_substation_statistical_data_y");
baseParam.setTagNames(set); baseParam.setTagNames(set);
liteFlowFeignClient.substationExecutor(baseParam); liteFlowFeignClient.substationExecutor(baseParam);
}else if("0".equals(type)){ }else if("0".equals(type)){
@@ -170,6 +170,7 @@ public class IRDimBusGlobalDController extends BaseController {
baseParam.setRepair(false); baseParam.setRepair(false);
set.add("r_upload_evaluation_data_d"); set.add("r_upload_evaluation_data_d");
set.add("r_upload_evaluation_data_m"); set.add("r_upload_evaluation_data_m");
set.add("r_upload_evaluation_data_y");
baseParam.setDataDate(statisticDate); baseParam.setDataDate(statisticDate);
baseParam.setTagNames(set); baseParam.setTagNames(set);
liteFlowFeignClient.uploadOrgExecutor(baseParam); liteFlowFeignClient.uploadOrgExecutor(baseParam);
@@ -180,6 +181,7 @@ public class IRDimBusGlobalDController extends BaseController {
baseParam.setRepair(false); baseParam.setRepair(false);
set.add("r_upload_point_statistical_data_d"); set.add("r_upload_point_statistical_data_d");
set.add("r_upload_point_statistical_data_m"); set.add("r_upload_point_statistical_data_m");
set.add("r_upload_point_statistical_data_y");
baseParam.setDataDate(statisticDate); baseParam.setDataDate(statisticDate);
baseParam.setTagNames(set); baseParam.setTagNames(set);
liteFlowFeignClient.uploadOrgExecutor(baseParam); liteFlowFeignClient.uploadOrgExecutor(baseParam);
@@ -188,8 +190,8 @@ public class IRDimBusGlobalDController extends BaseController {
BaseParam baseParam = new BaseParam(); BaseParam baseParam = new BaseParam();
baseParam.setFullChain(false); baseParam.setFullChain(false);
baseParam.setRepair(false); baseParam.setRepair(false);
set.add("r_upload_substation_statistical_data_d");
set.add("r_upload_substation_statistical_data_m"); set.add("r_upload_substation_statistical_data_m");
set.add("r_upload_substation_statistical_data_y");
baseParam.setDataDate(statisticDate); baseParam.setDataDate(statisticDate);
baseParam.setTagNames(set); baseParam.setTagNames(set);
liteFlowFeignClient.substationExecutor(baseParam); liteFlowFeignClient.substationExecutor(baseParam);
@@ -200,6 +202,7 @@ public class IRDimBusGlobalDController extends BaseController {
baseParam.setRepair(false); baseParam.setRepair(false);
set.add("pq_typical_source_create_d"); set.add("pq_typical_source_create_d");
set.add("pq_typical_source_create_m"); set.add("pq_typical_source_create_m");
set.add("pq_typical_source_create_y");
baseParam.setDataDate(statisticDate); baseParam.setDataDate(statisticDate);
baseParam.setTagNames(set); baseParam.setTagNames(set);
liteFlowFeignClient.uploadOrgExecutor(baseParam); liteFlowFeignClient.uploadOrgExecutor(baseParam);

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadSubstationStatisticalDataDService.java
View File

@@ -19,12 +19,12 @@ public interface IRUploadSubstationStatisticalDataDService extends IService<RUpl
* 变电站监测统计数据 * 变电站监测统计数据
* @param calculatedParam * @param calculatedParam
*/ */
void insertSubStatisticalDataDay(CalculatedParam<String> calculatedParam); void insertSubStatisticalDataMonth(CalculatedParam<String> calculatedParam);
/** /**
* 变电站监测统计数据-月数据 * 变电站监测统计数据-月数据
* @param calculatedParam * @param calculatedParam
*/ */
void insertSubStatisticalDataMonth(CalculatedParam<String> calculatedParam); void insertSubStatisticalDataYear(CalculatedParam<String> calculatedParam);
} }

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java
View File

@@ -50,7 +50,7 @@ public class RUploadSubstationStatisticalDataDServiceImpl extends MppServiceImpl
private final PmsMidLedgerMapper pmsMidLedgerMapper; private final PmsMidLedgerMapper pmsMidLedgerMapper;
private final CommTerminalGeneralClient commTerminalGeneralClient; private final CommTerminalGeneralClient commTerminalGeneralClient;
@Override @Override
public void insertSubStatisticalDataDay(CalculatedParam<String> calculatedParam) { public void insertSubStatisticalDataMonth(CalculatedParam<String> calculatedParam) {
List<RUploadSubstationStatisticalDataD> result = new ArrayList<>(); List<RUploadSubstationStatisticalDataD> result = new ArrayList<>();
//获取省级单位id //获取省级单位id
Dept data = deptFeignClient.getRootDept().getData(); Dept data = deptFeignClient.getRootDept().getData();
@@ -113,7 +113,7 @@ public class RUploadSubstationStatisticalDataDServiceImpl extends MppServiceImpl
} }
@Override @Override
public void insertSubStatisticalDataMonth(CalculatedParam<String> calculatedParam) { public void insertSubStatisticalDataYear(CalculatedParam<String> calculatedParam) {
//开始月份 //开始月份
String beginMonth = DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_YEAR_PATTERN); String beginMonth = DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_YEAR_PATTERN);
//起始时间 //起始时间