From 70fae8bb37133d84894a42712d9435dabb9edf8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com> Date: Fri, 27 Jun 2025 10:18:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=9C=BA=E7=BB=84?= =?UTF-8?q?=E3=80=81=E7=B3=BB=E7=BB=9F=E3=80=81=E5=AD=90=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/instant/vo/InstantPageReqVO.java | 7 ++++++- .../module/alert/dal/mysql/instant/InstantMapper.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPageReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPageReqVO.java index 640eea7..7098d13 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPageReqVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPageReqVO.java @@ -10,8 +10,13 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class InstantPageReqVO extends PageParam { + @Schema(description = "机组id", example = "id") - private Integer unitId; + private Integer unit; + @Schema(description = "系统id", example = "id") + private Integer type; + @Schema(description = "子系统id", example = "id") + private Integer system; @Schema(description = "系统id", example = "yudao") private Integer modelId; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java index 49d83d1..1453fd2 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java @@ -17,6 +17,9 @@ public interface InstantMapper extends BaseMapperX { .eqIfPresent(InstantDO::getIsUpdate,reqVO.getIsUpdate()) .eqIfPresent(InstantDO::getRunning,reqVO.getRunning()) .eqIfPresent(InstantDO::getRunningLog,reqVO.getRunningLog()) + .eqIfPresent(InstantDO::getUnitId,reqVO.getUnit()) + .eqIfPresent(InstantDO::getSystemTypeId,reqVO.getType()) + .eqIfPresent(InstantDO::getSystemId,reqVO.getSystem()) .orderByAsc(InstantDO::getId)); }