Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-29 05:33:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:增加仅上报模型说明和记忆模型排序

Browse Source
This commit is contained in:
rainv123
2026-03-23 16:58:51 +08:00
parent 2a49f0804c
commit 6d89ae1c66
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
+2 -1
View File
@@ -57,7 +57,8 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
.eq("model_type", modelType) .eq("model_type", modelType)
.eq("is_enabled", 1) .eq("is_enabled", 1)
.like(StringUtils.isNotBlank(modelName), "model_name", modelName) .like(StringUtils.isNotBlank(modelName), "model_name", modelName)
.select("id", "model_name")); .select("id", "model_name")
.orderByAsc("sort"));
return ConvertUtils.sourceToTarget(entities, ModelBasicInfoDTO.class); return ConvertUtils.sourceToTarget(entities, ModelBasicInfoDTO.class);
} }
main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
+2 -1
View File
@@ -148,7 +148,8 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
UserDetail user = SecurityUser.getUser(); UserDetail user = SecurityUser.getUser();
modelProviderDTO.setUpdater(user.getId()); modelProviderDTO.setUpdater(user.getId());
modelProviderDTO.setUpdateDate(new Date()); modelProviderDTO.setUpdateDate(new Date());
if (modelProviderDao.updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) { if (modelProviderDao
.updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) {
throw new RenException(ErrorCode.UPDATE_DATA_FAILED); throw new RenException(ErrorCode.UPDATE_DATA_FAILED);
} }
return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class); return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class);
main/manager-api/src/main/resources/db/changelog/202603231036.sql → main/manager-api/src/main/resources/db/changelog/202603231037.sql
+2 -1
View File
@@ -1,6 +1,7 @@
-- 新增仅上报聊天记录记忆模型供应器
delete from `ai_model_provider` where `id` = 'SYSTEM_Memory_mem_report_only'; delete from `ai_model_provider` where `id` = 'SYSTEM_Memory_mem_report_only';
delete from `ai_model_config` where `id` = 'Memory_mem_report_only'; delete from `ai_model_config` where `id` = 'Memory_mem_report_only';
INSERT INTO `ai_model_provider` VALUES ('SYSTEM_Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', '[]', 4, 1, NOW(), 1, NOW()); INSERT INTO `ai_model_provider` VALUES ('SYSTEM_Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', '[]', 4, 1, NOW(), 1, NOW());
INSERT INTO `ai_model_config` VALUES ('Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', 0, 1, '{"type": "mem_report_only"}', NULL, NULL, 3, NULL, NULL, NULL, NULL); INSERT INTO `ai_model_config` VALUES ('Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', 0, 1, '{"type": "mem_report_only"}', NULL, '仅上报聊天记录，不总结记忆', 3, NULL, NULL, NULL, NULL);
main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+2 -2
View File
@@ -572,9 +572,9 @@ databaseChangeLog:
encoding: utf8 encoding: utf8
path: classpath:db/changelog/202603111131.sql path: classpath:db/changelog/202603111131.sql
- changeSet: - changeSet:
id: 202603231036 id: 202603231037
author: rainv123 author: rainv123
changes: changes:
- sqlFile: - sqlFile:
encoding: utf8 encoding: utf8
path: classpath:db/changelog/202603231036.sql path: classpath:db/changelog/202603231037.sql