xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-04-13 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from violateer/feature/knowledge-role

Browse Source 
添加删除知识库角色组时关联删除数据
This commit is contained in:
ageerle
2025-08-03 09:59:50 +08:00
committed by GitHub
parent 3ffba456f4 bd41ff0f28
commit 5e032a68d5
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@ package org.ruoyi.domain;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -44,7 +43,7 @@ public class KnowledgeRole extends BaseEntity {
/** /**
* 删除标志（0代表存在 2代表删除） * 删除标志（0代表存在 2代表删除）
*/ */
@TableLogic // @TableLogic
private String delFlag; private String delFlag;
/** /**

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

@@ -1,7 +1,6 @@
package org.ruoyi.domain; package org.ruoyi.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -37,7 +36,7 @@ public class KnowledgeRoleGroup extends BaseEntity {
/** /**
* 删除标志（0代表存在 2代表删除） * 删除标志（0代表存在 2代表删除）
*/ */
@TableLogic // @TableLogic
private String delFlag; private String delFlag;
/** /**

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

@@ -8,16 +8,19 @@ import org.ruoyi.common.core.utils.MapstructUtils;
import org.ruoyi.common.core.utils.StringUtils; import org.ruoyi.common.core.utils.StringUtils;
import org.ruoyi.core.page.PageQuery; import org.ruoyi.core.page.PageQuery;
import org.ruoyi.core.page.TableDataInfo; import org.ruoyi.core.page.TableDataInfo;
import org.ruoyi.domain.KnowledgeRole;
import org.ruoyi.domain.KnowledgeRoleGroup; import org.ruoyi.domain.KnowledgeRoleGroup;
import org.ruoyi.domain.bo.KnowledgeRoleGroupBo; import org.ruoyi.domain.bo.KnowledgeRoleGroupBo;
import org.ruoyi.domain.vo.KnowledgeRoleGroupVo; import org.ruoyi.domain.vo.KnowledgeRoleGroupVo;
import org.ruoyi.mapper.KnowledgeRoleGroupMapper; import org.ruoyi.mapper.KnowledgeRoleGroupMapper;
import org.ruoyi.mapper.KnowledgeRoleMapper;
import org.ruoyi.service.IKnowledgeRoleGroupService; import org.ruoyi.service.IKnowledgeRoleGroupService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 知识库角色组Service业务层处理 * 知识库角色组Service业务层处理
@@ -30,6 +33,8 @@ import java.util.Map;
public class KnowledgeRoleGroupServiceImpl implements IKnowledgeRoleGroupService { public class KnowledgeRoleGroupServiceImpl implements IKnowledgeRoleGroupService {
private final KnowledgeRoleGroupMapper baseMapper; private final KnowledgeRoleGroupMapper baseMapper;
private final KnowledgeRoleMapper knowledgeRoleMapper;
private final KnowledgeRoleServiceImpl knowledgeRoleServiceImpl;
/** /**
* 查询知识库角色组 * 查询知识库角色组
@@ -104,6 +109,13 @@ public class KnowledgeRoleGroupServiceImpl implements IKnowledgeRoleGroupService
if (isValid) { if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验
} }
// 查询role表
LambdaQueryWrapper<KnowledgeRole> lqwState = Wrappers.lambdaQuery();
lqwState.in(KnowledgeRole::getGroupId, ids);
List<KnowledgeRole> knowledgeRoles = knowledgeRoleMapper.selectList();
knowledgeRoleServiceImpl.deleteWithValidByIds(knowledgeRoles.stream().map(KnowledgeRole::getId).collect(Collectors.toList()), true);
return baseMapper.deleteBatchIds(ids) > 0; return baseMapper.deleteBatchIds(ids) > 0;
} }
} }