Merge pull request 'dev-xjf' (#59) from dev-xjf into master

Reviewed-on: http://120.26.116.243:3000/root/alert-backend/pulls/59

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;
 

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

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<ModelDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<ModelDO>()
                 .likeIfPresent(ModelDO::getModelName, reqVO.getModelName())
                 .eqIfPresent(ModelDO::getStatus, reqVO.getStatus())
-
+                .eqIfPresent(ModelDO::getInstantNum, reqVO.getInstantNum())
                 .orderByAsc(ModelDO::getModelId));
     }
 

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<WarnTableDO> {
+
+    default void deleteByMpId(Long mpId) {
+        delete(Wrappers.lambdaUpdate(WarnTableDO.class).eq(WarnTableDO::getMpId, mpId));
+    }
 }

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