From 54a8b8d0eb4c9ced702ce56ab5ad547d1f79de16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com> Date: Wed, 24 Dec 2025 10:42:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=A2=84=E8=AD=A6=E8=A1=A8=E4=B8=AD=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/alert/dal/mysql/warn/WarnTableMapper.java | 6 ++++++ .../alert/service/instant/InstantServiceImpl.java | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnTableMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnTableMapper.java index 11d115c..aaa8c76 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnTableMapper.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnTableMapper.java @@ -2,8 +2,14 @@ package cn.iocoder.yudao.module.alert.dal.mysql.warn; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.alert.dal.dataobject.warn.WarnTableDO; +import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.ibatis.annotations.Mapper; @Mapper public interface WarnTableMapper extends BaseMapperX { + + default void deleteByMpId(Long mpId) { + delete(Wrappers.lambdaUpdate(WarnTableDO.class).eq(WarnTableDO::getMpId, mpId)); + } } \ No newline at end of file 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 4195df4..6a289e2 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 @@ -20,6 +20,7 @@ import cn.iocoder.yudao.module.alert.dal.mysql.instant.InstantTableMapper; import cn.iocoder.yudao.module.alert.dal.mysql.model.VersionMapper; import cn.iocoder.yudao.module.alert.dal.mysql.report.ReportMapper; import cn.iocoder.yudao.module.alert.dal.mysql.warn.WarnCalcMapper; +import cn.iocoder.yudao.module.alert.dal.mysql.warn.WarnTableMapper; import cn.iocoder.yudao.module.alert.service.warn.WarnService; import cn.iocoder.yudao.module.alert.utils.EXAUtils; import com.alibaba.fastjson.JSONObject; @@ -60,6 +61,10 @@ public class InstantServiceImpl implements InstantService { private WarnService warnService; + @Resource + private WarnTableMapper warnTableMapper; + + // 新增：注入WarnCalcMapper用于查询预警计算配置 @Resource private WarnCalcMapper warnCalcMapper; @@ -497,16 +502,19 @@ public class InstantServiceImpl implements InstantService { @LogRecord(type = SYSTEM_INSTANT_TYPE, subType = SYSTEM_INSTANT_DELETE_SUB_TYPE, bizNo = "{{#id}}", success = SYSTEM_INSTANT_DELETE_SUCCESS) public void deleteInstant(Long id) { - // 1. 校验用户存在 + // 1. 校实例存在 InstantDO instant = validateInstantExists(id); - // 2.1 删除用户 + // 2.1 删除实例 instantTableMapper.deleteById(id); // // 2.2 删除用户关联数据 // permissionService.processUserDeleted(id); // // 2.2 删除用户岗位 // userPostMapper.deleteByUserId(id); +// 2.2删除warn_online_cfg表该实例相关数据 + warnTableMapper.deleteByMpId(id); + // 3. 记录操作日志上下文 LogRecordContext.putVariable("instant", instant); } From b6ee4e5d300ec87c2823f31aee03294c0055ffcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com> Date: Wed, 24 Dec 2025 11:02:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E5=8F=AA=E7=AD=9B=E9=80=89=E6=9C=AA=E5=AE=9E=E4=BE=8B=E5=8C=96?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alert/controller/admin/model/vo/ModelPageReqVO.java | 3 +++ .../yudao/module/alert/dal/dataobject/model/ModelDO.java | 9 ++++++++- .../yudao/module/alert/dal/mysql/model/ModelMapper.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java index a92889d..5b6e6e5 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java @@ -15,6 +15,9 @@ public class ModelPageReqVO extends PageParam { @Schema(description = "模型名称", example = "yudao") private String modelName; + @Schema(description = "实例数量", example = "1") + private long instantNum; + @Schema(description = "状态", example = "1") private int status; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java index 3d4da70..379e586 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java @@ -47,8 +47,15 @@ public class ModelDO extends BaseDO { private String modelInfo; /** - * 模型信息 + * 模型状态已下装---1 */ private int status; + + /** + * 模型是否已经被实例化 + */ + private long instantNum; + + } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java index e6738b7..a2688db 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java @@ -14,7 +14,7 @@ public interface ModelMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(ModelDO::getModelName, reqVO.getModelName()) .eqIfPresent(ModelDO::getStatus, reqVO.getStatus()) - + .eqIfPresent(ModelDO::getInstantNum, reqVO.getInstantNum()) .orderByAsc(ModelDO::getModelId)); }