From bfb54207337d1e45942200d2d2611e4fe79794b0 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Sun, 11 May 2025 19:23:01 +0800 Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA0=E3=80=811=E3=80=812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/xiaozhi/common/constant/Constant.java | 4 +--- .../main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java | 2 +- .../main/java/xiaozhi/modules/agent/entity/AgentEntity.java | 2 +- .../xiaozhi/modules/agent/entity/AgentTemplateEntity.java | 2 +- .../service/biz/impl/AgentChatHistoryBizServiceImpl.java | 3 --- .../src/main/resources/db/changelog/202505111912.sql | 3 +++ 6 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 main/manager-api/src/main/resources/db/changelog/202505111912.sql diff --git a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java index c0ceab09..ab6766c7 100644 --- a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java +++ b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java @@ -180,9 +180,7 @@ public interface Constant { enum ChatHistoryConfEnum { IGNORE(0, "不记录"), RECORD_TEXT(1, "记录文本"), - RECORD_AUDIO(2, "记录音频"), - RECORD_TEXT_AUDIO(3, "文本音频都记录") - ; + RECORD_TEXT_AUDIO(2, "文本音频都记录"); private final int code; private final String name; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java index 1082d00b..e3d026e3 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java @@ -45,7 +45,7 @@ public class AgentUpdateDTO implements Serializable { @Schema(description = "角色设定参数", example = "你是一个专业的客服助手，负责回答用户问题并提供帮助", required = false) private String systemPrompt; - @Schema(description = "聊天记录配置（0不记录 1仅记录文本 2仅记录语音 3记录文本和语音）", example = "3", required = false) + @Schema(description = "聊天记录配置（0不记录 1仅记录文本 2记录文本和语音）", example = "3", required = false) private Integer chatHistoryConf; @Schema(description = "语言编码", example = "zh_CN", required = false) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentEntity.java index 39fd7682..82a20489 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentEntity.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentEntity.java @@ -48,7 +48,7 @@ public class AgentEntity { @Schema(description = "意图模型标识") private String intentModelId; - @Schema(description = "聊天记录配置（0不记录 1仅记录文本 2仅记录语音 3记录文本和语音）") + @Schema(description = "聊天记录配置（0不记录 1仅记录文本 2记录文本和语音）") private Integer chatHistoryConf; @Schema(description = "角色设定参数") diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentTemplateEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentTemplateEntity.java index cc132260..1604a27b 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentTemplateEntity.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentTemplateEntity.java @@ -70,7 +70,7 @@ public class AgentTemplateEntity implements Serializable { private String intentModelId; /** - * 聊天记录配置（0不记录 1仅记录文本 2仅记录语音 3记录文本和语音） + * 聊天记录配置（0不记录 1仅记录文本 2记录文本和语音） */ private Integer chatHistoryConf; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java index 48d02171..bf6c188b 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java @@ -60,8 +60,6 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic if (Objects.equals(chatHistoryConf, Constant.ChatHistoryConfEnum.RECORD_TEXT.getCode())) { saveChatText(report, agentId, macAddress, null); - } else if (Objects.equals(chatHistoryConf, Constant.ChatHistoryConfEnum.RECORD_AUDIO.getCode())) { - saveChatAudio(report); } else if (Objects.equals(chatHistoryConf, Constant.ChatHistoryConfEnum.RECORD_TEXT_AUDIO.getCode())) { String audioId = saveChatAudio(report); saveChatText(report, agentId, macAddress, audioId); @@ -69,7 +67,6 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic // 更新设备最后对话时间 redisUtils.set(RedisKeys.getAgentDeviceLastConnectedAtById(agentId), new Date()); - return Boolean.TRUE; } diff --git a/main/manager-api/src/main/resources/db/changelog/202505111912.sql b/main/manager-api/src/main/resources/db/changelog/202505111912.sql new file mode 100644 index 00000000..2d1cd7bf --- /dev/null +++ b/main/manager-api/src/main/resources/db/changelog/202505111912.sql @@ -0,0 +1,3 @@ +-- 添加聊天记录配置字段 +ALTER TABLE `ai_agent` +ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 2 COMMENT '聊天记录配置（0不记录 1仅记录文本 2记录文本和语音）' AFTER `system_prompt`; \ No newline at end of file