Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

岗位管理相关代码去除，增加：删除机台，加工分线，数据处理时关联判断是否在方案组中使用

Browse Source
This commit is contained in:
liuzhaotian
2025-03-12 17:36:41 +08:00
parent 30187c0905
commit a81637db28
10 changed files with 180 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/oauth2/OAuth2UserController.java
+5 -8
View File
@@ -1,13 +1,11 @@
package com.cf.imes.module.system.controller.admin.oauth2;
import cn.hutool.core.collection.CollUtil;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.module.system.controller.admin.oauth2.vo.user.OAuth2UserInfoRespVO;
import com.cf.imes.module.system.controller.admin.oauth2.vo.user.OAuth2UserUpdateReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
import com.cf.imes.module.system.dal.dataobject.dept.DeptDO;
import com.cf.imes.module.system.dal.dataobject.dept.PostDO;
import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO;
import com.cf.imes.module.system.service.dept.DeptService;
import com.cf.imes.module.system.service.dept.PostService;
@@ -21,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -60,11 +57,11 @@ public class OAuth2UserController {
DeptDO dept = deptService.getDept(user.getDeptId());
resp.setDept(BeanUtils.toBean(dept, OAuth2UserInfoRespVO.Dept.class));
}
// 获得岗位信息
if (CollUtil.isNotEmpty(user.getPostIds())) {
List<PostDO> posts = postService.getPostList(user.getPostIds());
resp.setPosts(BeanUtils.toBean(posts, OAuth2UserInfoRespVO.Post.class));
}
// // 获得岗位信息
// if (CollUtil.isNotEmpty(user.getPostIds())) {
// List<PostDO> posts = postService.getPostList(user.getPostIds());
// resp.setPosts(BeanUtils.toBean(posts, OAuth2UserInfoRespVO.Post.class));
// }
return success(resp);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserProfileController.java
+3 -5
View File
@@ -1,6 +1,5 @@
package com.cf.imes.module.system.controller.admin.user;
import cn.hutool.core.collection.CollUtil;
import com.cf.imes.framework.common.enums.UserTypeEnum;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.datapermission.core.annotation.DataPermission;
@@ -10,7 +9,6 @@ import com.cf.imes.module.system.controller.admin.user.vo.profile.UserProfileUpd
import com.cf.imes.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
import com.cf.imes.module.system.convert.user.UserConvert;
import com.cf.imes.module.system.dal.dataobject.dept.DeptDO;
import com.cf.imes.module.system.dal.dataobject.dept.PostDO;
import com.cf.imes.module.system.dal.dataobject.permission.RoleDO;
import com.cf.imes.module.system.dal.dataobject.social.SocialUserDO;
import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO;
@@ -66,11 +64,11 @@ public class UserProfileController {
List<RoleDO> userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(user.getId()));
// 获得部门信息
DeptDO dept = user.getDeptId() != null ? deptService.getDept(user.getDeptId()) : null;
// 获得岗位信息
List<PostDO> posts = CollUtil.isNotEmpty(user.getPostIds()) ? postService.getPostList(user.getPostIds()) : null;
// // 获得岗位信息
// List<PostDO> posts = CollUtil.isNotEmpty(user.getPostIds()) ? postService.getPostList(user.getPostIds()) : null;
// 获得社交用户信息
List<SocialUserDO> socialUsers = socialService.getSocialUserList(user.getId(), UserTypeEnum.ADMIN.getValue());
return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts, socialUsers));
return success(UserConvert.INSTANCE.convert(user, userRoles, dept, null, socialUsers));
}
@PutMapping("/update")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/user/UserConvert.java
+1 -2
View File
@@ -4,7 +4,6 @@ import com.cf.imes.framework.common.util.collection.CollectionUtils;
import com.cf.imes.framework.common.util.collection.MapUtils;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
import com.cf.imes.module.system.controller.admin.dept.vo.post.PostSimpleRespVO;
import com.cf.imes.module.system.controller.admin.permission.vo.role.RoleSimpleRespVO;
import com.cf.imes.module.system.controller.admin.user.vo.profile.UserProfileRespVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserExportRespVO;
@@ -64,7 +63,7 @@ public interface UserConvert {
UserProfileRespVO userVO = BeanUtils.toBean(user, UserProfileRespVO.class);
userVO.setRoles(BeanUtils.toBean(userRoles, RoleSimpleRespVO.class));
userVO.setDept(BeanUtils.toBean(dept, DeptSimpleRespVO.class));
userVO.setPosts(BeanUtils.toBean(posts, PostSimpleRespVO.class));
// userVO.setPosts(BeanUtils.toBean(posts, PostSimpleRespVO.class));
userVO.setSocialUsers(BeanUtils.toBean(socialUsers, UserProfileRespVO.SocialUser.class));
return userVO;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/systemconfig/SystemConfigSchemeMapper.java
+9
View File
@@ -27,4 +27,13 @@ public interface SystemConfigSchemeMapper extends BaseMapperX<SystemConfigScheme
.orderByAsc(SystemConfigSchemeDO::getSort, SystemConfigDO::getCreateTime));
}
default List<SystemConfigSchemeDO> selectOrganConfig(Long organId) {
return selectList(new LambdaQueryWrapperX<SystemConfigSchemeDO>()
.eq(SystemConfigSchemeDO::getOrganId, organId)
.eq(SystemConfigSchemeDO::getDeleted,false));
}
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+30 -3
View File
@@ -16,18 +16,21 @@ import com.cf.imes.framework.security.core.LoginUser;
import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
import com.cf.imes.module.executor.api.plan.OrderPlanApi;
import com.cf.imes.module.system.controller.admin.machine.vo.*;
import com.cf.imes.module.system.controller.admin.systemconfig.vo.ProcessSchemeConfig;
import com.cf.imes.module.system.convert.machine.MachineConvert;
import com.cf.imes.module.system.dal.dataobject.machine.MachineBrandDO;
import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO;
import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO;
import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO;
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigSchemeDO;
import com.cf.imes.module.system.dal.mysql.machine.MachineBrandMapper;
import com.cf.imes.module.system.dal.mysql.machine.MachineLimitMapper;
import com.cf.imes.module.system.dal.mysql.machine.MachineMapper;
import com.cf.imes.module.system.dal.mysql.machinetemplate.MachineTemplateLimitMapper;
import com.cf.imes.module.system.dal.mysql.machinetemplate.MachineTemplateMapper;
import com.cf.imes.module.system.dal.mysql.organ.OrganMapper;
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigSchemeMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -45,8 +48,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.framework.common.util.json.JsonUtils.unzipString;
import static com.cf.imes.framework.common.util.json.JsonUtils.zipString;
import static com.cf.imes.framework.common.util.json.JsonUtils.*;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
@@ -90,6 +92,9 @@ public class MachineServiceImpl implements MachineService {
@Resource
private OrganMapper organMapper;
@Resource
private SystemConfigSchemeMapper systemConfigSchemeMapper;
private static final String FIELD_ADVANCED_CONFIGS_REF = "advancedConfigsRef";
private static final String FIELD_AUTO_LABEL_MODEL = "autoLabelModel";
private static final String FIELD_CUTTING_MODULE_REF = "cuttingModuleRef";
@@ -361,9 +366,31 @@ public class MachineServiceImpl implements MachineService {
throw exception(MACHINE_NOT_EXISTS);
}
// 校验当前机台是否使用
if (orderPlanApi.getOrderPlan(id).getData()) {
if (Boolean.TRUE.equals(orderPlanApi.getOrderPlan(id).getData())) {
throw exception(THE_CURRENT_MACHINE_IS_ALREADY_IN_USE);
}
List<SystemConfigSchemeDO> systemConfigSchemeDOS = systemConfigSchemeMapper.selectOrganConfig(machineDO.getOrganId());
List<Long> machineIds = new ArrayList<>();
if(CollUtil.isNotEmpty(systemConfigSchemeDOS)){
try {
systemConfigSchemeDOS.forEach(f -> {
List<ProcessSchemeConfig> processSchemeConfigs = parseArray(f.getSetting(), ProcessSchemeConfig.class);
machineIds.addAll(processSchemeConfigs.stream().map(m -> Long.valueOf(m.getAnalyzer())).distinct().toList());
});
}catch (Exception e){
log.error("删除机台解析加工方案组配置报错："+e.getMessage());
}
}
if(machineIds.contains(id)){
throw exception(MACHINE_USED_ALREADY);
}
machineMapper.deleteById(id);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/SystemConfigServiceFactory.java
-3
View File
@@ -44,9 +44,6 @@ public class SystemConfigServiceFactory {
// 板件分线
case INTELLIGENT_BRANCH:
return applicationContext.getBean(IntellectBranchingService.class);
// // 高级筛选
// case ADVANCED_SCREEN:
// return applicationContext.getBean(AdvancedScreenServiceHandler.class);
// 加工分线
case PROCESSING_SCREENING:
return applicationContext.getBean(ProcessScreeningServiceHandler.class);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DataProcessServiceHandler.java
+46 -3
View File
@@ -1,6 +1,7 @@
package com.cf.imes.module.system.service.systemconfig.factory.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.cf.imes.framework.common.util.object.BeanUtils;
@@ -9,7 +10,9 @@ import com.cf.imes.framework.organ.core.context.OrganContextHolder;
import com.cf.imes.module.system.controller.admin.systemconfig.vo.*;
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO;
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDataDO;
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigSchemeDO;
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigDataMapper;
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigSchemeMapper;
import com.cf.imes.module.system.service.systemconfig.factory.service.AbstractSystemConfigServiceHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -20,7 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.SYSTEM_CONFIG_NOT_EXISTS;
import static com.cf.imes.framework.common.util.json.JsonUtils.parseArray;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
/**
* @author 数据处理服务处理器
@@ -32,6 +36,9 @@ public class DataProcessServiceHandler extends AbstractSystemConfigServiceHandle
@Resource
private SystemConfigDataMapper systemConfigDataMapper;
@Resource
private SystemConfigSchemeMapper systemConfigSchemeMapper;
@Override
public List<SystemConfigDO> selectList(ConfigPageReqVO pageReqVO) {
@@ -66,9 +73,13 @@ public class DataProcessServiceHandler extends AbstractSystemConfigServiceHandle
@Override
public void deleteConfig(ConfigDeleteReqVO reqVO) {
validateSystemConfigExists(reqVO.getId());
Long id = reqVO.getId();
systemConfigDataMapper.deleteById(reqVO.getId());
validateSystemConfigExists(id);
validateDataConfigUsedAlready(id);
systemConfigDataMapper.deleteById(id);
}
@@ -171,4 +182,36 @@ public class DataProcessServiceHandler extends AbstractSystemConfigServiceHandle
return systemConfigDataDO;
}
private void validateDataConfigUsedAlready(Long id){
List<SystemConfigSchemeDO> systemConfigSchemeDOS = systemConfigSchemeMapper.selectOrganConfig(OrganContextHolder.getOrganId());
List<Long> optimizationConfigIds = new ArrayList<>();
if(CollUtil.isNotEmpty(systemConfigSchemeDOS)){
try {
systemConfigSchemeDOS.forEach(f -> {
List<ProcessSchemeConfig> processSchemeConfigs = parseArray(f.getSetting(), ProcessSchemeConfig.class);
optimizationConfigIds.addAll(processSchemeConfigs.stream().map(m -> Long.valueOf(m.getOptimizationConfig())).distinct().toList());
});
}catch (Exception e){
log.error("删除数据处理解析加工方案组配置报错："+e.getMessage());
}
}
if(optimizationConfigIds.contains(id)){
throw exception(OPTIMIZATION_CONFIG_USED_ALREADY);
}
}
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessScreeningServiceHandler.java
+38 -3
View File
@@ -1,6 +1,7 @@
package com.cf.imes.module.system.service.systemconfig.factory.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.cf.imes.framework.common.util.object.BeanUtils;
@@ -9,7 +10,9 @@ import com.cf.imes.framework.organ.core.context.OrganContextHolder;
import com.cf.imes.module.system.controller.admin.systemconfig.vo.*;
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO;
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigProcessDO;
import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigSchemeDO;
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigProcessMapper;
import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigSchemeMapper;
import com.cf.imes.module.system.service.systemconfig.factory.service.AbstractSystemConfigServiceHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -20,7 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.SYSTEM_CONFIG_NOT_EXISTS;
import static com.cf.imes.framework.common.util.json.JsonUtils.parseArray;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
/**
* @author 加工分线服务处理器
@@ -33,6 +37,9 @@ public class ProcessScreeningServiceHandler extends AbstractSystemConfigServiceH
@Resource
private SystemConfigProcessMapper systemConfigProcessMapper;
@Resource
private SystemConfigSchemeMapper systemConfigSchemeMapper;
@Override
public List<SystemConfigDO> selectList(ConfigPageReqVO pageReqVO) {
@@ -67,9 +74,12 @@ public class ProcessScreeningServiceHandler extends AbstractSystemConfigServiceH
@Override
public void deleteConfig(ConfigDeleteReqVO reqVO) {
validateSystemConfigExists(reqVO.getId());
Long id = reqVO.getId();
validateSystemConfigExists(id);
systemConfigProcessMapper.deleteById(reqVO.getId());
validateProcessConfigUsedAlready(id);
systemConfigProcessMapper.deleteById(id);
}
@@ -173,6 +183,31 @@ public class ProcessScreeningServiceHandler extends AbstractSystemConfigServiceH
}
private void validateProcessConfigUsedAlready(Long id){
List<SystemConfigSchemeDO> systemConfigSchemeDOS = systemConfigSchemeMapper.selectOrganConfig(OrganContextHolder.getOrganId());
List<Long> processLineConfigIds = new ArrayList<>();
if(CollUtil.isNotEmpty(systemConfigSchemeDOS)){
try {
systemConfigSchemeDOS.forEach(f -> {
List<ProcessSchemeConfig> processSchemeConfigs = parseArray(f.getSetting(), ProcessSchemeConfig.class);
processLineConfigIds.addAll(processSchemeConfigs.stream().map(m -> Long.valueOf(m.getProcessLineConfig())).distinct().toList());
});
}catch (Exception e){
log.error("删除加工分线解析加工方案组配置报错："+e.getMessage());
}
}
if(processLineConfigIds.contains(id)){
throw exception(PROCESS_CONFIG_USED_ALREADY);
}
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
+44 -50
View File
@@ -31,27 +31,21 @@ import com.cf.imes.module.system.constants.permission.InternalRoleConstants;
import com.cf.imes.module.system.controller.admin.user.vo.profile.UserMobileUpdateReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserImportExcelVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserImportRespVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserPageReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserResetPasswordReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserSaveReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.*;
import com.cf.imes.module.system.dal.dataobject.dept.DeptDO;
import com.cf.imes.module.system.dal.dataobject.dept.UserPostDO;
import com.cf.imes.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
import com.cf.imes.module.system.dal.dataobject.permission.UserRoleDO;
import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO;
import com.cf.imes.module.system.dal.mysql.dept.UserPostMapper;
import com.cf.imes.module.system.dal.mysql.user.AdminUserMapper;
import com.cf.imes.module.system.enums.ErrorCodeConstants;
import com.cf.imes.module.system.enums.logger.LoginLogTypeEnum;
import com.cf.imes.module.system.enums.logger.LoginResultEnum;
import com.cf.imes.module.system.enums.sms.SmsSceneEnum;
import com.cf.imes.module.system.service.dept.DeptService;
import com.cf.imes.module.system.service.dept.PostService;
import com.cf.imes.module.system.service.logger.LoginLogService;
import com.cf.imes.module.system.service.permission.PermissionService;
import com.cf.imes.module.system.service.organ.OrganService;
import com.cf.imes.module.system.enums.ErrorCodeConstants;
import com.cf.imes.module.system.service.permission.PermissionService;
import com.cf.imes.module.system.service.sms.SmsCodeService;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
@@ -74,12 +68,9 @@ import java.util.*;
import java.util.regex.Pattern;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.framework.common.util.collection.CollectionUtils.convertList;
import static com.cf.imes.framework.common.util.collection.CollectionUtils.convertSet;
import static com.cf.imes.module.system.dal.redis.RedisKeyConstants.OAUTH2_ACCESS_TOKEN;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.USER_ME_ERROR;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.USER_MOBILE_UPDATE_NOT_ALLOW_ERROR;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.USER_OPERATE_SELF_STATUS_ERROR;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
/**
* 后台用户 Service 实现类
@@ -108,8 +99,8 @@ public class AdminUserServiceImpl implements AdminUserService {
@Lazy // 延迟，避免循环依赖报错
private OrganService organService;
@Resource
private UserPostMapper userPostMapper;
// @Resource
// private UserPostMapper userPostMapper;
@Resource
private FileApi fileApi;
@@ -166,11 +157,11 @@ public class AdminUserServiceImpl implements AdminUserService {
user.setPinyinFull(pinyinFull);
user.setPinyinInitial(PinYinUtils.convertFirstChar(user.getNickname()));
userMapper.insert(user);
// 插入关联岗位
if (CollUtil.isNotEmpty(user.getPostIds())) {
userPostMapper.insertBatch(convertList(user.getPostIds(),
postId -> new UserPostDO().setUserId(user.getId()).setPostId(postId)));
}
// // 插入关联岗位
// if (CollUtil.isNotEmpty(user.getPostIds())) {
// userPostMapper.insertBatch(convertList(user.getPostIds(),
// postId -> new UserPostDO().setUserId(user.getId()).setPostId(postId)));
// }
return user.getId();
}
@@ -207,8 +198,8 @@ public class AdminUserServiceImpl implements AdminUserService {
}
}
userMapper.updateById(updateObj);
// 更新岗位
updateUserPost(updateReqVO, updateObj);
// // 更新岗位
// updateUserPost(updateReqVO, updateObj);
// 如果改变了部门或修改状态为禁用移除用户token
if (ObjectUtil.notEqual(currUserDO.getDeptId(), updateReqVO.getDeptId()) || CommonStatusEnum.DISABLE.getStatus().equals(updateReqVO.getStatus())) {
scanAndCompareUserAndDelToken(String.format(OAUTH2_ACCESS_TOKEN, "*"), userId);
@@ -242,22 +233,22 @@ public class AdminUserServiceImpl implements AdminUserService {
}
}
private void updateUserPost(UserSaveReqVO reqVO, AdminUserDO updateObj) {
Long userId = reqVO.getId();
Set<Long> dbPostIds = convertSet(userPostMapper.selectListByUserId(userId), UserPostDO::getPostId);
// 计算新增和删除的岗位编号
Set<Long> postIds = CollUtil.emptyIfNull(updateObj.getPostIds());
Collection<Long> createPostIds = CollUtil.subtract(postIds, dbPostIds);
Collection<Long> deletePostIds = CollUtil.subtract(dbPostIds, postIds);
// 执行新增和删除。对于已经授权的菜单，不用做任何处理
if (!CollUtil.isEmpty(createPostIds)) {
userPostMapper.insertBatch(convertList(createPostIds,
postId -> new UserPostDO().setUserId(userId).setPostId(postId)));
}
if (!CollUtil.isEmpty(deletePostIds)) {
userPostMapper.deleteByUserIdAndPostId(userId, deletePostIds);
}
}
// private void updateUserPost(UserSaveReqVO reqVO, AdminUserDO updateObj) {
// Long userId = reqVO.getId();
// Set<Long> dbPostIds = convertSet(userPostMapper.selectListByUserId(userId), UserPostDO::getPostId);
// // 计算新增和删除的岗位编号
// Set<Long> postIds = CollUtil.emptyIfNull(updateObj.getPostIds());
// Collection<Long> createPostIds = CollUtil.subtract(postIds, dbPostIds);
// Collection<Long> deletePostIds = CollUtil.subtract(dbPostIds, postIds);
// // 执行新增和删除。对于已经授权的菜单，不用做任何处理
// if (!CollUtil.isEmpty(createPostIds)) {
// userPostMapper.insertBatch(convertList(createPostIds,
// postId -> new UserPostDO().setUserId(userId).setPostId(postId)));
// }
// if (!CollUtil.isEmpty(deletePostIds)) {
// userPostMapper.deleteByUserIdAndPostId(userId, deletePostIds);
// }
// }
@Override
public void updateUserLogin(Long id, String loginIp) {
@@ -379,8 +370,8 @@ public class AdminUserServiceImpl implements AdminUserService {
if (deleteNum > 0) {
// 删除用户关联数据
permissionService.processUserDeleted(id);
// 删除用户岗位
userPostMapper.deleteByUserId(id);
// // 删除用户岗位
// userPostMapper.deleteByUserId(id);
// 移除用户token
scanAndCompareUserAndDelToken(String.format(OAUTH2_ACCESS_TOKEN, "*"), id);
}
@@ -397,8 +388,8 @@ public class AdminUserServiceImpl implements AdminUserService {
if (deleteNum > 0) {
// 删除用户关联数据
permissionService.processUserDeleted(userId);
// 删除用户岗位
userPostMapper.deleteByUserId(userId);
// // 删除用户岗位
// userPostMapper.deleteByUserId(userId);
}
}
}
@@ -414,8 +405,8 @@ public class AdminUserServiceImpl implements AdminUserService {
if (deleteNum > 0) {
// 删除用户关联数据
permissionService.processUserDeleted(userId);
// 删除用户岗位
userPostMapper.deleteByUserId(userId);
// // 删除用户岗位
// userPostMapper.deleteByUserId(userId);
}
}
}
@@ -478,11 +469,12 @@ public class AdminUserServiceImpl implements AdminUserService {
if (CollUtil.isEmpty(postIds)) {
return Collections.emptyList();
}
Set<Long> userIds = convertSet(userPostMapper.selectListByPostIds(postIds), UserPostDO::getUserId);
if (CollUtil.isEmpty(userIds)) {
return Collections.emptyList();
}
return userMapper.selectBatchIds(userIds);
// Set<Long> userIds = convertSet(userPostMapper.selectListByPostIds(postIds), UserPostDO::getUserId);
// if (CollUtil.isEmpty(userIds)) {
// return Collections.emptyList();
// }
// return userMapper.selectBatchIds(userIds);
return null;
}
@Override
@@ -498,7 +490,7 @@ public class AdminUserServiceImpl implements AdminUserService {
if (CollUtil.isEmpty(ids)) {
return;
}
// 获得岗位信息
// 获得用户信息
List<AdminUserDO> users = userMapper.selectBatchIds(ids);
Map<Long, AdminUserDO> userMap = CollectionUtils.convertMap(users, AdminUserDO::getId);
// 校验
@@ -547,6 +539,8 @@ public class AdminUserServiceImpl implements AdminUserService {
// 校验部门处于开启状态
deptService.validDept(deptId);
}
// // 校验岗位处于开启状态
// postService.validatePostList(postIds);
return adminUserDO;
}