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-11-04 18:03:21 +08:00
parent 66c1bd1e0d
commit be83b50ad0
9 changed files with 110 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,7 @@ public class ProjectServiceImpl implements IProjectService
Project::getAdministrativeAreaCode, Project::getLevel, Project::getDeptId, Project::getDeptName,
Project::getVideoIntroduction, Project::getImage, Project::getLogo, Project::getRemark)
.eq(Project::getId, projectId)
.eq(Project::getDelFlag,0)
.list();
//查询项目管理员信息
List<SysUser> list = new LambdaQueryChainWrapper<>(sysUserMapper)
@ -117,6 +118,7 @@ public class ProjectServiceImpl implements IProjectService
Project::getLogo, Project::getImage, Project::getLevel, Project::getDeptName,
Project::getCreateTime,
Project::getAdministrativeAreaCode,Project::getAdministrativeArea, Project::getProvinceCode,Project::getCityCode,Project::getCountyCode)
.eq(Project::getDelFlag,0)
.like(StringUtils.isNotBlank(project.getSearchValue()),Project::getProjectName, project.getSearchValue())
.list();
}
@ -169,7 +171,7 @@ public class ProjectServiceImpl implements IProjectService
SysDept sysDept = deptService.selectDeptById(100L);
List<SysMenu> sysMenuList = sysMenuService.selectMenuList(new SysMenu(), sysDept.getDeptUserId());
Long[] menuIdList = sysMenuList.stream().map(SysMenu::getMenuId)
.filter(menuId-> menuId!=3469L&&menuId!=3L&&menuId!=2L)
.filter(menuId-> menuId!=3469L&&menuId!=3L&&menuId!=2L &&menuId!=3468L)
.toArray(Long[]::new);
SysRole sysRole = new SysRole();
sysRole.setRoleName("管理员");
@ -184,7 +186,7 @@ public class ProjectServiceImpl implements IProjectService
RegisterUserInput registerUserInput = new RegisterUserInput();
registerUserInput.setUsername(project.getUserName());
registerUserInput.setPassword(project.getPassword());
registerUserInput.setPhonenumber(String.valueOf(UUID.randomUUID()).substring(5,9));
registerUserInput.setPhonenumber(project.getPhoneNumber());
registerUserInput.setDeptId(newSysDept.getDeptId());
registerUserInput.setRoleIds(new Long[]{sysRole.getRoleId()});
RegisterUserOutput registerUserOutput = toolService.registerNoCaptcha(registerUserInput);
@ -331,9 +333,35 @@ public class ProjectServiceImpl implements IProjectService
* 删除项目
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int deleteProjectByProjectIds(Long projectId)
{
return projectMapper.deleteById(projectId);
{ //逻辑删除项目信息
boolean updateProject = new LambdaUpdateChainWrapper<>(projectMapper)
.set(Project::getDelFlag, "2")
.eq(Project::getId, projectId)
.update();
//查询项目下的机构
List<SysDept> projectDeptList = new LambdaQueryChainWrapper<>(sysDeptMapper)
.eq(SysDept::getProjectId, projectId)
.eq(SysDept::getDelFlag, "0")
.list();
//逻辑删除项目机构信息
boolean updateDept = new LambdaUpdateChainWrapper<>(sysDeptMapper)
.set(SysDept::getDelFlag, "2")
.eq(SysDept::getProjectId, projectId)
.update();
//逻辑删除项目用户信息
boolean updateUser=false;
LambdaUpdateChainWrapper<SysUser> sysUserLambdaUpdateChainWrapper = new LambdaUpdateChainWrapper<>(sysUserMapper);
sysUserLambdaUpdateChainWrapper
.set(SysUser::getDelFlag, "2");
if(!projectDeptList.isEmpty()){
updateUser = sysUserLambdaUpdateChainWrapper.in(SysUser::getDeptId, projectDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()))
.update();
}
return updateDept&&updateProject&&updateUser?1:0;
}
@ -384,7 +412,7 @@ public class ProjectServiceImpl implements IProjectService
projectLoginBaseInfo.setProjectLevel(ProjectLevelConstant.LEVEL_CITY);
projectLoginBaseInfo.setProjectAreaCode(JSONUtil.parseArray(project.getCityCode()).get(0).toString());
}
if(project.getLevel().equals("县级")){
if(project.getLevel().equals("县/区级")){
projectLoginBaseInfo.setProjectLevel(ProjectLevelConstant.LEVEL_COUNTY);
projectLoginBaseInfo.setProjectAreaCode(JSONUtil.parseArray(project.getCountyCode()).get(0).toString());
}
@ -530,9 +558,12 @@ public class ProjectServiceImpl implements IProjectService
}
//先根据项目机构行政管理级别查上层的行政区划信息
List<SysDistrict> aboveSysDistrictList = aboveSysDistrictLambdaQueryChainWrapper
.in(SysDistrict::getAdcode, queryInAdcodeList)
.list();
List<SysDistrict> aboveSysDistrictList =new ArrayList<>();
if(!queryInAdcodeList.isEmpty()){
aboveSysDistrictList= aboveSysDistrictLambdaQueryChainWrapper
.in(SysDistrict::getAdcode, queryInAdcodeList)
.list();
}
//根据行政区划级别查询下级行政区划信息
List<SysDistrict> belowSysDistrictList = belowSysDistrictLambdaQueryChainWrapper
.in(!queryInLevelList.isEmpty(),SysDistrict::getLevel, queryInLevelList)