From 64f5c3fe93352f66bc8dae90bb84f9f078a374d1 Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Mon, 11 Aug 2025 10:34:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor(llm):=20=E5=B0=86=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BB=8E=20Intege?= =?UTF-8?q?r=20=E6=94=B9=E4=B8=BA=20Double?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了 BaseModelDO、BaseModelPageReqVO、BaseModelRespVO、BaseModelSaveReqVO 中的 parameterCount 字段类型- 更新了 BaseModelTaskService 中的相关代码，以适应新的 Double 类型参数量 - 这个改动可以更精确地表示模型的参数量，特别是对于参数量较大的模型 --- .../controller/admin/basemodel/vo/BaseModelPageReqVO.java | 2 +- .../llm/controller/admin/basemodel/vo/BaseModelRespVO.java | 2 +- .../controller/admin/basemodel/vo/BaseModelSaveReqVO.java | 2 +- .../module/llm/dal/dataobject/basemodel/BaseModelDO.java | 2 +- .../module/llm/service/basemodel/BaseModelTaskService.java | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelPageReqVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelPageReqVO.java index de48d57f6..d37995166 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelPageReqVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelPageReqVO.java @@ -19,7 +19,7 @@ public class BaseModelPageReqVO extends PageParam { private String modelName; @Schema(description = "参数量", example = "12388") - private Integer parameterCount; + private Double parameterCount; @Schema(description = "最大上下文长度") private Integer maxContextLength; diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelRespVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelRespVO.java index d5b1ff00c..e43a57136 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelRespVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelRespVO.java @@ -25,7 +25,7 @@ public class BaseModelRespVO { @Schema(description = "参数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "12388") @ExcelProperty("参数量") - private Integer parameterCount; + private Double parameterCount; @Schema(description = "最大上下文长度", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("最大上下文长度") diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelSaveReqVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelSaveReqVO.java index b021c5c91..dba0f9a73 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelSaveReqVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/basemodel/vo/BaseModelSaveReqVO.java @@ -18,7 +18,7 @@ public class BaseModelSaveReqVO { @Schema(description = "参数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "12388") @NotNull(message = "参数量不能为空") - private Integer parameterCount; + private Double parameterCount; @Schema(description = "最大上下文长度", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "最大上下文长度不能为空") diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/basemodel/BaseModelDO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/basemodel/BaseModelDO.java index d2ce20112..7393b298c 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/basemodel/BaseModelDO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/basemodel/BaseModelDO.java @@ -34,7 +34,7 @@ public class BaseModelDO extends BaseDO { /** * 参数量 */ - private Integer parameterCount; + private Double parameterCount; /** * 最大上下文长度 */ diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java index 695bd6d24..2922dd226 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java @@ -179,12 +179,12 @@ public class BaseModelTaskService { baseModelSaveReqVO.setIsActive(1); baseModelSaveReqVO.setIsFinetuned(modelListRe.getIsFineTuning()); baseModelSaveReqVO.setNotes(modelListRe.getRemark()); - baseModelSaveReqVO.setParameterCount(1); + baseModelSaveReqVO.setParameterCount(1.0); baseModelService.createBaseModel(baseModelSaveReqVO); } else { BaseModelSaveReqVO baseModelSaveReqVO = new BaseModelSaveReqVO(); baseModelSaveReqVO.setId(byAigcId.getId()); - baseModelSaveReqVO.setParameterCount(1); + baseModelSaveReqVO.setParameterCount(1.0); baseModelSaveReqVO.setModelName(modelListRe.getModelName()); baseModelSaveReqVO.setModelType(modelListRe.getModelType()); baseModelSaveReqVO.setMaxContextLength(modelListRe.getMaxTokens()); @@ -311,7 +311,7 @@ public class BaseModelTaskService { PedestalModelVO pedestalModelVo = collect.get(0); // 查找本地模型 List localModels = modelServiceDOS.stream() - .filter(baseModel -> pedestalModelVo.getDeploymentName().equals(baseModel.getBaseModelName())) + .filter(baseModel -> pedestalModelVo.getDeploymentName().equals(baseModel.getBaseModelName()) && baseModel.getStatus() != 3) .collect(Collectors.toList()); if (localModels != null && localModels.size() > 0) {