代码注释补充,冗余删除,mapper找不到报错解决等
This commit is contained in:
@ -4,6 +4,7 @@ package com.fastbee.project.mapper;
|
||||
|
||||
import com.fastbee.project.domain.Project;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -11,8 +12,9 @@ import java.util.List;
|
||||
* 项目Mapper接口
|
||||
*
|
||||
* @author kerwincui
|
||||
* @date 2024-10-17
|
||||
* @date 2024-10-17
|
||||
*/
|
||||
@Mapper
|
||||
public interface ProjectMapper extends MPJBaseMapper<Project>
|
||||
{
|
||||
/**
|
||||
@ -21,7 +23,7 @@ public interface ProjectMapper extends MPJBaseMapper<Project>
|
||||
* @param projectId 项目主键
|
||||
* @return 项目
|
||||
*/
|
||||
public Project selectProjectByProjectId(Long projectId);
|
||||
Project selectProjectByProjectId(Long projectId);
|
||||
|
||||
/**
|
||||
* 查询项目列表
|
||||
@ -29,7 +31,7 @@ public interface ProjectMapper extends MPJBaseMapper<Project>
|
||||
* @param project 项目
|
||||
* @return 项目集合
|
||||
*/
|
||||
public List<Project> selectProjectList(Project project);
|
||||
List<Project> selectProjectList(Project project);
|
||||
|
||||
/**
|
||||
* 新增项目
|
||||
@ -37,7 +39,7 @@ public interface ProjectMapper extends MPJBaseMapper<Project>
|
||||
* @param project 项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertProject(Project project);
|
||||
int insertProject(Project project);
|
||||
|
||||
/**
|
||||
* 修改项目
|
||||
@ -45,7 +47,7 @@ public interface ProjectMapper extends MPJBaseMapper<Project>
|
||||
* @param project 项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProject(Project project);
|
||||
int updateProject(Project project);
|
||||
|
||||
/**
|
||||
* 删除项目
|
||||
@ -53,7 +55,7 @@ public interface ProjectMapper extends MPJBaseMapper<Project>
|
||||
* @param projectId 项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProjectByProjectId(Long projectId);
|
||||
int deleteProjectByProjectId(Long projectId);
|
||||
|
||||
/**
|
||||
* 批量删除项目
|
||||
@ -61,5 +63,5 @@ public interface ProjectMapper extends MPJBaseMapper<Project>
|
||||
* @param projectIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProjectByProjectIds(Long[] projectIds);
|
||||
int deleteProjectByProjectIds(Long[] projectIds);
|
||||
}
|
||||
|
@ -10,7 +10,7 @@ import java.util.Map;
|
||||
* 项目Service接口
|
||||
*
|
||||
* @author kerwincui
|
||||
* @date 2024-09-26
|
||||
* @date 2024-09-26
|
||||
*/
|
||||
public interface IProjectService
|
||||
{
|
||||
@ -20,7 +20,7 @@ public interface IProjectService
|
||||
* @param projectId 项目主键
|
||||
* @return 项目
|
||||
*/
|
||||
public Project selectProjectByProjectId(Long projectId);
|
||||
Project selectProjectByProjectId(Long projectId);
|
||||
|
||||
/**
|
||||
* 查询项目列表
|
||||
@ -28,7 +28,7 @@ public interface IProjectService
|
||||
* @param project 项目
|
||||
* @return 项目集合
|
||||
*/
|
||||
public List<Project> selectProjectList(Project project);
|
||||
List<Project> selectProjectList(Project project);
|
||||
|
||||
/**
|
||||
* 新增项目
|
||||
@ -36,7 +36,7 @@ public interface IProjectService
|
||||
* @param project 项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertProject(Project project);
|
||||
int insertProject(Project project);
|
||||
|
||||
/**
|
||||
* 修改项目
|
||||
@ -44,7 +44,7 @@ public interface IProjectService
|
||||
* @param project 项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProject(Project project);
|
||||
int updateProject(Project project);
|
||||
|
||||
/**
|
||||
* 批量删除项目
|
||||
@ -52,20 +52,12 @@ public interface IProjectService
|
||||
* @param projectIds 需要删除的项目主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProjectByProjectIds(Long[] projectIds);
|
||||
int deleteProjectByProjectIds(Long[] projectIds);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 删除项目信息
|
||||
*
|
||||
* @param projectId 项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProjectByProjectId(Long projectId);
|
||||
|
||||
/**
|
||||
* 查询项目基本信息
|
||||
* @param userId 用户ID
|
||||
* @return 项目信息
|
||||
* 获取管理员所管理的项目id以及子项目id列表
|
||||
*/
|
||||
Map<String,Object> selectProjectByUserId(Long userId);
|
||||
|
||||
@ -76,7 +68,7 @@ public interface IProjectService
|
||||
List<SysDept> getUnbindDeptList();
|
||||
|
||||
/**
|
||||
* 查询管理员项目切换下拉框数据
|
||||
* 查询管理员可管理项目下拉框列表
|
||||
* @return 项目列表
|
||||
*/
|
||||
List<Project> selectAdminProjectList();
|
||||
|
@ -13,7 +13,6 @@ import com.fastbee.project.service.IProjectService;
|
||||
|
||||
import com.fastbee.system.mapper.SysDeptMapper;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.*;
|
||||
@ -27,11 +26,16 @@ import java.util.*;
|
||||
@Service
|
||||
public class ProjectServiceImpl implements IProjectService
|
||||
{
|
||||
@Autowired
|
||||
private ProjectMapper projectMapper;
|
||||
|
||||
@Autowired
|
||||
private SysDeptMapper sysDeptMapper;
|
||||
private final ProjectMapper projectMapper;
|
||||
|
||||
|
||||
private final SysDeptMapper sysDeptMapper;
|
||||
|
||||
public ProjectServiceImpl(ProjectMapper projectMapper, SysDeptMapper sysDeptMapper) {
|
||||
this.projectMapper = projectMapper;
|
||||
this.sysDeptMapper = sysDeptMapper;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目
|
||||
@ -47,9 +51,6 @@ public class ProjectServiceImpl implements IProjectService
|
||||
|
||||
/**
|
||||
* 查询项目列表
|
||||
*
|
||||
* @param project 项目
|
||||
* @return 项目
|
||||
*/
|
||||
@Override
|
||||
public List<Project> selectProjectList(Project project)
|
||||
@ -65,9 +66,6 @@ public class ProjectServiceImpl implements IProjectService
|
||||
|
||||
/**
|
||||
* 新增项目
|
||||
*
|
||||
* @param project 项目
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertProject(Project project)
|
||||
@ -84,8 +82,6 @@ public class ProjectServiceImpl implements IProjectService
|
||||
|
||||
/**
|
||||
* 修改项目
|
||||
*
|
||||
* @param project 项目
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@ -107,9 +103,6 @@ public class ProjectServiceImpl implements IProjectService
|
||||
|
||||
/**
|
||||
* 批量删除项目
|
||||
*
|
||||
* @param projectIds 需要删除的项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteProjectByProjectIds(Long[] projectIds)
|
||||
@ -117,24 +110,10 @@ public class ProjectServiceImpl implements IProjectService
|
||||
return projectMapper.deleteProjectByProjectIds(projectIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除项目信息
|
||||
*
|
||||
* @param projectId 项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteProjectByProjectId(Long projectId)
|
||||
{
|
||||
return projectMapper.deleteProjectByProjectId(projectId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目基本信息
|
||||
* @param userId 管理员id
|
||||
* @return 结果
|
||||
* 获取管理员所管理的项目id以及子项目id列表
|
||||
*/
|
||||
|
||||
@Override
|
||||
public Map<String, Object> selectProjectByUserId(Long userId) {
|
||||
//查询该管理员所管理的项目id以及子项目id列表
|
||||
@ -145,7 +124,6 @@ public class ProjectServiceImpl implements IProjectService
|
||||
if(Objects.isNull(project)){
|
||||
return null;
|
||||
}
|
||||
|
||||
List<Long> projects = getAllProjects(project.getProjectId());
|
||||
//把列表进行Base64编码
|
||||
String projectsBase64 = Base64.encode(projects.toString());
|
||||
@ -159,7 +137,6 @@ public class ProjectServiceImpl implements IProjectService
|
||||
|
||||
/**
|
||||
* 查询未绑定项目的部门列表
|
||||
* @return 部门列表
|
||||
*/
|
||||
@Override
|
||||
public List<SysDept> getUnbindDeptList() {
|
||||
@ -176,13 +153,14 @@ public class ProjectServiceImpl implements IProjectService
|
||||
if (Objects.nonNull(project.getDeptId()))
|
||||
sysDeptList.removeIf(sysDept -> sysDept.getDeptId().equals(project.getDeptId()));
|
||||
}
|
||||
|
||||
return sysDeptList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询管理员可管理项目下拉框列表
|
||||
*/
|
||||
@Override
|
||||
public List<Project> selectAdminProjectList() {
|
||||
Map<String, Object> rest = new HashMap<>();
|
||||
//判断管理员级别
|
||||
List<Project> projectList=new ArrayList<>();
|
||||
//超级管理员
|
||||
@ -201,7 +179,6 @@ public class ProjectServiceImpl implements IProjectService
|
||||
.in(Project::getParentId, ProjectHolder.getProjectInfo().getProjectIdList())
|
||||
.list();
|
||||
}
|
||||
|
||||
return projectList;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user