DATA_MIDDLE_PLATFORM/Data_Middle_Platform_Server
3
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

人工评估增加返回模型名称

Browse Source
This commit is contained in:
limin 2024-12-27 15:30:59 +08:00
parent 3dec485c4b
commit f7526c8667
7 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-llm/yudao-module-llm-api/src/main/java/cn/iocoder/yudao/module/llm/enums/ErrorCodeConstants.java
View File

@ -26,5 +26,6 @@ public interface ErrorCodeConstants {
ErrorCode MODEL_ASSESS_TASK_AUTO_NOT_EXISTS = new ErrorCode(10012, "自动评估维度不存在");
ErrorCode MODEL_ASSESS_TASK_STOPLIST_NOT_EXISTS = new ErrorCode(10013, "自动评估维度不存在");
ErrorCode MODEL_ASSESS_STOPLIST_NOT_EXISTS = new ErrorCode(10014, "自动评估维度不存在");
ErrorCode LEARNING_RESOURCES_NOT_EXISTS = new ErrorCode(10015, "学习资源不存在");
}

13
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/ModelAssessTaskManualController.java
View File

@ -72,21 +72,16 @@ public class ModelAssessTaskManualController {
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')")
public CommonResult<ModelAssessTaskManualRespVO> getModelAssessTaskManual(@RequestParam("id") Long id) {
ModelAssessTaskManualDO modelAssessTaskManual = modelAssessTaskManualService.getModelAssessTaskManual(id);
ModelAssessTaskManualRespVO bean = BeanUtils.toBean(modelAssessTaskManual, ModelAssessTaskManualRespVO.class);
List<ModelAssessTaskDimensionDO> modelAssessTaskDimensionDOS = modelAssessTaskDimensionMapper.selectList(new LambdaQueryWrapper<ModelAssessTaskDimensionDO>()
.eq(ModelAssessTaskDimensionDO::getTaskId, id)
.eq(ModelAssessTaskDimensionDO::getDeleted, false));
bean.setDimensions(modelAssessTaskDimensionDOS);
return success(bean);
ModelAssessTaskManualRespVO modelAssessTaskManual = modelAssessTaskManualService.getModelAssessTaskManual(id);
return success(modelAssessTaskManual);
}
@GetMapping("/page")
@Operation(summary = "获得模型评估任务 —— 人工评估分页")
@PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual:query')")
public CommonResult<PageResult<ModelAssessTaskManualRespVO>> getModelAssessTaskManualPage(@Valid ModelAssessTaskManualPageReqVO pageReqVO) {
PageResult<ModelAssessTaskManualDO> pageResult = modelAssessTaskManualService.getModelAssessTaskManualPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ModelAssessTaskManualRespVO.class));
PageResult<ModelAssessTaskManualRespVO> pageResult = modelAssessTaskManualService.getModelAssessTaskManualPage1(pageReqVO);
return success(pageResult);
}
@GetMapping("/export-excel")

6
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ModelAssessTaskManualRespVO.java
View File

@ -50,6 +50,12 @@ public class ModelAssessTaskManualRespVO {
@Schema(description = "模型评估任务状态，使用字典（llm_model_assess_task_status）")
private Integer status;
@Schema(description = "任务进度")
private Integer progress;
@Schema(description = "模型服务名称")
private String modelServiceName;
}

3
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanual/vo/ModelAssessTaskManualSaveReqVO.java
View File

@ -34,4 +34,7 @@ public class ModelAssessTaskManualSaveReqVO {
@Schema(description = "模型评估任务状态，使用字典（llm_model_assess_task_status）")
private Integer status;
@Schema(description = "任务进度")
private Integer progress;
}

5
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelassesstaskmanual/ModelAssessTaskManualDO.java
View File

@ -56,4 +56,9 @@ public class ModelAssessTaskManualDO extends BaseDO {
*/
private Integer status;
/**
* 任务进度
*/
private Integer progress;
}

3
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualService.java
View File

@ -42,7 +42,7 @@ public interface ModelAssessTaskManualService {
* @param id 编号
* @return 模型评估任务 —— 人工评估
*/
ModelAssessTaskManualDO getModelAssessTaskManual(Long id);
ModelAssessTaskManualRespVO getModelAssessTaskManual(Long id);
/**
* 获得模型评估任务 —— 人工评估分页
@ -50,6 +50,7 @@ public interface ModelAssessTaskManualService {
* @param pageReqVO 分页查询
* @return 模型评估任务 —— 人工评估分页
*/
PageResult<ModelAssessTaskManualRespVO> getModelAssessTaskManualPage1(ModelAssessTaskManualPageReqVO pageReqVO);
PageResult<ModelAssessTaskManualDO> getModelAssessTaskManualPage(ModelAssessTaskManualPageReqVO pageReqVO);
}

38
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualServiceImpl.java
View File

@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.llm.service.modelassesstaskmanual;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskDimensionDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO;
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.ModelAssessTaskDimensionMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.modelservice.ModelServiceMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@ -13,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.*;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskManualDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
@ -38,6 +39,8 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe
private ModelAssessTaskManualMapper modelAssessTaskManualMapper;
@Resource
private ModelAssessTaskDimensionMapper modelAssessTaskDimensionMapper;
@Resource
private ModelServiceMapper modelServiceMapper;
@Override
public Long createModelAssessTaskManual(ModelAssessTaskManualSaveReqVO createReqVO) {
@ -100,11 +103,38 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe
}
@Override
public ModelAssessTaskManualDO getModelAssessTaskManual(Long id) {
ModelAssessTaskManualDO modelAssessTaskManualDO = modelAssessTaskManualMapper.selectById(id);
return modelAssessTaskManualDO;
public ModelAssessTaskManualRespVO getModelAssessTaskManual(Long id) {
ModelAssessTaskManualDO modelAssessTaskManual = modelAssessTaskManualMapper.selectById(id);
ModelAssessTaskManualRespVO result = BeanUtils.toBean(modelAssessTaskManual, ModelAssessTaskManualRespVO.class);
List<ModelAssessTaskDimensionDO> modelAssessTaskDimensionDOS = modelAssessTaskDimensionMapper.selectList(new LambdaQueryWrapper<ModelAssessTaskDimensionDO>()
.eq(ModelAssessTaskDimensionDO::getTaskId, id)
.eq(ModelAssessTaskDimensionDO::getDeleted, false));
result.setDimensions(modelAssessTaskDimensionDOS);
ModelServiceDO modelServiceDO = modelServiceMapper.selectById(modelAssessTaskManual.getModelService());
if (modelServiceDO != null){
result.setModelServiceName(modelServiceDO.getServiceName());
}
return result;
}
@Override
public PageResult<ModelAssessTaskManualRespVO> getModelAssessTaskManualPage1(ModelAssessTaskManualPageReqVO pageReqVO) {
PageResult<ModelAssessTaskManualDO> modelAssessTaskManualDOPageResult = modelAssessTaskManualMapper.selectPage(pageReqVO);
PageResult<ModelAssessTaskManualRespVO> result = BeanUtils.toBean(modelAssessTaskManualDOPageResult, ModelAssessTaskManualRespVO.class);
List<Long> serviceIds = modelAssessTaskManualDOPageResult.getList().stream().map(ModelAssessTaskManualDO::getModelService).collect(Collectors.toList());
LambdaQueryWrapper<ModelServiceDO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ModelServiceDO::getId,serviceIds);
List<ModelServiceDO> modelServiceDOS = modelServiceMapper.selectList(wrapper);
Map<Long, ModelServiceDO> longModelServiceDOMap = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
result.getList().stream().forEach(modelAssessTaskManualRespVO -> {
ModelServiceDO modelServiceDO = longModelServiceDOMap.get(modelAssessTaskManualRespVO.getModelService());
if(modelServiceDO != null){
modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName());
}
});
return result;
}
@Override
public PageResult<ModelAssessTaskManualDO> getModelAssessTaskManualPage(ModelAssessTaskManualPageReqVO pageReqVO) {
return modelAssessTaskManualMapper.selectPage(pageReqVO);