From 5bfbe0d588534b0c6d8fbd26ccd4b0dbd2ee3429 Mon Sep 17 00:00:00 2001 From: limin Date: Mon, 30 Dec 2024 16:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../llm/controller/admin/dataset/vo/DatasetPageReqVO.java | 2 +- .../module/llm/controller/admin/dataset/vo/DatasetRespVO.java | 2 +- .../llm/controller/admin/dataset/vo/DatasetSaveReqVO.java | 2 +- .../yudao/module/llm/dal/dataobject/dataset/DatasetDO.java | 2 +- .../yudao/module/llm/dal/mysql/dataset/DatasetMapper.java | 4 ++-- .../llm/service/dataset/DatasetQuestionServiceImpl.java | 2 +- .../yudao/module/llm/service/dataset/DatasetServiceImpl.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetPageReqVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetPageReqVO.java index b0616ea98..8ab2b84cb 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetPageReqVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetPageReqVO.java @@ -47,6 +47,6 @@ public class DatasetPageReqVO extends PageParam { private Long dataLength; @Schema(description = "标注进度", example = "20") - private String annotateProgress; + private Integer annotateProgress; } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetRespVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetRespVO.java index d44ebf8d1..67cb0563e 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetRespVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetRespVO.java @@ -55,7 +55,7 @@ public class DatasetRespVO { private Long dataLength; @Schema(description = "标注进度", example = "20") - private String annotateProgress; + private Integer annotateProgress; /* @Schema(description = "数据集数据文件", example = "[]") private List datasetQuestionRespVOS;*/ diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetSaveReqVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetSaveReqVO.java index ad1b45c07..e25f32e2a 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetSaveReqVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/vo/DatasetSaveReqVO.java @@ -42,7 +42,7 @@ public class DatasetSaveReqVO { private Long dataLength; @Schema(description = "标注进度", example = "20") - private String annotateProgress; + private Integer annotateProgress; @Schema(description = "数据集数据文件", example = "[]") private List datasetFiles; diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/dataset/DatasetDO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/dataset/DatasetDO.java index d9cafa83f..4e2f1a483 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/dataset/DatasetDO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/dataset/DatasetDO.java @@ -66,6 +66,6 @@ public class DatasetDO extends BaseDO { /** * 标注进度 */ - private String annotateProgress; + private Integer annotateProgress; } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java index 86be0484f..40ee082b4 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java @@ -33,6 +33,6 @@ public interface DatasetMapper extends BaseMapperX { .orderByDesc(DatasetDO::getId)); } - @Update("update llm_dataset set annotate_progress = CONCAT(#{formattedRatio}, '%') where id = #{datasetId}") - void updateProcess(@Param("formattedRatio") String formattedRatio, @Param("datasetId") Long datasetId); + @Update("update llm_dataset set annotate_progress = #{formattedRatio} where id = #{datasetId}") + void updateProcess(@Param("formattedRatio") Integer formattedRatio, @Param("datasetId") Long datasetId); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java index 4830b3d15..3f2e67e47 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java @@ -108,7 +108,7 @@ public class DatasetQuestionServiceImpl implements DatasetQuestionService { wrapper.eq(DatasetQuestionDO::getStatus,2); Long annoCount = datasetQuestionMapper.selectCount(wrapper); double ratio = sumCount == 0 ? 0 : ((double) annoCount / sumCount) *100; - String formattedRatio = String.format("%.2f", ratio); + Integer formattedRatio = ratio == 0 ? 0 : (int) ratio; datasetMapper.updateProcess(formattedRatio, updateReqVOS.get(0).getDatasetId()); } 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 bf6916c34..14584c117 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 @@ -107,7 +107,7 @@ public class DatasetServiceImpl implements DatasetService { .eq(DatasetQuestionDO::getDatasetId, updateObj.getId()) .eq(DatasetQuestionDO::getStatus,2)); double ratio = count == 0 ? 0 : ((double) annoCount / count) *100; - String formattedRatio = String.format("%.2f%%", ratio); + Integer formattedRatio = ratio == 0 ? 0 : (int) ratio; if (formattedRatio != null){ updateObj.setAnnotateProgress(formattedRatio); }