fix:移除触发器，在DAO层添加了删除方法

2026-07-22 23:23:55 +08:00 · 2025-11-13 12:35:07 +08:00
parent b7ca7cbdb5
commit 8ad22dc082
6 changed files with 41 additions and 23 deletions
@@ -111,11 +111,11 @@ public class AgentPluginMappingServiceImpl extends ServiceImpl<AgentPluginMappin
        if (StringUtils.isBlank(knowledgeBaseId)) {
            return;
        }
-        
+
        UpdateWrapper<AgentPluginMapping> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("plugin_id", knowledgeBaseId);
        int deletedCount = agentPluginMappingMapper.delete(updateWrapper);
-        
+
        if (deletedCount > 0) {
            log.info("已删除 {} 条与知识库ID '{}' 相关的插件映射记录", deletedCount, knowledgeBaseId);
        }
@@ -1,6 +1,7 @@
 package xiaozhi.modules.knowledge.dao;

 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;

 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.knowledge.entity.KnowledgeBaseEntity;
@@ -11,4 +12,11 @@ import xiaozhi.modules.knowledge.entity.KnowledgeBaseEntity;
@Mapper
 public interface KnowledgeBaseDao extends BaseDao<KnowledgeBaseEntity> {

+    /**
+     * 根据知识库ID删除相关的插件映射记录
+     * 
+     * @param knowledgeBaseId 知识库ID
+     */
+    void deletePluginMappingByKnowledgeBaseId(@Param("knowledgeBaseId") String knowledgeBaseId);
+
 }
@@ -314,8 +314,12 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,

        // API删除成功后再删除本地记录
        if (apiDeleteSuccess) {
-            log.info("数据库触发器将自动清理ai_agent_plugin_mapping表中与知识库ID '{}' 相关的映射记录", entity.getId());
+            log.info("开始删除ai_agent_plugin_mapping表中与知识库ID '{}' 相关的映射记录", entity.getId());
            
+            // 先删除相关的插件映射记录
+            knowledgeBaseDao.deletePluginMappingByKnowledgeBaseId(entity.getId());
+            log.info("插件映射记录删除完成");
+
            int deleteCount = knowledgeBaseDao.deleteById(entity.getId());
            log.info("本地数据库删除结果: {}", deleteCount > 0 ? "成功" : "失败");
        }
@@ -1,13 +0,0 @@
-- 当删除知识库记录时，自动删除相关的插件映射记录
-
-- 先删除可能存在的同名触发器（如果存在）
-DROP TRIGGER IF EXISTS trigger_delete_plugin_mapping_on_knowledgebase_delete;
-
-- 创建新的触发器
-CREATE TRIGGER trigger_delete_plugin_mapping_on_knowledgebase_delete
-AFTER DELETE ON ai_rag_dataset
-FOR EACH ROW
-BEGIN
-    -- 删除与该知识库ID相关的插件映射记录
-    DELETE FROM ai_agent_plugin_mapping WHERE plugin_id = OLD.id;
-END;
@@ -416,10 +416,3 @@ databaseChangeLog:
        - sqlFile:
            encoding: utf8
            path: classpath:db/changelog/202510251150.sql
-  - changeSet:
-      id: 202511131016
-      author: rainv123
-      changes:
-        - sqlFile:
-            encoding: utf8
-            path: classpath:db/changelog/202511131016.sql
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="xiaozhi.modules.knowledge.dao.KnowledgeBaseDao">
+
+    <resultMap id="BaseResultMap" type="xiaozhi.modules.knowledge.entity.KnowledgeBaseEntity">
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="datasetId" column="dataset_id" jdbcType="VARCHAR"/>
+        <result property="ragModelId" column="rag_model_id" jdbcType="VARCHAR"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="description" column="description" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="TINYINT"/>
+        <result property="creator" column="creator" jdbcType="BIGINT"/>
+        <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
+        <result property="updater" column="updater" jdbcType="BIGINT"/>
+        <result property="updatedAt" column="updated_at" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <!-- 根据知识库ID删除相关的插件映射记录 -->
+    <delete id="deletePluginMappingByKnowledgeBaseId">
+        DELETE FROM ai_agent_plugin_mapping 
+        WHERE plugin_id = #{knowledgeBaseId}
+    </delete>
+
+</mapper>