diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java index 07758def..dcedd535 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java @@ -16,6 +16,9 @@ public class ModelConfigBodyDTO { // @Schema(description = "模型类型(Memory/ASR/VAD/LLM/TTS)") // private String modelType; // + @Schema(description = "模型ID,未填写将自动生成") + private String id; + @Schema(description = "模型编码(如AliLLM、DoubaoTTS)") private String modelCode; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java index 32ff911f..dcd95730 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java @@ -18,7 +18,6 @@ import lombok.Data; @Schema(description = "模型配置表") public class ModelConfigEntity { - @TableId(type = IdType.ASSIGN_UUID) @Schema(description = "主键") private String id; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java index d17948a6..ea70c61f 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java @@ -1,23 +1,16 @@ package xiaozhi.modules.model.service.impl; -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; import xiaozhi.common.constant.Constant; import xiaozhi.common.exception.ErrorCode; import xiaozhi.common.exception.RenException; @@ -30,15 +23,17 @@ import xiaozhi.common.utils.SensitiveDataUtils; import xiaozhi.modules.agent.dao.AgentDao; import xiaozhi.modules.agent.entity.AgentEntity; import xiaozhi.modules.model.dao.ModelConfigDao; -import xiaozhi.modules.model.dto.LlmModelBasicInfoDTO; -import xiaozhi.modules.model.dto.ModelBasicInfoDTO; -import xiaozhi.modules.model.dto.ModelConfigBodyDTO; -import xiaozhi.modules.model.dto.ModelConfigDTO; -import xiaozhi.modules.model.dto.ModelProviderDTO; +import xiaozhi.modules.model.dto.*; import xiaozhi.modules.model.entity.ModelConfigEntity; import xiaozhi.modules.model.service.ModelConfigService; import xiaozhi.modules.model.service.ModelProviderService; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + @Service @AllArgsConstructor public class ModelConfigServiceImpl extends BaseServiceImpl @@ -230,7 +225,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl
+ + + @@ -107,6 +111,7 @@ export default { providerFields: [], currentProvider: null, formData: { + id: '', modelName: '', modelCode: '', supplier: '', @@ -202,6 +207,7 @@ export default { } const submitData = { + id: this.formData.id || '', modelName: this.formData.modelName || '', modelCode: this.formData.modelCode || '', supplier: this.formData.supplier, @@ -230,6 +236,7 @@ export default { resetForm() { this.saving = false; this.formData = { + id: '', modelName: '', modelCode: '', supplier: '', diff --git a/main/manager-web/src/i18n/en.js b/main/manager-web/src/i18n/en.js index eba922d2..47a1004e 100644 --- a/main/manager-web/src/i18n/en.js +++ b/main/manager-web/src/i18n/en.js @@ -841,6 +841,8 @@ export default { 'modelConfigDialog.modelInfo': 'Model Information', 'modelConfigDialog.enable': 'Enable', 'modelConfigDialog.setDefault': 'Set as Default', + 'modelConfigDialog.modelId': 'Model ID', + 'modelConfigDialog.enterModelId': 'If not filled in, it will be generated automatically', 'modelConfigDialog.modelName': 'Model Name', 'modelConfigDialog.enterModelName': 'Please enter model name', 'modelConfigDialog.modelCode': 'Model Code', diff --git a/main/manager-web/src/i18n/zh_CN.js b/main/manager-web/src/i18n/zh_CN.js index 428a3127..a3bc0dc2 100644 --- a/main/manager-web/src/i18n/zh_CN.js +++ b/main/manager-web/src/i18n/zh_CN.js @@ -841,6 +841,8 @@ export default { 'modelConfigDialog.modelInfo': '模型信息', 'modelConfigDialog.enable': '是否启用', 'modelConfigDialog.setDefault': '设为默认', + 'modelConfigDialog.modelId': '模型ID', + 'modelConfigDialog.enterModelId': '未填写将自动生成模型ID', 'modelConfigDialog.modelName': '模型名称', 'modelConfigDialog.enterModelName': '请输入模型名称', 'modelConfigDialog.modelCode': '模型编码', diff --git a/main/manager-web/src/i18n/zh_TW.js b/main/manager-web/src/i18n/zh_TW.js index 3eda82cf..3652b11e 100644 --- a/main/manager-web/src/i18n/zh_TW.js +++ b/main/manager-web/src/i18n/zh_TW.js @@ -841,6 +841,8 @@ export default { 'modelConfigDialog.modelInfo': '模型信息', 'modelConfigDialog.enable': '是否啟用', 'modelConfigDialog.setDefault': '設為默認', + 'modelConfigDialog.modelId': '模型ID', + 'modelConfigDialog.enterModelId': '未填冩將自動生成模型ID', 'modelConfigDialog.modelName': '模型名稱', 'modelConfigDialog.enterModelName': '請輸入模型名稱', 'modelConfigDialog.modelCode': '模型編碼',