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
This commit is contained in:
sunxiqing 2025-01-02 11:15:45 +08:00
commit 40f2ba64ac
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java
View File

@ -34,8 +34,8 @@ public interface DatasetMapper extends BaseMapperX<DatasetDO> {
.orderByDesc(DatasetDO::getId));
}
@Update("update llm_dataset set annotate_progress = #{formattedRatio} where id = #{datasetId}")
void updateProcess(@Param("formattedRatio") Integer formattedRatio, @Param("datasetId") Long datasetId);
@Update("update llm_dataset set annotate_progress = #{formattedRatio},status=#{status} where id = #{datasetId}")
void updateProcess(@Param("formattedRatio") Integer formattedRatio, @Param("datasetId") Long datasetId,@Param("status") Integer status);
@Delete("delete from llm_dataset where id = #{datasetPostId}")
void deleteTrue(@Param("datasetPostId") Long datasetPostId);
}

6
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java
View File

@ -110,6 +110,9 @@ public class DatasetQuestionServiceImpl implements DatasetQuestionService {
public void updateDatasetQuestionDataAnno(List<DatasetQuestionSaveReqVO> updateReqVOS) {
updateReqVOS.forEach(updateReqVO -> {
DatasetQuestionDO datasetQuestionDO = BeanUtils.toBean(updateReqVO, DatasetQuestionDO.class);
if (CollectionUtils.isNotEmpty(updateReqVO.getDatasetAnswerRespVO())){
datasetQuestionDO.setStatus(2);
}
datasetQuestionMapper.updateById(datasetQuestionDO);
List<DatasetAnswerSaveReqVO> datasetAnswerSaveReqVO = updateReqVO.getDatasetAnswerRespVO();
List<DatasetAnswerDO> datasetAnswerDOS = BeanUtils.toBean(datasetAnswerSaveReqVO, DatasetAnswerDO.class);
@ -125,7 +128,8 @@ public class DatasetQuestionServiceImpl implements DatasetQuestionService {
Long annoCount = datasetQuestionMapper.selectCount(wrapper);
double ratio = sumCount == 0 ? 0 : ((double) annoCount / sumCount) *100;
Integer formattedRatio = ratio == 0 ? 0 : (int) ratio;
datasetMapper.updateProcess(formattedRatio, updateReqVOS.get(0).getDatasetId());
Integer status = formattedRatio == 100 ? 2 : 1;
datasetMapper.updateProcess(formattedRatio, updateReqVOS.get(0).getDatasetId(),status);
}
}

5
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java
View File

@ -42,6 +42,11 @@ public class ModelService {
}
}
/**
* 对话聊天
* @param req
* @return
*/
public ModelCompletionsRespVO modelCompletions(ModelCompletionsReqVO req) {
if (StringUtils.isBlank(req.getModel())) {
req.setModel(DEFAULT_MODEL_ID);