fix:集中告警趋势展示错误修复

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;
+}

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<AlarmTrendRespVO> getAlarmTrend(@RequestParam("id") Long id, @Valid EXAHistoryReqVO exaHistoryReqVO) {
+    public CommonResult<AlarmTrendRespVO> 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);
     }

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<List<Double>> outputData = exaUtils.getHistory(EXA_IP, exaHistoryReqVO);
             // 4. 数据校验
-            if (inputData != null || outputData != null) {
-
                 //直接深拷贝outputData
                 //上限值列表
                 List<List<Double>> 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());