Merge pull request #153 from MuSan-Li/feature_20250802_fix_k_sql

feat: 调整知识库角色sql

ruoyi-admin/src/main/resources/application.yml

@@ -1,4 +1,3 @@
-
 # 项目相关配置
 ruoyi:
   # 名称
@@ -162,6 +161,9 @@ tenant:
     - sys_user_post
     - sys_user_role
 
+knowledge-role:
+  enable: false
+
 # MyBatisPlus配置
 # https://baomidou.com/config/
 mybatis-plus:

ruoyi-common/ruoyi-common-core/src/main/java/org/ruoyi/common/core/domain/model/LoginUser.java

@@ -117,6 +117,16 @@ public class LoginUser implements Serializable {
      */
     private Long roleId;
 
+    /**
+     * 关联角色类型
+     */
+    private String kroleGroupType;
+
+    /**
+     * 关联角色id
+     */
+    private String kroleGroupIds;
+
     /**
      * 获取登录id
      */

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java

@@ -1,5 +1,6 @@
 package org.ruoyi.domain;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -47,6 +48,9 @@ public class ChatSession extends BaseEntity {
      * 备注
      */
     private String remark;
-
+    /**
+     * 会话id
+     */
+    private String conversationId;
 
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatSessionBo.java

@@ -1,5 +1,6 @@
 package org.ruoyi.domain.bo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -44,6 +45,9 @@ public class ChatSessionBo extends BaseEntity {
      * 备注
      */
     private String remark;
-
+    /**
+     * 会话id
+     */
+    private String conversationId;
 
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatSessionVo.java

@@ -61,6 +61,11 @@ public class ChatSessionVo implements Serializable {
     @ExcelProperty(value = "创建时间")
     private String createTime;
 
+    /**
+     * 会话id
+     */
+    @ExcelProperty(value = "会话id")
+    private String conversationId;
 
 
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatMessageServiceImpl.java

@@ -48,7 +48,10 @@ public class ChatMessageServiceImpl implements IChatMessageService {
         if(!LoginHelper.isLogin()){
             return TableDataInfo.build();
         }
-        bo.setUserId(LoginHelper.getUserId());
+        // 只有非管理员才自动设置为自己的 ID
+        if (!LoginHelper.isSuperAdmin()) {
+            bo.setUserId(LoginHelper.getUserId());
+        }
         LambdaQueryWrapper<ChatMessage> lqw = buildQueryWrapper(bo);
         Page<ChatMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRole.java

@@ -0,0 +1,62 @@
+package org.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.util.List;
+
+/**
+ * 知识库角色对象 knowledge_role
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("knowledge_role")
+public class KnowledgeRole extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 知识库角色id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 知识库角色组id
+     */
+    private Long groupId;
+
+    /**
+     * 知识库角色name
+     */
+    private String name;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    /**
+     * 知识库id列表
+     */
+    @TableField(exist = false)
+    private List<Long> knowledgeIds;
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRoleGroup.java

@@ -0,0 +1,49 @@
+package org.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 知识库角色组对象 knowledge_role_group
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("knowledge_role_group")
+public class KnowledgeRoleGroup extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 知识库角色组id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 知识库角色组name
+     */
+    private String name;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeRoleRelation.java

@@ -0,0 +1,54 @@
+package org.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 知识库角色与知识库关联对象 knowledge_role_relation
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("knowledge_role_relation")
+public class KnowledgeRoleRelation extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 知识库角色id
+     */
+    private Long knowledgeRoleId;
+
+    /**
+     * 知识库id
+     */
+    private Long knowledgeId;
+
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/bo/KnowledgeRoleBo.java

@@ -0,0 +1,54 @@
+package org.ruoyi.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
+import org.ruoyi.domain.KnowledgeRole;
+
+import java.util.List;
+
+/**
+ * 知识库角色业务对象 knowledge_role
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeRole.class, reverseConvertGenerate = false)
+public class KnowledgeRoleBo extends BaseEntity {
+
+    /**
+     * 知识库角色id
+     */
+    @NotNull(message = "知识库角色id不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 知识库角色组id
+     */
+    @NotNull(message = "知识库角色组id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long groupId;
+
+    /**
+     * 知识库角色name
+     */
+    @NotBlank(message = "知识库角色name不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 知识库id列表
+     */
+    private List<Long> knowledgeIds;
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/bo/KnowledgeRoleGroupBo.java

@@ -0,0 +1,42 @@
+package org.ruoyi.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
+import org.ruoyi.domain.KnowledgeRoleGroup;
+
+/**
+ * 知识库角色组业务对象 knowledge_role_group
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeRoleGroup.class, reverseConvertGenerate = false)
+public class KnowledgeRoleGroupBo extends BaseEntity {
+
+    /**
+     * 知识库角色组id
+     */
+    @NotNull(message = "知识库角色组id不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 知识库角色组name
+     */
+    @NotBlank(message = "知识库角色组name不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/bo/KnowledgeRoleRelationBo.java

@@ -0,0 +1,49 @@
+package org.ruoyi.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
+import org.ruoyi.domain.KnowledgeRoleRelation;
+
+/**
+ * 知识库角色与知识库关联业务对象 knowledge_role_relation
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeRoleRelation.class, reverseConvertGenerate = false)
+public class KnowledgeRoleRelationBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String remark;
+
+    /**
+     * 知识库角色id
+     */
+    @NotNull(message = "知识库角色id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long knowledgeRoleId;
+
+    /**
+     * 知识库id
+     */
+    @NotNull(message = "知识库id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long knowledgeId;
+
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/vo/KnowledgeRoleGroupVo.java

@@ -0,0 +1,71 @@
+package org.ruoyi.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.ruoyi.domain.KnowledgeRoleGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 知识库角色组视图对象 knowledge_role_group
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeRoleGroup.class)
+public class KnowledgeRoleGroupVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 知识库角色组id
+     */
+    @ExcelProperty(value = "知识库角色组id")
+    private Long id;
+
+    /**
+     * 知识库角色组name
+     */
+    @ExcelProperty(value = "知识库角色组名称")
+    private String name;
+
+    /**
+     * 创建者
+     */
+    @ExcelProperty(value = "创建者")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @ExcelProperty(value = "更新时间")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/vo/KnowledgeRoleRelationVo.java

@@ -0,0 +1,52 @@
+package org.ruoyi.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.ruoyi.domain.KnowledgeRoleRelation;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 知识库角色与知识库关联视图对象 knowledge_role_relation
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeRoleRelation.class)
+public class KnowledgeRoleRelationVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 知识库角色id
+     */
+    @ExcelProperty(value = "知识库角色id")
+    private Long knowledgeRoleId;
+
+    /**
+     * 知识库id
+     */
+    @ExcelProperty(value = "知识库id")
+    private Long knowledgeId;
+
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/vo/KnowledgeRoleVo.java

@@ -0,0 +1,89 @@
+package org.ruoyi.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.ruoyi.domain.KnowledgeRole;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 知识库角色视图对象 knowledge_role
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeRole.class)
+public class KnowledgeRoleVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 知识库角色id
+     */
+    @ExcelProperty(value = "知识库角色id")
+    private Long id;
+
+    /**
+     * 知识库角色组id
+     */
+    @ExcelProperty(value = "知识库角色组id")
+    private Long groupId;
+
+    /**
+     * 知识库角色name
+     */
+    @ExcelProperty(value = "知识库角色name")
+    private String name;
+
+    /**
+     * 创建者
+     */
+    @ExcelProperty(value = "创建者")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @ExcelProperty(value = "更新时间")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+    /**
+     * 知识库id列表
+     */
+    private List<Long> knowledgeIds;
+
+
+    /**
+     * 角色组名称
+     */
+    private String groupName;
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/KnowledgeRoleGroupMapper.java

@@ -0,0 +1,15 @@
+package org.ruoyi.mapper;
+
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.domain.KnowledgeRoleGroup;
+import org.ruoyi.domain.vo.KnowledgeRoleGroupVo;
+
+/**
+ * 知识库角色组Mapper接口
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+public interface KnowledgeRoleGroupMapper extends BaseMapperPlus<KnowledgeRoleGroup, KnowledgeRoleGroupVo> {
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/KnowledgeRoleMapper.java

@@ -0,0 +1,15 @@
+package org.ruoyi.mapper;
+
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.domain.KnowledgeRole;
+import org.ruoyi.domain.vo.KnowledgeRoleVo;
+
+/**
+ * 知识库角色Mapper接口
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+public interface KnowledgeRoleMapper extends BaseMapperPlus<KnowledgeRole, KnowledgeRoleVo> {
+
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/KnowledgeRoleRelationMapper.java

@@ -0,0 +1,38 @@
+package org.ruoyi.mapper;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.domain.KnowledgeRoleRelation;
+import org.ruoyi.domain.vo.KnowledgeRoleRelationVo;
+
+import java.util.List;
+
+/**
+ * 知识库角色与知识库关联Mapper接口
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+public interface KnowledgeRoleRelationMapper extends BaseMapperPlus<KnowledgeRoleRelation, KnowledgeRoleRelationVo> {
+    @Select("SELECT knowledge_id FROM knowledge_role_relation WHERE knowledge_role_id = #{knowledgeRoleId}")
+    List<Long> selectKnowledgeIdsByRoleId(@Param("knowledgeRoleId") Long knowledgeRoleId);
+
+    /**
+     * 根据 roleId 删除所有关联
+     */
+    @Delete("DELETE FROM knowledge_role_relation WHERE knowledge_role_id = #{knowledgeRoleId}")
+    void deleteByRoleId(@Param("knowledgeRoleId") Long knowledgeRoleId);
+
+    @Delete({
+            "<script>",
+            "DELETE FROM knowledge_role_relation",
+            "WHERE knowledge_role_id IN",
+            "<foreach collection='knowledgeRoleIds' item='id' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    void deleteByRoleIds(@Param("knowledgeRoleIds") List<Long> knowledgeRoleIds);
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/IKnowledgeInfoService.java

@@ -28,6 +28,11 @@ public interface IKnowledgeInfoService {
      */
     TableDataInfo<KnowledgeInfoVo> queryPageList(KnowledgeInfoBo bo, PageQuery pageQuery);
 
+    /**
+     * 查询知识库列表
+     */
+    TableDataInfo<KnowledgeInfoVo> queryPageListByRole(PageQuery pageQuery);
+
     /**
      * 查询知识库列表
      */

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/IKnowledgeRoleGroupService.java

@@ -0,0 +1,48 @@
+package org.ruoyi.service;
+
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.bo.KnowledgeRoleGroupBo;
+import org.ruoyi.domain.vo.KnowledgeRoleGroupVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库角色组Service接口
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+public interface IKnowledgeRoleGroupService {
+
+    /**
+     * 查询知识库角色组
+     */
+    KnowledgeRoleGroupVo queryById(Long id);
+
+    /**
+     * 查询知识库角色组列表
+     */
+    TableDataInfo<KnowledgeRoleGroupVo> queryPageList(KnowledgeRoleGroupBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库角色组列表
+     */
+    List<KnowledgeRoleGroupVo> queryList(KnowledgeRoleGroupBo bo);
+
+    /**
+     * 新增知识库角色组
+     */
+    Boolean insertByBo(KnowledgeRoleGroupBo bo);
+
+    /**
+     * 修改知识库角色组
+     */
+    Boolean updateByBo(KnowledgeRoleGroupBo bo);
+
+    /**
+     * 校验并批量删除知识库角色组信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/IKnowledgeRoleRelationService.java

@@ -0,0 +1,48 @@
+package org.ruoyi.service;
+
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.bo.KnowledgeRoleRelationBo;
+import org.ruoyi.domain.vo.KnowledgeRoleRelationVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库角色与知识库关联Service接口
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+public interface IKnowledgeRoleRelationService {
+
+    /**
+     * 查询知识库角色与知识库关联
+     */
+    KnowledgeRoleRelationVo queryById(Long id);
+
+    /**
+     * 查询知识库角色与知识库关联列表
+     */
+    TableDataInfo<KnowledgeRoleRelationVo> queryPageList(KnowledgeRoleRelationBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库角色与知识库关联列表
+     */
+    List<KnowledgeRoleRelationVo> queryList(KnowledgeRoleRelationBo bo);
+
+    /**
+     * 新增知识库角色与知识库关联
+     */
+    Boolean insertByBo(KnowledgeRoleRelationBo bo);
+
+    /**
+     * 修改知识库角色与知识库关联
+     */
+    Boolean updateByBo(KnowledgeRoleRelationBo bo);
+
+    /**
+     * 校验并批量删除知识库角色与知识库关联信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/IKnowledgeRoleService.java

@@ -0,0 +1,48 @@
+package org.ruoyi.service;
+
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.bo.KnowledgeRoleBo;
+import org.ruoyi.domain.vo.KnowledgeRoleVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库角色Service接口
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+public interface IKnowledgeRoleService {
+
+    /**
+     * 查询知识库角色
+     */
+    KnowledgeRoleVo queryById(Long id);
+
+    /**
+     * 查询知识库角色列表
+     */
+    TableDataInfo<KnowledgeRoleVo> queryPageList(KnowledgeRoleBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库角色列表
+     */
+    List<KnowledgeRoleVo> queryList(KnowledgeRoleBo bo);
+
+    /**
+     * 新增知识库角色
+     */
+    Boolean insertByBo(KnowledgeRoleBo bo);
+
+    /**
+     * 修改知识库角色
+     */
+    Boolean updateByBo(KnowledgeRoleBo bo);
+
+    /**
+     * 校验并批量删除知识库角色信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/impl/KnowledgeRoleGroupServiceImpl.java

@@ -0,0 +1,109 @@
+package org.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.utils.MapstructUtils;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.KnowledgeRoleGroup;
+import org.ruoyi.domain.bo.KnowledgeRoleGroupBo;
+import org.ruoyi.domain.vo.KnowledgeRoleGroupVo;
+import org.ruoyi.mapper.KnowledgeRoleGroupMapper;
+import org.ruoyi.service.IKnowledgeRoleGroupService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 知识库角色组Service业务层处理
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeRoleGroupServiceImpl implements IKnowledgeRoleGroupService {
+
+    private final KnowledgeRoleGroupMapper baseMapper;
+
+    /**
+     * 查询知识库角色组
+     */
+    @Override
+    public KnowledgeRoleGroupVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库角色组列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeRoleGroupVo> queryPageList(KnowledgeRoleGroupBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeRoleGroup> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeRoleGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库角色组列表
+     */
+    @Override
+    public List<KnowledgeRoleGroupVo> queryList(KnowledgeRoleGroupBo bo) {
+        LambdaQueryWrapper<KnowledgeRoleGroup> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeRoleGroup> buildQueryWrapper(KnowledgeRoleGroupBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KnowledgeRoleGroup> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), KnowledgeRoleGroup::getName, bo.getName());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库角色组
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeRoleGroupBo bo) {
+        KnowledgeRoleGroup add = MapstructUtils.convert(bo, KnowledgeRoleGroup.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库角色组
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeRoleGroupBo bo) {
+        KnowledgeRoleGroup update = MapstructUtils.convert(bo, KnowledgeRoleGroup.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeRoleGroup entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识库角色组
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/impl/KnowledgeRoleRelationServiceImpl.java

@@ -0,0 +1,133 @@
+package org.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.utils.MapstructUtils;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.KnowledgeRoleRelation;
+import org.ruoyi.domain.bo.KnowledgeRoleRelationBo;
+import org.ruoyi.domain.vo.KnowledgeRoleRelationVo;
+import org.ruoyi.mapper.KnowledgeRoleRelationMapper;
+import org.ruoyi.service.IKnowledgeRoleRelationService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 知识库角色与知识库关联Service业务层处理
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeRoleRelationServiceImpl implements IKnowledgeRoleRelationService {
+
+    private final KnowledgeRoleRelationMapper baseMapper;
+    private final KnowledgeRoleRelationMapper knowledgeRoleRelationMapper;
+
+    /**
+     * 查询知识库角色与知识库关联
+     */
+    @Override
+    public KnowledgeRoleRelationVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库角色与知识库关联列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeRoleRelationVo> queryPageList(KnowledgeRoleRelationBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeRoleRelation> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeRoleRelationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库角色与知识库关联列表
+     */
+    @Override
+    public List<KnowledgeRoleRelationVo> queryList(KnowledgeRoleRelationBo bo) {
+        LambdaQueryWrapper<KnowledgeRoleRelation> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeRoleRelation> buildQueryWrapper(KnowledgeRoleRelationBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KnowledgeRoleRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getKnowledgeRoleId() != null, KnowledgeRoleRelation::getKnowledgeRoleId, bo.getKnowledgeRoleId());
+        lqw.eq(bo.getKnowledgeId() != null, KnowledgeRoleRelation::getKnowledgeId, bo.getKnowledgeId());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库角色与知识库关联
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeRoleRelationBo bo) {
+        KnowledgeRoleRelation add = MapstructUtils.convert(bo, KnowledgeRoleRelation.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库角色与知识库关联
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeRoleRelationBo bo) {
+        KnowledgeRoleRelation update = MapstructUtils.convert(bo, KnowledgeRoleRelation.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeRoleRelation entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识库角色与知识库关联
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    public void saveRoleKnowledgeRelations(Long knowledgeRoleId, List<Long> knowledgeIds) {
+        if (knowledgeRoleId == null) {
+            throw new IllegalArgumentException("knowledgeRoleId不能为空");
+        }
+
+        // 1. 删除旧的关联记录
+        knowledgeRoleRelationMapper.deleteByRoleId(knowledgeRoleId);
+
+        // 2. 插入新的关联记录
+        if (CollectionUtils.isNotEmpty(knowledgeIds)) {
+            List<KnowledgeRoleRelation> insertList = new ArrayList<>();
+            knowledgeIds.forEach(knowledgeId -> {
+                KnowledgeRoleRelation knowledgeRoleRelation = new KnowledgeRoleRelation();
+                knowledgeRoleRelation.setKnowledgeId(knowledgeId);
+                knowledgeRoleRelation.setKnowledgeRoleId(knowledgeRoleId);
+                insertList.add(knowledgeRoleRelation);
+            });
+            knowledgeRoleRelationMapper.insertBatch(insertList);
+        }
+    }
+}

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/impl/KnowledgeRoleServiceImpl.java

@@ -0,0 +1,213 @@
+package org.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.utils.MapstructUtils;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.KnowledgeRole;
+import org.ruoyi.domain.KnowledgeRoleGroup;
+import org.ruoyi.domain.KnowledgeRoleRelation;
+import org.ruoyi.domain.bo.KnowledgeRoleBo;
+import org.ruoyi.domain.vo.KnowledgeRoleVo;
+import org.ruoyi.mapper.KnowledgeRoleGroupMapper;
+import org.ruoyi.mapper.KnowledgeRoleMapper;
+import org.ruoyi.mapper.KnowledgeRoleRelationMapper;
+import org.ruoyi.service.IKnowledgeRoleService;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 知识库角色Service业务层处理
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeRoleServiceImpl implements IKnowledgeRoleService {
+
+    private final KnowledgeRoleMapper baseMapper;
+    private final KnowledgeRoleGroupMapper knowledgeRoleGroupMapper;
+    private final KnowledgeRoleRelationMapper knowledgeRoleRelationMapper;
+    private final KnowledgeRoleRelationServiceImpl knowledgeRoleRelationServiceImpl;
+
+    /**
+     * 查询知识库角色
+     */
+    @Override
+    public KnowledgeRoleVo queryById(Long id) {
+        KnowledgeRoleVo vo = baseMapper.selectVoById(id);
+        fillKnowledgeIds(vo);
+        fillKnowledgeRoleGroupName(vo);
+        return vo;
+    }
+
+    /**
+     * 查询知识库角色列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeRoleVo> queryPageList(KnowledgeRoleBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeRole> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeRoleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+
+        fillKnowledgeIds(result.getRecords());
+        fillKnowledgeRoleGroupName(result.getRecords());
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库角色列表
+     */
+    @Override
+    public List<KnowledgeRoleVo> queryList(KnowledgeRoleBo bo) {
+        LambdaQueryWrapper<KnowledgeRole> lqw = buildQueryWrapper(bo);
+        List<KnowledgeRoleVo> knowledgeRoleVos = baseMapper.selectVoList(lqw);
+        fillKnowledgeIds(knowledgeRoleVos);
+        fillKnowledgeRoleGroupName(knowledgeRoleVos);
+        return knowledgeRoleVos;
+    }
+
+    private LambdaQueryWrapper<KnowledgeRole> buildQueryWrapper(KnowledgeRoleBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KnowledgeRole> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getGroupId() != null, KnowledgeRole::getGroupId, bo.getGroupId());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库角色
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeRoleBo bo) {
+        KnowledgeRole add = MapstructUtils.convert(bo, KnowledgeRole.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+
+            // 生成relation数据
+            knowledgeRoleRelationServiceImpl.saveRoleKnowledgeRelations(bo.getId(), bo.getKnowledgeIds());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库角色
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeRoleBo bo) {
+        KnowledgeRole update = MapstructUtils.convert(bo, KnowledgeRole.class);
+        validEntityBeforeSave(update);
+        int count = baseMapper.updateById(update);
+        if (count > 0) {
+            // 生成relation数据
+            knowledgeRoleRelationServiceImpl.saveRoleKnowledgeRelations(bo.getId(), bo.getKnowledgeIds());
+        }
+
+        return count > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeRole entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识库角色
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        int count = baseMapper.deleteBatchIds(ids);
+        if (count > 0) {
+            knowledgeRoleRelationMapper.deleteByRoleIds(ids.stream().toList());
+        }
+
+        return count > 0;
+    }
+
+    /**
+     * 填充 VO 的 knowledgeIds 字段（从中间表查询）
+     */
+    private void fillKnowledgeIds(KnowledgeRoleVo vo) {
+        if (vo == null) return;
+        List<Long> knowledgeIds = knowledgeRoleRelationMapper.selectKnowledgeIdsByRoleId(vo.getId());
+        vo.setKnowledgeIds(knowledgeIds);
+    }
+
+    private void fillKnowledgeIds(List<KnowledgeRoleVo> list) {
+        if (CollectionUtils.isEmpty(list)) return;
+
+        // 1. 提取所有 roleId
+        Set<Long> roleIds = list.stream()
+                .map(KnowledgeRoleVo::getId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+
+        if (roleIds.isEmpty()) return;
+
+        // 2. 一次性查询所有 roleId 对应的 knowledgeId 列表
+        List<KnowledgeRoleRelation> relations = knowledgeRoleRelationMapper.selectList(
+                new LambdaQueryWrapper<KnowledgeRoleRelation>()
+                        .in(KnowledgeRoleRelation::getKnowledgeRoleId, roleIds)
+        );
+
+        // 3. 转为 Map<roleId, List<knowledgeId>>
+        Map<Long, List<Long>> roleIdToKnowledgeIds = relations.stream()
+                .collect(Collectors.groupingBy(
+                        KnowledgeRoleRelation::getKnowledgeRoleId,
+                        Collectors.mapping(KnowledgeRoleRelation::getKnowledgeId, Collectors.toList())
+                ));
+
+        // 4. 回填到 VO 中
+        for (KnowledgeRoleVo vo : list) {
+            vo.setKnowledgeIds(roleIdToKnowledgeIds.getOrDefault(vo.getId(), Collections.emptyList()));
+        }
+    }
+
+    /**
+     * 填充 VO 的 knowledgeRoleGroupName 字段
+     */
+    private void fillKnowledgeRoleGroupName(KnowledgeRoleVo vo) {
+        if (vo == null || vo.getGroupId() == null) return;
+
+        KnowledgeRoleGroup group = knowledgeRoleGroupMapper.selectById(vo.getGroupId());
+        if (group != null) {
+            vo.setGroupName(group.getName());
+        }
+    }
+
+    private void fillKnowledgeRoleGroupName(List<KnowledgeRoleVo> list) {
+        if (CollectionUtils.isEmpty(list)) return;
+
+        // 1. 提取所有 groupId（去重）
+        Set<Long> groupIds = list.stream()
+                .map(KnowledgeRoleVo::getGroupId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+
+        if (groupIds.isEmpty()) return;
+
+        // 2. 一次性查出所有角色组信息
+        List<KnowledgeRoleGroup> groupList = knowledgeRoleGroupMapper.selectBatchIds(groupIds);
+
+        // 3. 转为 Map<id, name>
+        Map<Long, String> groupNameMap = groupList.stream()
+                .collect(Collectors.toMap(KnowledgeRoleGroup::getId, KnowledgeRoleGroup::getName));
+
+        // 4. 回填到每个 VO
+        for (KnowledgeRoleVo vo : list) {
+            vo.setGroupName(groupNameMap.get(vo.getGroupId()));
+        }
+    }
+}

ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUser.java

@@ -76,9 +76,9 @@ public class SysUser extends TenantEntity {
      * 密码
      */
     @TableField(
-        insertStrategy = FieldStrategy.NOT_EMPTY,
-        updateStrategy = FieldStrategy.NOT_EMPTY,
-        whereStrategy = FieldStrategy.NOT_EMPTY
+            insertStrategy = FieldStrategy.NOT_EMPTY,
+            updateStrategy = FieldStrategy.NOT_EMPTY,
+            whereStrategy = FieldStrategy.NOT_EMPTY
     )
     private String password;
 
@@ -113,13 +113,19 @@ public class SysUser extends TenantEntity {
      */
     private String remark;
 
-    /** 普通用户的标识,对当前开发者帐号唯一。一个openid对应一个公众号或小程序 */
+    /**
+     * 普通用户的标识,对当前开发者帐号唯一。一个openid对应一个公众号或小程序
+     */
     private String openId;
 
-    /** 用户余额 */
+    /**
+     * 用户余额
+     */
     private Double userBalance;
 
-    /** 用户等级 */
+    /**
+     * 用户等级
+     */
     private String userGrade;
 
     public SysUser(Long userId) {
@@ -130,4 +136,14 @@ public class SysUser extends TenantEntity {
         return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
     }
 
+    /**
+     * 知识库角色组类型（role/roleGroup）
+     */
+    private String kroleGroupType;
+
+    /**
+     * 知识库角色组id（role/roleGroup）
+     */
+    private String kroleGroupIds;
+
 }

ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/bo/SysUserBo.java

@@ -120,13 +120,19 @@ public class SysUserBo extends BaseEntity {
      */
     private Long roleId;
 
-    /** 普通用户的标识,对当前开发者帐号唯一。一个openid对应一个公众号或小程序 */
+    /**
+     * 普通用户的标识,对当前开发者帐号唯一。一个openid对应一个公众号或小程序
+     */
     private String openId;
 
-    /** 用户等级 */
+    /**
+     * 用户等级
+     */
     private String userGrade;
 
-    /** 用户余额 */
+    /**
+     * 用户余额
+     */
     private Double userBalance;
 
     public SysUserBo(Long userId) {
@@ -137,4 +143,14 @@ public class SysUserBo extends BaseEntity {
         return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
     }
 
+    /**
+     * 知识库角色组类型（role/roleGroup）
+     */
+    private String kroleGroupType;
+
+    /**
+     * 知识库角色组id（role/roleGroup）
+     */
+    private String kroleGroupIds;
+
 }

ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/vo/SysUserVo.java

@@ -147,9 +147,23 @@ public class SysUserVo implements Serializable {
      */
     private Long roleId;
 
-    /** 用户等级 */
+    /**
+     * 用户等级
+     */
     private String userGrade;
 
-    /** 用户余额 */
+    /**
+     * 用户余额
+     */
     private Double userBalance;
+
+    /**
+     * 知识库角色组类型（role/roleGroup）
+     */
+    private String kroleGroupType;
+
+    /**
+     * 知识库角色组id（role/roleGroup）
+     */
+    private String kroleGroupIds;
 }

ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/service/impl/SysDataScopeServiceImpl.java

@@ -39,7 +39,17 @@ public class SysDataScopeServiceImpl implements ISysDataScopeService {
         if (CollUtil.isNotEmpty(list)) {
             return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId()));
         }
-        return null;
+        // 问题描述: 当前用户【如果没有绑定任何部门的情况下】在查询用户列表分页的时候 调用 SysUserMapper 的 selectPageUserList() 时候报错：sql错误
+        // 通过打印sql发现 select count(*) as total from sysUser u left join sys_dept d on u.dept_id where (u.del_flag = ?) and (d.dept_id in ())
+        // 在 (d.dept_id in ())  这个位置报错了, 这个在sql中执行也是不行的
+        // 我发现 在 PlusPostInitTableInfoHandler 中的
+        //                 String sql = DataPermissionHelper.ignore(() ->
+        //                    parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class)
+        //                );
+        // 把这个方法交给框架去处理了, 所以没办法进行判空
+        // 于是我找到了这里，想着给这里默认赋值一个 -1
+        // 下面的那个 getDeptAndChild 暂时没发现有问题,如果发现问题可以考虑参考这种方法
+        return "-1";
     }
 
     @Override

ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -439,6 +439,10 @@ public class SysRoleServiceImpl implements ISysRoleService {
         if (CollUtil.isEmpty(keys)) {
             return;
         }
+        // 修复：请求地址'/system/role/authUser/selectAll',发生未知异常:cn.dev33.satoken.exception.NotWebContextException: 非Web上下文无法获取Request
+        // 原因：LoginHelper.getLoginUser(); 由于是并行的方式，上下文出现不一致的情况
+        // 解决：只需要把用户信息拿到外面来即可
+        LoginUser loginUser = LoginHelper.getLoginUser();
         // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作
         keys.forEach(key -> {
             String token = StringUtils.substringAfterLast(key, ":");
@@ -447,7 +451,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
                 return;
             }
             // LoginUser loginUser = LoginHelper.getLoginUser(token);
-            LoginUser loginUser = LoginHelper.getLoginUser();
             if (loginUser.getRoles().stream().anyMatch(r -> r.getRoleId().equals(roleId))) {
                 try {
                     StpUtil.logoutByTokenValue(token);

ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -450,11 +450,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     private void insertUserPost(SysUserBo user, boolean clear) {
         Long[] posts = user.getPostIds();
+        // 修复：用户原本绑定了岗位,若想要取消所有的岗位,没有进行逻辑实现
+        // 原因：当用户取消所有岗位的时候, 传入的posts是空的,所以不进行操作
+        // 解决：先进行清空,后再进行处理逻辑
+        if (clear) {
+            // 删除用户与岗位关联
+            userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, user.getUserId()));
+        }
         if (ArrayUtil.isNotEmpty(posts)) {
-            if (clear) {
-                // 删除用户与岗位关联
-                userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, user.getUserId()));
-            }
             // 新增用户与岗位管理
             List<SysUserPost> list = StreamUtils.toList(List.of(posts), postId -> {
                 SysUserPost up = new SysUserPost();
@@ -474,6 +477,13 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      * @param clear   清除已存在的关联数据
      */
     private void insertUserRole(Long userId, Long[] roleIds, boolean clear) {
+        // 修复：用户原本绑定了角色,若想要取消所有的角色,没有进行逻辑实现
+        // 原因：当用户取消所有角色的时候, 传入的roleIds是空的,所以不进行操作
+        // 解决：先进行清空,后再进行处理逻辑
+        if (clear) {
+            // 删除用户与角色关联
+            userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
+        }
         if (ArrayUtil.isNotEmpty(roleIds)) {
             // 判断是否具有此角色的操作权限
             List<SysRoleVo> roles = roleMapper.selectRoleList(new LambdaQueryWrapper<>());
@@ -488,10 +498,6 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             if (CollUtil.isEmpty(canDoRoleList)) {
                 throw new ServiceException("没有权限访问角色的数据");
             }
-            if (clear) {
-                // 删除用户与角色关联
-                userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
-            }
             // 新增用户与角色管理
             List<SysUserRole> list = StreamUtils.toList(canDoRoleList, roleId -> {
                 SysUserRole ur = new SysUserRole();

ruoyi-modules-api/ruoyi-system-api/src/main/resources/mapper/SysUserMapper.xml

@@ -44,6 +44,8 @@
                u.create_by,
                u.create_time,
                u.remark,
+               u.krole_group_type,
+               u.krole_group_ids,
                d.dept_id,
                d.parent_id,
                d.ancestors,
@@ -58,50 +60,99 @@
                r.data_scope,
                r.status as role_status
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-            left join sys_user_role sur on u.user_id = sur.user_id
-            left join sys_role r on r.role_id = sur.role_id
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_role r on r.role_id = sur.role_id
     </sql>
 
     <update id="updateXcxUser">
         update sys_user
         set nick_name = #{nickName},
             wx_avatar = #{wxAvatar}
-            WHERE user_id = #{userId}
+        WHERE user_id = #{userId}
     </update>
 
     <select id="selectPageUserList" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,u.user_balance,u.user_grade,u.domain_name,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+        select u.user_id,
+               u.dept_id,
+               u.nick_name,
+               u.user_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.sex,
+               u.user_balance,
+               u.user_grade,
+               u.domain_name,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_name,
+               d.leader
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUserList" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,u.user_grade,u.user_balance,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+        select u.user_id,
+               u.dept_id,
+               u.nick_name,
+               u.user_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.sex,
+               u.user_grade,
+               u.user_balance,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_name,
+               d.leader
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id,
+                        u.dept_id,
+                        u.user_name,
+                        u.nick_name,
+                        u.email,
+                        u.phonenumber,
+                        u.status,
+                        u.create_time
         from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_role r on r.role_id = sur.role_id
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUnallocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id,
+                        u.dept_id,
+                        u.user_name,
+                        u.nick_name,
+                        u.email,
+                        u.phonenumber,
+                        u.status,
+                        u.create_time
         from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_role r on r.role_id = sur.role_id
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">

ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/config/KnowledgeRoleConfig.java

@@ -0,0 +1,17 @@
+package org.ruoyi.chat.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author: violateer
+ * @Date: 2025/7/20
+ */
+@Data
+@Component
+public class KnowledgeRoleConfig {
+    @Value("${knowledge-role.enable}")
+    private Boolean enable;
+}

ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/knowledge/KnowledgeController.java

@@ -5,7 +5,9 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.ruoyi.chat.config.KnowledgeRoleConfig;
 import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.domain.model.LoginUser;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.excel.utils.ExcelUtil;
 import org.ruoyi.common.log.annotation.Log;
@@ -42,120 +44,141 @@ import java.util.List;
 @RequestMapping("/knowledge")
 public class KnowledgeController extends BaseController {
 
-  private final IKnowledgeInfoService knowledgeInfoService;
+    private final IKnowledgeInfoService knowledgeInfoService;
 
-  private final IKnowledgeAttachService attachService;
+    private final IKnowledgeAttachService attachService;
 
-  private final IKnowledgeFragmentService fragmentService;
+    private final IKnowledgeFragmentService fragmentService;
 
-  /**
-   * 根据用户信息查询本地知识库
-   */
-  @GetMapping("/list")
-  public TableDataInfo<KnowledgeInfoVo> list(KnowledgeInfoBo bo, PageQuery pageQuery) {
-    if (!StpUtil.isLogin()) {
-      throw new SecurityException("请先去登录!");
+    private final KnowledgeRoleConfig knowledgeRoleConfig;
+
+    /**
+     * 根据用户信息查询本地知识库
+     */
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeInfoVo> list(KnowledgeInfoBo bo, PageQuery pageQuery) {
+        if (!StpUtil.isLogin()) {
+            throw new SecurityException("请先去登录!");
+        }
+        bo.setUid(LoginHelper.getUserId());
+        return knowledgeInfoService.queryPageList(bo, pageQuery);
     }
-    bo.setUid(LoginHelper.getUserId());
-    return knowledgeInfoService.queryPageList(bo, pageQuery);
-  }
 
-  /**
-   * 新增知识库
-   */
-  @Log(title = "知识库", businessType = BusinessType.INSERT)
-  @PostMapping("/save")
-  public R<Void> save(@Validated(AddGroup.class) @RequestBody KnowledgeInfoBo bo) {
-    knowledgeInfoService.saveOne(bo);
-    return R.ok();
-  }
+    /**
+     * 根据用户信息及知识库角色查询本地知识库
+     */
+    @GetMapping("/listByRole")
+    public TableDataInfo<KnowledgeInfoVo> listByRole(KnowledgeInfoBo bo, PageQuery pageQuery) {
+        if (!StpUtil.isLogin()) {
+            throw new SecurityException("请先去登录!");
+        }
+        LoginUser loginUser = LoginHelper.getLoginUser();
 
-  /**
-   * 删除知识库
-   */
-  @PostMapping("/remove/{id}")
-  public R<String> remove(@PathVariable String id) {
-    knowledgeInfoService.removeKnowledge(id);
-    return R.ok("删除知识库成功!");
-  }
+        // 管理员跳过权限
+        if (loginUser.getUserId().equals(1L) || !knowledgeRoleConfig.getEnable()) {
+            bo.setUid(LoginHelper.getUserId());
+            return knowledgeInfoService.queryPageList(bo, pageQuery);
+        } else {
+            return knowledgeInfoService.queryPageListByRole(pageQuery);
+        }
+    }
 
-  /**
-   * 修改知识库
-   */
-  @Log(title = "知识库", businessType = BusinessType.UPDATE)
-  @PostMapping("/edit")
-  public R<Void> edit(@RequestBody KnowledgeInfoBo bo) {
-    return toAjax(knowledgeInfoService.updateByBo(bo));
-  }
+    /**
+     * 新增知识库
+     */
+    @Log(title = "知识库", businessType = BusinessType.INSERT)
+    @PostMapping("/save")
+    public R<Void> save(@Validated(AddGroup.class) @RequestBody KnowledgeInfoBo bo) {
+        knowledgeInfoService.saveOne(bo);
+        return R.ok();
+    }
 
-  /**
-   * 导出知识库列表
-   */
-  @Log(title = "知识库", businessType = BusinessType.EXPORT)
-  @PostMapping("/export")
-  public void export(KnowledgeInfoBo bo, HttpServletResponse response) {
-    List<KnowledgeInfoVo> list = knowledgeInfoService.queryList(bo);
-    ExcelUtil.exportExcel(list, "知识库", KnowledgeInfoVo.class, response);
-  }
+    /**
+     * 删除知识库
+     */
+    @PostMapping("/remove/{id}")
+    public R<String> remove(@PathVariable String id) {
+        knowledgeInfoService.removeKnowledge(id);
+        return R.ok("删除知识库成功!");
+    }
 
-  /**
-   * 查询知识附件信息
-   */
-  @GetMapping("/detail/{kid}")
-  public TableDataInfo<KnowledgeAttachVo> attach(KnowledgeAttachBo bo, PageQuery pageQuery,
-      @PathVariable String kid) {
-    bo.setKid(kid);
-    return attachService.queryPageList(bo, pageQuery);
-  }
+    /**
+     * 修改知识库
+     */
+    @Log(title = "知识库", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public R<Void> edit(@RequestBody KnowledgeInfoBo bo) {
+        return toAjax(knowledgeInfoService.updateByBo(bo));
+    }
 
-  /**
-   * 上传知识库附件
-   */
-  @PostMapping(value = "/attach/upload")
-  public R<String> upload(KnowledgeInfoUploadBo bo) throws Exception {
-    knowledgeInfoService.upload(bo);
-    return R.ok("上传知识库附件成功!");
-  }
+    /**
+     * 导出知识库列表
+     */
+    @Log(title = "知识库", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeInfoBo bo, HttpServletResponse response) {
+        List<KnowledgeInfoVo> list = knowledgeInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库", KnowledgeInfoVo.class, response);
+    }
 
-  /**
-   * 获取知识库附件详细信息
-   *
-   * @param id 主键
-   */
-  @GetMapping("attach/info/{id}")
-  public R<KnowledgeAttachVo> getAttachInfo(@NotNull(message = "主键不能为空")
-  @PathVariable Long id) {
-    return R.ok(attachService.queryById(id));
-  }
+    /**
+     * 查询知识附件信息
+     */
+    @GetMapping("/detail/{kid}")
+    public TableDataInfo<KnowledgeAttachVo> attach(KnowledgeAttachBo bo, PageQuery pageQuery,
+                                                   @PathVariable String kid) {
+        bo.setKid(kid);
+        return attachService.queryPageList(bo, pageQuery);
+    }
 
-  /**
-   * 删除知识库附件
-   */
-  @PostMapping("attach/remove/{kid}")
-  public R<Void> removeAttach(@NotEmpty(message = "主键不能为空")
-  @PathVariable String kid) {
-    attachService.removeKnowledgeAttach(kid);
-    return R.ok();
-  }
+    /**
+     * 上传知识库附件
+     */
+    @PostMapping(value = "/attach/upload")
+    public R<String> upload(KnowledgeInfoUploadBo bo) throws Exception {
+        knowledgeInfoService.upload(bo);
+        return R.ok("上传知识库附件成功!");
+    }
+
+    /**
+     * 获取知识库附件详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("attach/info/{id}")
+    public R<KnowledgeAttachVo> getAttachInfo(@NotNull(message = "主键不能为空")
+                                              @PathVariable Long id) {
+        return R.ok(attachService.queryById(id));
+    }
+
+    /**
+     * 删除知识库附件
+     */
+    @PostMapping("attach/remove/{kid}")
+    public R<Void> removeAttach(@NotEmpty(message = "主键不能为空")
+                                @PathVariable String kid) {
+        attachService.removeKnowledgeAttach(kid);
+        return R.ok();
+    }
 
 
-  /**
-   * 查询知识片段
-   */
-  @GetMapping("/fragment/list/{docId}")
-  public TableDataInfo<KnowledgeFragmentVo> fragmentList(KnowledgeFragmentBo bo,
-      PageQuery pageQuery, @PathVariable String docId) {
-    bo.setDocId(docId);
-    return fragmentService.queryPageList(bo, pageQuery);
-  }
+    /**
+     * 查询知识片段
+     */
+    @GetMapping("/fragment/list/{docId}")
+    public TableDataInfo<KnowledgeFragmentVo> fragmentList(KnowledgeFragmentBo bo,
+                                                           PageQuery pageQuery, @PathVariable String docId) {
+        bo.setDocId(docId);
+        return fragmentService.queryPageList(bo, pageQuery);
+    }
 
-  /**
-   * 上传文件翻译
-   */
-  @PostMapping("/translationByFile")
-  @ResponseBody
-  public String translationByFile(@RequestParam("file") MultipartFile file, String targetLanguage) {
-    return attachService.translationByFile(file, targetLanguage);
-  }
+    /**
+     * 上传文件翻译
+     */
+    @PostMapping("/translationByFile")
+    @ResponseBody
+    public String translationByFile(@RequestParam("file") MultipartFile file, String targetLanguage) {
+        return attachService.translationByFile(file, targetLanguage);
+    }
 
 }

ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/knowledge/KnowledgeRoleController.java

@@ -0,0 +1,99 @@
+package org.ruoyi.chat.controller.knowledge;
+
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.bo.KnowledgeRoleBo;
+import org.ruoyi.domain.vo.KnowledgeRoleVo;
+import org.ruoyi.service.IKnowledgeRoleService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库角色
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledgeRole")
+public class KnowledgeRoleController extends BaseController {
+
+    private final IKnowledgeRoleService knowledgeRoleService;
+
+    /**
+     * 查询知识库角色列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeRoleVo> list(KnowledgeRoleBo bo, PageQuery pageQuery) {
+        return knowledgeRoleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库角色列表
+     */
+    @Log(title = "知识库角色", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeRoleBo bo, HttpServletResponse response) {
+        List<KnowledgeRoleVo> list = knowledgeRoleService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库角色", KnowledgeRoleVo.class, response);
+    }
+
+    /**
+     * 获取知识库角色详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<KnowledgeRoleVo> getInfo(@NotNull(message = "主键不能为空")
+                                      @PathVariable Long id) {
+        return R.ok(knowledgeRoleService.queryById(id));
+    }
+
+    /**
+     * 新增知识库角色
+     */
+    @Log(title = "知识库角色", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody KnowledgeRoleBo bo) {
+        return toAjax(knowledgeRoleService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库角色
+     */
+    @Log(title = "知识库角色", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody KnowledgeRoleBo bo) {
+        return toAjax(knowledgeRoleService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库角色
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "知识库角色", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(knowledgeRoleService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/knowledge/KnowledgeRoleGroupController.java

@@ -0,0 +1,99 @@
+package org.ruoyi.chat.controller.knowledge;
+
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.domain.bo.KnowledgeRoleGroupBo;
+import org.ruoyi.domain.vo.KnowledgeRoleGroupVo;
+import org.ruoyi.service.IKnowledgeRoleGroupService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库角色组
+ *
+ * @author ageerle
+ * @date 2025-07-19
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledgeRoleGroup")
+public class KnowledgeRoleGroupController extends BaseController {
+
+    private final IKnowledgeRoleGroupService knowledgeRoleGroupService;
+
+    /**
+     * 查询知识库角色组列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeRoleGroupVo> list(KnowledgeRoleGroupBo bo, PageQuery pageQuery) {
+        return knowledgeRoleGroupService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库角色组列表
+     */
+    @Log(title = "知识库角色组", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeRoleGroupBo bo, HttpServletResponse response) {
+        List<KnowledgeRoleGroupVo> list = knowledgeRoleGroupService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库角色组", KnowledgeRoleGroupVo.class, response);
+    }
+
+    /**
+     * 获取知识库角色组详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<KnowledgeRoleGroupVo> getInfo(@NotNull(message = "主键不能为空")
+                                           @PathVariable Long id) {
+        return R.ok(knowledgeRoleGroupService.queryById(id));
+    }
+
+    /**
+     * 新增知识库角色组
+     */
+    @Log(title = "知识库角色组", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody KnowledgeRoleGroupBo bo) {
+        return toAjax(knowledgeRoleGroupService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库角色组
+     */
+    @Log(title = "知识库角色组", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody KnowledgeRoleGroupBo bo) {
+        return toAjax(knowledgeRoleGroupService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库角色组
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "知识库角色组", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(knowledgeRoleGroupService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/DifyServiceImpl.java

@@ -1,5 +1,6 @@
 package org.ruoyi.chat.service.chat.impl;
 
+import cn.hutool.core.util.StrUtil;
 import io.github.imfangs.dify.client.DifyClient;
 import io.github.imfangs.dify.client.DifyClientFactory;
 import io.github.imfangs.dify.client.callback.ChatStreamCallback;
@@ -12,10 +13,15 @@ import io.github.imfangs.dify.client.model.chat.ChatMessage;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.ruoyi.chat.enums.ChatModeType;
+import org.ruoyi.chat.service.chat.IChatCostService;
 import org.ruoyi.chat.service.chat.IChatService;
+import org.ruoyi.common.chat.entity.chat.Message;
 import org.ruoyi.common.chat.request.ChatRequest;
+import org.ruoyi.domain.bo.ChatSessionBo;
 import org.ruoyi.domain.vo.ChatModelVo;
+import org.ruoyi.domain.vo.ChatSessionVo;
 import org.ruoyi.service.IChatModelService;
+import org.ruoyi.service.IChatSessionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
@@ -31,6 +37,10 @@ public class DifyServiceImpl implements IChatService {
 
     @Autowired
     private IChatModelService chatModelService;
+    @Autowired
+    private IChatSessionService chatSessionService;
+    @Autowired
+    private IChatCostService chatCostService;
 
     @Override
     public SseEmitter chat(ChatRequest chatRequest, SseEmitter emitter) {
@@ -53,6 +63,15 @@ public class DifyServiceImpl implements IChatService {
                 .responseMode(ResponseMode.STREAMING)
                 .build();
 
+        // 获取conversationId
+        ChatSessionVo sessionInfo = chatSessionService.queryById(chatRequest.getSessionId());
+        if (StrUtil.isNotBlank(sessionInfo.getConversationId())) {
+            message.setConversationId(sessionInfo.getConversationId());
+        }
+
+        // 获取模型返回的消息
+        StringBuffer respMessage = new StringBuffer();
+
         // 发送流式消息
         try {
             chatClient.sendChatMessageStream(message, new ChatStreamCallback() {
@@ -60,6 +79,7 @@ public class DifyServiceImpl implements IChatService {
                 @Override
                 public void onMessage(MessageEvent event) {
                     emitter.send(event.getAnswer());
+                    respMessage.append(event.getAnswer());
                     log.info("收到消息片段: {}", event.getAnswer());
                 }
 
@@ -67,6 +87,29 @@ public class DifyServiceImpl implements IChatService {
                 public void onMessageEnd(MessageEndEvent event) {
                     emitter.complete();
                     log.info("消息结束，完整消息ID: {}", event.getMessageId());
+                    // 更新conversationId
+                    if (StrUtil.isBlank(sessionInfo.getConversationId())) {
+                        String conversationId = event.getConversationId();
+                        sessionInfo.setConversationId(conversationId);
+                        // 更新conversationId
+                        ChatSessionBo chatSessionBo = new ChatSessionBo();
+                        chatSessionBo.setConversationId(sessionInfo.getConversationId());
+                        chatSessionBo.setId(sessionInfo.getId());
+                        chatSessionBo.setUserId(sessionInfo.getUserId());
+                        chatSessionBo.setSessionTitle(sessionInfo.getSessionTitle());
+                        chatSessionBo.setSessionContent(sessionInfo.getSessionContent());
+                        chatSessionBo.setRemark(sessionInfo.getRemark());
+                        chatSessionService.updateByBo(chatSessionBo);
+                    }
+                    // 扣除费用
+                    ChatRequest chatRequestResponse = new ChatRequest();
+                    // 设置对话角色
+                    chatRequestResponse.setRole(Message.Role.ASSISTANT.getName());
+                    chatRequestResponse.setModel(chatRequest.getModel());
+                    chatRequestResponse.setUserId(chatRequest.getUserId());
+                    chatRequestResponse.setSessionId(chatRequest.getSessionId());
+                    chatRequestResponse.setPrompt(respMessage.toString());
+                    chatCostService.deductToken(chatRequestResponse);
                 }
 
                 @Override

ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java

@@ -3,6 +3,7 @@ package org.ruoyi.chat.service.knowledge;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
@@ -14,17 +15,13 @@ import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.core.page.PageQuery;
 import org.ruoyi.core.page.TableDataInfo;
-import org.ruoyi.domain.KnowledgeAttach;
-import org.ruoyi.domain.KnowledgeFragment;
-import org.ruoyi.domain.KnowledgeInfo;
+import org.ruoyi.domain.*;
 import org.ruoyi.domain.bo.KnowledgeInfoBo;
 import org.ruoyi.domain.bo.KnowledgeInfoUploadBo;
 import org.ruoyi.domain.bo.StoreEmbeddingBo;
 import org.ruoyi.domain.vo.ChatModelVo;
 import org.ruoyi.domain.vo.KnowledgeInfoVo;
-import org.ruoyi.mapper.KnowledgeAttachMapper;
-import org.ruoyi.mapper.KnowledgeFragmentMapper;
-import org.ruoyi.mapper.KnowledgeInfoMapper;
+import org.ruoyi.mapper.*;
 import org.ruoyi.service.IChatModelService;
 import org.ruoyi.service.IKnowledgeInfoService;
 import org.ruoyi.service.VectorStoreService;
@@ -37,6 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -49,219 +47,266 @@ import java.util.*;
 @Service
 public class KnowledgeInfoServiceImpl implements IKnowledgeInfoService {
 
-  private static final Logger log = LoggerFactory.getLogger(KnowledgeInfoServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(KnowledgeInfoServiceImpl.class);
 
-  private final KnowledgeInfoMapper baseMapper;
+    private final KnowledgeInfoMapper baseMapper;
 
-  private final VectorStoreService vectorStoreService;
+    private final VectorStoreService vectorStoreService;
 
-  private final ResourceLoaderFactory resourceLoaderFactory;
+    private final ResourceLoaderFactory resourceLoaderFactory;
 
-  private final KnowledgeFragmentMapper fragmentMapper;
+    private final KnowledgeFragmentMapper fragmentMapper;
 
-  private final KnowledgeAttachMapper attachMapper;
+    private final KnowledgeAttachMapper attachMapper;
 
-  private final IChatModelService chatModelService;
+    private final IChatModelService chatModelService;
 
-  private final ISysOssService ossService;
+    private final ISysOssService ossService;
 
-  /**
-   * 查询知识库
-   */
-  @Override
-  public KnowledgeInfoVo queryById(Long id) {
-    return baseMapper.selectVoById(id);
-  }
+    private final KnowledgeRoleMapper knowledgeRoleMapper;
 
-  /**
-   * 查询知识库列表
-   */
-  @Override
-  public TableDataInfo<KnowledgeInfoVo> queryPageList(KnowledgeInfoBo bo, PageQuery pageQuery) {
-    LambdaQueryWrapper<KnowledgeInfo> lqw = buildQueryWrapper(bo);
-    Page<KnowledgeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-    return TableDataInfo.build(result);
-  }
+    private final KnowledgeRoleRelationMapper knowledgeRoleRelationMapper;
 
-  /**
-   * 查询知识库列表
-   */
-  @Override
-  public List<KnowledgeInfoVo> queryList(KnowledgeInfoBo bo) {
-    LambdaQueryWrapper<KnowledgeInfo> lqw = buildQueryWrapper(bo);
-    return baseMapper.selectVoList(lqw);
-  }
-
-  private LambdaQueryWrapper<KnowledgeInfo> buildQueryWrapper(KnowledgeInfoBo bo) {
-    Map<String, Object> params = bo.getParams();
-    LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
-    lqw.eq(StringUtils.isNotBlank(bo.getKid()), KnowledgeInfo::getKid, bo.getKid());
-    lqw.eq(bo.getUid() != null, KnowledgeInfo::getUid, bo.getUid());
-    lqw.like(StringUtils.isNotBlank(bo.getKname()), KnowledgeInfo::getKname, bo.getKname());
-    lqw.eq(bo.getShare() != null, KnowledgeInfo::getShare, bo.getShare());
-    lqw.eq(StringUtils.isNotBlank(bo.getDescription()), KnowledgeInfo::getDescription,
-        bo.getDescription());
-    lqw.eq(StringUtils.isNotBlank(bo.getKnowledgeSeparator()), KnowledgeInfo::getKnowledgeSeparator,
-        bo.getKnowledgeSeparator());
-    lqw.eq(StringUtils.isNotBlank(bo.getQuestionSeparator()), KnowledgeInfo::getQuestionSeparator,
-        bo.getQuestionSeparator());
-    lqw.eq(bo.getOverlapChar() != null, KnowledgeInfo::getOverlapChar, bo.getOverlapChar());
-    lqw.eq(bo.getRetrieveLimit() != null, KnowledgeInfo::getRetrieveLimit, bo.getRetrieveLimit());
-    lqw.eq(bo.getTextBlockSize() != null, KnowledgeInfo::getTextBlockSize, bo.getTextBlockSize());
-    return lqw;
-  }
-
-  /**
-   * 新增知识库
-   */
-  @Override
-  public Boolean insertByBo(KnowledgeInfoBo bo) {
-    KnowledgeInfo add = MapstructUtils.convert(bo, KnowledgeInfo.class);
-    validEntityBeforeSave(add);
-    boolean flag = baseMapper.insert(add) > 0;
-    if (flag) {
-      bo.setId(add.getId());
+    /**
+     * 查询知识库
+     */
+    @Override
+    public KnowledgeInfoVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
     }
-    return flag;
-  }
 
-  /**
-   * 修改知识库
-   */
-  @Override
-  public Boolean updateByBo(KnowledgeInfoBo bo) {
-    KnowledgeInfo update = MapstructUtils.convert(bo, KnowledgeInfo.class);
-    validEntityBeforeSave(update);
-    return baseMapper.updateById(update) > 0;
-  }
-
-  /**
-   * 保存前的数据校验
-   */
-  private void validEntityBeforeSave(KnowledgeInfo entity) {
-    //TODO 做一些数据校验,如唯一约束
-  }
-
-  /**
-   * 批量删除知识库
-   */
-  @Override
-  public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-    if (isValid) {
-      //TODO 做一些业务上的校验,判断是否需要校验
+    /**
+     * 查询知识库列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeInfoVo> queryPageList(KnowledgeInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeInfo> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
     }
-    return baseMapper.deleteBatchIds(ids) > 0;
-  }
 
-  @Override
-  @Transactional(rollbackFor = Exception.class)
-  public void saveOne(KnowledgeInfoBo bo) {
-    KnowledgeInfo knowledgeInfo = MapstructUtils.convert(bo, KnowledgeInfo.class);
-    if (StringUtils.isBlank(bo.getKid())) {
-      String kid = RandomUtil.randomString(10);
-      if (knowledgeInfo != null) {
-        knowledgeInfo.setKid(kid);
-        knowledgeInfo.setUid(LoginHelper.getLoginUser().getUserId());
-      }
-      baseMapper.insert(knowledgeInfo);
-      if (knowledgeInfo != null) {
-        vectorStoreService.createSchema(String.valueOf(knowledgeInfo.getId()),
-            bo.getVectorModelName());
-      }
-    } else {
-      baseMapper.updateById(knowledgeInfo);
-    }
-  }
-
-  @Override
-  @Transactional(rollbackFor = Exception.class)
-  public void removeKnowledge(String id) {
-    Map<String,Object> map = new HashMap<>();
-    KnowledgeInfo knowledgeInfo = baseMapper.selectById(id);
-    check(knowledgeInfo);
-    map.put("kid",knowledgeInfo.getId());
-    // 删除向量数据
-    vectorStoreService.removeById(String.valueOf(knowledgeInfo.getId()),knowledgeInfo.getVectorModelName());
-    // 删除附件和知识片段
-    fragmentMapper.deleteByMap(map);
-    attachMapper.deleteByMap(map);
-    // 删除知识库
-    map.put("kid",knowledgeInfo.getKid());
-    baseMapper.deleteByMap(map);
-  }
-
-  @Override
-  public void upload(KnowledgeInfoUploadBo bo) {
-    storeContent(bo.getFile(), bo.getKid());
-  }
-
-  public void storeContent(MultipartFile file, String kid) {
-    String fileName = file.getOriginalFilename();
-    List<String> chunkList = new ArrayList<>();
-    KnowledgeAttach knowledgeAttach = new KnowledgeAttach();
-    knowledgeAttach.setKid(kid);
-    String docId = RandomUtil.randomString(10);
-    knowledgeAttach.setDocId(docId);
-    knowledgeAttach.setDocName(fileName);
-    knowledgeAttach.setDocType(fileName.substring(fileName.lastIndexOf(".")+1));
-    String content = "";
-    ResourceLoader resourceLoader = resourceLoaderFactory.getLoaderByFileType(knowledgeAttach.getDocType());
-    List<String> fids = new ArrayList<>();
-    try {
-      content = resourceLoader.getContent(file.getInputStream());
-      chunkList = resourceLoader.getChunkList(content, kid);
-      List<KnowledgeFragment> knowledgeFragmentList = new ArrayList<>();
-      if (CollUtil.isNotEmpty(chunkList)) {
-        for (int i = 0; i < chunkList.size(); i++) {
-          String fid = RandomUtil.randomString(10);
-          fids.add(fid);
-          KnowledgeFragment knowledgeFragment = new KnowledgeFragment();
-          knowledgeFragment.setKid(kid);
-          knowledgeFragment.setDocId(docId);
-          knowledgeFragment.setFid(fid);
-          knowledgeFragment.setIdx(i);
-          knowledgeFragment.setContent(chunkList.get(i));
-          knowledgeFragment.setCreateTime(new Date());
-          knowledgeFragmentList.add(knowledgeFragment);
+    /**
+     * 根据知识库角色查询知识库列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeInfoVo> queryPageListByRole(PageQuery pageQuery) {
+        // 查询用户关联角色
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (StringUtils.isEmpty(loginUser.getKroleGroupIds()) || StringUtils.isEmpty(loginUser.getKroleGroupType())) {
+            return new TableDataInfo<>();
         }
-      }
-      fragmentMapper.insertBatch(knowledgeFragmentList);
-    } catch (IOException e) {
-      log.error("保存知识库信息失败！{}", e.getMessage());
+
+        // 角色/角色组id列表
+        List<String> groupIdList = Arrays.stream(loginUser.getKroleGroupIds().split(","))
+                .filter(StringUtils::isNotEmpty)
+                .toList();
+        List<KnowledgeRole> knowledgeRoles;
+        LambdaQueryWrapper<KnowledgeRole> roleLqw = Wrappers.lambdaQuery();
+        if ("role".equals(loginUser.getKroleGroupType())) {
+            roleLqw.in(KnowledgeRole::getId, groupIdList);
+        } else {
+            roleLqw.in(KnowledgeRole::getGroupId, groupIdList);
+        }
+        knowledgeRoles = knowledgeRoleMapper.selectList(roleLqw);
+
+        if (CollectionUtils.isEmpty(knowledgeRoles)) {
+            return new TableDataInfo<>();
+        }
+
+        // 查询知识库id列表
+        LambdaQueryWrapper<KnowledgeRoleRelation> relationLqw = Wrappers.lambdaQuery();
+        relationLqw.in(KnowledgeRoleRelation::getKnowledgeRoleId, knowledgeRoles.stream().map(KnowledgeRole::getId).filter(Objects::nonNull).collect(Collectors.toList()));
+        List<KnowledgeRoleRelation> knowledgeRoleRelations = knowledgeRoleRelationMapper.selectList(relationLqw);
+
+        if (CollectionUtils.isEmpty(knowledgeRoleRelations)) {
+            return new TableDataInfo<>();
+        }
+
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.in(KnowledgeInfo::getId, knowledgeRoleRelations.stream().map(KnowledgeRoleRelation::getKnowledgeId).filter(Objects::nonNull).collect(Collectors.toList()));
+        Page<KnowledgeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
     }
-    knowledgeAttach.setContent(content);
-    knowledgeAttach.setCreateTime(new Date());
-    attachMapper.insert(knowledgeAttach);
 
-    // 通过kid查询知识库信息
-    KnowledgeInfoVo knowledgeInfoVo = baseMapper.selectVoOne(Wrappers.<KnowledgeInfo>lambdaQuery()
-            .eq(KnowledgeInfo::getId, kid));
-
-    // 通过向量模型查询模型信息
-    ChatModelVo chatModelVo = chatModelService.selectModelByName(knowledgeInfoVo.getEmbeddingModelName());
-
-    StoreEmbeddingBo storeEmbeddingBo = new StoreEmbeddingBo();
-    storeEmbeddingBo.setKid(kid);
-    storeEmbeddingBo.setDocId(docId);
-    storeEmbeddingBo.setFids(fids);
-    storeEmbeddingBo.setChunkList(chunkList);
-    storeEmbeddingBo.setVectorModelName(knowledgeInfoVo.getVectorModelName());
-    storeEmbeddingBo.setEmbeddingModelName(knowledgeInfoVo.getEmbeddingModelName());
-    storeEmbeddingBo.setApiKey(chatModelVo.getApiKey());
-    storeEmbeddingBo.setBaseUrl(chatModelVo.getApiHost());
-    vectorStoreService.storeEmbeddings(storeEmbeddingBo);
-  }
-
-  /**
-   * 检查用户是否有删除知识库权限
-   *
-   * @param knowledgeInfo 知识库
-   */
-  public void check( KnowledgeInfo knowledgeInfo) {
-    LoginUser loginUser = LoginHelper.getLoginUser();
-    if (!knowledgeInfo.getUid().equals(loginUser.getUserId())) {
-      throw new SecurityException("权限不足");
+    /**
+     * 查询知识库列表
+     */
+    @Override
+    public List<KnowledgeInfoVo> queryList(KnowledgeInfoBo bo) {
+        LambdaQueryWrapper<KnowledgeInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeInfo> buildQueryWrapper(KnowledgeInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getKid()), KnowledgeInfo::getKid, bo.getKid());
+        lqw.eq(bo.getUid() != null, KnowledgeInfo::getUid, bo.getUid());
+        lqw.like(StringUtils.isNotBlank(bo.getKname()), KnowledgeInfo::getKname, bo.getKname());
+        lqw.eq(bo.getShare() != null, KnowledgeInfo::getShare, bo.getShare());
+        lqw.eq(StringUtils.isNotBlank(bo.getDescription()), KnowledgeInfo::getDescription,
+                bo.getDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getKnowledgeSeparator()), KnowledgeInfo::getKnowledgeSeparator,
+                bo.getKnowledgeSeparator());
+        lqw.eq(StringUtils.isNotBlank(bo.getQuestionSeparator()), KnowledgeInfo::getQuestionSeparator,
+                bo.getQuestionSeparator());
+        lqw.eq(bo.getOverlapChar() != null, KnowledgeInfo::getOverlapChar, bo.getOverlapChar());
+        lqw.eq(bo.getRetrieveLimit() != null, KnowledgeInfo::getRetrieveLimit, bo.getRetrieveLimit());
+        lqw.eq(bo.getTextBlockSize() != null, KnowledgeInfo::getTextBlockSize, bo.getTextBlockSize());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeInfoBo bo) {
+        KnowledgeInfo add = MapstructUtils.convert(bo, KnowledgeInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeInfoBo bo) {
+        KnowledgeInfo update = MapstructUtils.convert(bo, KnowledgeInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeInfo entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识库
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOne(KnowledgeInfoBo bo) {
+        KnowledgeInfo knowledgeInfo = MapstructUtils.convert(bo, KnowledgeInfo.class);
+        if (StringUtils.isBlank(bo.getKid())) {
+            String kid = RandomUtil.randomString(10);
+            if (knowledgeInfo != null) {
+                knowledgeInfo.setKid(kid);
+                knowledgeInfo.setUid(LoginHelper.getLoginUser().getUserId());
+            }
+            baseMapper.insert(knowledgeInfo);
+            if (knowledgeInfo != null) {
+                vectorStoreService.createSchema(String.valueOf(knowledgeInfo.getId()),
+                        bo.getVectorModelName());
+            }
+        } else {
+            baseMapper.updateById(knowledgeInfo);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void removeKnowledge(String id) {
+        Map<String, Object> map = new HashMap<>();
+        KnowledgeInfo knowledgeInfo = baseMapper.selectById(id);
+        check(knowledgeInfo);
+        map.put("kid", knowledgeInfo.getId());
+        // 删除向量数据
+        vectorStoreService.removeById(String.valueOf(knowledgeInfo.getId()), knowledgeInfo.getVectorModelName());
+        // 删除附件和知识片段
+        fragmentMapper.deleteByMap(map);
+        attachMapper.deleteByMap(map);
+        // 删除知识库
+        map.put("kid", knowledgeInfo.getKid());
+        baseMapper.deleteByMap(map);
+    }
+
+    @Override
+    public void upload(KnowledgeInfoUploadBo bo) {
+        storeContent(bo.getFile(), bo.getKid());
+    }
+
+    public void storeContent(MultipartFile file, String kid) {
+        String fileName = file.getOriginalFilename();
+        List<String> chunkList = new ArrayList<>();
+        KnowledgeAttach knowledgeAttach = new KnowledgeAttach();
+        knowledgeAttach.setKid(kid);
+        String docId = RandomUtil.randomString(10);
+        knowledgeAttach.setDocId(docId);
+        knowledgeAttach.setDocName(fileName);
+        knowledgeAttach.setDocType(fileName.substring(fileName.lastIndexOf(".") + 1));
+        String content = "";
+        ResourceLoader resourceLoader = resourceLoaderFactory.getLoaderByFileType(knowledgeAttach.getDocType());
+        List<String> fids = new ArrayList<>();
+        try {
+            content = resourceLoader.getContent(file.getInputStream());
+            chunkList = resourceLoader.getChunkList(content, kid);
+            List<KnowledgeFragment> knowledgeFragmentList = new ArrayList<>();
+            if (CollUtil.isNotEmpty(chunkList)) {
+                for (int i = 0; i < chunkList.size(); i++) {
+                    String fid = RandomUtil.randomString(10);
+                    fids.add(fid);
+                    KnowledgeFragment knowledgeFragment = new KnowledgeFragment();
+                    knowledgeFragment.setKid(kid);
+                    knowledgeFragment.setDocId(docId);
+                    knowledgeFragment.setFid(fid);
+                    knowledgeFragment.setIdx(i);
+                    knowledgeFragment.setContent(chunkList.get(i));
+                    knowledgeFragment.setCreateTime(new Date());
+                    knowledgeFragmentList.add(knowledgeFragment);
+                }
+            }
+            fragmentMapper.insertBatch(knowledgeFragmentList);
+        } catch (IOException e) {
+            log.error("保存知识库信息失败！{}", e.getMessage());
+        }
+        knowledgeAttach.setContent(content);
+        knowledgeAttach.setCreateTime(new Date());
+        attachMapper.insert(knowledgeAttach);
+
+        // 通过kid查询知识库信息
+        KnowledgeInfoVo knowledgeInfoVo = baseMapper.selectVoOne(Wrappers.<KnowledgeInfo>lambdaQuery()
+                .eq(KnowledgeInfo::getId, kid));
+
+        // 通过向量模型查询模型信息
+        ChatModelVo chatModelVo = chatModelService.selectModelByName(knowledgeInfoVo.getEmbeddingModelName());
+
+        StoreEmbeddingBo storeEmbeddingBo = new StoreEmbeddingBo();
+        storeEmbeddingBo.setKid(kid);
+        storeEmbeddingBo.setDocId(docId);
+        storeEmbeddingBo.setFids(fids);
+        storeEmbeddingBo.setChunkList(chunkList);
+        storeEmbeddingBo.setVectorModelName(knowledgeInfoVo.getVectorModelName());
+        storeEmbeddingBo.setEmbeddingModelName(knowledgeInfoVo.getEmbeddingModelName());
+        storeEmbeddingBo.setApiKey(chatModelVo.getApiKey());
+        storeEmbeddingBo.setBaseUrl(chatModelVo.getApiHost());
+        vectorStoreService.storeEmbeddings(storeEmbeddingBo);
+    }
+
+    /**
+     * 检查用户是否有删除知识库权限
+     *
+     * @param knowledgeInfo 知识库
+     */
+    public void check(KnowledgeInfo knowledgeInfo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (!knowledgeInfo.getUid().equals(loginUser.getUserId())) {
+            throw new SecurityException("权限不足");
+        }
     }
-  }
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java

@@ -124,7 +124,7 @@ public class SysLoginService {
                 TenantHelper.clearDynamic();
             }
             StpUtil.logout();
-            if (loginUser !=null) {
+            if (loginUser != null) {
                 recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
             }
         } catch (NotLoginException ignored) {
@@ -251,6 +251,8 @@ public class SysLoginService {
         loginUser.setUsername(user.getUserName());
         loginUser.setAvatar(user.getAvatar());
         loginUser.setUserType(user.getUserType());
+        loginUser.setKroleGroupIds(user.getKroleGroupIds());
+        loginUser.setKroleGroupType(user.getKroleGroupType());
         loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));
         loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId()));
         loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());

script/sql/ruoyi-ai.sql

@@ -554,7 +554,7 @@ CREATE TABLE `sys_menu`  (
 -- Records of sys_menu
 -- ----------------------------
 INSERT INTO `sys_menu` VALUES (1, '系统管理', 0, 2, 'system', NULL, '', 1, 0, 'M', '0', '0', '', 'eos-icons:system-group', 103, 1, '2023-05-14 15:19:39', 1, '2024-10-06 21:08:06', '系统管理目录');
-INSERT INTO `sys_menu` VALUES (100, '用户管理', 1775500307898949634, 1, 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'ph:user-fill', 103, 1, '2023-05-14 15:19:39', 1, '2024-10-07 21:29:29', '用户管理菜单');
+INSERT INTO `sys_menu` VALUES (100, '用户管理', 1775500307898949634, 1, 'user', 'operator/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'ph:user-fill', 103, 1, '2023-05-14 15:19:39', 1, '2024-10-07 21:29:29', '用户管理菜单');
 INSERT INTO `sys_menu` VALUES (101, '角色管理', 1, 2, 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'ri:user-3-fill', 103, 1, '2023-05-14 15:19:39', 1, '2024-10-07 21:04:59', '角色管理菜单');
 INSERT INTO `sys_menu` VALUES (102, '菜单管理', 1, 3, 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'typcn:th-menu-outline', 103, 1, '2023-05-14 15:19:39', 1, '2024-10-07 21:06:06', '菜单管理菜单');
 INSERT INTO `sys_menu` VALUES (103, '部门管理', 1, 4, 'dept', 'system/dept/index', '', 1, 0, 'C', '1', '1', 'system:dept:list', 'mdi:company', 103, 1, '2023-05-14 15:19:39', 1, '2024-10-07 21:07:38', '部门管理菜单');
@@ -613,33 +613,34 @@ INSERT INTO `sys_menu` VALUES (1044, '登录删除', 501, 2, '#', '', '', 1, 0,
 INSERT INTO `sys_menu` VALUES (1045, '日志导出', 501, 3, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 103, 1, '2023-05-14 15:19:40', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1050, '账户解锁', 501, 4, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 103, 1, '2023-05-14 15:19:40', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1775500307898949634, '运营管理', 0, 0, 'operate', NULL, NULL, 1, 0, 'M', '0', '0', NULL, 'icon-park-outline:appointment', 103, 1, '2024-04-03 20:27:15', 1, '2024-10-06 21:10:18', '');
-INSERT INTO `sys_menu` VALUES (1775895273104068610, '系统模型', 1775500307898949634, 2, 'model', 'system/model/index', NULL, 1, 0, 'C', '0', '0', 'system:model:list', 'ph:list-fill', 103, 1, '2024-04-05 12:00:38', 1, '2024-10-07 21:36:00', '系统模型菜单');
+INSERT INTO `sys_menu` VALUES (1775895273104068610, '系统模型', 1775500307898949634, 2, 'model', 'operator/model/index', NULL, 1, 0, 'C', '0', '0', 'system:model:list', 'ph:list-fill', 103, 1, '2024-04-05 12:00:38', 1, '2024-10-07 21:36:00', '系统模型菜单');
 INSERT INTO `sys_menu` VALUES (1775895273104068611, '系统模型查询', 1775895273104068610, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:model:query', '#', 103, 1, '2024-04-05 12:00:38', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1775895273104068612, '系统模型新增', 1775895273104068610, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:model:add', '#', 103, 1, '2024-04-05 12:00:38', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1775895273104068613, '系统模型修改', 1775895273104068610, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:model:edit', '#', 103, 1, '2024-04-05 12:00:38', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1775895273104068614, '系统模型删除', 1775895273104068610, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:model:remove', '#', 103, 1, '2024-04-05 12:00:38', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1775895273104068615, '系统模型导出', 1775895273104068610, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:model:export', '#', 103, 1, '2024-04-05 12:00:38', NULL, NULL, '');
-INSERT INTO `sys_menu` VALUES (1780240077690507266, '聊天消息', 1775500307898949634, 5, 'chatMessage', 'system/message/index', NULL, 1, 0, 'C', '0', '0', 'system:message:list', 'bx:chat', 103, 1, '2024-04-16 22:24:48', 1, '2024-10-07 21:38:49', '聊天消息菜单');
+INSERT INTO `sys_menu` VALUES (1780240077690507266, '聊天消息', 1775500307898949634, 5, 'chatMessage', 'operator/message/index', NULL, 1, 0, 'C', '0', '0', 'system:message:list', 'bx:chat', 103, 1, '2024-04-16 22:24:48', 1, '2024-10-07 21:38:49', '聊天消息菜单');
 INSERT INTO `sys_menu` VALUES (1780240077690507267, '聊天消息查询', 1780240077690507266, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:message:query', '#', 103, 1, '2024-04-16 22:24:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1780240077690507268, '聊天消息新增', 1780240077690507266, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:message:add', '#', 103, 1, '2024-04-16 22:24:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1780240077690507269, '聊天消息修改', 1780240077690507266, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:message:edit', '#', 103, 1, '2024-04-16 22:24:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1780240077690507270, '聊天消息删除', 1780240077690507266, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:message:remove', '#', 103, 1, '2024-04-16 22:24:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1780240077690507271, '聊天消息导出', 1780240077690507266, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:message:export', '#', 103, 1, '2024-04-16 22:24:48', NULL, NULL, '');
-INSERT INTO `sys_menu` VALUES (1780255628576018433, '支付订单', 1775500307898949634, 6, 'order', 'system/payOrder/index', NULL, 1, 0, 'C', '0', '0', 'system:order:list', 'material-symbols:order-approve', 103, 1, '2024-04-16 23:32:48', 1, '2025-03-30 21:12:38', '支付订单菜单');
+INSERT INTO `sys_menu` VALUES (1780255628576018433, '支付订单', 1775500307898949634, 6, 'order', 'operator/payOrder/index', NULL, 1, 0, 'C', '0', '0', 'system:order:list', 'material-symbols:order-approve', 103, 1, '2024-04-16 23:32:48', 1, '2025-03-30 21:12:38', '支付订单菜单');
 INSERT INTO `sys_menu` VALUES (1780255628576018434, '支付订单查询', 1780255628576018433, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:orders:query', '#', 103, 1, '2024-04-16 23:32:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1780255628576018435, '支付订单新增', 1780255628576018433, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:orders:add', '#', 103, 1, '2024-04-16 23:32:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1780255628576018436, '支付订单修改', 1780255628576018433, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:orders:edit', '#', 103, 1, '2024-04-16 23:32:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1780255628576018437, '支付订单删除', 1780255628576018433, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:orders:remove', '#', 103, 1, '2024-04-16 23:32:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1780255628576018438, '支付订单导出', 1780255628576018433, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:orders:export', '#', 103, 1, '2024-04-16 23:32:48', NULL, NULL, '');
-INSERT INTO `sys_menu` VALUES (1843281231381852162, '文件管理', 1775500307898949634, 20, 'file', 'system/oss/index', NULL, 1, 0, 'C', '0', '0', NULL, 'material-symbols-light:folder', 103, 1, '2024-10-07 21:24:27', 1, '2024-12-27 23:03:04', '');
-INSERT INTO `sys_menu` VALUES (1898286496441393153, '知识库管理', 1775500307898949634, 10, 'knowledgeBase', 'system/knowledgeBase/index', NULL, 1, 0, 'C', '0', '0', '', 'garden:knowledge-base-26', 103, 1, '2025-03-08 16:15:44', 1, '2025-03-10 00:21:26', '');
-INSERT INTO `sys_menu` VALUES (1906674838461321217, '配置信息', 1775500307898949634, 13, 'configurationManage', 'system/configurationManage/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'mdi:archive-cog-outline', 103, 1, '2025-03-31 19:48:48', 1, '2025-03-31 19:59:58', '配置信息菜单');
+INSERT INTO `sys_menu` VALUES (1843281231381852162, '文件管理', 1775500307898949634, 20, 'file', 'operator/oss/index', NULL, 1, 0, 'C', '0', '0', NULL, 'material-symbols-light:folder', 103, 1, '2024-10-07 21:24:27', 1, '2024-12-27 23:03:04', '');
+INSERT INTO `sys_menu` VALUES (1898286496441393153, '知识库管理', 1775500307898949634, 10, 'knowledgeBase', 'operator/knowledgeBase/index', NULL, 1, 0, 'C', '0', '0', '', 'garden:knowledge-base-26', 103, 1, '2025-03-08 16:15:44', 1, '2025-03-10 00:21:26', '');
+INSERT INTO `sys_menu` VALUES (1946483381643743233, '知识库角色管理', 1775500307898949634, 12, 'knowledgeRole', 'operator/knowledgeRole/index', NULL, 1, 0, 'C', '0', '0', NULL, 'ri:user-3-fill', 103, 1, '2025-07-19 16:41:17', NULL, NULL, '知识库角色管理');
+INSERT INTO `sys_menu` VALUES (1906674838461321217, '配置信息', 1775500307898949634, 13, 'configurationManage', 'operator/configurationManage/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'mdi:archive-cog-outline', 103, 1, '2025-03-31 19:48:48', 1, '2025-03-31 19:59:58', '配置信息菜单');
 INSERT INTO `sys_menu` VALUES (1906674838461321218, '配置信息查询', 1906674838461321217, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:config:query', '#', 103, 1, '2025-03-31 19:48:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1906674838461321219, '配置信息新增', 1906674838461321217, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:config:add', '#', 103, 1, '2025-03-31 19:48:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1906674838461321220, '配置信息修改', 1906674838461321217, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:config:edit', '#', 103, 1, '2025-03-31 19:48:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1906674838461321221, '配置信息删除', 1906674838461321217, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:config:remove', '#', 103, 1, '2025-03-31 19:48:48', NULL, NULL, '');
 INSERT INTO `sys_menu` VALUES (1906674838461321222, '配置信息导出', 1906674838461321217, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'system:config:export', '#', 103, 1, '2025-03-31 19:48:48', NULL, NULL, '');
-INSERT INTO `sys_menu` VALUES (1929170702299045890, '提示词模板', 1775500307898949634, '1', 'promptTemplate', 'system/promptTemplate/index', '', 1, 0, 'C', '0', '0', 'system:promptTemplate:list', 'fluent:prompt-16-filled', 103, 1, sysdate(), null, null, '提示词模板菜单');
+INSERT INTO `sys_menu` VALUES (1929170702299045890, '提示词模板', 1775500307898949634, '1', 'promptTemplate', 'operator/promptTemplate/index', '', 1, 0, 'C', '0', '0', 'system:promptTemplate:list', 'fluent:prompt-16-filled', 103, 1, sysdate(), null, null, '提示词模板菜单');
 INSERT INTO `sys_menu` VALUES (1929170702299045891, '提示词模板查询', 1929170702299045890, '1',  '#', '', NULL, 1, 0, 'F', '0', '0', 'system:promptTemplate:query',        '#', 103, 1, sysdate(), null, null, '');
 INSERT INTO `sys_menu` VALUES (1929170702299045892, '提示词模板新增', 1929170702299045890, '2',  '#', '', NULL, 1, 0, 'F', '0', '0', 'system:promptTemplate:add',          '#', 103, 1, sysdate(), null, null, '');
 INSERT INTO `sys_menu` VALUES (1929170702299045893, '提示词模板修改', 1929170702299045890, '3',  '#', '', NULL, 1, 0, 'F', '0', '0', 'system:promptTemplate:edit',         '#', 103, 1, sysdate(), null, null, '');
@@ -1438,11 +1439,16 @@ CREATE TABLE `sys_user`  (
                              PRIMARY KEY (`user_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = Dynamic;
 
+-- 用户表添加字段
+ALTER TABLE sys_user
+    ADD COLUMN `krole_group_type` VARCHAR(50) COMMENT '关联知识库角色/角色组',
+ADD COLUMN `krole_group_ids` TEXT COMMENT '关联知识库角色/角色组id';
+
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
 INSERT INTO `sys_user` (`user_id`, `open_id`, `user_grade`, `user_balance`, `tenant_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `user_plan`, `email`, `phonenumber`, `sex`, `avatar`, `wx_avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `domain_name`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, NULL, '1', 855.40, '00000', 103, 'admin', 'admin', 'sys_user', 'Free', 'ageerle@163.com', '15888888888', '0', 'https://ruoyi-ai-1254149996.cos.ap-guangzhou.myqcloud.com/2025/05/24/727370b029b648ea968977085da2b20f.jpg', NULL, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2025-05-26 09:26:03', NULL, 103, 1, '2023-05-14 15:19:39', 1, '2025-05-26 09:26:03', '管理员');
-INSERT INTO `sys_user` VALUES (1905928435494330370, NULL, '1', 100.00, '000000', 103, 'ageerle@163.com', '熊猫助手', 'sys_user', 'Free', 'ageerle@163.com', '', '0', NULL, NULL, '$2a$10$8WO.FFcmu4L/DhzpfM4rbee0HRK6gIYIs2KsRXkc4ckjudbzchvPi', '0', '2', '', NULL, NULL, 103, 1, '2025-03-29 18:22:04', 1, '2025-03-31 10:15:11', '备用账号');
+INSERT INTO `sys_user` VALUES (1905928435494330370, NULL, '1', 100.00, '000000', 103, 'ageerle@163.com', '熊猫助手',  'sys_user', 'Free', 'ageerle@163.com', '', '0', NULL, NULL, '$2a$10$8WO.FFcmu4L/DhzpfM4rbee0HRK6gIYIs2KsRXkc4ckjudbzchvPi', '0', '2', '', NULL, NULL, 103, 1, '2025-03-29 18:22:04', 1, '2025-03-31 10:15:11', '备用账号', null, null);
 
 -- ----------------------------
 -- Table structure for sys_user_post
@@ -2637,4 +2643,60 @@ INSERT INTO dev_schema_group (id, name, code, icon, sort, status, remark, del_fl
 INSERT INTO dev_schema_group (id, name, code, icon, sort, status, remark, del_flag, tenant_id, create_dept, create_by, create_time, update_by, update_time) VALUES (1944346023254429697, '在线开发', 'dev', 'carbon:development', 3, '0', null, '0', '000000', null, null, '2025-07-13 18:39:51', 1, '2025-07-13 18:42:07');
 
 
+
+
+
+-- ----------------------------
+-- Table structure for knowledge_role
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_role`;
+CREATE TABLE `knowledge_role`  (
+                                   `id` bigint NOT NULL COMMENT '知识库角色id',
+                                   `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '知识库角色name',
+                                   `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+                                   `create_dept` bigint NULL DEFAULT NULL COMMENT '创建部门',
+                                   `create_by` bigint NULL DEFAULT NULL COMMENT '创建者',
+                                   `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+                                   `update_by` bigint NULL DEFAULT NULL COMMENT '更新者',
+                                   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+                                   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+                                   `group_id` bigint NULL DEFAULT NULL COMMENT '知识库角色组id',
+                                   PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '知识库角色表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for knowledge_role_group
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_role_group`;
+CREATE TABLE `knowledge_role_group`  (
+                                         `id` bigint NOT NULL COMMENT '知识库角色组id',
+                                         `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '知识库角色组name',
+                                         `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+                                         `create_dept` bigint NULL DEFAULT NULL COMMENT '创建部门',
+                                         `create_by` bigint NULL DEFAULT NULL COMMENT '创建者',
+                                         `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+                                         `update_by` bigint NULL DEFAULT NULL COMMENT '更新者',
+                                         `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+                                         `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+                                         PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '知识库角色组表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for knowledge_role_relation
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_role_relation`;
+CREATE TABLE `knowledge_role_relation`  (
+                                            `id` bigint NOT NULL COMMENT 'id',
+                                            `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+                                            `create_dept` bigint NULL DEFAULT NULL COMMENT '创建部门',
+                                            `create_by` bigint NULL DEFAULT NULL COMMENT '创建者',
+                                            `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+                                            `update_by` bigint NULL DEFAULT NULL COMMENT '更新者',
+                                            `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+                                            `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+                                            `knowledge_role_id` bigint NULL DEFAULT NULL COMMENT '知识库角色id',
+                                            `knowledge_id` bigint NULL DEFAULT NULL COMMENT '知识库id',
+                                            PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '知识库角色与知识库关联表' ROW_FORMAT = DYNAMIC;
+
 SET FOREIGN_KEY_CHECKS = 1;

script/sql/update/20250605.sql

@@ -1 +0,0 @@
-

script/sql/update/knowledge-role-bak.sql

@@ -0,0 +1,83 @@
+/*
+ Navicat Premium Dump SQL
+
+ Source Server         : mysql-local-study
+ Source Server Type    : MySQL
+ Source Server Version : 80405 (8.4.5)
+ Source Host           : 100.168.0.1:3500
+ Source Schema         : ruoyi-ai
+
+ Target Server Type    : MySQL
+ Target Server Version : 80405 (8.4.5)
+ File Encoding         : 65001
+
+ Date: 20/07/2025 10:01:42
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for knowledge_role
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_role`;
+CREATE TABLE `knowledge_role`  (
+                                   `id` bigint NOT NULL COMMENT '知识库角色id',
+                                   `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '知识库角色name',
+                                   `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+                                   `create_dept` bigint NULL DEFAULT NULL COMMENT '创建部门',
+                                   `create_by` bigint NULL DEFAULT NULL COMMENT '创建者',
+                                   `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+                                   `update_by` bigint NULL DEFAULT NULL COMMENT '更新者',
+                                   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+                                   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+                                   `group_id` bigint NULL DEFAULT NULL COMMENT '知识库角色组id',
+                                   PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '知识库角色表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for knowledge_role_group
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_role_group`;
+CREATE TABLE `knowledge_role_group`  (
+                                         `id` bigint NOT NULL COMMENT '知识库角色组id',
+                                         `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '知识库角色组name',
+                                         `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+                                         `create_dept` bigint NULL DEFAULT NULL COMMENT '创建部门',
+                                         `create_by` bigint NULL DEFAULT NULL COMMENT '创建者',
+                                         `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+                                         `update_by` bigint NULL DEFAULT NULL COMMENT '更新者',
+                                         `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+                                         `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+                                         PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '知识库角色组表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for knowledge_role_relation
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_role_relation`;
+CREATE TABLE `knowledge_role_relation`  (
+                                            `id` bigint NOT NULL COMMENT 'id',
+                                            `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+                                            `create_dept` bigint NULL DEFAULT NULL COMMENT '创建部门',
+                                            `create_by` bigint NULL DEFAULT NULL COMMENT '创建者',
+                                            `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+                                            `update_by` bigint NULL DEFAULT NULL COMMENT '更新者',
+                                            `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+                                            `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+                                            `knowledge_role_id` bigint NULL DEFAULT NULL COMMENT '知识库角色id',
+                                            `knowledge_id` bigint NULL DEFAULT NULL COMMENT '知识库id',
+                                            PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '知识库角色与知识库关联表' ROW_FORMAT = DYNAMIC;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+-- 菜单
+INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1946483381643743233, '知识库角色管理', 1775500307898949634, '12', 'knowledgeRole', 'system/knowledgeRole/index', NULL, 1, 0, 'C', '0', '0', NULL, 'ri:user-3-fill', 103, 1, '2025-07-19 16:41:17', NULL, NULL, '知识库角色管理');
+
+-- 用户表添加字段
+ALTER TABLE sys_user
+    ADD COLUMN `krole_group_type` VARCHAR(50) COMMENT '关联知识库角色/角色组',
+ADD COLUMN `krole_group_id` TEXT COMMENT '关联知识库角色/角色组id';
+