diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java index 2706430c0..8eca3eeb5 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java @@ -205,8 +205,7 @@ public interface CommTerminalGeneralClient { HttpResult> tagOrIdGetSub(@RequestBody SubstationParam substationParam); - @GetMapping("/runLedgerStatistic") - HttpResult runLedgerStatistic(@RequestParam("date")String date); + /** diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java index 37051d682..655c8e9d8 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java @@ -169,11 +169,6 @@ public class CommTerminalGeneralClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } - @Override - public HttpResult runLedgerStatistic(String date) { - log.error("{}异常，降级处理，异常为：{}", "统计每日运行测点装置详细信息", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } @Override public HttpResult isPqOrPms() { diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java index 9ca95d358..0794ea848 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java @@ -17,7 +17,6 @@ import com.njcn.device.biz.pojo.po.PqsDeviceUnit; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.pojo.po.PmsTerminal; import com.njcn.device.pms.service.ledgerManger.CommTerminalService; -import com.njcn.device.pms.service.ledgerManger.IPmsRunStatisticService; import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; import com.njcn.device.pms.service.majornetwork.IMonitorService; import com.njcn.device.pms.service.majornetwork.ITerminalService; @@ -57,7 +56,6 @@ public class CommTerminalController extends BaseController { private final ITerminalService terminalService; - private final IPmsRunStatisticService iPmsRunStatisticService; /** * 通过部门获取所有子集部门所拥有的监测点 @@ -435,19 +433,7 @@ public class CommTerminalController extends BaseController { } - /** - * 统计每日运行测点装置详细信息 - * @author cdf - * @date 2024/4/17 - */ - @GetMapping("runLedgerStatistic") - @ApiOperation("统计每日运行测点装置详细信息") - @ApiIgnore - public HttpResult runLedgerStatistic(@RequestParam("date") String date) { - String methodDescribe = getMethodDescribe("runLedgerStatistic"); - iPmsRunStatisticService.statisticLedgerRunDay(date); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); - } + diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/upload/DimBusGlobalFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/upload/DimBusGlobalFeignClient.java new file mode 100644 index 000000000..c6cf9c6b7 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/upload/DimBusGlobalFeignClient.java @@ -0,0 +1,23 @@ +package com.njcn.prepare.harmonic.api.upload; + + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.upload.fallback.DimBusGlobalFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +@FeignClient( + value = ServerInfo.PREPARE_BOOT,//对应模块名 + path = "/dimGlobal",//对应controller请求类 + fallbackFactory = DimBusGlobalFeignClientFallbackFactory.class//服务降级处理类 +) +public interface DimBusGlobalFeignClient { + + @GetMapping("/runLedgerStatistic") + void runLedgerStatistic (@RequestParam("date")String date); +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/upload/fallback/DimBusGlobalFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/upload/fallback/DimBusGlobalFeignClientFallbackFactory.java new file mode 100644 index 000000000..5e3f5b8d8 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/upload/fallback/DimBusGlobalFeignClientFallbackFactory.java @@ -0,0 +1,35 @@ +package com.njcn.prepare.harmonic.api.upload.fallback; + +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.upload.DimBusGlobalFeignClient; +import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam; +import com.njcn.prepare.harmonic.utils.PrepareEnumUtil; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +@Slf4j +@Component +public class DimBusGlobalFeignClientFallbackFactory implements FallbackFactory { + @Override + public DimBusGlobalFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = PrepareEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new DimBusGlobalFeignClient() { + @Override + public void runLedgerStatistic(@RequestParam("date")String date) { + log.error("{}异常，降级处理，异常为：{}", "统计周期台账运行详细信息: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticD.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticD.java similarity index 89% rename from pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticD.java rename to pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticD.java index 4e994111f..6e3e76181 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticD.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticD.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.pojo.po; +package com.njcn.prepare.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -51,13 +51,7 @@ public class PmsRunStatisticD { private String onlineStationIds; - private String typicalTractionIds; - - private String typicalWindIds; - - private String typicalSunIds; - - private String typicalOtherIds; + private String typicalOnlineIds; /** * 创建时间 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticM.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java similarity index 86% rename from pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticM.java rename to pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java index fc83a084a..de14fb349 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticM.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.pojo.po; +package com.njcn.prepare.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -20,7 +20,7 @@ import java.time.LocalDateTime; * @author cdf * @date 2024/4/17 */ -@TableName(value = "pms_run_statistic_d") +@TableName(value = "pms_run_statistic_m") @Data public class PmsRunStatisticM { @@ -51,13 +51,7 @@ public class PmsRunStatisticM { private String onlineStationIds; - private String typicalTractionIds; - - private String typicalWindIds; - - private String typicalSunIds; - - private String typicalOtherIds; + private String typicalOnlineIds; /** * 创建时间 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticY.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java similarity index 86% rename from pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticY.java rename to pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java index 7fc90a5c6..6658b91df 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticY.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.pojo.po; +package com.njcn.prepare.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -20,7 +20,7 @@ import java.time.LocalDateTime; * @author cdf * @date 2024/4/17 */ -@TableName(value = "pms_run_statistic_d") +@TableName(value = "pms_run_statistic_y") @Data public class PmsRunStatisticY { @@ -51,13 +51,7 @@ public class PmsRunStatisticY { private String onlineStationIds; - private String typicalTractionIds; - - private String typicalWindIds; - - private String typicalSunIds; - - private String typicalOtherIds; + private String typicalOnlineIds; /** * 创建时间 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 8f15b789f..384ed1b77 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 @@ -3,6 +3,7 @@ package com.njcn.prepare.harmonic.controller.dim; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.TimeInterval; import cn.hutool.core.util.StrUtil; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; @@ -21,6 +22,9 @@ import com.njcn.prepare.harmonic.pojo.bo.BaseParam; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam; import com.njcn.prepare.harmonic.service.mysql.dim.*; +import com.njcn.prepare.harmonic.service.mysql.upload.IPmsRunStatisticMService; +import com.njcn.prepare.harmonic.service.mysql.upload.IPmsRunStatisticService; +import com.njcn.prepare.harmonic.service.mysql.upload.IPmsRunStatisticYService; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import com.njcn.web.controller.BaseController; @@ -30,8 +34,10 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Async; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.time.LocalDate; import java.util.*; @@ -70,6 +76,13 @@ public class IRDimBusGlobalDController extends BaseController { private final LiteFlowFeignClient liteFlowFeignClient; + + private final IPmsRunStatisticService iPmsRunStatisticService; + + private final IPmsRunStatisticMService iPmsRunStatisticMService; + + private final IPmsRunStatisticYService iPmsRunStatisticYService; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/dayDimGlobal") @ApiOperation("母线变电站每日运行情况统计") @@ -265,4 +278,24 @@ public class IRDimBusGlobalDController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + + /** + * 统计每日运行测点装置详细信息 + * @author cdf + * @date 2024/4/17 + */ + @GetMapping("runLedgerStatistic") + @ApiOperation("统计每日运行测点装置详细信息") + @Async("asyncExecutor") + public void runLedgerStatistic(@RequestParam("date") String date) { + TimeInterval timeInterval = new TimeInterval(); + iPmsRunStatisticService.statisticLedgerRunDay(date); + + iPmsRunStatisticMService.statisticLedgerRunMonth(date); + + iPmsRunStatisticYService.statisticLedgerRunYear(date); + + System.out.println(timeInterval.intervalSecond()); + } + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/PmsRunStatisticMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/PmsRunStatisticMapper.java index 931715c56..32b0dc36a 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/PmsRunStatisticMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/PmsRunStatisticMapper.java @@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.device.pms.pojo.po.PmsRunStatisticD; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; /** *

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticDMapper.java similarity index 66% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticDMapper.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticDMapper.java index e86ac8e80..68bdfa95a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticDMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticDMapper.java @@ -1,9 +1,9 @@ -package com.njcn.device.pms.mapper.majornetwork; +package com.njcn.prepare.harmonic.mapper.mysql.upload; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.device.pms.pojo.po.PmsRunStatisticD; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; /** *

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticMMapper.java similarity index 59% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMMapper.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticMMapper.java index 1602fb803..629069feb 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticMMapper.java @@ -1,10 +1,9 @@ -package com.njcn.device.pms.mapper.majornetwork; +package com.njcn.prepare.harmonic.mapper.mysql.upload; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.device.pms.pojo.po.PmsRunStatisticD; -import com.njcn.device.pms.pojo.po.PmsRunStatisticM; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticM; /** *

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticYMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticYMapper.java similarity index 59% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticYMapper.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticYMapper.java index fcc80b6f2..acd7b76e5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticYMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticYMapper.java @@ -1,10 +1,9 @@ -package com.njcn.device.pms.mapper.majornetwork; +package com.njcn.prepare.harmonic.mapper.mysql.upload; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.device.pms.pojo.po.PmsRunStatisticD; -import com.njcn.device.pms.pojo.po.PmsRunStatisticY; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticY; /** *

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsStatationStatMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsStatationStatMapper.java new file mode 100644 index 000000000..394a3c73c --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsStatationStatMapper.java @@ -0,0 +1,28 @@ +package com.njcn.prepare.harmonic.mapper.mysql.upload; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.device.biz.pojo.dto.SubGetBase; +import com.njcn.device.biz.pojo.param.SubstationParam; +import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; +import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; +import com.njcn.device.pms.pojo.param.TerminalQueryParam; +import com.njcn.device.pms.pojo.po.StatationStat; +import com.njcn.device.pms.pojo.vo.StatationStatVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author hongawen + * @since 2022-10-14 + */ +public interface PmsStatationStatMapper extends BaseMapper { + + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticMService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticMService.java new file mode 100644 index 000000000..5575c4b13 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticMService.java @@ -0,0 +1,29 @@ +package com.njcn.prepare.harmonic.service.mysql.upload; + + +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticM; + +/** + *

+ * 服务类 + *

+ * + * @author cdf + * @since 2024-04-17 + */ +public interface IPmsRunStatisticMService extends IMppService { + + + + /** + * 每日统计每月 + * @author cdf + * @date 2024/4/17 + */ + void statisticLedgerRunMonth(String date); + + + + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/IPmsRunStatisticService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticService.java similarity index 52% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/IPmsRunStatisticService.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticService.java index e4ae169da..98adbb1a8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/IPmsRunStatisticService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticService.java @@ -1,8 +1,8 @@ -package com.njcn.device.pms.service.ledgerManger; +package com.njcn.prepare.harmonic.service.mysql.upload; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.device.pms.pojo.po.PmsRunStatisticD; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; /** *

@@ -22,19 +22,5 @@ public interface IPmsRunStatisticService extends IMppService { void statisticLedgerRunDay(String date); - /** - * 每日统计每月 - * @author cdf - * @date 2024/4/17 - */ - void statisticLedgerRunMonth(String date); - - - /** - * 每日统计每年 - * @author cdf - * @date 2024/4/17 - */ - void statisticLedgerRunYear(String date); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticYService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticYService.java new file mode 100644 index 000000000..2aa74d42a --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticYService.java @@ -0,0 +1,27 @@ +package com.njcn.prepare.harmonic.service.mysql.upload; + + +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticY; + +/** + *

+ * 服务类 + *

+ * + * @author cdf + * @since 2024-04-17 + */ +public interface IPmsRunStatisticYService extends IMppService { + + + + + /** + * 每日统计每年 + * @author cdf + * @date 2024/4/17 + */ + void statisticLedgerRunYear(String date); + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java new file mode 100644 index 000000000..0c5b9857f --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java @@ -0,0 +1,102 @@ +package com.njcn.prepare.harmonic.service.mysql.upload.impl; + + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; + +import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticDMapper; +import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticMMapper; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticM; +import com.njcn.prepare.harmonic.service.mysql.upload.IPmsRunStatisticMService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * 服务实现类 + *

+ * + * @author cdf + * @since 2024-04-17 + */ +@Service +@RequiredArgsConstructor +public class PmsRunStatisticMServiceImpl extends MppServiceImpl implements IPmsRunStatisticMService { + + private final PmsRunStatisticDMapper pmsRunStatisticDMapper; + + + @Override + public void statisticLedgerRunMonth(String date) { + List poList = new ArrayList<>(); + DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(date)); + DateTime end = DateUtil.endOfMonth(DateUtil.parse(date)); + + ZoneId zoneId = ZoneId.systemDefault(); + LocalDate localDate = begin.toInstant().atZone(zoneId).toLocalDate(); + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.between(PmsRunStatisticD::getStatisticDate,begin,end); + List pmsRunStatisticDList = pmsRunStatisticDMapper.selectList(lambdaQueryWrapper); + Map> map = pmsRunStatisticDList.stream().collect(Collectors.groupingBy(PmsRunStatisticD::getDeptId)); + + map.forEach((key,val)->{ + PmsRunStatisticM pmsRunStatisticM = new PmsRunStatisticM(); + pmsRunStatisticM.setDeptId(key); + pmsRunStatisticM.setStatisticDate(localDate); + + Set pointSet = new HashSet<>(); + Set pointOnlineSet = new HashSet<>(); + + Set busSet = new HashSet<>(); + Set stationSet = new HashSet<>(); + + Set typicalSet = new HashSet<>(); + val.forEach(item->{ + if(StrUtil.isNotBlank(item.getRunMonitorIds())){ + pointSet.addAll(Arrays.asList(item.getRunMonitorIds().split(StrUtil.COMMA))); + } + if(StrUtil.isNotBlank(item.getOnlineMonitorIds())){ + pointOnlineSet.addAll(Arrays.asList(item.getOnlineMonitorIds().split(StrUtil.COMMA))); + } + if(StrUtil.isNotBlank(item.getOnlineBusIds())){ + busSet.addAll(Arrays.asList(item.getOnlineBusIds().split(StrUtil.COMMA))); + } + if(StrUtil.isNotBlank(item.getOnlineStationIds())){ + stationSet.addAll(Arrays.asList(item.getOnlineStationIds().split(StrUtil.COMMA))); + } + + if(StrUtil.isNotBlank(item.getTypicalOnlineIds())){ + typicalSet.addAll(Arrays.asList(item.getTypicalOnlineIds().split(StrUtil.COMMA))); + } + }); + pmsRunStatisticM.setRunMonitorIds(String.join(StrUtil.COMMA,pointSet)); + pmsRunStatisticM.setOnlineMonitorIds(String.join(StrUtil.COMMA,pointOnlineSet)); + pmsRunStatisticM.setOnlineBusIds(String.join(StrUtil.COMMA,busSet)); + pmsRunStatisticM.setOnlineStationIds(String.join(StrUtil.COMMA,stationSet)); + + pmsRunStatisticM.setTypicalOnlineIds(String.join(StrUtil.COMMA,typicalSet)); + + //月在运母线，电站数量取日的最大值 + int temBus = val.stream().map(PmsRunStatisticD::getRunBusNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0); + int temStation = val.stream().map(PmsRunStatisticD::getRunStationNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0); + pmsRunStatisticM.setRunBusNum(temBus); + pmsRunStatisticM.setRunStationNum(temStation); + poList.add(pmsRunStatisticM); + + + }); + this.saveOrUpdateBatchByMultiId(poList); + } + + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/PmsRunStatisticServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticServiceImpl.java similarity index 61% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/PmsRunStatisticServiceImpl.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticServiceImpl.java index 20956cb70..ff9a27143 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/PmsRunStatisticServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticServiceImpl.java @@ -1,21 +1,25 @@ -package com.njcn.device.pms.service.ledgerManger.impl; +package com.njcn.prepare.harmonic.service.mysql.upload.impl; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; import com.njcn.device.biz.pojo.param.DeptGetLineParam; -import com.njcn.device.pms.mapper.majornetwork.*; -import com.njcn.device.pms.pojo.po.*; -import com.njcn.device.pms.service.ledgerManger.CommTerminalService; -import com.njcn.device.pms.service.ledgerManger.IPmsRunStatisticService; +import com.njcn.device.pms.pojo.po.Monitor; +import com.njcn.device.pms.pojo.po.PmsMidLedger; +import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pq.pojo.po.RStatIntegrityD; +import com.njcn.prepare.harmonic.mapper.mysql.area.PmsMonitorPOMapper; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper; +import com.njcn.prepare.harmonic.mapper.mysql.dim.PmsMidLedgerMapper; +import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticDMapper; +import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsStatationStatMapper; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; +import com.njcn.prepare.harmonic.service.mysql.upload.IPmsRunStatisticService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient; import com.njcn.system.enums.DicDataEnum; @@ -33,7 +37,6 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import java.util.stream.Stream; /** *

@@ -47,7 +50,7 @@ import java.util.stream.Stream; @RequiredArgsConstructor public class PmsRunStatisticServiceImpl extends MppServiceImpl implements IPmsRunStatisticService { - private final CommTerminalService commTerminalService; + private final DeptFeignClient deptFeignClient; @@ -57,11 +60,18 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl deptGetChildrenMoreDTOList = commTerminalService.deptGetLine(deptGetLineParam); + List deptGetChildrenMoreDTOList = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData(); List poList = new ArrayList<>(); //获取在运母线，在运电站数量 @@ -81,9 +91,9 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl monitorList = monitorMapper.selectList(new LambdaQueryWrapper().eq(Monitor::getMonitorState,dictData.getId()).eq(Monitor::getIsUpToGrid,DataStateEnum.ENABLE.getCode())); + List monitorList = pmsMonitorPOMapper.selectList(new LambdaQueryWrapper().eq(Monitor::getMonitorState,dictData.getId()).eq(Monitor::getIsUpToGrid,DataStateEnum.ENABLE.getCode())); - List statationStatList = statationStatMapper.selectList(new LambdaQueryWrapper().isNotNull(StatationStat::getMidStationId)); + List statationStatList = pmsStatationStatMapper.selectList(new LambdaQueryWrapper().isNotNull(StatationStat::getMidStationId)); //数据完整性 @@ -91,28 +101,13 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl sysdictreepo = dictTreeFeignClient.queryAll().getData(); - List windfarm_user = Stream.of(DicDataEnum.WINDPOWER_STATION.getCode()).collect(Collectors.toList()); - List photovoltaicsit_eusers = Stream.of(DicDataEnum.PHOTOVOLTAIC_POWER_STATION.getCode()).collect(Collectors.toList()); - List tractionstation = Stream.of(DicDataEnum.ELECTRIFIED_RAILWAY.getCode()).collect(Collectors.toList()); - DictTreeVO dictTreeVO = dictTreeFeignClient.queryByCode(DicTreeEnum.Imp_Users.getCode()).getData(); List dictTreeVOList = dictTreeFeignClient.query(dictTreeVO.getId()).getData(); List importUser = dictTreeVOList.stream().map(DictTreeVO::getCode).distinct().collect(Collectors.toList()); importUser.add(dictTreeVO.getCode()); - - List windfarm_user_dict = sysdictreepo.stream().filter(temp -> windfarm_user.contains(temp.getCode())).map(SysDicTreePO::getId).collect(Collectors.toList()); - List photovoltaicsit_eusers_dict = sysdictreepo.stream().filter(temp -> photovoltaicsit_eusers.contains(temp.getCode())).map(SysDicTreePO::getId).collect(Collectors.toList()); - List tractionstation_dict = sysdictreepo.stream().filter(temp -> tractionstation.contains(temp.getCode())).map(SysDicTreePO::getId).collect(Collectors.toList()); List import_dict = sysdictreepo.stream().filter(temp -> importUser.contains(temp.getCode())).map(SysDicTreePO::getId).collect(Collectors.toList()); - List un_other_interferencesource_users_dict = new ArrayList<>(); - un_other_interferencesource_users_dict.addAll(photovoltaicsit_eusers_dict); - un_other_interferencesource_users_dict.addAll(tractionstation_dict); - un_other_interferencesource_users_dict.addAll(windfarm_user_dict); - un_other_interferencesource_users_dict.addAll(import_dict); - - //遍历每个部门 for(DeptGetChildrenMoreDTO dto : deptGetChildrenMoreDTOList){ List childrenDept = dto.getUnitChildrenList(); @@ -142,34 +137,16 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl windPointIds = dto.getLineBaseList().stream().filter(it->windfarm_user_dict.contains(it.getObjType())).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - List sunPointIds = dto.getLineBaseList().stream().filter(it->photovoltaicsit_eusers_dict.contains(it.getObjType())).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - List tractionPointIds = dto.getLineBaseList().stream().filter(it->tractionstation_dict.contains(it.getObjType())).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - List otherPointIds = dto.getLineBaseList().stream().filter(it->!un_other_interferencesource_users_dict.contains(it.getObjType())).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - pmsRunStatisticD.setTypicalWindIds(String.join(StrUtil.COMMA, windPointIds)); - pmsRunStatisticD.setTypicalSunIds(String.join(StrUtil.COMMA, sunPointIds)); - pmsRunStatisticD.setTypicalTractionIds(String.join(StrUtil.COMMA, tractionPointIds)); - pmsRunStatisticD.setTypicalOtherIds(String.join(StrUtil.COMMA, otherPointIds)); + List typicalOnlineIds = dto.getLineBaseList().stream().filter(it->!import_dict.contains(it.getObjType())).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); + pmsRunStatisticD.setTypicalOnlineIds(String.join(StrUtil.COMMA, typicalOnlineIds)); poList.add(pmsRunStatisticD); } - this.saveBatch(poList); + this.saveOrUpdateBatchByMultiId(poList); } - @Override - public void statisticLedgerRunMonth(String date) { - DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(date)); - DateTime end = DateUtil.endOfMonth(DateUtil.parse(date)); - } - - @Override - public void statisticLedgerRunYear(String date) { - - } - - /** * 获取中台母线电站信息 */ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java new file mode 100644 index 000000000..b375ec3aa --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java @@ -0,0 +1,105 @@ +package com.njcn.prepare.harmonic.service.mysql.upload.impl; + + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticMMapper; +import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticYMapper; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticM; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticY; +import com.njcn.prepare.harmonic.service.mysql.upload.IPmsRunStatisticYService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * 服务实现类 + *

+ * + * @author cdf + * @since 2024-04-17 + */ +@Service +@RequiredArgsConstructor +public class PmsRunStatisticYServiceImpl extends MppServiceImpl implements IPmsRunStatisticYService { + + private final PmsRunStatisticMMapper pmsRunStatisticMMapper; + + + + + + @Override + public void statisticLedgerRunYear(String date) { + List poList = new ArrayList<>(); + DateTime begin = DateUtil.beginOfYear(DateUtil.parse(date)); + DateTime end = DateUtil.endOfYear(DateUtil.parse(date)); + + ZoneId zoneId = ZoneId.systemDefault(); + LocalDate localDate = begin.toInstant().atZone(zoneId).toLocalDate(); + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.between(PmsRunStatisticM::getStatisticDate,begin,end); + List pmsRunStatisticDList = pmsRunStatisticMMapper.selectList(lambdaQueryWrapper); + Map> map = pmsRunStatisticDList.stream().collect(Collectors.groupingBy(PmsRunStatisticM::getDeptId)); + + map.forEach((key,val)->{ + PmsRunStatisticY pmsRunStatisticY = new PmsRunStatisticY(); + pmsRunStatisticY.setDeptId(key); + pmsRunStatisticY.setStatisticDate(localDate); + + Set pointSet = new HashSet<>(); + Set pointOnlineSet = new HashSet<>(); + + Set busSet = new HashSet<>(); + Set stationSet = new HashSet<>(); + + Set typicalSet = new HashSet<>(); + val.forEach(item->{ + if(StrUtil.isNotBlank(item.getRunMonitorIds())){ + pointSet.addAll(Arrays.asList(item.getRunMonitorIds().split(StrUtil.COMMA))); + } + if(StrUtil.isNotBlank(item.getOnlineMonitorIds())){ + pointOnlineSet.addAll(Arrays.asList(item.getOnlineMonitorIds().split(StrUtil.COMMA))); + } + if(StrUtil.isNotBlank(item.getOnlineBusIds())){ + busSet.addAll(Arrays.asList(item.getOnlineBusIds().split(StrUtil.COMMA))); + } + if(StrUtil.isNotBlank(item.getOnlineStationIds())){ + stationSet.addAll(Arrays.asList(item.getOnlineStationIds().split(StrUtil.COMMA))); + } + + if(StrUtil.isNotBlank(item.getTypicalOnlineIds())){ + typicalSet.addAll(Arrays.asList(item.getTypicalOnlineIds().split(StrUtil.COMMA))); + } + }); + pmsRunStatisticY.setRunMonitorIds(String.join(StrUtil.COMMA,pointSet)); + pmsRunStatisticY.setOnlineMonitorIds(String.join(StrUtil.COMMA,pointOnlineSet)); + pmsRunStatisticY.setOnlineBusIds(String.join(StrUtil.COMMA,busSet)); + pmsRunStatisticY.setOnlineStationIds(String.join(StrUtil.COMMA,stationSet)); + + pmsRunStatisticY.setTypicalOnlineIds(String.join(StrUtil.COMMA,typicalSet)); + + //月在运母线，电站数量取日的最大值 + int temBus = val.stream().map(PmsRunStatisticM::getRunBusNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0); + int temStation = val.stream().map(PmsRunStatisticM::getRunStationNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0); + pmsRunStatisticY.setRunBusNum(temBus); + pmsRunStatisticY.setRunStationNum(temStation); + poList.add(pmsRunStatisticY); + }); + + + this.saveOrUpdateBatchByMultiId(poList); + + + } + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java index 4e6e4644c..08dd7cca9 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java @@ -12,7 +12,6 @@ import com.njcn.device.biz.commApi.CommLineClient; import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; -import com.njcn.device.pms.pojo.po.PmsRunStatisticD; import com.njcn.device.pq.pojo.po.RStatIntegrityD; import com.njcn.harmonic.pojo.po.upload.RUploadPointStatisticalDataD; import com.njcn.prepare.harmonic.enums.UploadEnum; @@ -20,6 +19,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper; import com.njcn.prepare.harmonic.mapper.mysql.line.PmsRunStatisticMapper; import com.njcn.prepare.harmonic.mapper.mysql.upload.RUploadPointStatisticalDataDMapper; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; +import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadPointStatisticalDataDService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsRunStatisticTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsRunStatisticTaskRunner.java index 1ef8877de..50cca3e34 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsRunStatisticTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PmsRunStatisticTaskRunner.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.njcn.device.biz.commApi.CommTerminalGeneralClient; +import com.njcn.prepare.harmonic.api.upload.DimBusGlobalFeignClient; import com.njcn.system.timer.TimerTaskRunner; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -18,13 +19,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PmsRunStatisticTaskRunner implements TimerTaskRunner { - private final CommTerminalGeneralClient commTerminalGeneralClient; + private final DimBusGlobalFeignClient dimBusGlobalFeignClient; @Override public void action(String date) { if(StrUtil.isBlank(date)){ date = DateUtil.format(DateUtil.yesterday(),DatePattern.NORM_DATE_PATTERN); } - commTerminalGeneralClient.runLedgerStatistic(date); + dimBusGlobalFeignClient.runLedgerStatistic(date); } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java index 5d3a5ec87..8da5353e2 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; /** * pqs - * + * 每日定时统计河北两级贯通接口主网数据，用于后续定时上送国网 * @author cdf * @date 2024/2/22 */