From 39ed02ca5658099a18a4f6e6156646bb6ea72bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com> Date: Thu, 25 Dec 2025 10:32:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=9B=86=E4=B8=AD=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/warn/vo/WarnTrendReqVO.java | 12 ++++++++++++ .../alert/controller/admin/warn/warnController.java | 11 +++++------ .../module/alert/service/warn/WarnServiceImpl.java | 8 +------- 3 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnTrendReqVO.java diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnTrendReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnTrendReqVO.java new file mode 100644 index 0000000..e37d085 --- /dev/null +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnTrendReqVO.java @@ -0,0 +1,12 @@ +package cn.iocoder.yudao.module.alert.controller.admin.warn.vo; + +import cn.iocoder.yudao.module.alert.controller.admin.exa.vo.EXAHistoryReqVO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class WarnTrendReqVO extends EXAHistoryReqVO { + + @Schema(description = "告警id") + private Long id; +} diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java index d68eea4..14caf09 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java @@ -7,10 +7,7 @@ import cn.iocoder.yudao.module.alert.controller.admin.exa.vo.EXAHistoryReqVO; import cn.iocoder.yudao.module.alert.controller.admin.instant.vo.InstantPageReqVO; import cn.iocoder.yudao.module.alert.controller.admin.instant.vo.InstantRespVO; import cn.iocoder.yudao.module.alert.controller.admin.instant.vo.InstantSaveReqVO; -import cn.iocoder.yudao.module.alert.controller.admin.warn.vo.AlarmTrendRespVO; -import cn.iocoder.yudao.module.alert.controller.admin.warn.vo.WarnPageReqVO; -import cn.iocoder.yudao.module.alert.controller.admin.warn.vo.WarnRespVO; -import cn.iocoder.yudao.module.alert.controller.admin.warn.vo.WarnSaveReqVO; +import cn.iocoder.yudao.module.alert.controller.admin.warn.vo.*; import cn.iocoder.yudao.module.alert.dal.dataobject.instant.InstantDO; import cn.iocoder.yudao.module.alert.dal.dataobject.warn.AlarmLevelDO; import cn.iocoder.yudao.module.alert.dal.dataobject.warn.WarnDO; @@ -81,10 +78,12 @@ public class warnController { } - @GetMapping("/alarm/trend") + @PostMapping("/alarm/trend") @Operation(summary = "获取该条告警的趋势", description = "获取该条告警的趋势") - public CommonResult getAlarmTrend(@RequestParam("id") Long id, @Valid EXAHistoryReqVO exaHistoryReqVO) { + public CommonResult getAlarmTrend(@Valid @RequestBody WarnTrendReqVO warnTrendReqVO) { // versionReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + Long id = warnTrendReqVO.getId(); + EXAHistoryReqVO exaHistoryReqVO = warnTrendReqVO; AlarmTrendRespVO alarmTrendRespVO = warnService.getAlarmTrend(id, exaHistoryReqVO); return success(alarmTrendRespVO); } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java index 0d8debb..d8937b4 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java @@ -277,8 +277,6 @@ public class WarnServiceImpl implements WarnService { exaHistoryReqVO.setItemName(outpoint); List> outputData = exaUtils.getHistory(EXA_IP, exaHistoryReqVO); // 4. 数据校验 - if (inputData != null || outputData != null) { - //直接深拷贝outputData //上限值列表 List> upList = new ArrayList<>(outputData.size()); @@ -336,11 +334,7 @@ public class WarnServiceImpl implements WarnService { result.setValueList(Arrays.asList(inputData, upList, lowList, errorList)); result.setTagList(Arrays.asList("实时值", "上限值", "下限值", "告警值")); return result; - } - else{ - log.error("getAlarmTrend error, point: {}", point); - throw exception(ALARM_TREND_FAILED, "获取告警趋势失败: 数据为空"); - } + } catch (Exception e) { log.error("getAlarmTrend error", e); throw exception(ALARM_TREND_FAILED, "获取告警趋势失败: " + e.getMessage());