Browse Source

fix:运行中心-修改model相关名称防止冲突

pull/17/head
肖晋飞 1 month ago
parent
commit
04248d7516
  1. 10
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/RunModelController.java
  2. 4
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelVersionRespVO.java
  3. 5
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelService.java
  4. 2
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelServiceImpl.java

10
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/ModelController.java → 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.controller.admin.model.vo.ModelVersionRespVO;
import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelDO; 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.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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -30,15 +30,15 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@RestController @RestController
@RequestMapping("/alert/model") @RequestMapping("/alert/model")
@Validated @Validated
public class ModelController { public class RunModelController {
@Resource @Resource
private ModelService modelService; private RunModelService runModelService;
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得模型分页列表") @Operation(summary = "获得模型分页列表")
@PreAuthorize("@ss.hasPermission('run:model:query')") @PreAuthorize("@ss.hasPermission('run:model:query')")
public CommonResult<PageResult<ModelRespVO>> getModelPage(@Valid ModelPageReqVO pageReqVO) { public CommonResult<PageResult<ModelRespVO>> getModelPage(@Valid ModelPageReqVO pageReqVO) {
PageResult<ModelDO> pageResult = modelService.getModelPage(pageReqVO); PageResult<ModelDO> pageResult = runModelService.getModelPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ModelRespVO.class)); return success(BeanUtils.toBean(pageResult, ModelRespVO.class));
} }
@ -46,7 +46,7 @@ public class ModelController {
@Operation(summary = "获取模型版本列表", description = "用于前端的下拉选项") @Operation(summary = "获取模型版本列表", description = "用于前端的下拉选项")
public CommonResult<List<ModelVersionRespVO>> getModelVersionList(ModelVersionPageReqVO versionReqVO) { public CommonResult<List<ModelVersionRespVO>> getModelVersionList(ModelVersionPageReqVO versionReqVO) {
versionReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); versionReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<ModelVersionDO> list = modelService.getModelVersionPage(versionReqVO).getList(); List<ModelVersionDO> list = runModelService.getModelVersionPage(versionReqVO).getList();
list.sort(Comparator.comparing(ModelVersionDO::getVersion)); list.sort(Comparator.comparing(ModelVersionDO::getVersion));
return success(BeanUtils.toBean(list, ModelVersionRespVO.class)); return success(BeanUtils.toBean(list, ModelVersionRespVO.class));
} }

4
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 @ExcelIgnoreUnannotated
public class ModelVersionRespVO { public class ModelVersionRespVO {
@Schema(description = "版本id", example = "id") @Schema(description = "版本id", example = "id")
private String id; private Long id;
@Schema(description = "所属模型id", example = "id") @Schema(description = "所属模型id", example = "id")
private String modelId; private Long modelId;
@Schema(description = "模型版本名称", example = "yudao") @Schema(description = "模型版本名称", example = "yudao")
private String version; private String version;

5
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/ModelService.java → 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.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.ModelPageReqVO;
import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelVersionPageReqVO; 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.ModelDO;
import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelVersionDO; import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelVersionDO;
import java.util.List; public interface RunModelService {
public interface ModelService {
/** /**
* 获得模型分页 * 获得模型分页
* *

2
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/ModelServiceImpl.java → 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 @Service
@Slf4j @Slf4j
public class ModelServiceImpl implements ModelService { public class RunModelServiceImpl implements RunModelService {
@Resource @Resource
private ModelMapper modelMapper; private ModelMapper modelMapper;
@Resource @Resource
Loading…
Cancel
Save