diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/ModelController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/RunModelController.java similarity index 87% rename from yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/ModelController.java rename to yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/RunModelController.java index 4172898..bd74afc 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/ModelController.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/RunModelController.java @@ -10,7 +10,7 @@ import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelVersionPageR import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelVersionRespVO; import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelDO; import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelVersionDO; -import cn.iocoder.yudao.module.alert.service.model.ModelService; +import cn.iocoder.yudao.module.alert.service.model.RunModelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -30,15 +30,15 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @RestController @RequestMapping("/alert/model") @Validated -public class ModelController { +public class RunModelController { @Resource - private ModelService modelService; + private RunModelService runModelService; @GetMapping("/page") @Operation(summary = "获得模型分页列表") @PreAuthorize("@ss.hasPermission('run:model:query')") public CommonResult> getModelPage(@Valid ModelPageReqVO pageReqVO) { - PageResult pageResult = modelService.getModelPage(pageReqVO); + PageResult pageResult = runModelService.getModelPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ModelRespVO.class)); } @@ -46,7 +46,7 @@ public class ModelController { @Operation(summary = "获取模型版本列表", description = "用于前端的下拉选项") public CommonResult> getModelVersionList(ModelVersionPageReqVO versionReqVO) { versionReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = modelService.getModelVersionPage(versionReqVO).getList(); + List list = runModelService.getModelVersionPage(versionReqVO).getList(); list.sort(Comparator.comparing(ModelVersionDO::getVersion)); return success(BeanUtils.toBean(list, ModelVersionRespVO.class)); } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelVersionRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelVersionRespVO.java index 0fd7076..9a2877f 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelVersionRespVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelVersionRespVO.java @@ -9,11 +9,11 @@ import lombok.Data; @ExcelIgnoreUnannotated public class ModelVersionRespVO { @Schema(description = "版本id", example = "id") - private String id; + private Long id; @Schema(description = "所属模型id", example = "id") - private String modelId; + private Long modelId; @Schema(description = "模型版本名称", example = "yudao") private String version; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/ModelService.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelService.java similarity index 86% rename from yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/ModelService.java rename to yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelService.java index fd07b47..6a38b57 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/ModelService.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelService.java @@ -3,13 +3,10 @@ package cn.iocoder.yudao.module.alert.service.model; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelPageReqVO; import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelVersionPageReqVO; -import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelVersionRespVO; import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelDO; import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelVersionDO; -import java.util.List; - -public interface ModelService { +public interface RunModelService { /** * 获得模型分页 * diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/ModelServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelServiceImpl.java similarity index 94% rename from yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/ModelServiceImpl.java rename to yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelServiceImpl.java index dfae61c..abd417c 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/ModelServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; @Service @Slf4j -public class ModelServiceImpl implements ModelService { +public class RunModelServiceImpl implements RunModelService { @Resource private ModelMapper modelMapper; @Resource