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 'xnjz/master'

Browse Source
This commit is contained in:
zhangtao 2025-01-06 14:18:53 +08:00
commit 2f31c745ae
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java
View File

@ -149,6 +149,7 @@ public class DataRefluxDataServiceImpl implements DataRefluxDataService {
dataRespVO.setDataLength((long) pageReqVO.getDataids().size());
dataRespVO.setDatasetCategory(Math.toIntExact(pageReqVO.getDatasetType()));
dataRespVO.setAnnotateProgress(100);
dataRespVO.setStatus(2);
dataRespVO.setId(null);
List<DatasetDO> datasetDO = datasetMapper.selectList(new LambdaQueryWrapper<DatasetDO>().eq(DatasetDO::getDatasetName, dataRespVO.getDatasetName()));
if (!CollectionUtils.isAnyEmpty(datasetDO)){

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

@ -77,6 +77,16 @@ public class DatasetServiceImpl implements DatasetService {
Long count = datasetQuestionMapper.selectCount(new LambdaQueryWrapper<DatasetQuestionDO>()
.eq(DatasetQuestionDO::getDatasetId, dataset.getId()));
dataset.setDataLength(count);
Long annoCount = datasetQuestionMapper.selectCount(new LambdaQueryWrapper<DatasetQuestionDO>()
.eq(DatasetQuestionDO::getDatasetId, dataset.getId())
.eq(DatasetQuestionDO::getStatus,2));
double ratio = count == 0 ? 0 : ((double) annoCount / count) *100;
Integer formattedRatio = ratio == 0 ? 0 : (int) ratio;
Integer status = formattedRatio == 100 ? 2 : 1;
if (formattedRatio != null){
dataset.setAnnotateProgress(formattedRatio);
}
dataset.setStatus(status);
datasetMapper.updateById(dataset);
}
return dataset.getId();
@ -117,9 +127,11 @@ public class DatasetServiceImpl implements DatasetService {
.eq(DatasetQuestionDO::getStatus,2));
double ratio = count == 0 ? 0 : ((double) annoCount / count) *100;
Integer formattedRatio = ratio == 0 ? 0 : (int) ratio;
Integer status = formattedRatio == 100 ? 2 : 1;
if (formattedRatio != null){
updateObj.setAnnotateProgress(formattedRatio);
}
updateObj.setStatus(status);
}
datasetMapper.updateById(updateObj);
}
@ -213,11 +225,12 @@ public class DatasetServiceImpl implements DatasetService {
List<DataJsonTemplate> jsonList = mapper.readValue(content.toString(), new TypeReference<List<DataJsonTemplate>>() {});
jsonList.forEach(
dataJsonTemplate -> {
List<String> answers = dataJsonTemplate.getAnswers();
DatasetQuestionDO datasetQuestionDO = BeanUtils.toBean(dataJsonTemplate, DatasetQuestionDO.class);
datasetQuestionDO.setDatasetId(datasetFilesDO.getDatasetId());
datasetQuestionDO.setDatasetFilesId(datasetFilesDO.getId());
datasetQuestionDO.setStatus(CollectionUtils.isNotEmpty(answers) ? 2:0);
datasetQuestionMapper.insert(datasetQuestionDO);
List<String> answers = dataJsonTemplate.getAnswers();
if (CollectionUtils.isNotEmpty(answers)){
for (String answer : answers) {
DatasetAnswerDO datasetAnswerDO = new DatasetAnswerDO();