|
|
@ -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<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)); |
|
|
|
} |
|
|
|
|
|
|
@ -46,7 +46,7 @@ public class ModelController { |
|
|
|
@Operation(summary = "获取模型版本列表", description = "用于前端的下拉选项") |
|
|
|
public CommonResult<List<ModelVersionRespVO>> getModelVersionList(ModelVersionPageReqVO versionReqVO) { |
|
|
|
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)); |
|
|
|
return success(BeanUtils.toBean(list, ModelVersionRespVO.class)); |
|
|
|
} |