From 686366422cfe1dc072b8d9e5eefd72b15a9d87de Mon Sep 17 00:00:00 2001 From: limin Date: Mon, 6 Jan 2025 09:16:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=20=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../llm/service/dataset/DatasetServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetServiceImpl.java index 3e97799a2..84318ff88 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetServiceImpl.java @@ -77,6 +77,16 @@ public class DatasetServiceImpl implements DatasetService { Long count = datasetQuestionMapper.selectCount(new LambdaQueryWrapper() .eq(DatasetQuestionDO::getDatasetId, dataset.getId())); dataset.setDataLength(count); + Long annoCount = datasetQuestionMapper.selectCount(new LambdaQueryWrapper() + .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 jsonList = mapper.readValue(content.toString(), new TypeReference>() {}); jsonList.forEach( dataJsonTemplate -> { + List 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 answers = dataJsonTemplate.getAnswers(); if (CollectionUtils.isNotEmpty(answers)){ for (String answer : answers) { DatasetAnswerDO datasetAnswerDO = new DatasetAnswerDO(); From 0fd15cb3ada6efafa034b18eecf03f95c7c0429e Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Mon, 6 Jan 2025 09:49:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=9B=9E=E6=B5=81=E6=A0=87=E6=B3=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../llm/service/datarefluxdata/DataRefluxDataServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java index 369c054c7..21595af58 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java @@ -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 = datasetMapper.selectList(new LambdaQueryWrapper().eq(DatasetDO::getDatasetName, dataRespVO.getDatasetName())); if (!CollectionUtils.isAnyEmpty(datasetDO)){