luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加项目数据隔离逻辑

Browse Source
This commit is contained in:
mi9688
2024-10-17 18:17:06 +08:00
parent 0fb3e4bd8d
commit a5c5d88b46
12 changed files with 227 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/domain/Project.java
View File

@ -11,7 +11,7 @@ import com.fastbee.common.core.domain.BaseEntity;
* 项目对象 project
*
* @author kerwincui
* @date 2024-10-16
* @date 2024-10-17
*/
@ApiModel(value = "Project",description = "项目 project")
@Data
@ -101,4 +101,9 @@ public class Project extends BaseEntity
@ApiModelProperty("负责人id")
private Long ownerId;
/** 父项目id */
@Excel(name = "父项目id")
@ApiModelProperty("父项目id")
private Long parentId;
}

3
fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/mapper/ProjectMapper.java
View File

@ -3,7 +3,6 @@ package com.fastbee.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fastbee.project.domain.Project;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -11,7 +10,7 @@ import java.util.List;
* 项目Mapper接口
*
* @author kerwincui
* @date 2024-09-26
* @date 2024-10-17
*/
public interface ProjectMapper extends BaseMapper<Project>
{

44
fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java
View File

@ -1,18 +1,17 @@
package com.fastbee.project.service.impl;
import cn.hutool.core.codec.Base64;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.fastbee.common.utils.DateUtils;
import com.fastbee.project.domain.Project;
import com.fastbee.project.mapper.ProjectMapper;
import com.fastbee.project.service.IProjectService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
/**
* 项目Service业务层处理
@ -108,17 +107,50 @@ public class ProjectServiceImpl implements IProjectService
@Override
public Map<String, Object> selectProjectByUserId(Long userId) {
//查询该管理员所管理的项目id以及子项目id列表
Project project = new LambdaQueryChainWrapper<>(projectMapper)
.select(Project::getProjectId, Project::getProjectName)
.eq(Project::getOwnerId, userId)
.one();
HashMap<String , Object> map = new HashMap<>();
if(Objects.isNull(project)){
return null;
}
map.put("projectId", project.getProjectId());
List<Long> projects = getAllProjects(project.getProjectId());
//把列表进行Base64编码
String projectsBase64 = Base64.encode(projects.toString());
HashMap<String , Object> map = new HashMap<>();
map.put("projectIds",projectsBase64);
map.put("projectId",project.getProjectId());
map.put("projectName", project.getProjectName());
return map;
}
public List<Long> getAllProjects(Long projectId) {
List<Long> allProjects = new ArrayList<>();
// 查询当前项目
Project currentProject = new LambdaQueryChainWrapper<>(projectMapper)
.select(Project::getProjectId, Project::getProjectName)
.eq(Project::getProjectId, projectId)
.one();
if (currentProject != null) {
allProjects.add(currentProject.getProjectId());
// 查询当前项目的子项目
List<Project> children = new LambdaQueryChainWrapper<>(projectMapper)
.select(Project::getProjectId, Project::getProjectName)
.eq(Project::getParentId, projectId)
.list();
// 递归查询子项目
for (Project child : children) {
allProjects.addAll(getAllProjects(child.getProjectId()));
}
}
return allProjects;
}
}

7
fastbee-service/fastbee-project-service/src/main/resources/mapper/project/ProjectMapper.xml
View File

@ -26,10 +26,11 @@
<result property="tenantId" column="tenant_id" />
<result property="tenantName" column="tenant_name" />
<result property="ownerId" column="owner_id" />
<result property="parentId" column="parent_id" />
</resultMap>
<sql id="selectProjectVo">
select project_id, project_name, sys_show_name, central_coordinates, scope, administrative_area, owner, logo, image, video_introduction, remark, p_params, introduce, del_flag, create_time, create_by, update_time, remarks, tenant_id, tenant_name, owner_id from project
select project_id, project_name, sys_show_name, central_coordinates, scope, administrative_area, owner, logo, image, video_introduction, remark, p_params, introduce, del_flag, create_time, create_by, update_time, remarks, tenant_id, tenant_name, owner_id, parent_id from project
</sql>
<select id="selectProjectList" parameterType="Project" resultMap="ProjectResult">
@ -50,6 +51,7 @@
<if test="tenantId != null "> and tenant_id = #{tenantId}</if>
<if test="tenantName != null and tenantName != ''"> and tenant_name like concat('%', #{tenantName}, '%')</if>
<if test="ownerId != null "> and owner_id = #{ownerId}</if>
<if test="parentId != null "> and parent_id = #{parentId}</if>
</where>
</select>
@ -82,6 +84,7 @@
<if test="tenantId != null">tenant_id,</if>
<if test="tenantName != null">tenant_name,</if>
<if test="ownerId != null">owner_id,</if>
<if test="parentId != null">parent_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectId != null">#{projectId},</if>
@ -105,6 +108,7 @@
<if test="tenantId != null">#{tenantId},</if>
<if test="tenantName != null">#{tenantName},</if>
<if test="ownerId != null">#{ownerId},</if>
<if test="parentId != null">#{parentId},</if>
</trim>
</insert>
@ -131,6 +135,7 @@
<if test="tenantId != null">tenant_id = #{tenantId},</if>
<if test="tenantName != null">tenant_name = #{tenantName},</if>
<if test="ownerId != null">owner_id = #{ownerId},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
</trim>
where project_id = #{projectId}
</update>