From 4a0bdbf779ce1955083badcb9147e05ab7a1a2cc Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Mon, 12 May 2025 15:49:44 +0800
Subject: [PATCH] =?UTF-8?q?update:=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=A8=A1=E5=BC=8F=E5=92=8C=E8=AE=B0=E5=BF=86?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agent/service/impl/AgentServiceImpl.java  | 10 +-
 .../{202505111913.sql => 202505111914.sql}    |  4 +-
 .../db/changelog/db.changelog-master.yaml     |  4 +-
 main/manager-web/src/views/roleConfig.vue     | 99 ++++++++++---------
 4 files changed, 67 insertions(+), 50 deletions(-)
 rename main/manager-api/src/main/resources/db/changelog/{202505111913.sql => 202505111914.sql} (69%)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
index ae650c85..96040404 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import lombok.AllArgsConstructor;
+import xiaozhi.common.constant.Constant;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.redis.RedisKeys;
 import xiaozhi.common.redis.RedisUtils;
@@ -46,7 +47,14 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
 
     @Override
     public AgentEntity getAgentById(String id) {
-        return agentDao.selectById(id);
+        AgentEntity agent = agentDao.selectById(id);
+        if (agent != null && agent.getMemModelId() != null && agent.getMemModelId().equals("Memory_nomem")) {
+            agent.setChatHistoryConf(Constant.ChatHistoryConfEnum.IGNORE.getCode());
+        } else if (agent != null && agent.getMemModelId() != null && !agent.getMemModelId().equals("Memory_nomem")
+                && agent.getChatHistoryConf() == null) {
+            agent.setChatHistoryConf(Constant.ChatHistoryConfEnum.RECORD_TEXT_AUDIO.getCode());
+        }
+        return agent;
     }
 
     @Override
diff --git a/main/manager-api/src/main/resources/db/changelog/202505111913.sql b/main/manager-api/src/main/resources/db/changelog/202505111914.sql
similarity index 69%
rename from main/manager-api/src/main/resources/db/changelog/202505111913.sql
rename to main/manager-api/src/main/resources/db/changelog/202505111914.sql
index 5d248132..c67f3477 100644
--- a/main/manager-api/src/main/resources/db/changelog/202505111913.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202505111914.sql
@@ -1,6 +1,6 @@
 -- 添加聊天记录配置字段
 ALTER TABLE `ai_agent` 
-ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 2 COMMENT '聊天记录配置（0不记录 1仅记录文本 2记录文本和语音）' AFTER `system_prompt`;
+ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 0 COMMENT '聊天记录配置（0不记录 1仅记录文本 2记录文本和语音）' AFTER `system_prompt`;
 
 ALTER TABLE `ai_agent_template` 
-ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 2 COMMENT '聊天记录配置（0不记录 1仅记录文本 2记录文本和语音）' AFTER `system_prompt`;
\ No newline at end of file
+ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 0 COMMENT '聊天记录配置（0不记录 1仅记录文本 2记录文本和语音）' AFTER `system_prompt`;
\ No newline at end of file
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index ef975dce..65ec8972 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -115,9 +115,9 @@ databaseChangeLog:
             encoding: utf8
             path: classpath:db/changelog/202505091409.sql
   - changeSet:
-      id: 202505111913
+      id: 202505111914
       author: hrz
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202505111913.sql
\ No newline at end of file
+            path: classpath:db/changelog/202505111914.sql
\ No newline at end of file
diff --git a/main/manager-web/src/views/roleConfig.vue b/main/manager-web/src/views/roleConfig.vue
index fd601732..8e0d0fb4 100644
--- a/main/manager-web/src/views/roleConfig.vue
+++ b/main/manager-web/src/views/roleConfig.vue
@@ -61,29 +61,40 @@
                     <el-form-item v-for="(model, index) in models" :key="`model-${index}`" :label="model.label"
                       class="model-item">
                       <div class="model-select-wrapper">
-                        <el-select v-model="form.model[model.key]" filterable placeholder="请选择" class="form-select" @change="handleModelChange(model.type, $event)">
-                          <el-option v-for="(item, optionIndex) in modelOptions[model.type]" :key="`option-${index}-${optionIndex}`" :label="item.label" :value="item.value"/>
+                        <el-select v-model="form.model[model.key]" filterable placeholder="请选择" class="form-select"
+                          @change="handleModelChange(model.type, $event)">
+                          <el-option v-for="(item, optionIndex) in modelOptions[model.type]"
+                            :key="`option-${index}-${optionIndex}`" :label="item.label" :value="item.value" />
                         </el-select>
-                          <div v-if="showFunctionIcons(model.type)" class="function-icons">
-                            <el-tooltip v-for="func in currentFunctions" :key="func.name" effect="dark" placement="top" popper-class="custom-tooltip">
-                              <div slot="content">
-                                <div><strong>功能名称:</strong> {{ func.name }}</div>
-                                <div v-if="Object.keys(func.params).length > 0">
-                                  <strong>参数配置:</strong>
-                                  <div v-for="(value, key) in func.params" :key="key">
-                                    {{ key }}: {{ value }}
-                                  </div>
+                        <div v-if="showFunctionIcons(model.type)" class="function-icons">
+                          <el-tooltip v-for="func in currentFunctions" :key="func.name" effect="dark" placement="top"
+                            popper-class="custom-tooltip">
+                            <div slot="content">
+                              <div><strong>功能名称:</strong> {{ func.name }}</div>
+                              <div v-if="Object.keys(func.params).length > 0">
+                                <strong>参数配置:</strong>
+                                <div v-for="(value, key) in func.params" :key="key">
+                                  {{ key }}: {{ value }}
                                 </div>
-                                <div v-else>无参数配置</div>
                               </div>
-                              <div class="icon-dot" :style="{backgroundColor: getFunctionColor(func.name)}">
-                                {{ func.name.charAt(0) }}
-                              </div>
-                            </el-tooltip>
-                            <el-button class="edit-function-btn" @click="showFunctionDialog = true" :class="{'active-btn': showFunctionDialog}">
-                              编辑功能
-                            </el-button>
-                          </div>
+                              <div v-else>无参数配置</div>
+                            </div>
+                            <div class="icon-dot" :style="{ backgroundColor: getFunctionColor(func.name) }">
+                              {{ func.name.charAt(0) }}
+                            </div>
+                          </el-tooltip>
+                          <el-button class="edit-function-btn" @click="showFunctionDialog = true"
+                            :class="{ 'active-btn': showFunctionDialog }">
+                            编辑功能
+                          </el-button>
+                        </div>
+                        <div v-if="model.type === 'Memory' && form.model.memModelId !== 'Memory_nomem'"
+                          class="chat-history-options">
+                          <el-radio-group v-model="form.chatHistoryConf" @change="updateChatHistoryConf">
+                            <el-radio-button :label="1">上报文字</el-radio-button>
+                            <el-radio-button :label="2">上报文字+语音</el-radio-button>
+                          </el-radio-group>
+                        </div>
                       </div>
                     </el-form-item>
                     <el-form-item label="角色音色">
@@ -92,12 +103,6 @@
                           :value="item.value" />
                       </el-select>
                     </el-form-item>
-                    <el-form-item label="聊天记录配置">
-                      <el-select v-model="form.chatHistoryConf" placeholder="请选择" class="form-select">
-                        <el-option v-for="(item, index) in chatHistoryOptions" :key="`chatHistoryConf-${index}`"
-                          :label="item.label" :value="item.value" />
-                      </el-select>
-                    </el-form-item>
                   </div>
                 </div>
               </div>
@@ -107,14 +112,15 @@
       </div>
     </div>
 
-    <function-dialog v-model="showFunctionDialog" :functions="currentFunctions" @update-functions="handleUpdateFunctions"  @dialog-closed="handleDialogClosed"/>
+    <function-dialog v-model="showFunctionDialog" :functions="currentFunctions"
+      @update-functions="handleUpdateFunctions" @dialog-closed="handleDialogClosed" />
   </div>
 </template>
 
 <script>
 import Api from '@/apis/api';
-import HeaderBar from "@/components/HeaderBar.vue";
 import FunctionDialog from "@/components/FunctionDialog.vue";
+import HeaderBar from "@/components/HeaderBar.vue";
 
 export default {
   name: 'RoleConfigPage',
@@ -125,7 +131,7 @@ export default {
         agentCode: "",
         agentName: "",
         ttsVoiceId: "",
-        chatHistoryConf: "",
+        chatHistoryConf: 0,
         systemPrompt: "",
         langCode: "",
         language: "",
@@ -163,20 +169,6 @@ export default {
         { name: '工具', params: {} },
         { name: '退出', params: {} }
       ],
-      chatHistoryOptions: [
-        {
-          "value": 0,
-          "label": "不记录"
-        },
-        {
-          "value": 1,
-          "label": "仅记录文本"
-        },
-        {
-          "value": 2,
-          "label": "文本音频都记录"
-        }
-      ],
     }
   },
   methods: {
@@ -225,7 +217,7 @@ export default {
           agentCode: "",
           agentName: "",
           ttsVoiceId: "",
-          chatHistoryConf: "",
+          chatHistoryConf: 0,
           systemPrompt: "",
           langCode: "",
           language: "",
@@ -244,7 +236,7 @@ export default {
           message: '配置已重置',
           showClose: true
         })
-      }).catch(() => {});
+      }).catch(() => { });
     },
     fetchTemplates() {
       Api.agent.getAgentTemplate(({ data }) => {
@@ -355,6 +347,12 @@ export default {
       if (type === 'Intent' && value === 'Intent_function_call') {
         this.fetchFunctionList();
       }
+      if (type === 'Memory' && value === 'Memory_nomem') {
+        this.form.chatHistoryConf = 0;
+      }
+      if (type === 'Memory' && value !== 'Memory_nomem' && (this.form.chatHistoryConf === 0 || this.form.chatHistoryConf === null)) {
+        this.form.chatHistoryConf = 2;
+      }
     },
     fetchFunctionList() {
       // 使用假数据代替API调用
@@ -379,6 +377,11 @@ export default {
         this.currentFunctions = JSON.parse(JSON.stringify(this.originalFunctions));
       }
     },
+    updateChatHistoryConf() {
+      if (this.form.model.memModelId === 'Memory_nomem') {
+        this.form.chatHistoryConf = 0;
+      }
+    },
   },
   watch: {
     'form.model.ttsModelId': {
@@ -693,4 +696,10 @@ export default {
   color: white;
 }
 
+.chat-history-options {
+  display: flex;
+  gap: 10px;
+  min-width: 250px;
+  justify-content: flex-end;
+}
 </style>
\ No newline at end of file