From 16e90de9eb20ee9818ba146d309819e435a02d15 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 26 Jun 2024 11:22:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=88=E7=AB=AF=E5=91=A8=E6=9C=9F=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=202.=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E8=B6=85=E6=A0=87=E7=BB=9F=E8=AE=A1=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/api/LineWarningFeignClient.java | 4 ++-- .../LineWarningFeignClientFallbackFactory.java | 8 +++----- .../supervision/pojo/param/device/OnlineParam.java | 2 +- .../controller/device/LineWarningController.java | 14 ++++++++------ .../service/device/ILineWarningService.java | 2 +- .../device/impl/LineWarningServiceImpl.java | 10 +++++----- .../system/timer/tasks/LineWarningTaskRunner.java | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/LineWarningFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/LineWarningFeignClient.java index c2eac81c1..51292d4d8 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/LineWarningFeignClient.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/LineWarningFeignClient.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping; @FeignClient(value = ServerInfo.SUPERVISION, path = "/onlineMonitor", fallbackFactory = LineWarningFeignClientFallbackFactory.class) public interface LineWarningFeignClient { - @PostMapping("/add") - HttpResult add(); + @PostMapping("/heBeiNorthAdd") + HttpResult heBeiNorthAdd(); } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/LineWarningFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/LineWarningFeignClientFallbackFactory.java index 113344c15..c232a6e70 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/LineWarningFeignClientFallbackFactory.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/LineWarningFeignClientFallbackFactory.java @@ -10,9 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; /** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 + * @author xy */ @Slf4j @Component @@ -28,8 +26,8 @@ public class LineWarningFeignClientFallbackFactory implements FallbackFactory
  • finalExceptionEnum = exceptionEnum; return new LineWarningFeignClient() { @Override - public HttpResult add() { - log.error("{}异常，降级处理，异常为：{}", "新增终端检测数据", throwable.toString()); + public HttpResult heBeiNorthAdd() { + log.error("{}异常，降级处理，异常为：{}", "新增在线监测数据(冀北-按月统计累计超标天数)", throwable.toString()); throw new BusinessException(finalExceptionEnum); } }; diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/OnlineParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/OnlineParam.java index 5bcee1733..3bf6b544f 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/OnlineParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/OnlineParam.java @@ -53,7 +53,7 @@ public class OnlineParam extends BaseParam implements Serializable { @EqualsAndHashCode(callSuper = true) public static class ReportParam extends OnlineParam { - @ApiModelProperty(name = "type", value = "0:预警单 1:告警单") + @ApiModelProperty(name = "type", value = "1:预警单 2:告警单") private Integer type; @ApiModelProperty(name = "issueDetail", value = "问题描述") diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/LineWarningController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/LineWarningController.java index e011ab4b7..1ef6edf8a 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/LineWarningController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/LineWarningController.java @@ -13,14 +13,12 @@ import com.njcn.supervision.service.device.ILineWarningService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; @@ -55,9 +53,13 @@ public class LineWarningController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/heBeiNorthAdd") @ApiOperation("新增在线监测数据(冀北-按月统计累计超标天数)") - public HttpResult heBeiNorthAdd() { + @ApiImplicitParams({ + @ApiImplicitParam(name = "startTime", value = "开始时间"), + @ApiImplicitParam(name = "endTime", value = "结束时间") + }) + public HttpResult heBeiNorthAdd(@RequestParam(value = "startTime",required = false) String startTime, @RequestParam(value = "endTime",required = false) String endTime) { String methodDescribe = getMethodDescribe("heBeiNorthAdd"); - lineWarningService.addHeBeiNorthLineWarning(); + lineWarningService.addHeBeiNorthLineWarning(startTime,endTime); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/ILineWarningService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/ILineWarningService.java index f7f2b4c8e..c0dc0ef9b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/ILineWarningService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/ILineWarningService.java @@ -26,7 +26,7 @@ public interface ILineWarningService extends IService { /** * 每日统计当前月各监测点各指标累计超标天数 */ - void addHeBeiNorthLineWarning(); + void addHeBeiNorthLineWarning(String startTime, String endTime); /** * 获取在线监测的数据列表 diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java index 2815bec4b..1db4a03ea 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java @@ -131,18 +131,18 @@ public class LineWarningServiceImpl extends MppServiceImpl result = new ArrayList<>(); - //获取指标集合(8个指标，包含总指标) + //获取指标集合(8个指标) List dataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData(); Map targetMap = dataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity())); //获取监测点和部门表关系 List deptLines = deptLineFeignClient.getAllData().getData(); Map> deptLineMap = deptLines.stream().collect(Collectors.groupingBy(DeptLine::getLineId)); //获取监测点按时间统计越限天数 - LocalDate firstDayOfMonth = LocalDate.now().minusDays(1).with(TemporalAdjusters.firstDayOfMonth()); - String date = DateUtil.format(firstDayOfMonth.atStartOfDay(), DatePattern.NORM_DATE_PATTERN); - String endDate = DateUtil.format(LocalDateTime.now().minusDays(1), DatePattern.NORM_DATE_PATTERN); + LocalDate firstDayOfMonth = Objects.isNull(startTime)?LocalDate.now().minusDays(1).with(TemporalAdjusters.firstDayOfMonth()):LocalDate.parse(startTime); + String date = Objects.isNull(startTime)?DateUtil.format(firstDayOfMonth.atStartOfDay(), DatePattern.NORM_DATE_PATTERN):startTime; + String endDate = Objects.isNull(endTime)?DateUtil.format(LocalDateTime.now().minusDays(1), DatePattern.NORM_DATE_PATTERN):endTime; RStatLimitQueryParam rStatLimitQueryParam = new RStatLimitQueryParam(null,date,endDate); List limitTarget = limitRateDClient.monitorOverLimitDays(rStatLimitQueryParam).getData(); //按各指标统计越限天数 diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/LineWarningTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/LineWarningTaskRunner.java index abb37f8b8..b1a5204d1 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/LineWarningTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/LineWarningTaskRunner.java @@ -16,6 +16,6 @@ public class LineWarningTaskRunner implements TimerTaskRunner { @Override public void action(String date) { - lineWarningFeignClient.add(); + lineWarningFeignClient.heBeiNorthAdd(); } }