From 20e4c0cd75a3fecd8149c24d0c929b125e866990 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Wed, 12 Apr 2023 11:09:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=90=E6=B3=A2=E7=95=B8=E5=8F=98=E7=8E=87?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/DeviceAbnormalStatisticsJob.java | 2 +- .../executor/handler/DistortionRateJob.java | 29 +++++++++++++++++++ .../api/line/DistortionRateFeignClient.java | 3 +- .../harmonic/pojo/param/LineParam.java | 3 -- .../device/DeviceAbnormalController.java | 2 +- .../DeviceAbnormaStatisticsServiceImpl.java | 6 ++-- .../Impl/line/DistortionRateServiceImpl.java | 2 +- .../DeviceAbnormalStatisticsService.java | 3 +- 8 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DistortionRateJob.java diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java index af7745c96..6a2960227 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java @@ -16,7 +16,7 @@ public class DeviceAbnormalStatisticsJob { private final DeviceAbnormalFeignClient deviceAbnormalFeignClient; @XxlJob("deviceAbnormalStatisticsJob") - public void deviceAbnormalStatisticsJob (){ + public void deviceAbnormalStatisticsJob () { String time = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); log.info("执行日期deviceAbnormalStatisticsJob===============>"+time); DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam(); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DistortionRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DistortionRateJob.java new file mode 100644 index 000000000..c8aecee2c --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DistortionRateJob.java @@ -0,0 +1,29 @@ +package com.njcn.executor.handler; + +import com.njcn.prepare.harmonic.api.line.DistortionRateFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Date; + +@Slf4j +@Component +@AllArgsConstructor +public class DistortionRateJob { + private final DistortionRateFeignClient distortionRateFeignClient; + + @XxlJob("DistortionRateJob") + public void DistortionRateJob () { + log.info("===================DistortionRateJob Start==================="); + LineParam lineParam = new LineParam(); + lineParam.setDataDate(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + log.info(lineParam.toString()); + distortionRateFeignClient.distortionRate(lineParam); + log.info("===================DistortionRateJob End==================="); + } +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java index 53cf7938a..66957c8ef 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java @@ -18,8 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody; @FeignClient( value = ServerInfo.PREPARE_BOOT, path = "/distortion", - fallbackFactory = DistortionRateFeignClientFallbackFactory.class -) + fallbackFactory = DistortionRateFeignClientFallbackFactory.class) public interface DistortionRateFeignClient { @PostMapping("/distortionRate") diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java index d8dfe9a8f..965a58c46 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java @@ -22,15 +22,12 @@ public class LineParam { private Integer lineType; @ApiModelProperty(name = "type",value = "时间类型（1年，2季，3月，4周，5日）") - @NotNull(message = "时间类型不可为空") private Integer type; @ApiModelProperty(name = "dataDate",value = "时间") - @NotBlank(message = "时间不可为空") private String dataDate; @ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb 2:mysql）") - @NotNull(message = "数据源不可为空") private Integer dataSource; } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceAbnormalController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceAbnormalController.java index f1d91a438..66129a3ff 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceAbnormalController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceAbnormalController.java @@ -30,7 +30,7 @@ public class DeviceAbnormalController extends BaseController { @PostMapping("/statistics") @ApiOperation("终端异常统计") @ApiImplicitParam(name = "param", value = "参数", required = true) - public HttpResult dailyDeviceAbnormaStatistics(@RequestBody DeviceAbnormaStatisticsParam param) throws ParseException { + public HttpResult dailyDeviceAbnormaStatistics(@RequestBody DeviceAbnormaStatisticsParam param) { String methodDescribe = getMethodDescribe("dailyDeviceAbnormaStatistics"); boolean res = deviceAbnormaStatisticsService.dailyDeviceAbnormaStatistics(param); if(res){ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java index e67f4b448..09a81f9f1 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java @@ -37,8 +37,8 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist private final InfluxDbUtils influxDbUtils; @Override - public boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param) throws ParseException { - Map> comMap = new HashMap<>();Map> devLineMap = new HashMap<>(); + public boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param) { + Map> comMap = new HashMap<>(); Map> deviceFlowAndOnlineRateMap = new HashMap<>(); // 获取所有装置以及下属监测点 List lines = deviceAbnormaStatisticsMapper.getLines(); @@ -156,7 +156,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(instant.toEpochMilli()); return format; } - public List getCommunicate(List devs, String startTime, String endTime) throws ParseException { + public List getCommunicate(List devs, String startTime, String endTime) { // startTime ="2023-04-02"; // endTime = "2023-04-02"; //组装sql语句 diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DistortionRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DistortionRateServiceImpl.java index dd3a5a3b6..52355ca00 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DistortionRateServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DistortionRateServiceImpl.java @@ -59,7 +59,7 @@ public class DistortionRateServiceImpl implements DistortionRateService { } LocalDateTime local = LocalDateTimeUtil.parse (lineParam.getDataDate ( ) + "T00:00:00"); for (String lineId : lineIdOutList) { - List rateOut = getDistortionRateInfluxDb (lineId, lineParam.getDataDate ( )); + List rateOut = getDistortionRateInfluxDb (lineId, lineParam.getDataDate()); if (rateOut.size ( ) > 0) { Map inMap = new HashMap<> ( ); inMap.put ("lineId", lineId); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/device/DeviceAbnormalStatisticsService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/device/DeviceAbnormalStatisticsService.java index a4a764ab3..d84da0a0b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/device/DeviceAbnormalStatisticsService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/device/DeviceAbnormalStatisticsService.java @@ -5,5 +5,6 @@ import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam; import java.text.ParseException; public interface DeviceAbnormalStatisticsService { - boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param) throws ParseException; + + boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param); }