From 209393ad3cf88762a6f6ef9b2734628e2416b293 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 12 Mar 2024 16:09:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/prepare/executor/SubStationExecutor.java | 8 ++++---- .../controller/dim/IRDimBusGlobalDController.java | 7 +++++-- .../upload/IRUploadSubstationStatisticalDataDService.java | 4 ++-- .../RUploadSubstationStatisticalDataDServiceImpl.java | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java index ab8dd0d5e..f86e08f87 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java @@ -141,14 +141,14 @@ public class SubStationExecutor extends BaseExecutor{ public void rUploadSubStatisticalDataProcess(NodeComponent bindCmp) { String tag = bindCmp.getTag(); CalculatedParam 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()); - } else if (tag.equalsIgnoreCase("r_upload_substation_statistical_data_m")) { + rUploadSubstationStatisticalDataDService.insertSubStatisticalDataMonth(bindCmp.getRequestData()); + } else if (tag.equalsIgnoreCase("r_upload_substation_statistical_data_y")) { //数据补招不执行非日表算法 if (!calculatedParam.isRepair()) { //年算法 - rUploadSubstationStatisticalDataDService.insertSubStatisticalDataMonth(bindCmp.getRequestData()); + rUploadSubstationStatisticalDataDService.insertSubStatisticalDataYear(bindCmp.getRequestData()); } } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java index d0bda3fb2..8e8aed88e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java @@ -159,8 +159,8 @@ public class IRDimBusGlobalDController extends BaseController { baseParam.setRepair(false); 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_y"); baseParam.setTagNames(set); liteFlowFeignClient.substationExecutor(baseParam); }else if("0".equals(type)){ @@ -170,6 +170,7 @@ public class IRDimBusGlobalDController extends BaseController { baseParam.setRepair(false); set.add("r_upload_evaluation_data_d"); set.add("r_upload_evaluation_data_m"); + set.add("r_upload_evaluation_data_y"); baseParam.setDataDate(statisticDate); baseParam.setTagNames(set); liteFlowFeignClient.uploadOrgExecutor(baseParam); @@ -180,6 +181,7 @@ public class IRDimBusGlobalDController extends BaseController { baseParam.setRepair(false); set.add("r_upload_point_statistical_data_d"); set.add("r_upload_point_statistical_data_m"); + set.add("r_upload_point_statistical_data_y"); baseParam.setDataDate(statisticDate); baseParam.setTagNames(set); liteFlowFeignClient.uploadOrgExecutor(baseParam); @@ -188,8 +190,8 @@ public class IRDimBusGlobalDController extends BaseController { BaseParam baseParam = new BaseParam(); baseParam.setFullChain(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_y"); baseParam.setDataDate(statisticDate); baseParam.setTagNames(set); liteFlowFeignClient.substationExecutor(baseParam); @@ -200,6 +202,7 @@ public class IRDimBusGlobalDController extends BaseController { baseParam.setRepair(false); set.add("pq_typical_source_create_d"); set.add("pq_typical_source_create_m"); + set.add("pq_typical_source_create_y"); baseParam.setDataDate(statisticDate); baseParam.setTagNames(set); liteFlowFeignClient.uploadOrgExecutor(baseParam); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadSubstationStatisticalDataDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadSubstationStatisticalDataDService.java index 908438073..67d2f72eb 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadSubstationStatisticalDataDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadSubstationStatisticalDataDService.java @@ -19,12 +19,12 @@ public interface IRUploadSubstationStatisticalDataDService extends IService calculatedParam); + void insertSubStatisticalDataMonth(CalculatedParam calculatedParam); /** * 变电站监测统计数据-月数据 * @param calculatedParam */ - void insertSubStatisticalDataMonth(CalculatedParam calculatedParam); + void insertSubStatisticalDataYear(CalculatedParam calculatedParam); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java index cb4699a56..cffc53990 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadSubstationStatisticalDataDServiceImpl.java @@ -50,7 +50,7 @@ public class RUploadSubstationStatisticalDataDServiceImpl extends MppServiceImpl private final PmsMidLedgerMapper pmsMidLedgerMapper; private final CommTerminalGeneralClient commTerminalGeneralClient; @Override - public void insertSubStatisticalDataDay(CalculatedParam calculatedParam) { + public void insertSubStatisticalDataMonth(CalculatedParam calculatedParam) { List result = new ArrayList<>(); //获取省级单位id Dept data = deptFeignClient.getRootDept().getData(); @@ -113,7 +113,7 @@ public class RUploadSubstationStatisticalDataDServiceImpl extends MppServiceImpl } @Override - public void insertSubStatisticalDataMonth(CalculatedParam calculatedParam) { + public void insertSubStatisticalDataYear(CalculatedParam calculatedParam) { //开始月份 String beginMonth = DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_YEAR_PATTERN); //起始时间