From b3f553c450da24f3ac8fa1623a4b019ae030ecd2 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 23 Oct 2024 14:24:09 +0800 Subject: [PATCH] =?UTF-8?q?1.pms=E4=B8=BB=E7=BD=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prepare/executor/OrgPointExecutor.java | 34 ++++ .../mapper/mysql/line/LimitRateMapper.java | 18 -- .../upload/RUploadMainMonitorDataMapper.java | 17 ++ .../IRUploadMainMonitorDataService.java | 23 +++ .../RUploadMainMonitorDataServiceImpl.java | 176 ++++++++++++++++++ .../service/impl/SupvPlanServiceImpl.java | 2 +- .../com/njcn/system/enums/DicDataEnum.java | 5 + .../com/njcn/system/enums/DicTreeEnum.java | 11 ++ .../tasks/PqTypicalSourceTaskRunner.java | 8 +- .../tasks/UploadGwTaskSubstationRunner.java | 1 - .../hbPushGw/UploadGwCommPointRunner.java | 32 ++++ .../hbPushGw/UploadGwMainMonitorRunner.java | 32 ++++ 12 files changed, 332 insertions(+), 27 deletions(-) delete mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRateMapper.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadMainMonitorDataMapper.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadMainMonitorDataService.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadMainMonitorDataServiceImpl.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwCommPointRunner.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwMainMonitorRunner.java diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java index 239d70a56..4b4873a51 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java @@ -16,6 +16,7 @@ import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadCommPointBusServic import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadEvaluationDataDService; import com.njcn.prepare.harmonic.service.mysql.send.ConverterIndexStatisticsPOService; import com.njcn.prepare.harmonic.service.mysql.send.PqTypicalSourceCreatePOService; +import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadMainMonitorDataService; import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadPointStatisticalDataDService; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; @@ -75,6 +76,8 @@ public class OrgPointExecutor extends BaseExecutor{ private final IRUploadEvaluationDataDService irUploadEvaluationDataDService; private final IRUploadCommPointBusService irUploadCommPointBusService; + + private final IRUploadMainMonitorDataService irUploadMainMonitorDataService; /** * * 3.3.2. 单位标数据质量 @@ -712,6 +715,11 @@ public class OrgPointExecutor extends BaseExecutor{ } } + /** + * 河北国网上送接口 + * 22.4.1.38接收电能质量公共连接点监测数据统计数据接口 + * xuyang + */ @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rUploadCommPoint", nodeType = NodeTypeEnum.COMMON) public boolean rUploadCommPointAccess(NodeComponent bindCmp) { return isAccess(bindCmp); @@ -732,4 +740,30 @@ public class OrgPointExecutor extends BaseExecutor{ } } + + /** + * 河北国网上送接口 + * 22.4.1.38接收电能质量公共连接点监测数据统计数据接口 + * xuyang + */ + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rUploadMainMonitor", nodeType = NodeTypeEnum.COMMON) + public boolean rUploadMainMonitorAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rUploadMainMonitor", nodeType = NodeTypeEnum.COMMON) + public void rUploadMainMonitorProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); + CalculatedParam calculatedParam = bindCmp.getRequestData(); + if (tag.equalsIgnoreCase("r_upload_main_monitor_data_d")) { + //日表 + irUploadMainMonitorDataService.handlerDay(calculatedParam.getDataDate()); + } else if (tag.equalsIgnoreCase("r_upload_main_monitor_data_m")) { + //月表 + irUploadMainMonitorDataService.handlerMonth(calculatedParam.getDataDate()); + } else if (tag.equalsIgnoreCase("r_upload_main_monitor_data_y")) { + //月表 + irUploadMainMonitorDataService.handlerYear(calculatedParam.getDataDate()); + } + } + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRateMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRateMapper.java deleted file mode 100644 index 1fda68624..000000000 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRateMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -//package com.njcn.prepare.harmonic.mapper.mysql.line; -// -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -//import com.njcn.process.pojo.po.LimitRate; -//import org.apache.ibatis.annotations.Mapper; -// -///** -// *

-// * Mapper 接口 -// *

-// * -// * @author lxp -// * @since 2023-03-16 -// */ -//@Mapper -//public interface LimitRateMapper extends BaseMapper { -// -//} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadMainMonitorDataMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadMainMonitorDataMapper.java new file mode 100644 index 000000000..edfb77a40 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadMainMonitorDataMapper.java @@ -0,0 +1,17 @@ +package com.njcn.prepare.harmonic.mapper.mysql.upload; + + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData; + +/** + *

+ * 2.4.1.23接收电能质量主网监测点统计数据接口功能表（日月年数据） Mapper 接口 + *

+ * + * @author cdf + * @since 2024-10-21 + */ +public interface RUploadMainMonitorDataMapper extends MppBaseMapper { + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadMainMonitorDataService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadMainMonitorDataService.java new file mode 100644 index 000000000..25513eab2 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadMainMonitorDataService.java @@ -0,0 +1,23 @@ +package com.njcn.prepare.harmonic.service.mysql.upload; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData; + +/** + *

+ * 公共连接点母线电能质量统计 服务类 + *

+ */ +public interface IRUploadMainMonitorDataService extends IService { + + + void handlerDay(String date); + + + void handlerMonth(String date); + + + void handlerYear(String date); + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadMainMonitorDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadMainMonitorDataServiceImpl.java new file mode 100644 index 000000000..2dec5db40 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadMainMonitorDataServiceImpl.java @@ -0,0 +1,176 @@ +package com.njcn.prepare.harmonic.service.mysql.upload.impl; + + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.device.pms.api.MonitorClient; +import com.njcn.device.pms.pojo.param.MonitorParam; +import com.njcn.device.pms.pojo.po.*; +import com.njcn.device.pq.pojo.po.RStatIntegrityD; +import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper; +import com.njcn.prepare.harmonic.mapper.mysql.upload.RUploadMainMonitorDataMapper; +import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadMainMonitorDataService; +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 lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + *

+ * 公共连接点母线电能质量统计 服务实现类 + *

+ */ +@Service +@RequiredArgsConstructor +@Slf4j +public class RUploadMainMonitorDataServiceImpl extends MppServiceImpl implements IRUploadMainMonitorDataService { + + private final MonitorClient monitorClient; + + private final DicDataFeignClient dicDataFeignClient; + + private final RStatIntegrityDMapper rStatIntegrityDMapper; + + + + + + + @Override + public void handlerDay(String date){ + + LocalDate staDate = LocalDate.parse(date, DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)); + + MonitorParam monitorParam = new MonitorParam(); + monitorParam.setIsUpToGrid(DataStateEnum.ENABLE.getCode()); + + DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.RUN.getCode(),DicDataTypeEnum.LINE_STATE.getCode()).getData(); + monitorParam.setMonitorState(dictData.getId()); + List monitorList = monitorClient.getMonitorListByParam(monitorParam).getData(); + List monitorIds = monitorList.stream().map(Monitor::getId).distinct().collect(Collectors.toList()); + + LambdaQueryWrapper integrityDLambda = new LambdaQueryWrapper<>(); + integrityDLambda.in(RStatIntegrityD::getLineIndex,monitorIds).eq(RStatIntegrityD::getTimeId,staDate); + List rStatIntegrityDList = rStatIntegrityDMapper.selectList(integrityDLambda); + Map inteMap = rStatIntegrityDList.stream().collect(Collectors.toMap(RStatIntegrityD::getLineIndex,Function.identity())); + + List poList = new ArrayList<>(); + for(Monitor item : monitorList){ + + RUploadMainMonitorData rUploadMainMonitorData = new RUploadMainMonitorData(); + rUploadMainMonitorData.setMonitorId(item.getMonitorId()); + rUploadMainMonitorData.setComputeDate(staDate); + rUploadMainMonitorData.setObjId(IdUtil.simpleUUID()); + rUploadMainMonitorData.setStatisticalType(DicDataEnum.STATISTICAL_TYPE_D.getCode()); + rUploadMainMonitorData.setStatisticalDate(date); + rUploadMainMonitorData.setUploadStatus(0); + if(inteMap.containsKey(item.getId())){ + RStatIntegrityD rStatIntegrityD = inteMap.get(item.getId()); + if(rStatIntegrityD.getRealTime()>0){ + rUploadMainMonitorData.setIsMonitorOnline(DicDataEnum.YES.getCode()); + rUploadMainMonitorData.setIsTerminalOnline(DicDataEnum.YES.getCode()); + rUploadMainMonitorData.setOnlineMonitorNum(1); + rUploadMainMonitorData.setRunMonitorNum(1); + BigDecimal rate = BigDecimal.valueOf((double)rStatIntegrityD.getRealTime()/rStatIntegrityD.getDueTime()).setScale(2, RoundingMode.HALF_UP); + rUploadMainMonitorData.setOnlineMonitorRate(rate); + rUploadMainMonitorData.setExpectCollectNum((long)rStatIntegrityD.getDueTime()); + rUploadMainMonitorData.setActualCollectNum((long)rStatIntegrityD.getRealTime()); + rUploadMainMonitorData.setDataFullRate(rate); + }else { + assLessEntity(rUploadMainMonitorData); + } + }else { + assLessEntity(rUploadMainMonitorData); + } + poList.add(rUploadMainMonitorData); + } + + if(CollUtil.isNotEmpty(poList)){ + this.saveOrUpdateBatchByMultiId(poList); + } + } + + + public void handlerMonth(String date){ + String begin = DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(date,DatePattern.NORM_DATE_PATTERN)),DatePattern.NORM_DATE_PATTERN); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("monitor_id,max(is_Monitor_Online) is_Monitor_Online,max(is_Terminal_Online) is_Terminal_Online,max(online_Monitor_Num) online_Monitor_Num,max(run_Monitor_Num) run_Monitor_Num,avg(online_Monitor_Rate) online_Monitor_Rate,sum(expect_Collect_Num) expect_Collect_Num,sum(actual_Collect_Num) actual_Collect_Num,avg(data_Full_Rate) data_Full_Rate") + .eq("statistical_type",DicDataEnum.STATISTICAL_TYPE_D.getCode()) + .between("statistical_date",begin,date).groupBy("monitor_id"); + List rUploadMainMonitorDataList = this.list(queryWrapper); + if(CollUtil.isNotEmpty(rUploadMainMonitorDataList)){ + for(RUploadMainMonitorData item : rUploadMainMonitorDataList){ + item.setStatisticalType(DicDataEnum.STATISTICAL_TYPE_M.getCode()); + item.setUploadStatus(0); + item.setObjId(IdUtil.simpleUUID()); + item.setStatisticalDate(date.substring(0,7)); + item.setComputeDate(LocalDate.parse(date,DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + } + if(CollUtil.isNotEmpty(rUploadMainMonitorDataList)){ + this.saveOrUpdateBatchByMultiId(rUploadMainMonitorDataList); + } + } + } + + + public void handlerYear(String date){ + String begin = DateUtil.format(DateUtil.beginOfYear(DateUtil.parse(date,DatePattern.NORM_DATE_PATTERN)),DatePattern.NORM_DATE_PATTERN); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("monitor_id,max(is_Monitor_Online) is_Monitor_Online,max(is_Terminal_Online) is_Terminal_Online,max(online_Monitor_Num) online_Monitor_Num,max(run_Monitor_Num) run_Monitor_Num,avg(online_Monitor_Rate) online_Monitor_Rate,sum(expect_Collect_Num) expect_Collect_Num,sum(actual_Collect_Num) actual_Collect_Num,avg(data_Full_Rate) data_Full_Rate") + .eq("statistical_type",DicDataEnum.STATISTICAL_TYPE_M.getCode()) + .between("statistical_date",begin,date).groupBy("monitor_id"); + List rUploadMainMonitorDataList = this.list(queryWrapper); + if(CollUtil.isNotEmpty(rUploadMainMonitorDataList)){ + for(RUploadMainMonitorData item : rUploadMainMonitorDataList){ + item.setStatisticalType(DicDataEnum.STATISTICAL_TYPE_Y.getCode()); + item.setUploadStatus(0); + item.setObjId(IdUtil.simpleUUID()); + item.setStatisticalDate(date.substring(0,4)); + item.setComputeDate(LocalDate.parse(date,DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + } + if(CollUtil.isNotEmpty(rUploadMainMonitorDataList)){ + this.saveOrUpdateBatchByMultiId(rUploadMainMonitorDataList); + } + } + } + + + + private void assLessEntity(RUploadMainMonitorData rUploadMainMonitorData){ + rUploadMainMonitorData.setIsMonitorOnline(DicDataEnum.NO.getCode()); + rUploadMainMonitorData.setIsTerminalOnline(DicDataEnum.NO.getCode()); + rUploadMainMonitorData.setOnlineMonitorNum(0); + rUploadMainMonitorData.setRunMonitorNum(0); + rUploadMainMonitorData.setOnlineMonitorRate(BigDecimal.ZERO); + rUploadMainMonitorData.setExpectCollectNum((long)0); + rUploadMainMonitorData.setActualCollectNum((long)0); + rUploadMainMonitorData.setDataFullRate(BigDecimal.ZERO); + } + + + + + + + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java index b6e78a75b..172a8a849 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java @@ -170,7 +170,7 @@ public class SupvPlanServiceImpl extends ServiceImpl i } } - if(!byId.getSupvType().equals(supvPlanParam.getSupvType())){ + if(StrUtil.isBlank(supvPlanParam.getSupvObjId()) || !byId.getSupvType().equals(supvPlanParam.getSupvType())){ supvPlan.setSupvObjId(IdUtil.simpleUUID()); } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index 5a718b8af..6b84e71b9 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -624,6 +624,11 @@ public enum DicDataEnum { WORK_ORDER_STATUS_ING("处理中","02"), WORK_ORDER_STATUS_HAS("已上报","03"), WORK_ORDER_STATUS_CLOSE("已闭环","04"), + + + YES("是","1"), + NO("否","0") + ; private final String name; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java index a3d5eab28..b3c861ef4 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java @@ -10,6 +10,13 @@ import lombok.Getter; */ @Getter public enum DicTreeEnum { + + /** + * 树结构字典类型 + */ + HB_PMS_TYPE("河北pms对象类型","0"), + REPORT_UNIT_TYPE("自定义报表单位指标","1"), + /** * 字典树 */ @@ -118,6 +125,10 @@ public enum DicTreeEnum { + + + + ; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java index 39a40dc10..9cf7c6f00 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java @@ -2,10 +2,7 @@ package com.njcn.system.timer.tasks; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; -import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.api.PqTypicalSourceFeignClient; -import com.njcn.harmonic.api.UploadGwDataFeignClient; -import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.system.timer.TimerTaskRunner; import lombok.RequiredArgsConstructor; @@ -22,7 +19,6 @@ public class PqTypicalSourceTaskRunner implements TimerTaskRunner { private final PqTypicalSourceFeignClient pqTypicalSourceFeignClient; - private final UploadGwDataFeignClient uploadGwDataFeignClient; @Override @@ -32,9 +28,7 @@ public class PqTypicalSourceTaskRunner implements TimerTaskRunner { param.setTime(dateDeal); pqTypicalSourceFeignClient.send(param).getCode(); - UploadDataParam uploadDataParam = new UploadDataParam(); - uploadDataParam.setSearchBeginTime(dateDeal); - uploadGwDataFeignClient.upGwCommPoint(uploadDataParam); + } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java index 02b1131e4..8960e5ddb 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java @@ -2,7 +2,6 @@ package com.njcn.system.timer.tasks; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; -import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.api.UploadGwDataFeignClient; import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.system.timer.TimerTaskRunner; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwCommPointRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwCommPointRunner.java new file mode 100644 index 000000000..feb09fd55 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwCommPointRunner.java @@ -0,0 +1,32 @@ +package com.njcn.system.timer.tasks.hbPushGw; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.njcn.harmonic.api.UploadGwDataFeignClient; +import com.njcn.harmonic.pojo.param.UploadDataParam; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 用于pms往国网推送公共连接点数据定时任务 + */ +@Component +@RequiredArgsConstructor +public class UploadGwCommPointRunner implements TimerTaskRunner { + + private final UploadGwDataFeignClient uploadGwDataFeignClient; + + @Override + public void action(String date) { + UploadDataParam uploadDataParam = new UploadDataParam(); + if(StrUtil.isBlank(date)){ + String dateDeal = DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN); + uploadDataParam.setSearchBeginTime(dateDeal); + }else { + uploadDataParam.setSearchBeginTime(date); + } + uploadGwDataFeignClient.upGwCommPoint(uploadDataParam); + } +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwMainMonitorRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwMainMonitorRunner.java new file mode 100644 index 000000000..ab57f8ce4 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwMainMonitorRunner.java @@ -0,0 +1,32 @@ +package com.njcn.system.timer.tasks.hbPushGw; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.njcn.harmonic.api.UploadGwDataFeignClient; +import com.njcn.harmonic.pojo.param.UploadDataParam; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 用于pms往国网推送公共连接点数据定时任务 + */ +@Component +@RequiredArgsConstructor +public class UploadGwMainMonitorRunner implements TimerTaskRunner { + + private final UploadGwDataFeignClient uploadGwDataFeignClient; + + @Override + public void action(String date) { + UploadDataParam uploadDataParam = new UploadDataParam(); + if(StrUtil.isBlank(date)){ + String dateDeal = DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN); + uploadDataParam.setSearchBeginTime(dateDeal); + }else { + uploadDataParam.setSearchBeginTime(date); + } + uploadGwDataFeignClient.upGwMainMonitor(uploadDataParam); + } +}