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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/ModelAssessTaskManualBackupController.java
#	yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupService.java
#	yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupServiceImpl.java
This commit is contained in:
sunxiqing 2025-01-04 09:52:20 +08:00
commit e9307b2ab5
4 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,8 @@ public class ModelAssessTaskManualRespVO {
@Schema(description = "模型类型（0普通，1官方）")
private Integer modelType;
@Schema(description = "备份id")
private Long backupId;
}

6
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelassesstaskmanualbackup/ModelAssessTaskManualBackupController.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskauto.vo.ModelAssessTaskAutoPageReqVO;
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskauto.vo.ModelAssessTaskAutoRespVO;
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ManualEvaluationReportRespVO;
import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskManualRespVO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -78,8 +79,8 @@ public class ModelAssessTaskManualBackupController {
@Operation(summary = "获得人工评估备份分页")
@PreAuthorize("@ss.hasPermission('llm:model-assess-task-manual-backup:query')")
public CommonResult<PageResult<ModelAssessTaskManualBackupRespVO>> getModelAssessTaskManualBackupPage(@Valid ModelAssessTaskManualBackupPageReqVO pageReqVO) {
PageResult<ModelAssessTaskManualBackupDO> pageResult = modelAssessTaskManualBackupService.getModelAssessTaskManualBackupPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ModelAssessTaskManualBackupRespVO.class));
PageResult<ModelAssessTaskManualBackupRespVO> pageResult = modelAssessTaskManualBackupService.getModelAssessTaskManualPage1(pageReqVO);
return success(pageResult);
}
@GetMapping("/automatic-get")
@ -122,3 +123,4 @@ public class ModelAssessTaskManualBackupController {
}

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

@ -67,4 +67,7 @@ public interface ModelAssessTaskManualBackupService {
PageResult<ModelAssessTaskAutoRespVO> getModelAssessTaskAutoPage1(ModelAssessTaskAutoPageReqVO pageReqVO);
ModelAssessTaskAutoRespVO getModelAssessTaskAuto(Long id);
PageResult<ModelAssessTaskManualBackupRespVO> getModelAssessTaskManualPage1(ModelAssessTaskManualBackupPageReqVO pageReqVO);
}

40
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupServiceImpl.java
View File

@ -323,4 +323,44 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa
return result;
}
@Override
public PageResult<ModelAssessTaskManualBackupRespVO> getModelAssessTaskManualPage1(ModelAssessTaskManualBackupPageReqVO pageReqVO) {
PageResult<ModelAssessTaskManualBackupDO> modelAssessTaskManualDOPageResult = modelAssessTaskManualBackupMapper.selectPage(pageReqVO);
PageResult<ModelAssessTaskManualBackupRespVO> result = BeanUtils.toBean(modelAssessTaskManualDOPageResult, ModelAssessTaskManualBackupRespVO.class);
if (CollectionUtils.isNotEmpty(result.getList())){
// 我的模型获取校验
List<Long> serviceMyIds = modelAssessTaskManualDOPageResult.getList().stream().
filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 0)
.map(ModelAssessTaskManualBackupDO::getModelService).collect(Collectors.toList());
List<ModelServiceDO> modelServiceDOS = modelServiceMapper.selectList(new LambdaQueryWrapper<ModelServiceDO>()
.in(ModelServiceDO::getId,serviceMyIds));
Map<Long, ModelServiceDO> serviceMyMaps = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(modelServiceDOS, ModelServiceDO::getId);
// 人工模型获取校验
List<Long> serviceForeseeIds = modelAssessTaskManualDOPageResult.getList().stream().
filter(modelAssessTaskManualDO -> modelAssessTaskManualDO.getModelType() == 1)
.map(ModelAssessTaskManualBackupDO::getModelService).collect(Collectors.toList());
List<BaseModelDO> baseModelDOS = baseModelMapper.selectList(new LambdaQueryWrapper<BaseModelDO>()
.in(BaseModelDO::getId, serviceForeseeIds));
Map<Long, BaseModelDO> serviceForeseeMaps = cn.iocoder.yudao.framework.common.util.collection.
CollectionUtils.convertMap(baseModelDOS, BaseModelDO::getId);
result.getList().stream().forEach(modelAssessTaskManualRespVO -> {
if (modelAssessTaskManualRespVO.getModelType() == 0){
ModelServiceDO modelServiceDO = serviceMyMaps.get(modelAssessTaskManualRespVO.getModelService());
if(modelServiceDO != null){
modelAssessTaskManualRespVO.setModelServiceName(modelServiceDO.getServiceName());
}
}else {
BaseModelDO baseModelDO = serviceForeseeMaps.get(modelAssessTaskManualRespVO.getModelService());
if(baseModelDO != null){
modelAssessTaskManualRespVO.setModelServiceName(baseModelDO.getModelName());
}
}
});
}
return result;
}
}