From ae09fef49c7c77c3840e298c2329ab21d11efec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com> Date: Tue, 30 Dec 2025 09:44:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9instant=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alert/controller/admin/instant/vo/InstantRespVO.java | 2 +- .../controller/admin/instant/vo/InstantSaveReqVO.java | 5 ++--- .../alert/dal/dataobject/instant/InstantTableDO.java | 2 +- .../module/alert/service/instant/InstantServiceImpl.java | 8 +++++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantRespVO.java index 5305aa1..44aa585 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantRespVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantRespVO.java @@ -35,7 +35,7 @@ public class InstantRespVO { private Integer visible; @Schema(description = "状态", example = "1") - private Integer status; + private Integer instantStatus; @Schema(description = "创建时间", example = "2022-07-01 00:00:00") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java index b065720..87c6b95 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java @@ -22,9 +22,8 @@ public class InstantSaveReqVO extends InstantInfoVO { private Long mpId; @Schema(description = "实例编号---和mpId一样,为了适配instant_info字符串", example = "1") - @NotNull(message = "实例编号不能为空") - private Long id; + @Schema(description = "模型编号", requiredMode = Schema.RequiredMode.REQUIRED,example = "1") @DiffLogField(name = "模型编号") private Long modelId; @@ -59,7 +58,7 @@ public class InstantSaveReqVO extends InstantInfoVO { @Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED,example = "1") @DiffLogField(name = "是否可见") - private Long visible; + private Integer visible; @Schema(description = "状态可见", requiredMode = Schema.RequiredMode.REQUIRED,example = "1") @DiffLogField(name = "状态") diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantTableDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantTableDO.java index 35db782..3181cc5 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantTableDO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantTableDO.java @@ -31,7 +31,7 @@ public class InstantTableDO extends BaseDO { private Long hisSto; - private Long visible; + private Integer visible; private Long status; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java index fd0efb4..3838cbe 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java @@ -101,7 +101,7 @@ public class InstantServiceImpl implements InstantService { .setCalcGroup(createReqVO.getGroup()) .setModelVersion(createReqVO.getVersion()) .setStatus(ObjUtil.defaultIfNull(createReqVO.getStatus(), 1L)) - .setVisible(ObjUtil.defaultIfNull(createReqVO.getVisible(), 1L)); + .setVisible(ObjUtil.defaultIfNull(createReqVO.getVisible(), 1)); instantTableMapper.insert(instant); @@ -523,6 +523,12 @@ public class InstantServiceImpl implements InstantService { InstantDO instant = validateInstantExists(id); // 2.1 删除实例 instantTableMapper.deleteById(id); + //这一步本来不应该有，但是为了适配以前的程序，把visible变成0 + InstantTableDO updateObj = new InstantTableDO(); + updateObj.setMpId(id); + updateObj.setVisible(0); + instantTableMapper.updateById(updateObj); + // 2.2删除warn_online_cfg表该实例相关数据 warnTableMapper.deleteByMpId(id); // 3. 记录操作日志上下文