From f4b5786236f3061f208592ca02c7d341b35c6d4f Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Wed, 26 Jul 2023 15:29:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=83=A8=E5=88=86=E7=AE=97=E6=B3=95=E8=B0=83?= =?UTF-8?q?=E5=BA=A6=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0=202.=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/po/RMpPartHarmonicDetailD.java | 8 +- .../pojo/po/RMpSurplusHarmonicDetailD.java | 2 +- .../executor/handler/RMpEventDetailJob.java | 39 ++++ .../handler/RMpMonitorEvaluateJob.java | 38 ++++ .../handler/ROperatingMonitorJob.java | 49 +++++ .../executor/handler/RStatAbnormalJob.java | 39 ++++ .../executor/handler/RStatHarmonicJob.java | 47 ++++ .../njcn/executor/handler/TargetWarnJob.java | 4 +- .../executor/utils/CommonExecutorUtils.java | 8 +- .../RMpEventDetailFeignClient.java | 24 +++ .../RMpMonitorEvaluateFeignClient.java | 23 ++ .../ROperatingMonitorFeignClient.java | 24 +++ .../RStatAbnormalFeignClient.java | 23 ++ .../RStatHarmonicFeignClient.java | 21 ++ ...EventDetailFeignClientFallbackFactory.java | 33 +++ ...torEvaluateFeignClientFallbackFactory.java | 33 +++ ...tingMonitorFeignClientFallbackFactory.java | 38 ++++ ...tatAbnormalFeignClientFallbackFactory.java | 33 +++ ...tatHarmonicFeignClientFallbackFactory.java | 33 +++ .../mysql/day/mapping/RStatDataVDMapper.xml | 136 +++++++----- .../mapping/RMpPartHarmonicDetailDMapper.xml | 202 +++++++++++++++++- .../RMpSurplusHarmonicDetailDMapper.xml | 66 +++++- .../RMpPartHarmonicDetailDServiceImpl.java | 2 + 23 files changed, 857 insertions(+), 68 deletions(-) create mode 100644 pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpEventDetailJob.java create mode 100644 pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpMonitorEvaluateJob.java create mode 100644 pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ROperatingMonitorJob.java create mode 100644 pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RStatAbnormalJob.java create mode 100644 pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RStatHarmonicJob.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RMpEventDetailFeignClient.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RMpMonitorEvaluateFeignClient.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/ROperatingMonitorFeignClient.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RStatAbnormalFeignClient.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RStatHarmonicFeignClient.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RMpEventDetailFeignClientFallbackFactory.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RMpMonitorEvaluateFeignClientFallbackFactory.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/ROperatingMonitorFeignClientFallbackFactory.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RStatAbnormalFeignClientFallbackFactory.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RStatHarmonicFeignClientFallbackFactory.java diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java index 7cfad86a4..b88b58799 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java @@ -93,7 +93,7 @@ public class RMpPartHarmonicDetailD implements Serializable { /** * 谐波电压超标次数 */ - @TableField(value = "v_times", exist = false) + @TableField(value = "v_times") private Integer vTimes; /** @@ -105,7 +105,7 @@ public class RMpPartHarmonicDetailD implements Serializable { /** * 谐波电流超标次数 */ - @TableField(value = "i_times", exist = false) + @TableField(value = "i_times") private Integer iTimes; /** @@ -711,13 +711,13 @@ public class RMpPartHarmonicDetailD implements Serializable { /** * 三相电压不平衡度超标次数 */ - @TableField(value = "unbalance_times", exist = false) + @TableField(value = "unbalance_times") private Integer unbalanceTimes; /** * 负序电流超标次数 */ - @TableField(value = "i_neg_times", exist = false) + @TableField(value = "i_neg_times") private Integer iNegTimes; @TableField(exist = false) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java index 8e8ddd293..ce6ee70e3 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java @@ -51,7 +51,7 @@ public class RMpSurplusHarmonicDetailD implements Serializable { /** * 间谐波电压超标次数 */ - @TableField(value = "inuharm_times", exist = false) + @TableField(value = "inuharm_times") private Integer inuharmTimes; /** diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpEventDetailJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpEventDetailJob.java new file mode 100644 index 000000000..3896e62de --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpEventDetailJob.java @@ -0,0 +1,39 @@ +package com.njcn.executor.handler; + +import com.njcn.common.pojo.constant.BizParamConstant; +import com.njcn.executor.utils.CommonExecutorUtils; +import com.njcn.prepare.harmonic.api.newalgorithm.RMpEventDetailFeignClient; +import com.njcn.prepare.harmonic.api.newalgorithm.RMpMonitorEvaluateFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/7/26 9:30 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class RMpEventDetailJob { + + private final RMpEventDetailFeignClient rMpEventDetailFeignClient; + + @XxlJob("rMpEventDetailDay") + public void rMpEventDetailDay(){ + log.info(LocalDateTime.now()+"监测点暂态指标处理调度开始------------------------"); + LineParam lineParam = new LineParam(); + lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataSource(2); + rMpEventDetailFeignClient.eventdetailHandler(lineParam); + } + +} diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpMonitorEvaluateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpMonitorEvaluateJob.java new file mode 100644 index 000000000..e275c5387 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpMonitorEvaluateJob.java @@ -0,0 +1,38 @@ +package com.njcn.executor.handler; + +import com.njcn.common.pojo.constant.BizParamConstant; +import com.njcn.executor.utils.CommonExecutorUtils; +import com.njcn.prepare.harmonic.api.newalgorithm.RMpMonitorEvaluateFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/7/26 9:30 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class RMpMonitorEvaluateJob { + + private final RMpMonitorEvaluateFeignClient rMpMonitorEvaluateFeignClient; + + @XxlJob("rMpMonitorEvaluate") + public void rMpMonitorEvaluate(){ + log.info(LocalDateTime.now()+"监测点评价_日统计调度开始------------------------"); + LineParam lineParam = new LineParam(); + lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataSource(2); + rMpMonitorEvaluateFeignClient.handlerMonitorEvaluate(lineParam); + } + +} diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ROperatingMonitorJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ROperatingMonitorJob.java new file mode 100644 index 000000000..e22894a95 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ROperatingMonitorJob.java @@ -0,0 +1,49 @@ +package com.njcn.executor.handler; + +import com.njcn.common.pojo.constant.BizParamConstant; +import com.njcn.common.utils.PubUtils; +import com.njcn.executor.utils.CommonExecutorUtils; +import com.njcn.prepare.harmonic.api.newalgorithm.ROperatingMonitorFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/7/25 11:05 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class ROperatingMonitorJob { + + private final ROperatingMonitorFeignClient rOperatingMonitorFeignClient; + + @XxlJob("rOperatingMonitorDay") + public void rOperatingMonitorDay(){ + log.info(LocalDateTime.now()+"监测点数据质量_日统计调度开始------------------------"); + LineParam lineParam = new LineParam(); + lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataSource(2); + rOperatingMonitorFeignClient.handlerMonitorOperatingD(lineParam); + } + + @XxlJob("rOperatingMonitorMonth") + public void rOperatingMonitorMonth(){ + log.info(LocalDateTime.now()+"监测点数据质量_月统计调度开始------------------------"); + LineParam lineParam = new LineParam(); + lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH)); + lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH)); + lineParam.setDataSource(2); + rOperatingMonitorFeignClient.handlerMonitorOperatingM(lineParam); + } + +} diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RStatAbnormalJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RStatAbnormalJob.java new file mode 100644 index 000000000..313b187aa --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RStatAbnormalJob.java @@ -0,0 +1,39 @@ +package com.njcn.executor.handler; + +import com.njcn.common.pojo.constant.BizParamConstant; +import com.njcn.executor.utils.CommonExecutorUtils; +import com.njcn.prepare.harmonic.api.newalgorithm.ROperatingMonitorFeignClient; +import com.njcn.prepare.harmonic.api.newalgorithm.RStatAbnormalFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/7/26 10:03 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class RStatAbnormalJob { + + private final RStatAbnormalFeignClient rStatAbnormalFeignClient; + + @XxlJob("rStatAbnormalDay") + public void rStatAbnormalDay(){ + log.info(LocalDateTime.now()+"监测点异常_日统计调度开始------------------------"); + LineParam lineParam = new LineParam(); + lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataSource(2); + rStatAbnormalFeignClient.handlerMonitorAbnormal(lineParam); + } + +} diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RStatHarmonicJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RStatHarmonicJob.java new file mode 100644 index 000000000..77685e164 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RStatHarmonicJob.java @@ -0,0 +1,47 @@ +package com.njcn.executor.handler; + +import com.njcn.common.pojo.constant.BizParamConstant; +import com.njcn.executor.utils.CommonExecutorUtils; +import com.njcn.prepare.harmonic.api.newalgorithm.RStatHarmonicFeignClient; +import com.njcn.prepare.harmonic.pojo.param.OrgParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/7/25 11:05 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class RStatHarmonicJob { + + private final RStatHarmonicFeignClient rStatHarmonicFeignClient; + + @XxlJob("rStatHarmonicDay") + public void rStatHarmonicDay(){ + log.info(LocalDateTime.now()+"单位监测点稳态指标日统计调度开始------------------------"); + OrgParam orgParam = new OrgParam(); + orgParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); + orgParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + rStatHarmonicFeignClient.handler(orgParam); + } + + @XxlJob("rStatHarmonicMonth") + public void rStatHarmonicMonth(){ + log.info(LocalDateTime.now()+"单位监测点稳态指标月统计调度开始------------------------"); + OrgParam orgParam = new OrgParam(); + orgParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH)); + orgParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH)); + System.out.println("orgParam==:" + orgParam); + rStatHarmonicFeignClient.handler(orgParam); + } + +} diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/TargetWarnJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/TargetWarnJob.java index e13d16066..9eb1640b5 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/TargetWarnJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/TargetWarnJob.java @@ -45,8 +45,8 @@ public class TargetWarnJob { @XxlJob("alarmMonthJob") public void alarmMonthJob(){ LineParam lineParam = new LineParam(); - lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH)); + lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH)); lineParam.setDataSource(2); targetWarnFeignClient.alarmMonth(lineParam); } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java index 3343c0ea1..cc00f3f60 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.Calendar; +import java.util.Objects; /** * pqs @@ -23,10 +24,13 @@ public class CommonExecutorUtils { log.error(LocalDateTime.now()+"xxl调度任务参数未设置"); return null; } - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH,-1); + if (Objects.equals(BizParamConstant.STAT_BIZ_DAY,command)){ + calendar.add(Calendar.DAY_OF_MONTH,-1); + } else if (Objects.equals(BizParamConstant.STAT_BIZ_MONTH,command)){ + calendar.set(Calendar.DAY_OF_MONTH, 1); + } log.info("job调度时间:"+sdf.format(calendar.getTime())); return sdf.format(calendar.getTime()); } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RMpEventDetailFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RMpEventDetailFeignClient.java new file mode 100644 index 000000000..8f4c26af6 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RMpEventDetailFeignClient.java @@ -0,0 +1,24 @@ +package com.njcn.prepare.harmonic.api.newalgorithm; + + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.newalgorithm.fallback.RMpEventDetailFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient( + value = ServerInfo.PREPARE_BOOT,//对应模块名 + path = "/rmpeventdetail",//对应controller请求类 + fallbackFactory = RMpEventDetailFeignClientFallbackFactory.class//服务降级处理类 +) +public interface RMpEventDetailFeignClient { + + @PostMapping("/eventdetailHandler") + @ApiOperation("监测点暂态指标处理") + HttpResult eventdetailHandler(@RequestBody @Validated LineParam lineParam); +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RMpMonitorEvaluateFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RMpMonitorEvaluateFeignClient.java new file mode 100644 index 000000000..ac838d595 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RMpMonitorEvaluateFeignClient.java @@ -0,0 +1,23 @@ +package com.njcn.prepare.harmonic.api.newalgorithm; + + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.newalgorithm.fallback.RMpMonitorEvaluateFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient( + value = ServerInfo.PREPARE_BOOT,//对应模块名 + path = "/rmpmonitorevaluate",//对应controller请求类 + fallbackFactory = RMpMonitorEvaluateFeignClientFallbackFactory.class//服务降级处理类 +) +public interface RMpMonitorEvaluateFeignClient { + + @ApiOperation("监测点评价_日统计(MySQL库)") + @PostMapping("handlerMonitorEvaluate") + HttpResult handlerMonitorEvaluate(@RequestBody LineParam jobParam ); +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/ROperatingMonitorFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/ROperatingMonitorFeignClient.java new file mode 100644 index 000000000..9b89b35c4 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/ROperatingMonitorFeignClient.java @@ -0,0 +1,24 @@ +package com.njcn.prepare.harmonic.api.newalgorithm; + + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.newalgorithm.fallback.ROperatingMonitorFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient( + value = ServerInfo.PREPARE_BOOT,//对应模块名 + path = "/roperatingmonitor",//对应controller请求类 + fallbackFactory = ROperatingMonitorFeignClientFallbackFactory.class//服务降级处理类 +) +public interface ROperatingMonitorFeignClient { + + @PostMapping("handlerMonitorOperatingD") + HttpResult handlerMonitorOperatingD(@RequestBody LineParam jobParam ); + + @PostMapping("handlerMonitorOperatingM") + HttpResult handlerMonitorOperatingM(@RequestBody LineParam jobParam ); +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RStatAbnormalFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RStatAbnormalFeignClient.java new file mode 100644 index 000000000..9990ea99b --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RStatAbnormalFeignClient.java @@ -0,0 +1,23 @@ +package com.njcn.prepare.harmonic.api.newalgorithm; + + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.newalgorithm.fallback.RStatAbnormalFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient( + value = ServerInfo.PREPARE_BOOT,//对应模块名 + path = "/rmstatabnormal",//对应controller请求类 + fallbackFactory = RStatAbnormalFeignClientFallbackFactory.class//服务降级处理类 +) +public interface RStatAbnormalFeignClient { + + @ApiOperation("监测点异常_日统计(MySQL库)") + @PostMapping("handlerMonitorAbnormal") + HttpResult handlerMonitorAbnormal(@RequestBody LineParam jobParam ); +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RStatHarmonicFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RStatHarmonicFeignClient.java new file mode 100644 index 000000000..44f045dff --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RStatHarmonicFeignClient.java @@ -0,0 +1,21 @@ +package com.njcn.prepare.harmonic.api.newalgorithm; + + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.newalgorithm.fallback.RStatHarmonicFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.OrgParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient( + value = ServerInfo.PREPARE_BOOT,//对应模块名 + path = "/rstatharmonic",//对应controller请求类 + fallbackFactory = RStatHarmonicFeignClientFallbackFactory.class//服务降级处理类 +) +public interface RStatHarmonicFeignClient { + + @PostMapping("/Handler") + HttpResult handler(@RequestBody OrgParam orgParam); +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RMpEventDetailFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RMpEventDetailFeignClientFallbackFactory.java new file mode 100644 index 000000000..de259c2f1 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RMpEventDetailFeignClientFallbackFactory.java @@ -0,0 +1,33 @@ +package com.njcn.prepare.harmonic.api.newalgorithm.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.device.biz.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.newalgorithm.RMpEventDetailFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class RMpEventDetailFeignClientFallbackFactory implements FallbackFactory { + @Override + public RMpEventDetailFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new RMpEventDetailFeignClient() { + @Override + public HttpResult eventdetailHandler(LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "监测点暂态指标处理: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RMpMonitorEvaluateFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RMpMonitorEvaluateFeignClientFallbackFactory.java new file mode 100644 index 000000000..7aeba4ab0 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RMpMonitorEvaluateFeignClientFallbackFactory.java @@ -0,0 +1,33 @@ +package com.njcn.prepare.harmonic.api.newalgorithm.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.device.biz.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.newalgorithm.RMpMonitorEvaluateFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class RMpMonitorEvaluateFeignClientFallbackFactory implements FallbackFactory { + @Override + public RMpMonitorEvaluateFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new RMpMonitorEvaluateFeignClient() { + @Override + public HttpResult handlerMonitorEvaluate(LineParam jobParam) { + log.error("{}异常，降级处理，异常为：{}", "监测点评价_日统计: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/ROperatingMonitorFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/ROperatingMonitorFeignClientFallbackFactory.java new file mode 100644 index 000000000..a3377bde7 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/ROperatingMonitorFeignClientFallbackFactory.java @@ -0,0 +1,38 @@ +package com.njcn.prepare.harmonic.api.newalgorithm.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.device.biz.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.newalgorithm.ROperatingMonitorFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class ROperatingMonitorFeignClientFallbackFactory implements FallbackFactory { + @Override + public ROperatingMonitorFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new ROperatingMonitorFeignClient() { + @Override + public HttpResult handlerMonitorOperatingD(LineParam jobParam) { + log.error("{}异常，降级处理，异常为：{}", "监测点数据质量_日统计: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override + public HttpResult handlerMonitorOperatingM(LineParam jobParam) { + log.error("{}异常，降级处理，异常为：{}", "监测点数据质量_月统计: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RStatAbnormalFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RStatAbnormalFeignClientFallbackFactory.java new file mode 100644 index 000000000..bf711a096 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RStatAbnormalFeignClientFallbackFactory.java @@ -0,0 +1,33 @@ +package com.njcn.prepare.harmonic.api.newalgorithm.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.device.biz.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.newalgorithm.RStatAbnormalFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class RStatAbnormalFeignClientFallbackFactory implements FallbackFactory { + @Override + public RStatAbnormalFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new RStatAbnormalFeignClient() { + @Override + public HttpResult handlerMonitorAbnormal(LineParam jobParam) { + log.error("{}异常，降级处理，异常为：{}", "监测点异常_日统计: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RStatHarmonicFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RStatHarmonicFeignClientFallbackFactory.java new file mode 100644 index 000000000..76848f2cc --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RStatHarmonicFeignClientFallbackFactory.java @@ -0,0 +1,33 @@ +package com.njcn.prepare.harmonic.api.newalgorithm.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.device.biz.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.newalgorithm.RStatHarmonicFeignClient; +import com.njcn.prepare.harmonic.pojo.param.OrgParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class RStatHarmonicFeignClientFallbackFactory implements FallbackFactory { + @Override + public RStatHarmonicFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new RStatHarmonicFeignClient() { + @Override + public HttpResult handler(OrgParam orgParam) { + log.error("{}异常，降级处理，异常为：{}", "单位监测点稳态指标统计: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml index 8caafb0f6..96a74bbaf 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml @@ -87,26 +87,20 @@