From 7db7e1710d2c39fba60958d4b0785a0223019ccf Mon Sep 17 00:00:00 2001 From: Jiale Date: Wed, 28 May 2025 09:09:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(module-alert):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=9B=86=E5=9B=A2=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=A0=81=E5=B9=B6=E4=BC=98=E5=8C=96=20EXA=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ErrorCodeConstants 中添加了三个新的集团管理相关错误码 - 优化了 EXAHistoryReqVO 类，调整了字段格式并设置了默认间隔时间 - 在 EXAService接口中新增了获取点选项列表的方法 --- .../alert/controller/admin/exa/vo/EXAHistoryReqVO.java | 8 ++++---- .../yudao/module/alert/service/exa/EXAService.java | 3 +++ .../yudao/module/system/enums/ErrorCodeConstants.java | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/exa/vo/EXAHistoryReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/exa/vo/EXAHistoryReqVO.java index 87b8568..19f8e61 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/exa/vo/EXAHistoryReqVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/exa/vo/EXAHistoryReqVO.java @@ -7,12 +7,12 @@ import lombok.Data; public class EXAHistoryReqVO { @Schema(description = "点号") - private String itemName; + private String itemName; @Schema(description = "开始时间") - private String startTime; + private String startTime; @Schema(description = "结束时间") - private String endTime; + private String endTime; @Schema(description = "间隔时间-以秒为单位传入，会自动转为毫秒") - private Long interval; + private Long interval = 300L; } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/exa/EXAService.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/exa/EXAService.java index 3b971d5..02c465b 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/exa/EXAService.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/exa/EXAService.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.alert.service.exa; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.module.alert.controller.admin.exa.vo.*; +import cn.iocoder.yudao.module.alert.controller.admin.system.vo.PointOptionItemVO; import java.io.IOException; import java.net.URISyntaxException; @@ -33,4 +34,6 @@ public interface EXAService { public String deletePoint(String ItemName); EXAPointImportRespVO importPointList(List importPoints, boolean isUpdateSupport); + + List getPointOptionList(String search); } diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java index 8ba2a29..bba7a0b 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java @@ -176,5 +176,7 @@ public interface ErrorCodeConstants { // ========== 预警模块 4-001========== ErrorCode WARN_NOT_EXISTS = new ErrorCode(4_001_000, "预警不存在"); - + ErrorCode Company_NOT_EXISTS = new ErrorCode(1_002_30_000,"集团不存在"); + ErrorCode Company_DISABLED = new ErrorCode(1_002_30_001,"集团被禁用"); + ErrorCode Company_NAME_DUPLICATE = new ErrorCode(1_002_31_000,"集团名称已存在"); }