Browse Source

fix:读取已下装模型

pull/40/head
xjf 1 month ago
parent
commit
cb2b0cb03d
  1. 3
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java
  2. 7
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java
  3. 5
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java
  4. 1
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java
  5. 4
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java

3
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.alert.controller.admin.model.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.models.security.SecurityScheme;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -14,5 +15,7 @@ public class ModelPageReqVO extends PageParam {
@Schema(description = "模型名称", example = "yudao")
private String modelName;
@Schema(description = "状态", example = "1")
private int status;
}

7
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java

@ -44,4 +44,11 @@ public class ModelRespVO {
@Schema(description = "模型信息-长字符串", example = "yudao")
private String modelInfo;
/**
* 模型信息
*/
@Schema(description = "模型状态", example = "yudao")
private int status;
}

5
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java

@ -45,6 +45,9 @@ public class ModelDO extends BaseDO {
*/
private String modelInfo;
/**
* 模型信息
*/
private int status;
}

1
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java

@ -13,6 +13,7 @@ public interface ModelMapper extends BaseMapperX<ModelDO> {
default PageResult<ModelDO> selectPage(ModelPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ModelDO>()
.likeIfPresent(ModelDO::getModelName, reqVO.getModelName())
.eqIfPresent(ModelDO::getStatus, reqVO.getStatus())
.orderByAsc(ModelDO::getId));
}

4
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java

@ -75,9 +75,6 @@ public class InstantServiceImpl implements InstantService {
public List<String> createInstant(InstantSaveReqVO createReqVO, Integer type) throws IOException {
// 1. 校验角色
// validateRoleDuplicate(createReqVO.getName(), createReqVO.getCode(), null);
//根据modelversionid查询modelversion,录入instantcfg表的modelversion字段
String modelVersion = versionMapper.selectById(createReqVO.getModelVersionId()).getVersion();
createReqVO.setModelVersion(modelVersion);
@ -224,6 +221,7 @@ public class InstantServiceImpl implements InstantService {
}
createWarn1(instant, createReqVO);
return resultList;
}

Loading…
Cancel
Save