diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseConfigDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseConfigDAO.java index e53265292..c8142c4ff 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseConfigDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseConfigDAO.java @@ -21,11 +21,9 @@ public class EnterpriseConfigDAO { private EnterpriseConfigMapper enterpriseConfigMapper; - public EnterpriseConfigDO selectByEnterpriseId(String enterpriseId) { - if(StringUtils.isBlank(enterpriseId)){ - return null; - } - return enterpriseConfigMapper.selectByEnterpriseId(enterpriseId); + public EnterpriseConfigDO selectByEnterpriseId() { + //return enterpriseConfigMapper.selectByEnterpriseId(enterpriseId); + return null; } public EnterpriseConfigDO getDbInfoByDbName(String dbName) { diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseDAO.java index b98e1e74c..17ba41a67 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseDAO.java @@ -2,7 +2,6 @@ package com.cool.store.dao; import com.cool.store.entity.EnterpriseDO; import com.cool.store.mapper.EnterpriseMapper; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; import javax.annotation.Resource; @@ -20,11 +19,9 @@ public class EnterpriseDAO { private EnterpriseMapper enterpriseMapper; - public EnterpriseDO getEnterpriseById(String enterpriseId){ - if(StringUtils.isBlank(enterpriseId)){ - return null; - } - return enterpriseMapper.getEnterpriseById(enterpriseId); + public EnterpriseDO getEnterpriseById(){ + //return enterpriseMapper.getEnterpriseById(enterpriseId); + return null; } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java index 040fe350a..15a39ff7e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java @@ -25,14 +25,14 @@ public class EnterpriseUserDAO { private EnterpriseUserMapper enterpriseUserMapper; - public EnterpriseUserDO getUserInfoById(String enterpriseId, String userId){ - if(StringUtils.isAnyBlank(enterpriseId, userId)){ + public EnterpriseUserDO getUserInfoById(String userId){ + if(StringUtils.isAnyBlank(userId)){ return null; } - return enterpriseUserMapper.getUserInfoById(enterpriseId, userId); + return enterpriseUserMapper.getUserInfoById(userId); } - public void batchInsertOrUpdate(String eid, List users) { + public void batchInsertOrUpdate(List users) { List result = new ArrayList<>(); users.forEach(user -> { if (StringUtils.isBlank(user.getUnionid()) || StringUtils.isBlank(user.getUserId())) { @@ -43,17 +43,17 @@ public class EnterpriseUserDAO { } result.add(user); }); - enterpriseUserMapper.batchInsertOrUpdate(eid, result); + enterpriseUserMapper.batchInsertOrUpdate(result); } - public void batchUpdateDiffUserDiffRegionIds(String enterpriseId, List enterpriseUserList) { - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(enterpriseUserList)){ + public void batchUpdateDiffUserDiffRegionIds(List enterpriseUserList) { + if(CollectionUtils.isEmpty(enterpriseUserList)){ return; } - enterpriseUserMapper.batchUpdateDiffUserDiffRegionIds(enterpriseId, enterpriseUserList); + enterpriseUserMapper.batchUpdateDiffUserDiffRegionIds(enterpriseUserList); } - public List fuzzyUsersByDepartment(String eid, + public List fuzzyUsersByDepartment( String deptId, Long roleId, String orderBy, @@ -63,10 +63,10 @@ public class EnterpriseUserDAO { Integer userStatus, List userIdList, String regionId){ - return enterpriseUserMapper.fuzzyUsersByDepartment(eid, deptId, roleId, orderBy, orderRule, userName, jobnumber, userStatus, userIdList, regionId); + return enterpriseUserMapper.fuzzyUsersByDepartment(deptId, roleId, orderBy, orderRule, userName, jobnumber, userStatus, userIdList, regionId); } - public List fuzzyUsersByNotRole(String eid, + public List fuzzyUsersByNotRole( String deptId, String orderBy, String orderRule, @@ -75,28 +75,28 @@ public class EnterpriseUserDAO { Integer userStatus, List userIdList, String regionId){ - return enterpriseUserMapper.fuzzyUsersByNotRole(eid, deptId, orderBy, orderRule, userName, jobnumber, userStatus, userIdList, regionId); + return enterpriseUserMapper.fuzzyUsersByNotRole(deptId, orderBy, orderRule, userName, jobnumber, userStatus, userIdList, regionId); } - public List selectUsersByUserIds(String eid, List userIds) { - return enterpriseUserMapper.selectUsersByUserIds(eid, userIds); + public List selectUsersByUserIds(List userIds) { + return enterpriseUserMapper.selectUsersByUserIds(userIds); } - public List listUserByGroupId(String eid, String groupId, String userName, List userIdList){ - if(StringUtils.isAnyBlank(eid, groupId)){ + public List listUserByGroupId(String groupId, String userName, List userIdList){ + if(StringUtils.isAnyBlank(groupId)){ return Lists.newArrayList(); } - return enterpriseUserMapper.listUserByGroupId(eid, groupId, userName, userIdList); + return enterpriseUserMapper.listUserByGroupId(groupId, userName, userIdList); } - public List listByRegionIdList(String eid, List regionIdList){ - if(StringUtils.isBlank(eid) || CollectionUtils.isEmpty(regionIdList)){ + public List listByRegionIdList(List regionIdList){ + if(CollectionUtils.isEmpty(regionIdList)){ return Lists.newArrayList(); } - return enterpriseUserMapper.listByRegionIdList(eid, regionIdList); + return enterpriseUserMapper.listByRegionIdList(regionIdList); } - public Boolean insertEnterpriseUser(String eid, EnterpriseUserDO entity) { + public Boolean insertEnterpriseUser(EnterpriseUserDO entity) { if(Objects.isNull(entity.getUserStatus())){ entity.setUserStatus(UserStatusEnum.NORMAL.getCode()); } @@ -113,36 +113,30 @@ public class EnterpriseUserDAO { if (StringUtils.isBlank(entity.getName())) { entity.setName(entity.getUserId()); } - enterpriseUserMapper.insertEnterpriseUser(eid, entity); + enterpriseUserMapper.insertEnterpriseUser(entity); return true; } - public void updateEnterpriseUser(String eid,EnterpriseUserDO enterpriseUser){ - if(StringUtils.isBlank(eid) || Objects.isNull(enterpriseUser)){ + public void updateEnterpriseUser(EnterpriseUserDO enterpriseUser){ + if(Objects.isNull(enterpriseUser)){ return; } - enterpriseUserMapper.updateEnterpriseUser(eid, enterpriseUser); + enterpriseUserMapper.updateEnterpriseUser(enterpriseUser); } - public List getMainAdminUserIds(String eid){ - if(StringUtils.isBlank(eid)){ - return Lists.newArrayList(); - } - return enterpriseUserMapper.getMainAdminUserIds(eid); + public List getMainAdminUserIds(){ + return enterpriseUserMapper.getMainAdminUserIds(); } - public List selectSpecifyNodeUserIds(String eid, String dingDeptId) { - return enterpriseUserMapper.selectSpecifyNodeUserIds(eid,dingDeptId); + public List selectSpecifyNodeUserIds( String dingDeptId) { + return enterpriseUserMapper.selectSpecifyNodeUserIds(dingDeptId); } - public List selectAllUserId(String eid) { - if(StringUtils.isBlank(eid)){ - return Lists.newArrayList(); - } - return enterpriseUserMapper.selectAllUserIds(eid); + public List selectAllUserId() { + return enterpriseUserMapper.selectAllUserIds(); } - public EnterpriseUserDO selectByUserIdIgnoreActive(String enterpriseId, String userId) { - return enterpriseUserMapper.selectByUserIdIgnoreActive(enterpriseId, userId); + public EnterpriseUserDO selectByUserIdIgnoreActive(String userId) { + return enterpriseUserMapper.selectByUserIdIgnoreActive(userId); } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDepartmentDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDepartmentDAO.java deleted file mode 100644 index 9238d90d6..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDepartmentDAO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.EnterpriseUserDepartmentDO; -import com.cool.store.mapper.EnterpriseUserDepartmentMapper; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: EnterpriseUserDepartmentDAO - * @Description: - * @date 2023-06-02 17:08 - */ -@Repository -public class EnterpriseUserDepartmentDAO { - - @Resource - private EnterpriseUserDepartmentMapper enterpriseUserDepartmentMapper; - - public List getIdsByUserId( String eid, String userId){ - if(StringUtils.isAnyBlank(eid, userId)){ - return Lists.newArrayList(); - } - return enterpriseUserDepartmentMapper.getIdsByUserId(eid, userId); - } - - public void deleteByIdList( String eid, @Param("list") List ids){ - if(StringUtils.isBlank(eid) || CollectionUtils.isEmpty(ids)){ - return; - } - enterpriseUserDepartmentMapper.deleteByIdList(eid, ids); - } - - - public List selectUserDeptByUserId(String eid, String userId){ - if(StringUtils.isAnyBlank(eid, userId)){ - return Lists.newArrayList(); - } - return enterpriseUserDepartmentMapper.selectUserDeptByUserId(eid, userId); - } - - public int batchInsert(String eid, List deptUsers){ - if(StringUtils.isBlank(eid) || CollectionUtils.isEmpty(deptUsers)){ - return 0; - } - return enterpriseUserDepartmentMapper.batchInsert(eid, deptUsers); - } - - public List selectUserDeptAuthByUserId(String eid, String userId){ - if(StringUtils.isAnyBlank(eid, userId)){ - return Lists.newArrayList(); - } - return enterpriseUserDepartmentMapper.selectUserDeptAuthByUserId(eid, userId); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserGroupDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserGroupDAO.java deleted file mode 100644 index 3aec1b656..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserGroupDAO.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.EnterpriseUserGroupDO; -import com.cool.store.mapper.EnterpriseUserGroupMapper; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 用户分组 - * @author wxp - * @date 2022-12-29 14:56 - */ -@Repository -public class EnterpriseUserGroupDAO { - - @Resource - private EnterpriseUserGroupMapper enterpriseUserGroupMapper; - - public int insertSelective(EnterpriseUserGroupDO record, String enterpriseId){ - return enterpriseUserGroupMapper.insertSelective(record,enterpriseId); - } - - public int updateByPrimaryKeySelective(EnterpriseUserGroupDO record, String enterpriseId){ - return enterpriseUserGroupMapper.updateByPrimaryKeySelective(record,enterpriseId); - } - - public int updateByGroupId(EnterpriseUserGroupDO record, String enterpriseId){ - return enterpriseUserGroupMapper.updateByGroupId(record,enterpriseId); - } - - public int countByGroupName(String enterpriseId, String groupName, String groupId){ - return enterpriseUserGroupMapper.countByGroupName(enterpriseId, groupName, groupId); - } - - public void deleteByGroupIdList(String enterpriseId, List groupIdList) { - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(groupIdList)) { - return; - } - enterpriseUserGroupMapper.deleteByGroupIdList(enterpriseId, groupIdList); - } - - public List listUserGroup(String enterpriseId, String groupName){ - return enterpriseUserGroupMapper.listUserGroup(enterpriseId, groupName); - } - - public EnterpriseUserGroupDO getByGroupId(String enterpriseId, String groupId){ - return enterpriseUserGroupMapper.getByGroupId(enterpriseId, groupId); - } - - public List listByGroupIdList(String enterpriseId, List groupIdList){ - if (StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(groupIdList)) { - return new ArrayList<>(); - } - return enterpriseUserGroupMapper.listByGroupIdList(enterpriseId, groupIdList); - } - - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserGroupMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserGroupMappingDAO.java deleted file mode 100644 index 6939646cb..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserGroupMappingDAO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.EnterpriseUserGroupMappingDO; -import com.cool.store.mapper.EnterpriseUserGroupMappingMapper; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 用户分组映射 - * @author wxp - * @date 2022-12-29 14:56 - */ -@Repository -public class EnterpriseUserGroupMappingDAO { - - @Resource - private EnterpriseUserGroupMappingMapper enterpriseUserGroupMappingMapper; - - public void deleteUserGroupMappingByGroupId(String enterpriseId, String groupId) { - if (StringUtils.isBlank(enterpriseId) || StringUtils.isBlank(groupId)) { - return; - } - enterpriseUserGroupMappingMapper.deleteUserGroupMappingByGroupId(enterpriseId, groupId); - } - - public void batchInsertMapping(String enterpriseId, List userIdList, String groupId) { - if (StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(userIdList) || StringUtils.isBlank(groupId)) { - return; - } - enterpriseUserGroupMappingMapper.batchInsertMapping(enterpriseId, userIdList, groupId); - } - - public void deleteMappingByGroupIdList(String enterpriseId, String groupId, List userIdList) { - if(StringUtils.isBlank(enterpriseId) || StringUtils.isBlank(groupId)) { - return; - } - enterpriseUserGroupMappingMapper.deleteMappingByGroupIdList(enterpriseId, groupId, userIdList); - } - - public void deleteMappingByUserIdList(String enterpriseId, List userIdList) { - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(userIdList)) { - return; - } - enterpriseUserGroupMappingMapper.deleteMappingByUserIdList(enterpriseId, userIdList); - } - - - public List listByGroupIdList(String enterpriseId, List groupIdList){ - return enterpriseUserGroupMappingMapper.listByGroupIdList(enterpriseId, groupIdList); - } - - public List listByUserIdList(String enterpriseId, List userIdList){ - if (StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(userIdList)) { - return new ArrayList<>(); - } - return enterpriseUserGroupMappingMapper.listByUserIdList(enterpriseId, userIdList); - } - - public void batchInsertOrUpdateUserGroupMapping(String enterpriseId, List userGroupMappingDOList) { - if (CollectionUtils.isEmpty(userGroupMappingDOList)) { - return; - } - enterpriseUserGroupMappingMapper.batchInsertOrUpdateUserGroupMapping(enterpriseId, userGroupMappingDOList); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserRoleDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserRoleDAO.java index b61b2209a..6263ac311 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserRoleDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserRoleDAO.java @@ -25,51 +25,52 @@ public class EnterpriseUserRoleDAO { @Resource private EnterpriseUserRoleMapper enterpriseUserRoleMapper; - public Boolean insertBatchUserRole(String eid, List userRole) { - return enterpriseUserRoleMapper.insertBatchUserRole(eid, userRole); + public Boolean insertBatchUserRole(List userRole) { + return enterpriseUserRoleMapper.insertBatchUserRole(userRole); } - public List getUserAndRolesByUserId(String enterpriseId, List userIdList){ - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(userIdList)){ + public List getUserAndRolesByUserId(List userIdList){ + if(CollectionUtils.isEmpty(userIdList)){ return Lists.newArrayList(); } - return enterpriseUserRoleMapper.getUserAndRolesByUserId(enterpriseId, userIdList); + return enterpriseUserRoleMapper.getUserAndRolesByUserId(userIdList); } - public Boolean checkIsAdmin(String enterpriseId, String userId) { + public Boolean checkIsAdmin(String userId) { // 1.取出所有用户角色 // 2.匹配是否有管理员角色 - List sysRoleDOList = enterpriseUserRoleMapper.listRoleByUserId(enterpriseId, userId); + List sysRoleDOList = enterpriseUserRoleMapper.listRoleByUserId(userId); return ListUtils.emptyIfNull(sysRoleDOList) .stream() .anyMatch(role-> StringUtils.equals(RoleEnum.MASTER.getRoleEnum(),role.getRoleEnum())); } - public void deleteBatchByPrimaryKey(String enterpriseId, List ids){ - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(ids)){ + public void deleteBatchByPrimaryKey(List ids){ + if(CollectionUtils.isEmpty(ids)){ return; } - enterpriseUserRoleMapper.deleteBatchByPrimaryKey(enterpriseId, ids); + enterpriseUserRoleMapper.deleteBatchByPrimaryKey(ids); } - public List selectIdsByUserId(String enterpriseId, String userId){ - if(StringUtils.isAnyBlank(enterpriseId, userId)){ + public List selectIdsByUserId(String userId){ + if(StringUtils.isAnyBlank(userId)){ return Lists.newArrayList(); } - return enterpriseUserRoleMapper.selectIdsByUserId(enterpriseId, userId); + return enterpriseUserRoleMapper.selectIdsByUserId(userId); } - public EnterpriseUserRole selectByUserIdAndRoleId(String enterpriseId, String userId, String roleId){ - if(StringUtils.isAnyBlank(enterpriseId, userId, roleId)){ + public EnterpriseUserRole selectByUserIdAndRoleId(String userId, String roleId){ + if(StringUtils.isAnyBlank(userId, roleId)){ return null; } - return enterpriseUserRoleMapper.selectByUserIdAndRoleId(enterpriseId, userId, roleId); + return enterpriseUserRoleMapper.selectByUserIdAndRoleId(userId, roleId); } - public void save(String enterpriseId, EnterpriseUserRole entity){ - if(StringUtils.isBlank(enterpriseId) || Objects.isNull(entity)){ + public void save( EnterpriseUserRole entity){ + if(Objects.isNull(entity)){ return; } + enterpriseUserRoleMapper.save(entity); } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LoginRecordDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LoginRecordDAO.java index 51b62e5f7..1c7bd4b1c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LoginRecordDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LoginRecordDAO.java @@ -18,11 +18,11 @@ public class LoginRecordDAO { @Resource private LoginRecordMapper loginRecordMapper; - public void addLoginRecord(String enterpriseId, String userId){ + public void addLoginRecord(String userId){ LoginRecordDO record = new LoginRecordDO(); record.setUserId(userId); record.setCreateTime(System.currentTimeMillis()); - loginRecordMapper.insertSelective(record, enterpriseId); + loginRecordMapper.insertSelective(record); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java index 685b01fd3..e3524a7e2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java @@ -27,23 +27,23 @@ public class RegionDAO { @Resource private RegionMapper regionMapper; - public List getRegionIdsBySynDingDeptIds(String eid, List synDingDeptIds) { + public List getRegionIdsBySynDingDeptIds(List synDingDeptIds) { if (CollectionUtils.isEmpty(synDingDeptIds)) { return new ArrayList<>(); } - return regionMapper.selectRegionIdsBySynDingDeptIds(eid, synDingDeptIds); + return regionMapper.selectRegionIdsBySynDingDeptIds(synDingDeptIds); } - public List getRegionByRegionIds(String eid, List regionIds) { + public List getRegionByRegionIds(List regionIds) { if(CollectionUtils.isEmpty(regionIds)){ return Collections.emptyList(); } - return regionMapper.getRegionByRegionIds(eid, regionIds); + return regionMapper.getRegionByRegionIds(regionIds); } - public RegionDO getUnclassifiedRegionDO(String enterpriseId) { + public RegionDO getUnclassifiedRegionDO() { //先查询是否存在未分组区域 - RegionDO unclassified = regionMapper.getUnclassifiedRegionDO(enterpriseId, CommonConstants.UNGROUPED_DEPT_NAME); + RegionDO unclassified = regionMapper.getUnclassifiedRegionDO(CommonConstants.UNGROUPED_DEPT_NAME); if (Objects.isNull(unclassified)) { RegionDO regionDO = new RegionDO(); regionDO.setId(CommonConstants.UNGROUPED_DEPT_ID); @@ -54,45 +54,42 @@ public class RegionDAO { regionDO.setCreateTime(Calendar.getInstance().getTimeInMillis()); regionDO.setRegionPath("/" + CommonConstants.ROOT_DEPT_ID_STR + "/"); regionDO.setUnclassifiedFlag(CommonConstants.ONE); - insertRegion(enterpriseId, regionDO); + insertRegion(regionDO); regionDO.setRegionId(regionDO.getId().toString()); return regionDO; } return unclassified; } - public Long insertRegion(String eid, RegionDO regionDO) { - return regionMapper.insertRoot(eid, regionDO); + public Long insertRegion(RegionDO regionDO) { + return regionMapper.insertRoot(regionDO); } - public void batchInsertRegions(List regionDOList, String eid){ - regionMapper.batchInsertRegionsByDepartments(eid, regionDOList); + public void batchInsertRegions(List regionDOList){ + regionMapper.batchInsertRegionsByDepartments(regionDOList); } - public Map getRegionSynDeptIdAndIdMapping(String eid, List syncDeptIds){ - List regionDOS = regionMapper.selectRegionBySynDingDeptIds(eid, syncDeptIds); + public Map getRegionSynDeptIdAndIdMapping(List syncDeptIds){ + List regionDOS = regionMapper.selectRegionBySynDingDeptIds(syncDeptIds); return ListUtils.emptyIfNull(regionDOS) .stream() .collect(Collectors.toMap(RegionDO::getSynDingDeptId, RegionDO::getId, (r, e) -> r)); } - public List getAllRegion(String eid){ - if(StringUtils.isBlank(eid)){ - return Lists.newArrayList(); - } - return regionMapper.getAllRegion(eid); + public List getAllRegion(){ + return regionMapper.getAllRegion(); } - public List listStoreRegionByIds(String enterpriseId, List regionIds){ - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(regionIds)){ + public List listStoreRegionByIds(List regionIds){ + if(CollectionUtils.isEmpty(regionIds)){ return Lists.newArrayList(); } - return regionMapper.listStoreRegionByIds(enterpriseId, regionIds); + return regionMapper.listStoreRegionByIds(regionIds); } - public List getRegionPathByList(String eid, List regionIds) { - List regionList = regionMapper.getRegionByRegionIds(eid, regionIds); + public List getRegionPathByList(List regionIds) { + List regionList = regionMapper.getRegionByRegionIds(regionIds); return ListUtils.emptyIfNull(regionList) .stream() .map(data->{ @@ -106,60 +103,60 @@ public class RegionDAO { }).collect(Collectors.toList()); } - public RegionDO getByRegionId(String eid, Long regionId){ - if(StringUtils.isBlank(eid) || Objects.isNull(regionId)){ + public RegionDO getByRegionId(Long regionId){ + if(Objects.isNull(regionId)){ return null; } - return regionMapper.getByRegionId(eid, regionId); + return regionMapper.getByRegionId(regionId); } - public RegionNode getRegionById(String eid, String regionId){ - return regionMapper.getRegionByRegionId(eid, regionId); + public RegionNode getRegionById(String regionId){ + return regionMapper.getRegionByRegionId(regionId); } - public void insertOrUpdate(RegionDO regionDO, String eid){ - regionMapper.insertOrUpdate(regionDO,eid); + public void insertOrUpdate(RegionDO regionDO){ + regionMapper.insertOrUpdate(regionDO); } - public List getSpecifiedRegionIdAndDeptId(String eid, Long parentId){ - return regionMapper.getSpecifiedRegionIdAndDeptId(eid,parentId); + public List getSpecifiedRegionIdAndDeptId(Long parentId){ + return regionMapper.getSpecifiedRegionIdAndDeptId(parentId); } - public List getRegionByDingDeptIds(String enterpriseId, List dingDeptIds){ - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(dingDeptIds)){ + public List getRegionByDingDeptIds(List dingDeptIds){ + if(CollectionUtils.isEmpty(dingDeptIds)){ return Lists.newArrayList(); } - return regionMapper.getRegionByDingDeptIds(enterpriseId, dingDeptIds); + return regionMapper.getRegionByDingDeptIds(dingDeptIds); } - public RegionDO getBySynDingDeptId(String eid, String synDingDeptId){ - if(StringUtils.isAnyBlank(eid, synDingDeptId)){ + public RegionDO getBySynDingDeptId(String synDingDeptId){ + if(StringUtils.isAnyBlank(synDingDeptId)){ return null; } - return regionMapper.getBySynDingDeptId(eid, synDingDeptId); + return regionMapper.getBySynDingDeptId(synDingDeptId); } - public Long ignoreInsert(String eid, RegionDO regionDO) { - if(StringUtils.isBlank(eid) || Objects.isNull(regionDO)){ + public Long ignoreInsert(RegionDO regionDO) { + if(Objects.isNull(regionDO)){ return 0L; } - return regionMapper.ignoreInsert(eid, regionDO); + return regionMapper.ignoreInsert(regionDO); } - public Integer updateSyncRegion(String eid, RegionDO regionDO){ - if(StringUtils.isBlank(eid) || Objects.isNull(regionDO)){ + public Integer updateSyncRegion(RegionDO regionDO){ + if(Objects.isNull(regionDO)){ return 0; } - return regionMapper.updateSyncRegion(eid, regionDO); + return regionMapper.updateSyncRegion(regionDO); } - public void removeRegion(String eid, List regionIds) { + public void removeRegion(List regionIds) { if (regionIds.contains(CommonConstants.UNGROUPED_DEPT_ID)) { regionIds.remove(CommonConstants.UNGROUPED_DEPT_ID); } if(CollectionUtils.isEmpty(regionIds)) { return; } - regionMapper.removeRegions(eid, regionIds); + regionMapper.removeRegions(regionIds); } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDAO.java deleted file mode 100644 index c62d1b3b3..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDAO.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.dto.region.RegionSyncDTO; -import com.cool.store.dto.store.StoreAreaDTO; -import com.cool.store.entity.StoreDO; -import com.cool.store.enums.StoreIsDeleteEnum; -import com.cool.store.mapper.StoreMapper; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.*; - -/** - * @author zhangchenbiao - * @FileName: StoreDAO - * @Description: - * @date 2023-05-31 11:52 - */ -@Repository -public class StoreDAO { - - @Resource - private StoreMapper storeMapper; - - public List listStoreByRegionIdList(String eid, List regionIdList) { - if(StringUtils.isBlank(eid) || CollectionUtils.isEmpty(regionIdList)){ - return Collections.emptyList(); - } - return storeMapper.listStoreByRegionIdList(eid, regionIdList); - } - - public List getStoreListByStoreIds(String enterpriseId, List storeIdList){ - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(storeIdList)){ - return Lists.newArrayList(); - } - return storeMapper.getStoreListByStoreIds(enterpriseId, storeIdList); - } - - public List listStoreByRegionIdListNotChild(String eid, List regionIdList) { - if(StringUtils.isBlank(eid) || CollectionUtils.isEmpty(regionIdList)){ - return Lists.newArrayList(); - } - return storeMapper.listStoreByRegionIdListNotChild(eid, regionIdList); - } - - public Integer getStoreCount(String enterpriseId){ - return storeMapper.countStore(enterpriseId); - } - - public List getAllStoreList (String eid,Boolean isReturnList){ - if(isReturnList){ - return storeMapper.listStoreIdList(eid); - } - return null; - } - - public List getSpecifiedStoreIdsAndDeptId(String eId, Long parentId) { - List storeDOList = storeMapper.getSpecifiedStoreIdsAndDeptId(eId, StoreIsDeleteEnum.EFFECTIVE.getValue(), parentId); - return storeDOList; - } - - public StoreDO getStoreBySynId(String eid, String synId){ - if(StringUtils.isAnyBlank(eid, synId)){ - return null; - } - return storeMapper.getStoreBySynId(eid, synId); - } - - public Integer updateStore(String enterpriseId, StoreDO storeDO) { - fillAddressPoint(storeDO); - return storeMapper.updateStore(enterpriseId, storeDO); - } - - public Integer insertStore(String enterpriseId, StoreDO storeDO) { - fillAddressPoint(storeDO); - return storeMapper.insertStore(enterpriseId, storeDO); - } - - private void fillAddressPoint(StoreDO storeDO){ - if(StringUtils.isNoneBlank(storeDO.getLatitude(), storeDO.getLongitude()) && StringUtils.isBlank(storeDO.getLongitudeLatitude())){ - storeDO.setLongitudeLatitude(storeDO.getLongitude() + CommonConstants.COMMA+ storeDO.getLatitude()); - } - if(StringUtils.isNotBlank(storeDO.getLongitudeLatitude())){ - List list = Arrays.asList(storeDO.getLongitudeLatitude().split(",")); - storeDO.setAddressPoint("POINT("+list.get(0)+" "+list.get(1)+")"); - } - } - - public List getStoreIdByIdList(String eid, List ids){ - if(StringUtils.isBlank(eid) || CollectionUtils.isEmpty(ids)){ - return Lists.newArrayList(); - } - return storeMapper.getStoreIdByIdList(eid, ids); - } - - public Integer deleteStoreByStoreIds(String enterpriseId, List storeIds, String userId, Long updateTime){ - if(StringUtils.isAnyBlank(enterpriseId, userId) || CollectionUtils.isEmpty(storeIds) || Objects.isNull(updateTime)){ - return 0; - } - return storeMapper.deleteStoreByStoreIds(enterpriseId, storeIds, userId, updateTime); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SubordinateMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SubordinateMappingDAO.java deleted file mode 100644 index e9393c6d0..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SubordinateMappingDAO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.SubordinateMappingDO; -import com.cool.store.mapper.SubordinateMappingMapper; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: SubordinateMappingDAO - * @Description: - * @date 2023-05-31 14:27 - */ -@Repository -public class SubordinateMappingDAO { - - @Resource - private SubordinateMappingMapper subordinateMappingMapper; - - public List selectByUserIds(String enterpriseId, List userIds){ - if (StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(userIds)){ - return Lists.newArrayList(); - } - return subordinateMappingMapper.selectByUserIds(enterpriseId,userIds); - } - - public void batchInsertSubordinateMapping(String enterpriseId, List subordinateMappingDOS) { - if (CollectionUtils.isEmpty(subordinateMappingDOS)) { - return; - } - List distinctData = subordinateMappingDOS.stream() - .distinct() - .collect(Collectors.toList()); - subordinateMappingMapper.batchInsertSubordinateMapping(enterpriseId, distinctData); - } - - public void deletedByUserIds(String enterpriseId,List userIds){ - if (CollectionUtils.isEmpty(userIds)){ - return; - } - List distinctUserIds = userIds.stream().distinct().collect(Collectors.toList()); - subordinateMappingMapper.deletedByUserIds(enterpriseId,distinctUserIds); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysDepartmentDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysDepartmentDAO.java index 6cf922ad0..b9ed02a2e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysDepartmentDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysDepartmentDAO.java @@ -22,38 +22,32 @@ public class SysDepartmentDAO { @Resource private SysDepartmentMapper sysDepartmentMapper; - public void batchInsertOrUpdate(String enterpriseId, List deptList){ - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(deptList)){ + public void batchInsertOrUpdate(List deptList){ + if(CollectionUtils.isEmpty(deptList)){ return; } - sysDepartmentMapper.batchInsertOrUpdate(deptList, enterpriseId); + sysDepartmentMapper.batchInsertOrUpdate(deptList); } - public List getDeptChildListByParentId(String eid, String parentId){ - if(StringUtils.isAnyBlank(eid, parentId)){ + public List getDeptChildListByParentId(String parentId){ + if(StringUtils.isAnyBlank(parentId)){ return Lists.newArrayList(); } - return sysDepartmentMapper.getDeptChildListByParentId(eid, parentId); + return sysDepartmentMapper.getDeptChildListByParentId(parentId); } - public void deleteByNotInIds(String enterpriseId, List deptIds){ - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(deptIds)){ + public void deleteByNotInIds(List deptIds){ + if(CollectionUtils.isEmpty(deptIds)){ return; } - sysDepartmentMapper.deleteByNotInIds(deptIds, enterpriseId); + sysDepartmentMapper.deleteByNotInIds(deptIds); } - public List getSyncDeptTreeList(String eid) { - if(StringUtils.isBlank(eid)){ - return Lists.newArrayList(); - } - return sysDepartmentMapper.getSyncDeptTreeList(eid); + public List getSyncDeptTreeList() { + return sysDepartmentMapper.getSyncDeptTreeList(); } - public List selectAllDepts(String enterpriseId){ - if(StringUtils.isBlank(enterpriseId)){ - return Lists.newArrayList(); - } - return sysDepartmentMapper.selectAll(enterpriseId); + public List selectAllDepts(){ + return sysDepartmentMapper.selectAll(); } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleDAO.java index 4b05fb2e2..91b799535 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleDAO.java @@ -24,16 +24,16 @@ public class SysRoleDAO { * @param userId * @return */ - public SysRoleDO getHighestPrioritySysRoleDoByUserId(String enterpriseId, String userId){ - if(StringUtils.isAnyBlank(enterpriseId, userId)){ + public SysRoleDO getHighestPrioritySysRoleDoByUserId(String userId){ + if(StringUtils.isAnyBlank(userId)){ return null; } - return sysRoleMapper.getHighestPrioritySysRoleDoByUserId(enterpriseId, userId); + return sysRoleMapper.getHighestPrioritySysRoleDoByUserId(userId); } - public Long getRoleIdByRoleEnum(String eid, String roleEnum) { + public Long getRoleIdByRoleEnum(String roleEnum) { - SysRoleDO roleByRoleEnum = sysRoleMapper.getRoleByRoleEnum(eid, roleEnum); + SysRoleDO roleByRoleEnum = sysRoleMapper.getRoleByRoleEnum(roleEnum); if(roleByRoleEnum==null){ return Long.valueOf(RoleEnum.getByCode(roleEnum).getId()); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserAuthMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserAuthMappingDAO.java deleted file mode 100644 index 319bfa040..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserAuthMappingDAO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.UserAuthMappingDO; -import com.cool.store.mapper.UserAuthMappingMapper; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @date 2023-05-19 02:54 - */ -@Repository -public class UserAuthMappingDAO { - - @Resource - private UserAuthMappingMapper userAuthMappingMapper; - - - public List listUserAuthMappingByUserId(String eid, String userId){ - if(StringUtils.isAnyBlank(eid, userId)){ - return Lists.newArrayList(); - } - return userAuthMappingMapper.listUserAuthMappingByUserId(eid, userId); - } - - public List listUserAuthMappingByUserIds(String eid, List userIds){ - if(StringUtils.isBlank(eid) || CollectionUtils.isEmpty(userIds)){ - return Lists.newArrayList(); - } - return userAuthMappingMapper.listUserAuthMappingByUserIds(eid, userIds); - } - - public void deleteAuthMappingByIds(String eid, List ids){ - if(StringUtils.isBlank(eid) || CollectionUtils.isEmpty(ids)){ - return; - } - userAuthMappingMapper.deleteAuthMappingByIds(eid, ids); - } - - public List selectIdsByUserId(String eid, String userId){ - if(StringUtils.isAnyBlank(eid, userId)){ - return Lists.newArrayList(); - } - return userAuthMappingMapper.selectIdsByUserId(eid, userId); - } - - public void insertUserAuthMapping(String eid, UserAuthMappingDO auth){ - if(StringUtils.isBlank(eid)|| Objects.isNull(auth)){ - return; - } - userAuthMappingMapper.insertUserAuthMapping(eid, auth); - } - - public void deleteAuthMappingByIdAndType(String eid, List ids, String type){ - if(StringUtils.isAnyBlank(eid, type) || CollectionUtils.isEmpty(ids)){ - return; - } - userAuthMappingMapper.deleteAuthMappingByIdAndType(eid, ids, type); - } -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java index c8041bd21..9f7ce6fea 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java @@ -4,7 +4,6 @@ import com.cool.store.entity.UserRegionMappingDO; import com.cool.store.mapper.UserRegionMappingMapper; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; import javax.annotation.Resource; @@ -22,42 +21,42 @@ public class UserRegionMappingDAO { private UserRegionMappingMapper userRegionMappingMapper; - public void deletedByUserIds(String enterpriseId, List userIds){ + public void deletedByUserIds(List userIds){ if (CollectionUtils.isEmpty(userIds)) { return; } List distinctData = userIds.stream() .distinct() .collect(Collectors.toList()); - userRegionMappingMapper.deletedByUserIds(enterpriseId, distinctData); + userRegionMappingMapper.deletedByUserIds(distinctData); } - public void batchInsertRegionMapping(String enterpriseId, List userRegionMappingDOS){ + public void batchInsertRegionMapping(List userRegionMappingDOS){ if (CollectionUtils.isEmpty(userRegionMappingDOS)) { return; } List distinctData = userRegionMappingDOS.stream() .distinct() .collect(Collectors.toList()); - userRegionMappingMapper.batchInsertRegionMapping(enterpriseId, distinctData); + userRegionMappingMapper.batchInsertRegionMapping(distinctData); } - public List listUserRegionMappingByUserId(String enterpriseId, List userIds){ - if(StringUtils.isBlank(enterpriseId) || CollectionUtils.isEmpty(userIds)){ + public List listUserRegionMappingByUserId(List userIds){ + if(CollectionUtils.isEmpty(userIds)){ return Lists.newArrayList(); } - return userRegionMappingMapper.listUserRegionMappingByUserId(enterpriseId, userIds); + return userRegionMappingMapper.listUserRegionMappingByUserId(userIds); } - public void deletedByIds(String enterpriseId, List ids){ + public void deletedByIds(List ids){ if (CollectionUtils.isEmpty(ids)) { return; } List distinctData = ids.stream() .distinct() .collect(Collectors.toList()); - userRegionMappingMapper.deletedByIds(enterpriseId, distinctData); + userRegionMappingMapper.deletedByIds(distinctData); } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserDepartmentMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserDepartmentMapper.java deleted file mode 100644 index 3a6562562..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserDepartmentMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.EnterpriseUserDepartmentDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-06-02 05:01 - */ -public interface EnterpriseUserDepartmentMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-06-02 05:01 - */ - int insertSelective(@Param("record") EnterpriseUserDepartmentDO record, @Param("enterpriseId") String enterpriseId); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-02 05:01 - */ - int updateByPrimaryKeySelective(@Param("record") EnterpriseUserDepartmentDO record, @Param("enterpriseId") String enterpriseId); - - - List getIdsByUserId(@Param("eid") String eid, @Param("userId") String userId); - - void deleteByIdList(@Param("eid") String eid, @Param("list") List ids); - - List selectUserDeptByUserId(@Param("eid")String eid, @Param("userId")String userId); - - int batchInsert(@Param("eid")String eid, @Param("deptUsers") List deptUsers); - - - List selectUserDeptAuthByUserId(@Param("eid")String eid, @Param("userId")String userId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserGroupMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserGroupMapper.java deleted file mode 100644 index ae3d211cf..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserGroupMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.EnterpriseUserGroupDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-31 02:43 - */ -public interface EnterpriseUserGroupMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-31 02:43 - */ - int insertSelective(@Param("record") EnterpriseUserGroupDO record, @Param("enterpriseId") String enterpriseId); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-31 02:43 - */ - int updateByPrimaryKeySelective(@Param("record") EnterpriseUserGroupDO record, @Param("enterpriseId") String enterpriseId); - - - int countByGroupName(@Param("enterpriseId") String enterpriseId, @Param("groupName") String groupName, @Param("groupId") String groupId); - - void deleteByGroupIdList(@Param("enterpriseId") String enterpriseId, @Param("groupIdList") List groupIdList); - - List listUserGroup(@Param("enterpriseId")String enterpriseId, @Param("groupName")String groupName); - - EnterpriseUserGroupDO getByGroupId(@Param("enterpriseId")String enterpriseId, @Param("groupId")String groupId); - - List listByGroupIdList(@Param("enterpriseId") String enterpriseId, @Param("groupIdList") List groupIdList); - - int updateByGroupId(@Param("record")EnterpriseUserGroupDO record, @Param("enterpriseId") String enterpriseId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserGroupMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserGroupMappingMapper.java deleted file mode 100644 index ed18ad404..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserGroupMappingMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.EnterpriseUserGroupMappingDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-31 02:43 - */ -public interface EnterpriseUserGroupMappingMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-31 02:43 - */ - int insertSelective(@Param("record") EnterpriseUserGroupMappingDO record, @Param("enterpriseId") String enterpriseId); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-31 02:43 - */ - int updateByPrimaryKeySelective(@Param("record") EnterpriseUserGroupMappingDO record, @Param("enterpriseId") String enterpriseId); - - void deleteUserGroupMappingByGroupId(@Param("enterpriseId")String enterpriseId, @Param("groupId") String groupId); - - Integer batchInsertMapping(@Param("enterpriseId") String enterpriseId, @Param("userIdList") List userIdList, @Param("groupId") String groupId); - - Integer deleteMappingByGroupIdList(@Param("enterpriseId") String enterpriseId, @Param("groupId") String groupId, @Param("userIdList") List userIdList); - - Integer deleteMappingByUserIdList(@Param("enterpriseId") String enterpriseId, @Param("userIdList") List userIdList); - - List listByGroupIdList(@Param("enterpriseId") String enterpriseId, @Param("groupIdList") List groupIdList); - - List listByUserIdList(@Param("enterpriseId") String enterpriseId, @Param("userIdList") List userIdList); - - void batchInsertOrUpdateUserGroupMapping(@Param("enterpriseId") String enterpriseId,@Param("userGroupMappingList") List userGroupMappingList); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java index 2b30cf7a3..d42be0fcf 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java @@ -17,14 +17,14 @@ public interface EnterpriseUserMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-19 02:58 */ - int insertSelective(@Param("record") EnterpriseUserDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") EnterpriseUserDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-19 02:58 */ - int updateByPrimaryKeySelective(@Param("record") EnterpriseUserDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") EnterpriseUserDO record); /** * @@ -32,14 +32,14 @@ public interface EnterpriseUserMapper { * @param userId * @return */ - EnterpriseUserDO getUserInfoById(@Param("enterpriseId")String enterpriseId, @Param("userId")String userId); + EnterpriseUserDO getUserInfoById(@Param("userId")String userId); /** * 批量插入或更新 * @param enterpriseId * @param users */ - void batchInsertOrUpdate(@Param("enterpriseId") String enterpriseId, @Param("list") List users); + void batchInsertOrUpdate(@Param("list") List users); /** * 批量更新不同用户 不同的userRegionids @@ -47,10 +47,9 @@ public interface EnterpriseUserMapper { * @param enterpriseUserDOList * @return */ - Boolean batchUpdateDiffUserDiffRegionIds(@Param("eid") String eid, @Param("list") List enterpriseUserDOList); + Boolean batchUpdateDiffUserDiffRegionIds(@Param("list") List enterpriseUserDOList); - List fuzzyUsersByDepartment(@Param("eid") String eid, - @Param("deptId") String deptId, + List fuzzyUsersByDepartment(@Param("deptId") String deptId, @Param("roleId") Long roleId, @Param("orderBy") String orderBy, @Param("orderRule") String orderRule, @@ -60,8 +59,7 @@ public interface EnterpriseUserMapper { @Param("userIdList") List userIdList, @Param("regionId") String regionId); - List fuzzyUsersByNotRole(@Param("eid") String eid, - @Param("deptId") String deptId, + List fuzzyUsersByNotRole(@Param("deptId") String deptId, @Param("orderBy") String orderBy, @Param("orderRule") String orderRule, @Param("userName") String userName, @@ -76,27 +74,26 @@ public interface EnterpriseUserMapper { * @param userIds * @return */ - List selectUsersByUserIds(@Param("eid") String eid, @Param("userIds") List userIds); + List selectUsersByUserIds(@Param("userIds") List userIds); - List listUserByGroupId(@Param("eid") String eid, - @Param("groupId") String groupId, + List listUserByGroupId(@Param("groupId") String groupId, @Param("userName") String userName, @Param("userIdList") List userIdList); - List listByRegionIdList(@Param("eid") String eid, @Param("regionIdList") List regionIdList); + List listByRegionIdList(@Param("regionIdList") List regionIdList); - void updateEnterpriseUser(@Param("eid") String eid,@Param("enterpriseUserDO") EnterpriseUserDO enterpriseUserDO); + void updateEnterpriseUser(@Param("enterpriseUserDO") EnterpriseUserDO enterpriseUserDO); - List getMainAdminUserIds(@Param("eid")String eid); + List getMainAdminUserIds(); - List selectSpecifyNodeUserIds(@Param("eid") String eid, @Param("dingDeptId") String dingDeptId); + List selectSpecifyNodeUserIds(@Param("dingDeptId") String dingDeptId); - List selectAllUserIds(@Param("eid") String eid); + List selectAllUserIds(); - EnterpriseUserDO selectByUserIdIgnoreActive(@Param("enterpriseId") String enterpriseId, @Param("userId") String userId); + EnterpriseUserDO selectByUserIdIgnoreActive(@Param("userId") String userId); - void insertEnterpriseUser(@Param("eid") String eid, @Param("entity") EnterpriseUserDO entity); + void insertEnterpriseUser(@Param("entity") EnterpriseUserDO entity); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserRoleMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserRoleMapper.java index 7ae4490e3..f8defbe0d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserRoleMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserRoleMapper.java @@ -19,14 +19,14 @@ public interface EnterpriseUserRoleMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-19 02:59 */ - int insertSelective(@Param("record") EnterpriseUserRoleDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") EnterpriseUserRoleDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-19 02:59 */ - int updateByPrimaryKeySelective(@Param("record") EnterpriseUserRoleDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") EnterpriseUserRoleDO record); /** * 批量插入用户角色 @@ -34,17 +34,17 @@ public interface EnterpriseUserRoleMapper { * @param userRoles * @return */ - Boolean insertBatchUserRole(@Param("eid") String enterpriseId, @Param("userRoles") List userRoles); + Boolean insertBatchUserRole(@Param("userRoles") List userRoles); - List getUserAndRolesByUserId(@Param("eip") String enterpriseId, @Param("userIdList") List userIdList); + List getUserAndRolesByUserId(@Param("userIdList") List userIdList); - List listRoleByUserId(@Param("eip") String enterpriseId, @Param("userId") String userId); + List listRoleByUserId(@Param("userId") String userId); - void deleteBatchByPrimaryKey(@Param("eid") String enterpriseId, @Param("ids") List ids); + void deleteBatchByPrimaryKey(@Param("ids") List ids); - List selectIdsByUserId(@Param("eid") String enterpriseId, @Param("userId") String userId); + List selectIdsByUserId(@Param("userId") String userId); - EnterpriseUserRole selectByUserIdAndRoleId(@Param("eid") String enterpriseId, @Param("userId") String userId, @Param("roleId") String roleId); + EnterpriseUserRole selectByUserIdAndRoleId(@Param("userId") String userId, @Param("roleId") String roleId); - void save(@Param("eid") String enterpriseId, @Param("entity") EnterpriseUserRole entity); + void save(@Param("entity") EnterpriseUserRole entity); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java index 5598e751c..9e2beea92 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java @@ -14,12 +14,12 @@ public interface HyAdvancedSettingMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:49 */ - int insertSelective(@Param("record") HyAdvancedSettingDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyAdvancedSettingDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:49 */ - int updateByPrimaryKeySelective(@Param("record") HyAdvancedSettingDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyAdvancedSettingDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java index fb92f71e4..dd6033691 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java @@ -14,12 +14,12 @@ public interface HyContentInfoMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:50 */ - int insertSelective(@Param("record") HyContentInfoDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyContentInfoDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:50 */ - int updateByPrimaryKeySelective(@Param("record") HyContentInfoDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyContentInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java index 0eaf82412..080548d01 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java @@ -14,12 +14,12 @@ public interface HyIntendDevZoneInfoMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:50 */ - int insertSelective(@Param("record") HyIntendDevZoneInfoDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyIntendDevZoneInfoDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:50 */ - int updateByPrimaryKeySelective(@Param("record") HyIntendDevZoneInfoDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyIntendDevZoneInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java index 61a7e8096..01196264d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java @@ -14,12 +14,12 @@ public interface HyIntendDevelopementMappingMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:50 */ - int insertSelective(@Param("record") HyIntendDevelopementMappingDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyIntendDevelopementMappingDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:50 */ - int updateByPrimaryKeySelective(@Param("record") HyIntendDevelopementMappingDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyIntendDevelopementMappingDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java index 6aa82dffc..a3581e90f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java @@ -14,12 +14,12 @@ public interface HyOpenAreaInfoMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:51 */ - int insertSelective(@Param("record") HyOpenAreaInfoDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyOpenAreaInfoDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:51 */ - int updateByPrimaryKeySelective(@Param("record") HyOpenAreaInfoDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyOpenAreaInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java index 58a6a1174..7b2ebbcf4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerBaseInfoMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:51 */ - int insertSelective(@Param("record") HyPartnerBaseInfoDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerBaseInfoDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:51 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerBaseInfoDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerBaseInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java index 2342a5dfd..426e1a742 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerCertificationInfoMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:51 */ - int insertSelective(@Param("record") HyPartnerCertificationInfoDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerCertificationInfoDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:51 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerCertificationInfoDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerCertificationInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java index c761f833a..d428722d2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerClerkMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:51 */ - int insertSelective(@Param("record") HyPartnerClerkDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerClerkDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:51 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerClerkDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerClerkDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java index db627435e..9764d0ad5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerIntentInfoMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:52 */ - int insertSelective(@Param("record") HyPartnerIntentInfoDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerIntentInfoDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:52 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerIntentInfoDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerIntentInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewLogMapper.java index 4828339b8..c687395b1 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewLogMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewLogMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerInterviewLogMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:52 */ - int insertSelective(@Param("record") HyPartnerInterviewLogDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerInterviewLogDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:52 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewLogDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewLogDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java index 65566885c..9fdddcda5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerInterviewMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:52 */ - int insertSelective(@Param("record") HyPartnerInterviewDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerInterviewDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:52 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java index ce7c795a2..25b436937 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerInterviewPlanMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:52 */ - int insertSelective(@Param("record") HyPartnerInterviewPlanDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerInterviewPlanDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:52 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewPlanDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewPlanDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index 6308a3302..936823266 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -15,12 +15,12 @@ public interface HyPartnerLineInfoMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:52 */ - int insertSelective(@Param("record") HyPartnerLineInfoDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerLineInfoDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:52 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerLineInfoDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerLineInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java index 317e07ba6..6f8723c38 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerTaskInfoLogMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:53 */ - int insertSelective(@Param("record") HyPartnerTaskInfoLogDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerTaskInfoLogDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:53 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerTaskInfoLogDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerTaskInfoLogDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java index ccc94954d..300a9a959 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerUserInfoMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:53 */ - int insertSelective(@Param("record") HyPartnerUserInfoDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerUserInfoDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:53 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerUserInfoDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerUserInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java index f50d69d10..253bf461d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java @@ -14,12 +14,12 @@ public interface HyPartnerUserPlatformBindMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:53 */ - int insertSelective(@Param("record") HyPartnerUserPlatformBindDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyPartnerUserPlatformBindDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:53 */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerUserPlatformBindDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyPartnerUserPlatformBindDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java index 59f9a4471..5afd65996 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java @@ -14,12 +14,12 @@ public interface HyWorkflowStageMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-29 03:53 */ - int insertSelective(@Param("record") HyWorkflowStageDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") HyWorkflowStageDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-29 03:53 */ - int updateByPrimaryKeySelective(@Param("record") HyWorkflowStageDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") HyWorkflowStageDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LoginRecordMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LoginRecordMapper.java index 7455d5688..6a3333556 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LoginRecordMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LoginRecordMapper.java @@ -14,12 +14,12 @@ public interface LoginRecordMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-23 03:46 */ - int insertSelective(@Param("record") LoginRecordDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") LoginRecordDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-23 03:46 */ - int updateByPrimaryKeySelective(@Param("record") LoginRecordDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") LoginRecordDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java index 186c9507c..4f0ef45c0 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java @@ -18,48 +18,48 @@ public interface RegionMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-19 02:59 */ - int insertSelective(@Param("record") RegionDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") RegionDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-19 02:59 */ - int updateByPrimaryKeySelective(@Param("record") RegionDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") RegionDO record); - List selectRegionIdsBySynDingDeptIds(@Param("eid") String eid, @Param("synDingDeptIds") List synDingDeptIds); + List selectRegionIdsBySynDingDeptIds(@Param("synDingDeptIds") List synDingDeptIds); - List getRegionByRegionIds(@Param("eid") String eid, @Param("regionIds") List regionIds); + List getRegionByRegionIds( @Param("regionIds") List regionIds); - RegionDO getUnclassifiedRegionDO(@Param("enterpriseId") String enterpriseId, @Param("name")String name); + RegionDO getUnclassifiedRegionDO(@Param("name")String name); - Long insertRoot(@Param("eid") String eid, @Param("region") RegionDO regionDO); + Long insertRoot(@Param("region") RegionDO regionDO); - Integer batchInsertRegionsByDepartments(@Param("eid") String eid, @Param("regions") List regions); + Integer batchInsertRegionsByDepartments(@Param("regions") List regions); - List selectRegionBySynDingDeptIds(@Param("eid") String eid, @Param("synDingDeptIds") List synDingDeptIds); + List selectRegionBySynDingDeptIds(@Param("synDingDeptIds") List synDingDeptIds); - List getAllRegion(@Param("eid") String eid); + List getAllRegion(); - List listStoreRegionByIds(@Param("eid")String enterpriseId, @Param("regionIds")List regionIds); + List listStoreRegionByIds(@Param("regionIds")List regionIds); - RegionDO getByRegionId(@Param("eid") String eid, @Param("regionId") Long regionId); + RegionDO getByRegionId(@Param("regionId") Long regionId); - RegionNode getRegionByRegionId(@Param("eid") String eid, @Param("regionId") String regionId); + RegionNode getRegionByRegionId(@Param("regionId") String regionId); - Integer insertOrUpdate(@Param("record") RegionDO regionDO, @Param("eid") String eid); + Integer insertOrUpdate(@Param("record") RegionDO regionDO); - List getSpecifiedRegionIdAndDeptId(@Param("eid") String eid, @Param("parentId") Long parentId); + List getSpecifiedRegionIdAndDeptId(@Param("parentId") Long parentId); - List getRegionByDingDeptIds(@Param("eid")String enterpriseId, @Param("list")List dingDeptIds); + List getRegionByDingDeptIds(@Param("list")List dingDeptIds); - RegionDO getBySynDingDeptId(@Param("eid") String eid, @Param("synDingDeptId") String synDingDeptId); + RegionDO getBySynDingDeptId(@Param("synDingDeptId") String synDingDeptId); - Long ignoreInsert(@Param("eid") String eid, @Param("region") RegionDO regionDO); + Long ignoreInsert(@Param("region") RegionDO regionDO); - Integer updateSyncRegion(@Param("eid") String eid, @Param("item")RegionDO regionDO); + Integer updateSyncRegion(@Param("item")RegionDO regionDO); - Integer removeRegions(@Param("eid")String eid,@Param("regionIds") List regionIds); + Integer removeRegions(@Param("regionIds") List regionIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java deleted file mode 100644 index f96332d5c..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.region.RegionSyncDTO; -import com.cool.store.dto.store.StoreAreaDTO; -import com.cool.store.entity.StoreDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-31 11:51 - */ -public interface StoreMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-31 11:51 - */ - int insertSelective(@Param("record") StoreDO record, @Param("enterpriseId") String enterpriseId); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-31 11:51 - */ - int updateByPrimaryKeySelective(@Param("record") StoreDO record, @Param("enterpriseId") String enterpriseId); - - List listStoreByRegionIdList(@Param("eid") String eid, @Param("regionIdList") List regionIdList); - - List getStoreListByStoreIds(@Param("enterpriseId") String enterpriseId, @Param("storeIdList") List storeIdList); - - List listStoreByRegionIdListNotChild(@Param("eid") String eid, @Param("regionIdList") List regionIdList); - - Integer countStore(@Param("eid") String eid); - - List listStoreIdList(@Param("eid") String eid); - - List getSpecifiedStoreIdsAndDeptId(@Param("eid") String eid, - @Param("isDelete") String isDelete, - @Param("parentId") Long parentId); - - StoreDO getStoreBySynId(@Param("eid") String eid, @Param("synId") String synId); - - Integer insertStore(@Param("enterpriseId") String enterpriseId, @Param("storeDO") StoreDO storeDO); - - Integer updateStore(@Param("enterpriseId") String enterpriseId, @Param("storeDO") StoreDO storeDO); - - List getStoreIdByIdList(@Param("eid") String eid, @Param("ids") List ids); - - Integer deleteStoreByStoreIds(@Param("enterpriseId") String enterpriseId, @Param("storeIds") List storeIds, @Param("userId") String userId, @Param("updateTime") Long updateTime); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SubordinateMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SubordinateMappingMapper.java deleted file mode 100644 index b6f4cf34f..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SubordinateMappingMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.SubordinateMappingDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-31 02:27 - */ -public interface SubordinateMappingMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-31 02:27 - */ - int insertSelective(@Param("record") SubordinateMappingDO record, @Param("enterpriseId") String enterpriseId); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-31 02:27 - */ - int updateByPrimaryKeySelective(@Param("record") SubordinateMappingDO record, @Param("enterpriseId") String enterpriseId); - - /** - * 根据用户ids查询直属上级列表 - * @param enterpriseId - * @param userIds - * @return - */ - List selectByUserIds(@Param("enterpriseId") String enterpriseId, @Param("userIds") List userIds); - - - /** - * 批量新增用户的下属部门 - * @param enterpriseId - * @param subordinateMappingDOS - */ - void batchInsertSubordinateMapping(@Param("enterpriseId") String enterpriseId,@Param("subordinateMappingDOS") List subordinateMappingDOS); - - void deletedByUserIds(@Param("enterpriseId") String enterpriseId,@Param("userIds") List userIds); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysDepartmentMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysDepartmentMapper.java index 64531d106..cc0720875 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysDepartmentMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysDepartmentMapper.java @@ -18,22 +18,22 @@ public interface SysDepartmentMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-19 03:00 */ - int insertSelective(@Param("record") SysDepartmentDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") SysDepartmentDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-19 03:00 */ - int updateByPrimaryKeySelective(@Param("record") SysDepartmentDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") SysDepartmentDO record); - void batchInsertOrUpdate(@Param("list") List sysDepartmentDOList, @Param("eid") String eid); + void batchInsertOrUpdate(@Param("list") List sysDepartmentDOList); - List getDeptChildListByParentId(@Param("eid") String eid, @Param("parentId") String parentId); + List getDeptChildListByParentId(@Param("parentId") String parentId); - void deleteByNotInIds(@Param("list") List deptIdList, @Param("eid") String eid); + void deleteByNotInIds(@Param("list") List deptIdList); - List getSyncDeptTreeList(@Param("eid") String eid); + List getSyncDeptTreeList(); - List selectAll(@Param("eid") String eid); + List selectAll(); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java index ef52867e4..930eb25f6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java @@ -17,17 +17,17 @@ public interface SysRoleMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-19 03:00 */ - int insertSelective(@Param("record") SysRoleDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") SysRoleDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-19 03:00 */ - int updateByPrimaryKeySelective(@Param("record") SysRoleDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") SysRoleDO record); - SysRoleDO getHighestPrioritySysRoleDoByUserId(@Param("enterpriseId") String enterpriseId, @Param("userId") String userId); + SysRoleDO getHighestPrioritySysRoleDoByUserId(@Param("userId") String userId); - SysRoleDO getRoleByRoleEnum(@Param("eid") String enterpriseId, @Param("roleEnum") String roleEnum); + SysRoleDO getRoleByRoleEnum(@Param("roleEnum") String roleEnum); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMenuMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMenuMapper.java index ac5674a70..1dd78abc0 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMenuMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMenuMapper.java @@ -14,12 +14,12 @@ public interface SysRoleMenuMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-19 03:01 */ - int insertSelective(@Param("record") SysRoleMenuDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") SysRoleMenuDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-19 03:01 */ - int updateByPrimaryKeySelective(@Param("record") SysRoleMenuDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") SysRoleMenuDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserAuthMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserAuthMappingMapper.java deleted file mode 100644 index 5d5cc3f64..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserAuthMappingMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.UserAuthMappingDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-19 02:54 - */ -public interface UserAuthMappingMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-19 02:54 - */ - int insertSelective(@Param("record") UserAuthMappingDO record, @Param("enterpriseId") String enterpriseId); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-19 02:54 - */ - int updateByPrimaryKeySelective(@Param("record") UserAuthMappingDO record, @Param("enterpriseId") String enterpriseId); - - List listUserAuthMappingByUserId(@Param("eid") String eid, @Param("userId") String userId); - - List listUserAuthMappingByUserIds(@Param("eid") String eid, @Param("userIds") List userIds); - - void deleteAuthMappingByIds(@Param("eid") String eid, @Param("ids") List ids); - - List selectIdsByUserId(@Param("eid") String eid, @Param("userId") String userId); - - void insertUserAuthMapping(@Param("eid") String eid, @Param("auth") UserAuthMappingDO auth); - - void deleteAuthMappingByIdAndType(@Param("eid") String eid, @Param("ids") List ids, @Param("type") String type); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java index 96b01ebee..91b75b978 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java @@ -16,20 +16,20 @@ public interface UserRegionMappingMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-05-19 03:00 */ - int insertSelective(@Param("record") UserRegionMappingDO record, @Param("enterpriseId") String enterpriseId); + int insertSelective(@Param("record") UserRegionMappingDO record); /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 * dateTime:2023-05-19 03:00 */ - int updateByPrimaryKeySelective(@Param("record") UserRegionMappingDO record, @Param("enterpriseId") String enterpriseId); + int updateByPrimaryKeySelective(@Param("record") UserRegionMappingDO record); - void batchInsertRegionMapping(@Param("enterpriseId") String enterpriseId,@Param("userRegionMappingDOS") List userRegionMappingDOS); + void batchInsertRegionMapping(@Param("userRegionMappingDOS") List userRegionMappingDOS); - void deletedByUserIds(@Param("enterpriseId") String enterpriseId,@Param("userIds") List userIds); + void deletedByUserIds(@Param("userIds") List userIds); - List listUserRegionMappingByUserId(@Param("enterpriseId") String enterpriseId, @Param("userIds") List userIds); + List listUserRegionMappingByUserId(@Param("userIds") List userIds); - void deletedByIds(@Param("enterpriseId") String enterpriseId,@Param("ids") List ids); + void deletedByIds(@Param("ids") List ids); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserDepartmentMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserDepartmentMapper.xml deleted file mode 100644 index c5603669b..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserDepartmentMapper.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - id, user_id, department_id, create_time, update_time, is_has_auth - - - insert into enterprise_user_department_${enterpriseId} - - - user_id, - - - department_id, - - - create_time, - - - update_time, - - - is_has_auth, - - - - - #{record.userId}, - - - #{record.departmentId}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.isHasAuth}, - - - - - update enterprise_user_department_${enterpriseId} - - - user_id = #{record.userId}, - - - department_id = #{record.departmentId}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - is_has_auth = #{record.isHasAuth}, - - - where id = #{record.id} - - - - - - delete from enterprise_user_department_${eid} where - - id in - - #{id} - - - - - - - - insert into enterprise_user_department_${eid} - (user_id, department_id, create_time, is_has_auth) - values - - (#{deptUser.userId}, #{deptUser.departmentId}, now(), #{deptUser.isHasAuth}) - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserGroupMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserGroupMapper.xml deleted file mode 100644 index 5bacc66bc..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserGroupMapper.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - - id, group_id, group_name, create_time, create_user_id, update_time, update_user_id, - deleted - - - common_edit_userids - - - insert into enterprise_user_group_${enterpriseId} - - - group_id, - - - group_name, - - - create_time, - - - create_user_id, - - - update_time, - - - update_user_id, - - - deleted, - - - common_edit_userids, - - - - - #{record.groupId}, - - - #{record.groupName}, - - - #{record.createTime}, - - - #{record.createUserId}, - - - #{record.updateTime}, - - - #{record.updateUserId}, - - - #{record.deleted}, - - - #{record.commonEditUserids}, - - - - - update enterprise_user_group_${enterpriseId} - - - group_id = #{record.groupId}, - - - group_name = #{record.groupName}, - - - create_time = #{record.createTime}, - - - create_user_id = #{record.createUserId}, - - - update_time = #{record.updateTime}, - - - update_user_id = #{record.updateUserId}, - - - deleted = #{record.deleted}, - - - common_edit_userids = #{record.commonEditUserids}, - - - where id = #{record.id} - - - - - delete from enterprise_user_group_${enterpriseId} - where group_id in - - #{groupId} - - - - - - - - - - - update enterprise_user_group_${enterpriseId} - - - group_id = #{record.groupId}, - - - group_name = #{record.groupName}, - - - common_edit_userids = #{record.commonEditUserids}, - - - create_time = #{record.createTime}, - - - create_user_id = #{record.createUserId}, - - - update_time = #{record.updateTime}, - - - update_user_id = #{record.updateUserId}, - - - deleted = #{record.deleted}, - - - where group_id = #{record.groupId} - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserGroupMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserGroupMappingMapper.xml deleted file mode 100644 index d3b4b9f03..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserGroupMappingMapper.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - id, user_id, group_id, create_time, create_user_id, update_time, update_user_id, - deleted - - - insert into enterprise_user_group_mapping_${enterpriseId} - - - user_id, - - - group_id, - - - create_time, - - - create_user_id, - - - update_time, - - - update_user_id, - - - deleted, - - - - - #{record.userId}, - - - #{record.groupId}, - - - #{record.createTime}, - - - #{record.createUserId}, - - - #{record.updateTime}, - - - #{record.updateUserId}, - - - #{record.deleted}, - - - - - update enterprise_user_group_mapping_${enterpriseId} - - - user_id = #{record.userId}, - - - group_id = #{record.groupId}, - - - create_time = #{record.createTime}, - - - create_user_id = #{record.createUserId}, - - - update_time = #{record.updateTime}, - - - update_user_id = #{record.updateUserId}, - - - deleted = #{record.deleted}, - - - where id = #{record.id} - - - - delete from enterprise_user_group_mapping_${enterpriseId} - where group_id in (#{groupId}) - - - - insert into enterprise_user_group_mapping_${enterpriseId} - ( - group_id, - user_id - ) - values - - ( - #{groupId}, - #{userId} - ) - - - - - delete from enterprise_user_group_mapping_${enterpriseId} - where group_id = #{groupId} - - - #{userId} - - - - - - delete from enterprise_user_group_mapping_${enterpriseId} - where user_id in - - - #{userId} - - - - - - - - - - insert into enterprise_user_group_mapping_${enterpriseId} - ( - user_id, - group_id, - create_time, - create_user_id, - update_time, - update_user_id - ) - values - - ( - #{entity.userId}, - #{entity.groupId}, - now(), - #{entity.createUserId}, - now(), - #{entity.updateUserId} - ) - - ON DUPLICATE KEY UPDATE - update_time = now() - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index e6fc1fa27..7525104c8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -52,7 +52,7 @@ is_leader_in_depts, department, jobnumber, monitored_departments, departments, user_region_ids - insert into enterprise_user_${enterpriseId} + insert into enterprise_user user_id, @@ -275,7 +275,7 @@ - update enterprise_user_${enterpriseId} + update enterprise_user user_id = #{record.userId}, @@ -394,14 +394,14 @@ , from - enterprise_user_${enterpriseId} + enterprise_user where user_id = #{userId} - insert into enterprise_user_${eid} ( + insert into enterprise_user ( id, user_id, `name`, @@ -469,7 +469,7 @@ - update enterprise_user_${eid} + update enterprise_user set user_region_ids = when #{item.userId} then #{item.userRegionIds} @@ -493,9 +493,9 @@ u.avatar as avatar, u.user_status as userStatus, u.unionid as unionid - from enterprise_user_${eid} u - left join enterprise_user_role_${eid} ul on u.user_id=ul.user_id - left join sys_role_${eid} r on ul.role_id=r.id + from enterprise_user u + left join enterprise_user_role ul on u.user_id=ul.user_id + left join sys_role r on ul.role_id=r.id u.active = true and u.user_id != 'a100000001' @@ -544,7 +544,7 @@ departments as departments, user_status as userStatus, unionid - from enterprise_user_${eid} + from enterprise_user active = true and user_id != 'a100000001' @@ -588,7 +588,7 @@ `language`, user_status as userStatus, subordinate_range as subordinateRange - from enterprise_user_${eid} + from enterprise_user user_id != 'a100000001' and @@ -615,8 +615,8 @@ u.departments as departments, u.user_status as userStatus, u.unionid as unionid - from enterprise_user_${eid} u - left join enterprise_user_group_mapping_${eid} ug on u.user_id=ug.user_id + from enterprise_user u + left join enterprise_user_group_mapping ug on u.user_id=ug.user_id ug.group_id = #{groupId} and u.active = true and u.user_id != 'a100000001' @@ -663,7 +663,7 @@ face_url as faceUrl, create_time as createTime, `language` as language - from enterprise_user_${eid} where user_id != 'a100000001' + from enterprise_user where user_id != 'a100000001' user_region_ids like concat('%/', #{regionId}, '/%') @@ -671,7 +671,7 @@ - update enterprise_user_${eid} + update enterprise_user `name` = #{enterpriseUserDO.name}, `tel` = #{enterpriseUserDO.tel}, @@ -760,20 +760,20 @@ - insert into enterprise_user_${eid} + insert into enterprise_user ( `id`, `user_id`, `name`, diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserRoleMapper.xml index 7eb828761..e8de8ff07 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserRoleMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserRoleMapper.xml @@ -12,7 +12,7 @@ id, role_id, user_id, create_time, update_time - insert into enterprise_user_role_${enterpriseId} + insert into enterprise_user_role role_id, @@ -43,7 +43,7 @@ - update enterprise_user_role_${enterpriseId} + update enterprise_user_role role_id = #{record.roleId}, @@ -62,7 +62,7 @@ - insert ignore into enterprise_user_role_${eid} + insert ignore into enterprise_user_role (role_id, user_id ,create_time) values @@ -78,7 +78,7 @@ b.role_auth as roleAuth, b.role_enum as roleEnum, b.priority as priority - from enterprise_user_role_${eip} a left join sys_role_${eip} b on a.role_id=b.id + from enterprise_user_role a left join sys_role b on a.role_id=b.id @@ -96,31 +96,31 @@ c.role_auth as roleAuth, c.source as source, c.role_enum as roleEnum - from enterprise_user_role_${eip} b - left join sys_role_${eip} c on c.id = b.role_id + from enterprise_user_role b + left join sys_role c on c.id = b.role_id where b.user_id = #{userId} - delete from enterprise_user_role_${eid} where id in + delete from enterprise_user_role where id in #{id} - insert ignore into enterprise_user_role_${eid} + insert ignore into enterprise_user_role ( `role_id`, `user_id`, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml index 635897157..490ff459f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml @@ -17,7 +17,7 @@ update_time, create_user_id, update_user_id - insert into hy_advanced_setting_${enterpriseId} + insert into hy_advanced_setting partner_url, @@ -72,7 +72,7 @@ - update hy_advanced_setting_${enterpriseId} + update hy_advanced_setting partner_url = #{record.partnerUrl}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml index 0bc1b97c7..71fa3c625 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml @@ -25,7 +25,7 @@ content - insert into hy_content_info_${enterpriseId} + insert into hy_content_info content_title, @@ -98,7 +98,7 @@ - update hy_content_info_${enterpriseId} + update hy_content_info content_title = #{record.contentTitle}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml index 47bddedd7..e9e56b812 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml @@ -18,7 +18,7 @@ update_time, create_user_id, update_user_id - insert into hy_intend_dev_zone_info_${enterpriseId} + insert into hy_intend_dev_zone_info zone_name, @@ -79,7 +79,7 @@ - update hy_intend_dev_zone_info_${enterpriseId} + update hy_intend_dev_zone_info zone_name = #{record.zoneName}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml index 917162556..c3ad3a277 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml @@ -13,7 +13,7 @@ id, mapping_id, open_area_mapping_id, type, create_time, update_time - insert into hy_intend_developement_mapping_${enterpriseId} + insert into hy_intend_developement_mapping mapping_id, @@ -50,7 +50,7 @@ - update hy_intend_developement_mapping_${enterpriseId} + update hy_intend_developement_mapping mapping_id = #{record.mappingId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml index 79474931c..c66f1251b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml @@ -19,7 +19,7 @@ deleted, create_time, update_time, update_user_id - insert into hy_open_area_info_${enterpriseId} + insert into hy_open_area_info parent_id, @@ -86,7 +86,7 @@ - update hy_open_area_info_${enterpriseId} + update hy_open_area_info parent_id = #{record.parentId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml index f993ffbc6..27e2e1876 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml @@ -28,7 +28,7 @@ pass_reason, certify_file, create_time, update_time - insert into hy_partner_base_info_${enterpriseId} + insert into hy_partner_base_info partner_id, @@ -143,7 +143,7 @@ - update hy_partner_base_info_${enterpriseId} + update hy_partner_base_info partner_id = #{record.partnerId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml index 05fc699fe..b33680fc8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml @@ -32,7 +32,7 @@ signer_real_control_relation_cert, create_time, update_time - insert into hy_partner_certification_info_${enterpriseId} + insert into hy_partner_certification_info partner_id, @@ -159,7 +159,7 @@ - update hy_partner_certification_info_${enterpriseId} + update hy_partner_certification_info partner_id = #{record.partnerId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml index ee92f4644..3d8f19b42 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml @@ -17,7 +17,7 @@ update_time - insert into hy_partner_clerk_${enterpriseId} + insert into hy_partner_clerk partner_line_id, @@ -72,7 +72,7 @@ - update hy_partner_clerk_${enterpriseId} + update hy_partner_clerk partner_line_id = #{record.partnerLineId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml index 94d3779e3..fbc690fb3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml @@ -33,7 +33,7 @@ create_time, update_time - insert into hy_partner_intent_info_${enterpriseId} + insert into hy_partner_intent_info partner_id, @@ -172,7 +172,7 @@ - update hy_partner_intent_info_${enterpriseId} + update hy_partner_intent_info partner_id = #{record.partnerId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml index b0201f021..276aa7f9e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml @@ -19,7 +19,7 @@ change_before_cpoy - insert into hy_partner_interview_log_${enterpriseId} + insert into hy_partner_interview_log partner_line_id, @@ -62,7 +62,7 @@ - update hy_partner_interview_log_${enterpriseId} + update hy_partner_interview_log partner_line_id = #{record.partnerLineId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index 51ae0ddf8..ada661bab 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -28,7 +28,7 @@ latest_log_message, pass_reason, certify_file, create_time, update_time - insert into hy_partner_interview_${enterpriseId} + insert into hy_partner_interview status, @@ -143,7 +143,7 @@ - update hy_partner_interview_${enterpriseId} + update hy_partner_interview status = #{record.status}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index ce7e0ce6b..8d9f83e09 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -25,7 +25,7 @@ deleted, create_time, update_time - insert into hy_partner_interview_plan_${enterpriseId} + insert into hy_partner_interview_plan partner_line_id, @@ -122,7 +122,7 @@ - update hy_partner_interview_plan_${enterpriseId} + update hy_partner_interview_plan partner_line_id = #{record.partnerLineId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 924b25f4a..a02351c7a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -28,7 +28,7 @@ close_user_id - insert into hy_partner_line_info_${enterpriseId} + insert into hy_partner_line_info partner_id, @@ -137,7 +137,7 @@ - update hy_partner_line_info_${enterpriseId} + update hy_partner_line_info partner_id = #{record.partnerId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml index b6a6c37cc..7da0086fa 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml @@ -24,7 +24,7 @@ field_copy - insert into hy_partner_task_info_log_${enterpriseId} + insert into hy_partner_task_info_log partner_line_id, @@ -91,7 +91,7 @@ - update hy_partner_task_info_log_${enterpriseId} + update hy_partner_task_info_log partner_line_id = #{record.partnerLineId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index 6e13a2861..c66e654db 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -19,7 +19,7 @@ invite_code, is_write_partner_know, create_time, update_time - insert into hy_partner_user_info_${enterpriseId} + insert into hy_partner_user_info partner_id, @@ -86,7 +86,7 @@ - update hy_partner_user_info_${enterpriseId} + update hy_partner_user_info partner_id = #{record.partnerId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml index 42ceb1e68..ca8007d2d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml @@ -14,7 +14,7 @@ id, platform_type, platform_user_id, bind_time, partner_id, create_time, update_time - insert into hy_partner_user_platform_bind_${enterpriseId} + insert into hy_partner_user_platform_bind platform_type, @@ -57,7 +57,7 @@ - update hy_partner_user_platform_bind_${enterpriseId} + update hy_partner_user_platform_bind platform_type = #{record.platformType}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml index bdd3223d3..3c292c257 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml @@ -13,7 +13,7 @@ id, stage_code, stage_name, stage_order, create_time, update_time - insert into hy_workflow_stage_${enterpriseId} + insert into hy_workflow_stage stage_code, @@ -50,7 +50,7 @@ - update hy_workflow_stage_${enterpriseId} + update hy_workflow_stage stage_code = #{record.stageCode}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/LoginRecordMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LoginRecordMapper.xml index b7494922b..2c1650a4e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LoginRecordMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LoginRecordMapper.xml @@ -10,7 +10,7 @@ id, user_id, create_time - insert into login_record_${enterpriseId} + insert into login_record user_id, @@ -29,7 +29,7 @@ - update login_record_${enterpriseId} + update login_record user_id = #{record.userId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml index c3db73f01..3a145553e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml @@ -28,7 +28,7 @@ store_num, store_id, unclassified_flag, order_num, third_dept_id - insert into region_${enterpriseId} + insert into region region_id, @@ -143,7 +143,7 @@ - update region_${enterpriseId} + update region region_id = #{record.regionId}, @@ -207,7 +207,7 @@ - insert ignore into region_${eid} + insert ignore into region ( id, region_id, @@ -295,7 +295,7 @@ - insert into region_${eid} + insert into region ( id, name, @@ -333,7 +333,7 @@ select id, syn_ding_dept_id - from region_${eid} + from region where deleted = 0 and syn_ding_dept_id in ( #{item} @@ -357,7 +357,7 @@ region_path as regionPath, deleted as deleted, third_dept_id as thirdDeptId - from region_${eid} + from region where deleted = 0 and id > 0 and region_type != 'store' @@ -378,7 +378,7 @@ deleted as deleted, region_path as regionPath, store_id as storeId - from region_${eid} + from region where region_type = 'store' and id in ( @@ -404,7 +404,7 @@ region_path as regionPath, deleted, store_num as storeNum - from region_${eid} + from region where id = #{regionId} @@ -423,11 +423,11 @@ region_type as regionType, region_path as regionPath, store_num as storeCount - from region_${eid} where id = #{regionId, jdbcType=BIGINT} and deleted = 0 + from region where id = #{regionId, jdbcType=BIGINT} and deleted = 0 - insert into region_${eid} + insert into region ( id, name, @@ -460,7 +460,7 @@ select id , syn_ding_dept_id as synDingDeptId - from region_${eid} + from region where (id > 0 or id = -3) and (deleted = 0 or syn_ding_dept_id is not null) and region_path like concat('%/',#{parentId},'/%') @@ -481,7 +481,7 @@ syn_ding_dept_id as synDingDeptId, region_type as regionType, deleted as deleted - from region_${eid} + from region where deleted = 0 and syn_ding_dept_id in ( @@ -507,12 +507,12 @@ region_path as regionPath, deleted, store_num as storeNum - from region_${eid} + from region where syn_ding_dept_id = #{synDingDeptId} - insert ignore into region_${eid} + insert ignore into region ( region_id, name, @@ -554,12 +554,12 @@ ,#{region.synDingDeptId} - ,(SELECT max(order_num)+1 FROM region_${eid} AS num) + ,(SELECT max(order_num)+1 FROM region AS num) ) - update region_${eid} + update region set `parent_id` = #{item.parentId}, `name` = #{item.name}, @@ -575,7 +575,7 @@ - update region_${eid} + update region set deleted = 1, parent_id = -1 diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml deleted file mode 100644 index 2aacca8a1..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml +++ /dev/null @@ -1,637 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, store_id, store_name, store_num, avatar, ding_id, region_id, province, city, - county, store_address, location_address, is_lock, longitude_latitude, longitude, - latitude, is_delete, telephone, business_hours, store_acreage, store_bandwidth, create_time, - create_name, create_user, update_time, update_name, update_user, aliyun_corp_id, - source, vds_corp_id, syn_ding_dept_id, region_path, has_camera, store_status, third_dept_id - - - remark, extend_field, address_point - - - insert into store_${enterpriseId} - - - store_id, - - - store_name, - - - store_num, - - - avatar, - - - ding_id, - - - region_id, - - - province, - - - city, - - - county, - - - store_address, - - - location_address, - - - is_lock, - - - longitude_latitude, - - - longitude, - - - latitude, - - - is_delete, - - - telephone, - - - business_hours, - - - store_acreage, - - - store_bandwidth, - - - create_time, - - - create_name, - - - create_user, - - - update_time, - - - update_name, - - - update_user, - - - aliyun_corp_id, - - - source, - - - vds_corp_id, - - - syn_ding_dept_id, - - - region_path, - - - has_camera, - - - store_status, - - - third_dept_id, - - - remark, - - - extend_field, - - - address_point, - - - - - #{record.storeId}, - - - #{record.storeName}, - - - #{record.storeNum}, - - - #{record.avatar}, - - - #{record.dingId}, - - - #{record.regionId}, - - - #{record.province}, - - - #{record.city}, - - - #{record.county}, - - - #{record.storeAddress}, - - - #{record.locationAddress}, - - - #{record.isLock}, - - - #{record.longitudeLatitude}, - - - #{record.longitude}, - - - #{record.latitude}, - - - #{record.isDelete}, - - - #{record.telephone}, - - - #{record.businessHours}, - - - #{record.storeAcreage}, - - - #{record.storeBandwidth}, - - - #{record.createTime}, - - - #{record.createName}, - - - #{record.createUser}, - - - #{record.updateTime}, - - - #{record.updateName}, - - - #{record.updateUser}, - - - #{record.aliyunCorpId}, - - - #{record.source}, - - - #{record.vdsCorpId}, - - - #{record.synDingDeptId}, - - - #{record.regionPath}, - - - #{record.hasCamera}, - - - #{record.storeStatus}, - - - #{record.thirdDeptId}, - - - #{record.remark}, - - - #{record.extendField}, - - - #{record.addressPoint}, - - - - - update store_${enterpriseId} - - - store_id = #{record.storeId}, - - - store_name = #{record.storeName}, - - - store_num = #{record.storeNum}, - - - avatar = #{record.avatar}, - - - ding_id = #{record.dingId}, - - - region_id = #{record.regionId}, - - - province = #{record.province}, - - - city = #{record.city}, - - - county = #{record.county}, - - - store_address = #{record.storeAddress}, - - - location_address = #{record.locationAddress}, - - - is_lock = #{record.isLock}, - - - longitude_latitude = #{record.longitudeLatitude}, - - - longitude = #{record.longitude}, - - - latitude = #{record.latitude}, - - - is_delete = #{record.isDelete}, - - - telephone = #{record.telephone}, - - - business_hours = #{record.businessHours}, - - - store_acreage = #{record.storeAcreage}, - - - store_bandwidth = #{record.storeBandwidth}, - - - create_time = #{record.createTime}, - - - create_name = #{record.createName}, - - - create_user = #{record.createUser}, - - - update_time = #{record.updateTime}, - - - update_name = #{record.updateName}, - - - update_user = #{record.updateUser}, - - - aliyun_corp_id = #{record.aliyunCorpId}, - - - source = #{record.source}, - - - vds_corp_id = #{record.vdsCorpId}, - - - syn_ding_dept_id = #{record.synDingDeptId}, - - - region_path = #{record.regionPath}, - - - has_camera = #{record.hasCamera}, - - - store_status = #{record.storeStatus}, - - - third_dept_id = #{record.thirdDeptId}, - - - remark = #{record.remark}, - - - extend_field = #{record.extendField}, - - - address_point = #{record.addressPoint}, - - - where id = #{record.id} - - - - - - - - - - - - - - - - - - insert into store_${enterpriseId} - ( - store_id, - store_name, - store_num, - region_id, - avatar, - province, - city, - county, - store_address, - location_address, - is_lock, - longitude_latitude, - longitude, - latitude, - is_delete, - telephone, - business_hours, - store_acreage, - store_bandwidth, - create_time, - create_name, - remark, - region_path, - extend_field, - syn_ding_dept_id, - source, - store_status, - address_point - ) - values - ( - #{storeDO.storeId}, - #{storeDO.storeName}, - #{storeDO.storeNum}, - #{storeDO.regionId}, - #{storeDO.avatar}, - #{storeDO.province}, - #{storeDO.city}, - #{storeDO.county}, - #{storeDO.storeAddress}, - #{storeDO.locationAddress}, - #{storeDO.isLock,jdbcType=CHAR}, - #{storeDO.longitudeLatitude}, - #{storeDO.longitude}, - #{storeDO.latitude}, - #{storeDO.isDelete,jdbcType=CHAR}, - #{storeDO.telephone}, - #{storeDO.businessHours}, - #{storeDO.storeAcreage}, - #{storeDO.storeBandwidth}, - #{storeDO.createTime}, - #{storeDO.createName}, - #{storeDO.remark}, - #{storeDO.regionPath}, - #{storeDO.extendField}, - #{storeDO.synDingDeptId}, - #{storeDO.source}, - #{storeDO.storeStatus}, - ST_GeomFromText(#{storeDO.addressPoint}) - ) - - - - update store_${enterpriseId} set - - - store_name = #{storeDO.storeName}, - - - store_num = #{storeDO.storeNum}, - - - region_path = #{storeDO.regionPath}, - - - region_id = #{storeDO.regionId}, - - - avatar = #{storeDO.avatar}, - - - - province = #{storeDO.province}, - - - city = #{storeDO.city}, - - - county = #{storeDO.county}, - - - store_address = #{storeDO.storeAddress}, - - - location_address = #{storeDO.locationAddress}, - - - longitude_latitude = #{storeDO.longitudeLatitude}, - - - longitude = #{storeDO.longitude}, - - - latitude = #{storeDO.latitude}, - - - address_point = ST_GeomFromText(#{storeDO.addressPoint}), - - - telephone = #{storeDO.telephone}, - - - business_hours = #{storeDO.businessHours}, - - - store_acreage = #{storeDO.storeAcreage}, - - - store_bandwidth = #{storeDO.storeBandwidth}, - - - update_time = #{storeDO.updateTime}, - - - update_name = #{storeDO.updateName}, - - - remark = #{storeDO.remark}, - - - is_delete = #{storeDO.isDelete}, - - - store_status = #{storeDO.storeStatus}, - - - extend_field = #{storeDO.extendField} - - - where store_id=#{storeDO.storeId} - - - - - - update store_${enterpriseId} - set is_delete='invalid', - update_name=#{userId, jdbcType=VARCHAR}, - update_time=#{updateTime, jdbcType=BIGINT} - where store_id in - - #{storeId, jdbcType=VARCHAR} - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/SubordinateMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SubordinateMappingMapper.xml deleted file mode 100644 index 84210b639..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/SubordinateMappingMapper.xml +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - id, user_id, region_id, personal_id, type, create_id, create_time, update_id, update_time, - user_range, source - - - insert into subordinate_mapping_${enterpriseId} - - - user_id, - - - region_id, - - - personal_id, - - - type, - - - create_id, - - - create_time, - - - update_id, - - - update_time, - - - user_range, - - - source, - - - - - #{record.userId}, - - - #{record.regionId}, - - - #{record.personalId}, - - - #{record.type}, - - - #{record.createId}, - - - #{record.createTime}, - - - #{record.updateId}, - - - #{record.updateTime}, - - - #{record.userRange}, - - - #{record.source}, - - - - - update subordinate_mapping_${enterpriseId} - - - user_id = #{record.userId}, - - - region_id = #{record.regionId}, - - - personal_id = #{record.personalId}, - - - type = #{record.type}, - - - create_id = #{record.createId}, - - - create_time = #{record.createTime}, - - - update_id = #{record.updateId}, - - - update_time = #{record.updateTime}, - - - user_range = #{record.userRange}, - - - source = #{record.source}, - - - where id = #{record.id} - - - - - - - insert into subordinate_mapping_${enterpriseId} - ( - user_id, - region_id, - personal_id, - `type`, - create_id, - create_time, - update_id, - update_time, - user_range, - source - ) - values - - ( - #{entity.userId}, - #{entity.regionId}, - #{entity.personalId}, - #{entity.type}, - #{entity.createId}, - now(), - #{entity.updateId}, - now(), - #{entity.userRange}, - #{entity.source} - ) - - - - - delete from subordinate_mapping_${enterpriseId} - where - user_id in - - #{userId} - - and type = 0 - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysDepartmentMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysDepartmentMapper.xml index 162445bcc..79f74abf1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysDepartmentMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysDepartmentMapper.xml @@ -32,7 +32,7 @@ parent_ids, sub_ids - insert into sys_department_${enterpriseId} + insert into sys_department name, @@ -141,7 +141,7 @@ - update sys_department_${enterpriseId} + update sys_department name = #{record.name}, @@ -199,7 +199,7 @@ - insert into sys_department_${eid} + insert into sys_department ( id, name, @@ -226,12 +226,12 @@ name, depart_order as departOrder, parent_id as parentId - from sys_department_${eid} + from sys_department where parent_id = #{parentId} - delete from sys_department_${eid} + delete from sys_department where id not in #{item} @@ -244,7 +244,7 @@ id, name, parent_id as pid - from sys_department_${eid} + from sys_department \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml index 81b592558..33143da57 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml @@ -23,7 +23,7 @@ priority, create_time, update_time, role_enum, create_user, update_user, third_unique_id - insert into sys_role_${enterpriseId} + insert into sys_role role_name, @@ -114,7 +114,7 @@ - update sys_role_${enterpriseId} + update sys_role role_name = #{record.roleName}, @@ -171,9 +171,9 @@ c.app_menu as appMenu, c.role_enum as roleEnum from - enterprise_user_${enterpriseId} a - left join enterprise_user_role_${enterpriseId} b on a.user_id =b.user_id - left join sys_role_${enterpriseId} c on c.id=b.role_id + enterprise_user a + left join enterprise_user_role b on a.user_id =b.user_id + left join sys_role c on c.id=b.role_id where a.user_id= #{userId} and a.active = true order by @@ -193,7 +193,7 @@ position_type as positionType, role_enum as roleEnum from - sys_role_${eid} + sys_role where role_enum = #{roleEnum} diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMenuMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMenuMapper.xml index 005ec2ed6..7f2e4bb07 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMenuMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMenuMapper.xml @@ -11,7 +11,7 @@ id, menu_id, role_id, platform - insert into sys_role_menu_${enterpriseId} + insert into sys_role_menu menu_id, @@ -36,7 +36,7 @@ - update sys_role_menu_${enterpriseId} + update sys_role_menu menu_id = #{record.menuId}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml deleted file mode 100644 index e1302706b..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - id, user_id, mapping_id, type, source, create_id, create_time, update_id, update_time - - - insert into user_auth_mapping_${enterpriseId} - - - user_id, - - - mapping_id, - - - type, - - - source, - - - create_id, - - - create_time, - - - update_id, - - - update_time, - - - - - #{record.userId}, - - - #{record.mappingId}, - - - #{record.type}, - - - #{record.source}, - - - #{record.createId}, - - - #{record.createTime}, - - - #{record.updateId}, - - - #{record.updateTime}, - - - - - update user_auth_mapping_${enterpriseId} - - - user_id = #{record.userId}, - - - mapping_id = #{record.mappingId}, - - - type = #{record.type}, - - - source = #{record.source}, - - - create_id = #{record.createId}, - - - create_time = #{record.createTime}, - - - update_id = #{record.updateId}, - - - update_time = #{record.updateTime}, - - - where id = #{record.id} - - - - - - - - delete from user_auth_mapping_${eid} - where id in - - #{id} - - - - - - - insert into user_auth_mapping_${eid} - ( - `user_id`, - `mapping_id`, - `type`, - `source`, - `create_id`, - `create_time` - ) - values - ( - #{auth.userId}, - #{auth.mappingId}, - #{auth.type}, - #{auth.source}, - #{auth.createId}, - #{auth.createTime} - ) - - - - delete from user_auth_mapping_${eid} - where type=#{type} and mapping_id in - - #{id} - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml index 0f61491e7..1d841bc44 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml @@ -14,7 +14,7 @@ id, region_id, user_id, create_id, create_time, update_id, update_time - insert into user_region_mapping_${enterpriseId} + insert into user_region_mapping region_id, @@ -57,7 +57,7 @@ - update user_region_mapping_${enterpriseId} + update user_region_mapping region_id = #{record.regionId}, @@ -82,14 +82,14 @@ - delete from user_region_mapping_${enterpriseId} where user_id in + delete from user_region_mapping where user_id in #{userId} - insert into user_region_mapping_${enterpriseId} + insert into user_region_mapping ( region_id, user_id, @@ -114,7 +114,7 @@ - delete from user_region_mapping_${enterpriseId} where id in + delete from user_region_mapping where id in #{id} diff --git a/coolstore-partner-dao/src/test/java/generator/defined/MyIntrospectedTableMyBatis3Impl.java b/coolstore-partner-dao/src/test/java/generator/defined/MyIntrospectedTableMyBatis3Impl.java index 8963b5269..95e53bd3c 100644 --- a/coolstore-partner-dao/src/test/java/generator/defined/MyIntrospectedTableMyBatis3Impl.java +++ b/coolstore-partner-dao/src/test/java/generator/defined/MyIntrospectedTableMyBatis3Impl.java @@ -36,7 +36,7 @@ import static org.mybatis.generator.internal.util.messages.Messages.getString; */ public class MyIntrospectedTableMyBatis3Impl extends IntrospectedTableMyBatis3Impl { - private String enterpriseIdTableSuffix = "_${enterpriseId}"; + private String enterpriseIdTableSuffix = ""; @Override public String getFullyQualifiedTableNameAtRuntime() { diff --git a/coolstore-partner-dao/src/test/java/generator/defined/MyPluginAdapter.java b/coolstore-partner-dao/src/test/java/generator/defined/MyPluginAdapter.java index b5a3fe009..50d30d5f5 100644 --- a/coolstore-partner-dao/src/test/java/generator/defined/MyPluginAdapter.java +++ b/coolstore-partner-dao/src/test/java/generator/defined/MyPluginAdapter.java @@ -158,7 +158,7 @@ public class MyPluginAdapter extends PluginAdapter { String tableSuffix = tableName.substring(tableName.lastIndexOf("_") + 1); if(StringUtils.isNotBlank(tableSuffix) && tableSuffix.length() == 32){ //企业库 - return tableName.substring(0, tableName.lastIndexOf("_")) + "_${enterpriseId}"; + return tableName.substring(0, tableName.lastIndexOf("_")) + ""; } //平台库 return tableName; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthStoreCountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthStoreCountDTO.java deleted file mode 100644 index 440c32994..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthStoreCountDTO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cool.store.dto.auth; - -import lombok.Data; - -import java.util.List; - -/** - * describe: - * - * @author zhouyiping - * @date 2020/11/17 - */ -@Data -public class AuthStoreCountDTO { - - private String userId; - private List storeList; - private Integer storeCount; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/MySubordinatesDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/MySubordinatesDTO.java deleted file mode 100644 index 55f58c8cc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/MySubordinatesDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.dto.buser; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2022/2/28 17:27 - * @Version 1.0 - */ -@Data -public class MySubordinatesDTO { - - /** - * 映射ID - */ - String regionId; - - String regionName; - - String personalId; - - String personalName; - /** - * 节点类型 区域 人员 - */ - String nodeType; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/SubordinateUserRangeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/SubordinateUserRangeDTO.java deleted file mode 100644 index dbca2c731..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/SubordinateUserRangeDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cool.store.dto.buser; - -import lombok.Data; - -import java.util.List; - -/** - * @ClassName SubordinateUserRangeDTO - * @Description 用户管辖范围 - * @author wxp - */ -@Data -public class SubordinateUserRangeDTO { - - private String userId; - - /** - * 管辖用户范围：self-仅自己，all-全部人员，define-自定义 - */ - private String subordinateUserRange; - - /** - * auto自动关联 select手动选择 - */ - private List sourceList; - - /** - * 我的下属集合 - */ - private List mySubordinates; - - - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreAreaDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreAreaDTO.java deleted file mode 100644 index 713e795fb..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreAreaDTO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cool.store.dto.store; - -import cn.hutool.core.util.StrUtil; -import lombok.Data; - -import java.util.List; - -/** - * describe: - * - * @author zhouyiping - * @date 2020/10/22 - */ -@Data -public class StoreAreaDTO { - - private String storeId; - private String storeName; - /** - * 门店所属区域的全部节点信息 - */ - private String regionPath; - - /** - * 门店挂靠的区域Id - */ - private String areaId; - - /** - * 门店的挂挂靠的父节点区域ID - */ - private List areaIdList; - - /** - * 所属区域id - */ - private Long regionId; - - private String storeStatus; - - - public List getAreaIdList(){ - return StrUtil.splitTrim(regionPath,"/"); - } - - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/usergroup/UserGroupAddRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/usergroup/UserGroupAddRequest.java deleted file mode 100644 index ec0412c0c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/usergroup/UserGroupAddRequest.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.dto.usergroup; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotBlank; -import java.util.List; - - -/** - * @author wxp - */ -@ApiModel(value = "分组创建") -@Data -public class UserGroupAddRequest { - - @ApiModelProperty("分组id") - private String groupId; - - @ApiModelProperty(value = "分组名称", required = true) - @NotBlank(message = "分组名称不能为空") - @Length(max = 100, message = "名称最多100个字") - private String groupName; - - @ApiModelProperty("共同编辑人userId集合") - private List commonEditUserIdList; - - @ApiModelProperty("配置用户userId集合") - private List userIdList; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/usergroup/UserGroupDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/usergroup/UserGroupDTO.java deleted file mode 100644 index 1b6568456..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/usergroup/UserGroupDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cool.store.dto.usergroup; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 用户分组dto - * @ClassName: UserGroupDTO - * @Author: wxp - * @Date: 2023/1/5 16:04 - */ -@Data -public class UserGroupDTO { - - @ApiModelProperty("组别id") - private String groupId; - - @ApiModelProperty("组别名称") - private String groupName; - - - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/buser/EnterpriseUserPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/buser/EnterpriseUserPageVO.java index 367a3251c..f02e4beef 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/buser/EnterpriseUserPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/buser/EnterpriseUserPageVO.java @@ -1,10 +1,7 @@ package com.cool.store.vo.buser; import com.cool.store.dto.auth.AuthRegionStoreUserDTO; -import com.cool.store.dto.buser.MySubordinatesDTO; -import com.cool.store.dto.usergroup.UserGroupDTO; import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.utils.UUIDUtils; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -79,18 +76,12 @@ public class EnterpriseUserPageVO implements Serializable { private String department; - @ApiModelProperty("用户分组") - private List userGroupList; - @ApiModelProperty("管辖用户范围") private String subordinateUserRange; @ApiModelProperty("auto自动关联 select手动选择") private List sourceList; - @ApiModelProperty("我的下属集合") - private List mySubordinates; - private List authRegionStoreList; @ApiModelProperty("选取权限 true可选 false不可选") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/usergroup/UserGroupVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/usergroup/UserGroupVO.java deleted file mode 100644 index 485b3d2e0..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/usergroup/UserGroupVO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cool.store.vo.usergroup; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -@Data -public class UserGroupVO { - - @ApiModelProperty("分组名称") - private String groupName; - - @ApiModelProperty("分组id") - private String groupId; - - @ApiModelProperty("人员数量") - private Integer userCount; - - private List commonEditUserList; - - @ApiModelProperty("更新人") - private String updateUserName; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("更新人") - private String updateUserId; - - @ApiModelProperty("创建人") - private String createUserName; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("创建人id") - private String createUserId; - - @ApiModelProperty("配置用户集合") - private List configUserList; - - @ApiModelProperty("编辑权限") - private Boolean editFlag; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/usergroup/UserSimpleDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/usergroup/UserSimpleDTO.java deleted file mode 100644 index a83927c79..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/usergroup/UserSimpleDTO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cool.store.vo.usergroup; - -import lombok.Data; - -/** - * @author ：xugangkun - * @date ：2022/3/8 14:22 - */ -@Data -public class UserSimpleDTO { - /** - * 用户id - */ - private String userId; - /** - * 用户名称 - */ - private String userName; - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java index bafc99b5f..d3f387949 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java @@ -8,8 +8,6 @@ import com.aliyun.openservices.ons.api.bean.Subscription; import com.cool.store.constants.CommonConstants; import com.cool.store.enums.RocketMqGroupEnum; import com.cool.store.mq.RocketMqConfig; -import com.cool.store.mq.consumer.listener.EnterpriseInitListener; -import com.cool.store.mq.consumer.listener.EnterpriseScriptListener; import com.cool.store.mq.consumer.listener.TestListener; import com.google.common.collect.Maps; import org.springframework.context.annotation.Bean; @@ -31,10 +29,6 @@ public class ConsumerClient { @Resource private RocketMqConfig rocketMqConfig; @Resource - private EnterpriseInitListener enterpriseInitListener; - @Resource - private EnterpriseScriptListener enterpriseScriptListener; - @Resource private TestListener testListener; /** @@ -88,36 +82,4 @@ public class ConsumerClient { return consumerBean; } - /** - * 企业开通 - */ - @Bean(initMethod = "start", destroyMethod = "shutdown") - public ConsumerBean enterpriseOpenBean() { - RocketMqGroupEnum groupEnum = RocketMqGroupEnum.ENTERPRISE_OPEN_DATA_SYNC; - ConsumerBean consumerBean = new ConsumerBean(); - //配置文件 - Properties properties = getCommonProperties(groupEnum); - consumerBean.setProperties(properties); - Map commonSubscriptionTable = getCommonSubscriptionTable(groupEnum, testListener); - //订阅多个topic如上面设置 - consumerBean.setSubscriptionTable(commonSubscriptionTable); - return consumerBean; - } - - /** - * 企业库脚本开通 - */ - @Bean(initMethod = "start", destroyMethod = "shutdown") - public ConsumerBean enterpriseScriptBean() { - RocketMqGroupEnum groupEnum = RocketMqGroupEnum.ENTERPRISE_OPEN_ENTERPRISE_RUN_SCRIPT; - ConsumerBean consumerBean = new ConsumerBean(); - //配置文件 - Properties properties = getCommonProperties(groupEnum); - consumerBean.setProperties(properties); - Map commonSubscriptionTable = getCommonSubscriptionTable(groupEnum, enterpriseScriptListener); - //订阅多个topic如上面设置 - consumerBean.setSubscriptionTable(commonSubscriptionTable); - return consumerBean; - } - } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/EnterpriseInitListener.java b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/EnterpriseInitListener.java deleted file mode 100644 index 7e80e41f0..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/EnterpriseInitListener.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.cool.store.mq.consumer.listener; - -import com.alibaba.fastjson.JSONObject; -import com.aliyun.openservices.ons.api.Action; -import com.aliyun.openservices.ons.api.ConsumeContext; -import com.aliyun.openservices.ons.api.Message; -import com.aliyun.openservices.ons.api.MessageListener; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dto.enterprise.EnterpriseInitDTO; -import com.cool.store.enums.AppTypeEnum; -import com.cool.store.enums.EnterpriseStatusEnum; -import com.cool.store.service.EnterpriseInitService; -import com.cool.store.utils.RedisUtilPool; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.Arrays; - -/** - * 企业开通初始化 - * - * @author chenyupeng - * @since 2022/1/26 - */ -@Slf4j -@Service -public class EnterpriseInitListener implements MessageListener { - @Resource - private EnterpriseInitService enterpriseInitService; - @Autowired - private RedisUtilPool redisUtilPool; - - @Override - public Action consume(Message message, ConsumeContext consumeContext) { - if(message.getReconsumeTimes() + 1 >= Integer.parseInt(CommonConstants.MaxReconsumeTimes)){ - //超过最大消费次数 - return Action.CommitMessage; - } - String text = new String(message.getBody()); - if(StringUtils.isBlank(text)){ - return Action.CommitMessage; - } - String lockKey = "EnterpriseInitDataSync:" + message.getMsgID(); - EnterpriseInitDTO enterpriseInitDTO = JSONObject.parseObject(text, EnterpriseInitDTO.class); - log.info("EnterpriseInitListener messageId：{}，try times：{}， receive data :{}", message.getMsgID(), message.getReconsumeTimes(), JSONObject.toJSONString(enterpriseInitDTO)); - boolean lock = redisUtilPool.setNxExpire(lockKey, message.getMsgID(), CommonConstants.ENTERPRISE_OPEN_LOCK_TIMES); - if (lock) { - try { - String appType = enterpriseInitDTO.getAppType(); - String enterpriseStatusKey = MessageFormat.format(CommonConstants.ENTERPRISE_OPEN_STATUS_KEY, enterpriseInitDTO.getCorpId(), enterpriseInitDTO.getAppType()); - enterpriseInitService.enterpriseInit(enterpriseInitDTO.getCorpId(), AppTypeEnum.getAppType(enterpriseInitDTO.getAppType()), - enterpriseInitDTO.getEid(), enterpriseInitDTO.getDbName(), enterpriseInitDTO.getUserId()); - enterpriseInitService.sendOpenSucceededMsg(enterpriseInitDTO.getCorpId(), enterpriseInitDTO.getAppType(), Arrays.asList(enterpriseInitDTO.getUserId())); - //更新企业开通缓存状态 - redisUtilPool.setString(enterpriseStatusKey, String.valueOf(EnterpriseStatusEnum.NORMAL.getCode()), CommonConstants.ONE_DAY_SECONDS); - return Action.CommitMessage; - } catch (Exception e) { - log.error("has exception", e); - } finally { - redisUtilPool.delKey(lockKey); - } - } - return Action.CommitMessage; - } - - -} - - - - - - - - - diff --git a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/EnterpriseScriptListener.java b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/EnterpriseScriptListener.java deleted file mode 100644 index 6d53260ad..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/EnterpriseScriptListener.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cool.store.mq.consumer.listener; - -import com.alibaba.fastjson.JSON; -import com.aliyun.openservices.ons.api.Action; -import com.aliyun.openservices.ons.api.ConsumeContext; -import com.aliyun.openservices.ons.api.Message; -import com.aliyun.openservices.ons.api.MessageListener; -import com.cool.store.dto.enterprise.EnterpriseOpenMsg; -import com.cool.store.enums.RocketMqTagEnum; -import com.cool.store.service.EnterpriseInitService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * 执行企业端脚本消息监听 - * @author ：xugangkun - * @date ：2022/2/11 15:32 - */ -@Service -@Slf4j -public class EnterpriseScriptListener implements MessageListener { - - @Resource - private EnterpriseInitService enterpriseInitService; - - @Override - public Action consume(Message message, ConsumeContext consumeContext) { - String text = new String(message.getBody()); - log.info("EnterpriseScriptListener messageId:{}, msg:{}", message.getMsgID(), text); - if(StringUtils.isBlank(text)){ - return Action.CommitMessage; - } - switch (RocketMqTagEnum.getByTag(message.getTag())){ - case ENTERPRISE_OPEN_ENTERPRISE_RUN_SCRIPT: - log.info("run Enterprise Script start"); - EnterpriseOpenMsg msg = null; - try { - msg = JSON.parseObject(text, EnterpriseOpenMsg.class); - } catch (Exception e) { - log.error("invalid auth msg={}", text); - } - enterpriseInitService.runEnterpriseScript(msg); - break; - default: - break; - } - return Action.CommitMessage; - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AuthVisualService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AuthVisualService.java deleted file mode 100644 index 4c01efa1d..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/AuthVisualService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.auth.AuthRegionStoreDTO; -import com.cool.store.dto.auth.AuthRegionStoreUserDTO; -import com.cool.store.dto.auth.AuthStoreCountDTO; - -import java.util.List; - -/** - * describe:可视化权限服务 - * - * @author zhouyiping - * @date 2020/10/14 - */ -public interface AuthVisualService { - - /** - * do - * 查询权限区域/门店(配置区域使用) - * @param eid - * @param userId - * @return - */ - List authRegionStore(String eid, String userId); - - - /** - * do - * 查询权限区域/门店(配置区域使用) - * @param eid - * @param userIdList - * @return - */ - List authRegionStoreByUserList(String eid, List userIdList); - - - - /** - * do - * 获取人员拥有的门店总数 - * @param eid - * @param userId - * @param isReturnList 是否返回门店列表 - * @return - */ - List authStoreCount(String eid, List userId, Boolean isReturnList); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseConfigService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseConfigService.java index 972517884..aac068c5c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseConfigService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseConfigService.java @@ -8,7 +8,7 @@ import java.util.List; public interface EnterpriseConfigService { - EnterpriseConfigDO selectByEnterpriseId(String enterpriseId); + EnterpriseConfigDO selectByEnterpriseId(); /** * 根据dbName获取dbServer diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseInitService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseInitService.java index 881238358..c1b5d95fd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseInitService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseInitService.java @@ -13,12 +13,5 @@ import java.util.List; */ public interface EnterpriseInitService { - void runEnterpriseScript(EnterpriseOpenMsg msg); - - - void enterpriseInit(String cropId, AppTypeEnum appType, String eid, String dbName, String openUserId); - - void sendOpenSucceededMsg(String corpId, String appType, List userList); - - void sync(String eid, String userName, String userId, Long regionId); + void sync(String userName, String userId, Long regionId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserGroupService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserGroupService.java deleted file mode 100644 index 2d82becfa..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserGroupService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.context.CurrentUser; -import com.cool.store.dto.enterprise.EnterpriseUserDTO; -import com.cool.store.dto.usergroup.UserGroupAddRequest; -import com.cool.store.dto.usergroup.UserGroupDTO; -import com.cool.store.vo.buser.EnterpriseUserPageVO; -import com.cool.store.vo.usergroup.UserGroupVO; -import com.github.pagehelper.PageInfo; - -import java.util.List; -import java.util.Map; - -/** - * @Author wxp - * @Date 2022/12/29 11:18 - * @Version 1.0 - */ -public interface EnterpriseUserGroupService { - - /** - * 增加用户分组 - * @param enterpriseId - * @param userGroupAddRequest - * @param user - * @return - */ - Boolean saveOrUpdateUserGroup(String enterpriseId, UserGroupAddRequest userGroupAddRequest, CurrentUser user); - - Boolean updateUserGroup(String enterpriseId,Long userGroupId,List userIdList); - - void batchDeleteGroup(String enterpriseId, String groupId, List userIdList); - - /** - * 获取用户分组列表 - * @param enterpriseId - * @param groupName 分组名，模糊查询用 - * @return - */ - List listUserGroup(String enterpriseId, String groupName, CurrentUser user); - - UserGroupVO getGroupInfo(String enterpriseId, String groupId, CurrentUser user); - - PageInfo listUserByGroupId(String enterpriseId, String groupId, String userName, Integer pageNum, Integer pageSize, CurrentUser currentUser); - - void updateUserGroup(String enterpriseId, List groupIdList, String userId, CurrentUser currentUser); - - Boolean configUser(String enterpriseId, UserGroupAddRequest userGroupAddRequest, CurrentUser user); - - Map> getUserGroupMap(String enterpriseId, List userIdList); - - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java index 453f88789..9c4e815ce 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java @@ -1,7 +1,5 @@ package com.cool.store.service; -import com.cool.store.dto.buser.SubordinateUserRangeDTO; -import com.cool.store.dto.enterprise.EnterpriseUserDTO; import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.request.EnterpriseUserRequest; import com.cool.store.vo.buser.EnterpriseUserPageVO; @@ -17,15 +15,13 @@ import java.util.Map; */ public interface EnterpriseUserService { - void updateUserRegionPathList(String enterpriseId, List userIds); + void updateUserRegionPathList(List userIds); - List listUser(String enterpriseId, String userName, String deptId, + List listUser(String userName, String deptId, String orderBy, String orderRule, Long roleId, Integer userStatus, Integer pageNum, Integer pageSize, String jobNumber, String regionId, Boolean hasPage); - List initUserRole(String enterpriseId, List enterpriseUserList); - - Map fillUserSubordinateNames(String enterpriseId, List userIdList); + List initUserRole(List enterpriseUserList); /** * 获取人员所属部门 @@ -33,7 +29,7 @@ public interface EnterpriseUserService { * @param userIdList * @return */ - Map getUserRegion(String enterpriseId, List userIdList); + Map getUserRegion(List userIdList); /** * 更新用户的部门全路径 @@ -42,6 +38,6 @@ public interface EnterpriseUserService { */ void updateUserDeptPath(EnterpriseUserRequest user, Map deptIdMap); - EnterpriseUserDO selectByUserIdIgnoreActive(String enterpriseId, String userId); + EnterpriseUserDO selectByUserIdIgnoreActive(String userId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java index 435ba181e..4dc7708a6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java @@ -12,10 +12,8 @@ import java.util.List; */ public interface RegionService { - void saveRegionAndStore(String eid, RegionDO regionDO, String userId); + void saveRegionAndStore(RegionDO regionDO, String userId); - void removeRegions(String eid, List regionIds); - - void deleteByStoreIds(String enterpriseId, List storeIds, String userId); + void removeRegions(List regionIds); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/SubordinateMappingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/SubordinateMappingService.java deleted file mode 100644 index f7650704e..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/SubordinateMappingService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.service; - -import java.util.List; - -public interface SubordinateMappingService { - - - /** - * 判断用户是否管辖全部用户 - * @param enterpriseId - * @param currentUserId - * @return - */ - Boolean checkHaveAllSubordinateUser(String enterpriseId, String currentUserId); - - /** - * 获取管辖用户 - * @param enterpriseId - * @param currentUserId - * @return - */ - List getSubordinateUserIdList(String enterpriseId, String currentUserId,Boolean addCurrentFlag); - - /** - * 保留管辖用户 - * @param enterpriseId - * @param currentUserId - * @param userIdList - * @return - */ - List retainSubordinateUserIdList(String enterpriseId, String currentUserId, List userIdList,Boolean addCurrentFlag); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuthVisualServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuthVisualServiceImpl.java deleted file mode 100644 index bc03f2da1..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuthVisualServiceImpl.java +++ /dev/null @@ -1,365 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.dao.*; -import com.cool.store.dto.auth.AuthRegionStoreDTO; -import com.cool.store.dto.auth.AuthRegionStoreUserDTO; -import com.cool.store.dto.auth.AuthStoreCountDTO; -import com.cool.store.dto.buser.UserRoleDTO; -import com.cool.store.dto.store.StoreAreaDTO; -import com.cool.store.entity.RegionDO; -import com.cool.store.entity.StoreDO; -import com.cool.store.entity.UserAuthMappingDO; -import com.cool.store.enums.*; -import com.cool.store.service.AuthVisualService; -import com.cool.store.utils.CommonNodeUtils; -import com.cool.store.utils.RedisConstantUtil; -import com.cool.store.utils.RedisUtilPool; -import javafx.util.Pair; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * describe: - * - * @author zhouyiping - * @date 2020/10/14 - */ -@Service -public class AuthVisualServiceImpl implements AuthVisualService { - - @Resource - private UserAuthMappingDAO userAuthMappingDAO; - @Resource - private RegionDAO regionDAO; - @Autowired - private RedisUtilPool redisUtilPool; - @Autowired - private EnterpriseUserRoleDAO enterpriseUserRoleDAO; - @Resource - private UserRegionMappingDAO userRegionMappingDAO; - @Resource - private RedisConstantUtil redisConstantUtil; - @Resource - private StoreDAO storeDAO; - - - @Override - public List authRegionStore(String eid, String userId) { - - List userAuthMappingList = userAuthMappingDAO.listUserAuthMappingByUserId(eid, userId); - return getAuthRegionStoreUserDTO(eid, userAuthMappingList); - } - - public List getAuthRegionStoreUserDTO(String eid, List userAuthMappingList) { - List authRegionStoreDTOList = new ArrayList<>(); - Pair, List> listListTwoResultTuple = splitUserAuthMapping(userAuthMappingList); - List storeIdList = listListTwoResultTuple.getKey(); - List regionIdList = listListTwoResultTuple.getValue(); - //将组织架构权限中的区域转换 - if (CollectionUtils.isNotEmpty(regionIdList)) { - List regionByRegionIds = regionDAO.getRegionByRegionIds(eid, regionIdList); - List regionAuthRegionStoreList = ListUtils.emptyIfNull(regionByRegionIds).stream() - .map(data -> mapAuthRegionStoreByRegion(data.getName(), data.getRegionId(), false, data.getStoreId())) - .collect(Collectors.toList()); - List regionStoreIdList = ListUtils.emptyIfNull(regionByRegionIds).stream() - .filter(e -> StringUtils.isNotBlank(e.getStoreId()) && RegionTypeEnum.STORE.getType().equals(e.getRegionType())) - .map(RegionDO::getStoreId) - .collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(regionAuthRegionStoreList)) { - authRegionStoreDTOList.addAll(regionAuthRegionStoreList); - } - // 是否需要展示区域对应门店权限数据 - if (storeIdList != null && CollectionUtils.isNotEmpty(regionStoreIdList) - && StringUtils.isNotBlank(redisUtilPool.getString(redisConstantUtil.getShowStoreAuthKey()))) { - storeIdList.addAll(regionStoreIdList); - } - } - //将组织架构权限中的门店转换 - if (CollectionUtils.isNotEmpty(storeIdList) && StringUtils.isNotBlank(redisUtilPool.getString(redisConstantUtil.getShowStoreAuthKey()))) { - List storeListByStoreIds = storeDAO.getStoreListByStoreIds(eid, storeIdList); - List storeAuthRegionStoreList = ListUtils.emptyIfNull(storeListByStoreIds).stream() - .map(data -> mapAuthRegionStoreByRegion(data.getStoreName(), data.getStoreId(), true, data.getStoreId())) - .collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(storeAuthRegionStoreList)) { - authRegionStoreDTOList.addAll(storeAuthRegionStoreList); - } - } - return authRegionStoreDTOList; - } - - public Pair, List> splitUserAuthMapping(List userAuthMappingList) { - - List store = new ArrayList<>(); - List region = new ArrayList<>(); - ListUtils.emptyIfNull(userAuthMappingList) - .forEach(data -> { - if (data.getType().equals(UserAuthMappingTypeEnum.STORE.getCode())) { - store.add(data); - } else { - region.add(data); - } - }); - List storeIdList = ListUtils.emptyIfNull(store).stream() - .map(UserAuthMappingDO::getMappingId).distinct().filter(Objects::nonNull).collect(Collectors.toList()); - List regionIdList = ListUtils.emptyIfNull(region).stream() - .map(UserAuthMappingDO::getMappingId).distinct().filter(Objects::nonNull).collect(Collectors.toList()); - return new Pair(storeIdList, regionIdList); - } - - @Override - public List authRegionStoreByUserList(String eid, List userIdList) { - - List userAuthMappingList = userAuthMappingDAO.listUserAuthMappingByUserIds(eid, userIdList); - List authRegionStoreUserDTO = getAuthRegionStoreUserDTO(eid, userAuthMappingList); - Map regionStoreUserMap = ListUtils.emptyIfNull(authRegionStoreUserDTO) - .stream() - .collect(Collectors.toMap(AuthRegionStoreUserDTO::getId, data -> data, (a, b) -> a)); - Map> userAuthGroup = ListUtils.emptyIfNull(userAuthMappingList) - .stream() - .collect(Collectors.groupingBy(UserAuthMappingDO::getUserId)); - return userIdList.stream() - .map(data -> mapAuthRegionStoreDTO(regionStoreUserMap, userAuthGroup, data)) - .filter(Objects::nonNull) - .collect(Collectors.toList()); - } - - @Override - public List authStoreCount(String eid, List userIdList, Boolean isReturnList) { - /** - * 1.查询出所有关于用户的权限门店 - * 1.权限区域角色权限 - * 2.权限门店 - * 2.分组聚合 - * 3.去重统计门店数 - */ - //用户配置的区域权限 - List userAuthMappingDOList = userAuthMappingDAO.listUserAuthMappingByUserIds(eid, userIdList); - - List allAuthRegionList = ListUtils.emptyIfNull(userAuthMappingDOList) - .stream() - .filter(data -> StringUtils.equals(UserAuthMappingTypeEnum.REGION.getCode(), data.getType())) - .map(UserAuthMappingDO::getMappingId) - .distinct() - .filter(Objects::nonNull) - .collect(Collectors.toList()); - - List storeAreaDTOS = storeDAO.listStoreByRegionIdList(eid, allAuthRegionList); - Map> storeAreaMap = ListUtils.emptyIfNull(storeAreaDTOS) - .stream() - .collect(Collectors.groupingBy(StoreAreaDTO::getAreaId, - Collectors.mapping(StoreAreaDTO::getStoreId, Collectors.toList()))); - Map> authMappingMap = ListUtils.emptyIfNull(userAuthMappingDOList) - .stream() - .collect(Collectors.groupingBy(UserAuthMappingDO::getUserId)); - //用户角色可视化范围 - List userRoleList = enterpriseUserRoleDAO.getUserAndRolesByUserId(eid, userIdList); - //取优先级最大角色去查询权限 - //todo role - Map userRoleMap = ListUtils.emptyIfNull(userRoleList) - .stream() - .collect(Collectors.toMap(UserRoleDTO::getUserId, data -> data, (a, b) -> { - if (a.getPriority() == null || b.getPriority() == null) { - return a; - } - return a.getPriority() > b.getPriority() ? b : a; - })); - List minUserRoleList = new ArrayList(userRoleMap.values()); - List allStoreList = storeDAO.getAllStoreList(eid, isReturnList); - Integer allStoreCount = storeDAO.getStoreCount(eid); - - //子区域计算 - List all = null; - Map> regionParentGroupMap = null; - Map regionIdStoreIdMap = null; - if (CollectionUtils.isNotEmpty(allAuthRegionList)) { - List allRegion = regionDAO.getAllRegion(eid); - ListUtils.emptyIfNull(allRegion).forEach(this::initRoot); - all = ListUtils.emptyIfNull(allRegion) - .stream() - .map(RegionDO::getId) - .collect(Collectors.toList()); - regionParentGroupMap = ListUtils.emptyIfNull(allRegion) - .stream() - .collect(Collectors.groupingBy(data -> Long.valueOf(data.getParentId()), - Collectors.mapping(RegionDO::getId, Collectors.toList()))); - - List storeRegionIdList = allAuthRegionList.stream() - .map(e -> Long.valueOf(e)).collect(Collectors.toList()); - List storeRegionList = regionDAO.listStoreRegionByIds(eid, storeRegionIdList); - regionIdStoreIdMap = ListUtils.emptyIfNull(storeRegionList).stream() - .filter(e -> StringUtils.isNotBlank(e.getStoreId()) && !e.getDeleted() && RegionTypeEnum.STORE.getType().equals(e.getRegionType())) - .collect(Collectors.toMap(data->String.valueOf(data.getId()), RegionDO::getStoreId, (a, b) -> a)); - } - - List finalAll = all; - Map> finalRegionParentGroupMap = regionParentGroupMap; - Map finalRegionIdStoreIdMap = regionIdStoreIdMap; - return ListUtils.emptyIfNull(minUserRoleList).stream() - .map(data -> mapAuStoreCountDTO(data, authMappingMap, storeAreaMap, allStoreList, allStoreCount, finalAll, finalRegionParentGroupMap, finalRegionIdStoreIdMap)) - .collect(Collectors.toList()); - } - - - - private AuthRegionStoreDTO mapAuthRegionStoreDTO(Map regionStoreUserMap, Map> userAuthGroup, String data) { - if (MapUtils.isNotEmpty(userAuthGroup) && CollectionUtils.isNotEmpty(userAuthGroup.get(data)) && MapUtils.isNotEmpty(regionStoreUserMap)) { - List authRegionStoreUserDTOList = ListUtils.emptyIfNull(userAuthGroup.get(data)) - .stream() - .map(userAuthMappingDO -> regionStoreUserMap.get(userAuthMappingDO.getMappingId())) - .distinct() - .filter(Objects::nonNull) - .collect(Collectors.toList()); - AuthRegionStoreDTO authRegionStoreDTO = new AuthRegionStoreDTO(); - authRegionStoreDTO.setUserId(data); - authRegionStoreDTO.setAuthRegionStoreUserList(authRegionStoreUserDTOList); - return authRegionStoreDTO; - } - return null; - } - - private void initRoot(RegionDO regionDO) { - if (regionDO.getParentId() == null) { - regionDO.setParentId("0"); - } - } - - - /** - * 获取区域下的门店(不包含子节点) - * @param storeIdList - * @param areaStoreList - * @return - */ - private List authStoreId(List storeIdList, - List areaStoreList) { - - List allStoreIdList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(storeIdList)) { - allStoreIdList.addAll(storeIdList); - } - //聚合区域下的门店信息 - - if (CollectionUtils.isNotEmpty(areaStoreList)) { - allStoreIdList.addAll(areaStoreList); - } - - - //去除重复的StoreId - return ListUtils.emptyIfNull(allStoreIdList).stream() - .distinct() - .collect(Collectors.toList()); - } - - private AuthStoreCountDTO mapAuStoreCountDTO(UserRoleDTO userRoleDTO, - Map> authMappingMap, - Map> storeAreaMap, - List invalidStores, - Integer allStoreCount, - List all, - Map> regionParentGroupMap, Map regionIdStoreIdMap) { - AuthStoreCountDTO authStoreCountDTO = new AuthStoreCountDTO(); - if (userRoleDTO == null || userRoleDTO.getRoleAuth() == null) { - return authStoreCountDTO; - } - String userId = userRoleDTO.getUserId(); - authStoreCountDTO.setUserId(userId); - //全企业数据或者管理员 直接返回企业下所有的门店总数 - if (StringUtils.equals(userRoleDTO.getRoleEnum(), (RoleEnum.MASTER.getRoleEnum()))) { - authStoreCountDTO.setStoreList(invalidStores); - authStoreCountDTO.setStoreCount(allStoreCount); - return authStoreCountDTO; - } - List storeIdList = new ArrayList<>(); - List regionIdList = new ArrayList<>(); - List areaStoreList; - - if (MapUtils.isNotEmpty(authMappingMap)) { - List userAuthMappingDOList = authMappingMap.get(userId); - Pair, List> listListTwoResultTuple = splitUserAuthMapping(userAuthMappingDOList); - storeIdList = listListTwoResultTuple.getKey(); - regionIdList = listListTwoResultTuple.getValue(); - if(CollectionUtils.isNotEmpty(regionIdList) && regionIdStoreIdMap != null){ - List finalStoreIdList = storeIdList; - regionIdList.forEach(regionId -> { - String regionStoreId = regionIdStoreIdMap.get(regionId); - if (StringUtils.isNotBlank(regionStoreId)) { - finalStoreIdList.add(regionStoreId); - } - }); - } - } - switch (AuthRoleEnum.getByCode(userRoleDTO.getRoleAuth())) { - case ALL: - authStoreCountDTO.setStoreList(invalidStores); - authStoreCountDTO.setStoreCount(allStoreCount); - break; - case INCLUDE_SUBORDINATE: - - areaStoreList = ListUtils.emptyIfNull(regionIdList) - .stream() - .map(data -> CommonNodeUtils.getAllChildListContainSelf(0L, - Long.valueOf(data), all, regionParentGroupMap)) - .flatMap(Collection::stream) - .map(data -> data.toString()) - .map(data -> { - if (MapUtils.isNotEmpty(storeAreaMap)) { - return storeAreaMap.get(data); - } - return null; - }) - .filter(Objects::nonNull) - .flatMap(Collection::stream) - .collect(Collectors.toList()); - List includeSubordinateStoreIdList = authStoreId(storeIdList, areaStoreList); - if (CollectionUtils.isNotEmpty(includeSubordinateStoreIdList)) { - authStoreCountDTO.setStoreList(includeSubordinateStoreIdList); - authStoreCountDTO.setStoreCount(ListUtils.emptyIfNull(includeSubordinateStoreIdList).size()); - - } - break; - case PERSONAL: - areaStoreList = ListUtils.emptyIfNull(regionIdList) - .stream() - .map(data -> CommonNodeUtils.getAllChildListContainSelf(0L, - Long.valueOf(data), all, regionParentGroupMap)) - .flatMap(Collection::stream) - .map(data -> data.toString()) - .map(data -> { - if (MapUtils.isNotEmpty(storeAreaMap)) { - return storeAreaMap.get(data); - } - return null; - }) - .filter(Objects::nonNull) - .flatMap(Collection::stream) - .collect(Collectors.toList()); - List personalStoreIdList = authStoreId(storeIdList, areaStoreList); - if (CollectionUtils.isNotEmpty(personalStoreIdList)) { - authStoreCountDTO.setStoreList(personalStoreIdList); - authStoreCountDTO.setStoreCount(ListUtils.emptyIfNull(personalStoreIdList).size()); - - } - break; - default: - break; - } - return authStoreCountDTO; - } - - private AuthRegionStoreUserDTO mapAuthRegionStoreByRegion(String name, String regionId, boolean b, String storeId) { - AuthRegionStoreUserDTO authRegionStoreDTO = new AuthRegionStoreUserDTO(); - authRegionStoreDTO.setName(name); - authRegionStoreDTO.setId(regionId); - authRegionStoreDTO.setStoreFlag(b); - authRegionStoreDTO.setStoreId(storeId); - return authRegionStoreDTO; - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseConfigServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseConfigServiceImpl.java index d6be1c8d0..d1fce6193 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseConfigServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseConfigServiceImpl.java @@ -21,8 +21,9 @@ public class EnterpriseConfigServiceImpl implements EnterpriseConfigService { private EnterpriseConfigDAO enterpriseConfigDAO; @Override - public EnterpriseConfigDO selectByEnterpriseId(String enterpriseId) { - return enterpriseConfigDAO.selectByEnterpriseId(enterpriseId); + public EnterpriseConfigDO selectByEnterpriseId() { + //return enterpriseConfigDAO.selectByEnterpriseId(enterpriseId); + return null; } @Override diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseInitServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseInitServiceImpl.java index 8649882e9..a48fc0a7d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseInitServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseInitServiceImpl.java @@ -72,16 +72,8 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { @Resource private RedisConstantUtil redisConstantUtil; @Resource - private StoreDAO storeDAO; - @Resource private RedisUtilPool redisUtilPool; @Resource - private UserAuthMappingDAO userAuthMappingDAO; - @Resource - private EnterpriseUserDepartmentDAO enterpriseUserDepartmentDAO; - @Resource - private SubordinateMappingDAO subordinateMappingDAO; - @Resource private EnterpriseDAO enterpriseDAO; @Autowired private RedisUtil redisUtil; @@ -89,105 +81,36 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { private RegionService regionService; @Override - public void runEnterpriseScript(EnterpriseOpenMsg msg) { - runEnterpriseScriptAndInitAuthUser(msg); - //抛出开始数据同步消息 - EnterpriseInitDTO enterpriseInitDTO = new EnterpriseInitDTO(); - enterpriseInitDTO.setEid(msg.getEid()); - enterpriseInitDTO.setAppType(msg.getAppType()); - enterpriseInitDTO.setCorpId(msg.getCorpId()); - enterpriseInitDTO.setDbName(msg.getDbName()); - enterpriseInitDTO.setUserId(msg.getAuthUserId()); - log.info("send msg to enterprise_open_data_sync, eid:{}, appType:{}, corpId:{}, dbName:{}", msg.getEid(), msg.getAppType(), msg.getCorpId(), msg.getDbName(), msg.getAuthUserId()); - simpleMessageService.send(JSONObject.toJSONString(enterpriseInitDTO), RocketMqTagEnum.ENTERPRISE_OPEN_DATA_SYNC); - } - - @Override - public void enterpriseInit(String corpId, AppTypeEnum appTypeEnum, String eid, String dbName, String openUserId) { - try { - String appType = appTypeEnum.getValue(); - //优先处理ai用户 保证能够超登 - List authUsers = new ArrayList<>(); - List adminUserList = isvHttpRequest.getAdminUserList(corpId, appType); - //添加ai用户 - authUsers.add(getAIUser()); - authUsers.addAll(getAdminList(adminUserList)); - DataSourceHelper.changeToSpecificDataSource(dbName); - //获取开通授权信息 - AuthInfoDTO authInfo = isvHttpRequest.getAuthInfo(corpId, appType); - //记录此次处理的用户的id， - Set handlerUserIds = new HashSet<>(); - //处理ai用户 - dealUsers(authUsers, eid, corpId, dbName, new HashMap<>(), null, authInfo, handlerUserIds); - //初始化部门 - List sysDepartmentDTOS = initDept(corpId, eid, appType, dbName); - if(CollectionUtils.isEmpty(sysDepartmentDTOS)){ - //构建跟部门 - SysDepartmentDTO root = new SysDepartmentDTO(); - root.setId(CommonConstants.ROOT_DEPT_ID_STR); - root.setName(authInfo.getAuthCorpInfo().getCorpName()); - sysDepartmentDTOS.add(root); - } - //初始化根区域 - initRootRegion(sysDepartmentDTOS, eid, dbName); - //初始化用户 - initUser(sysDepartmentDTOS,corpId,eid,appType,dbName, adminUserList, authInfo, handlerUserIds); - } catch (Exception e) { - log.error("enterpriseInit enterpriseInit error,corpId:{},appType:{}", corpId, appTypeEnum.getValue(), e); - throw new ServiceException(ErrorCodeEnum.FEISHU_SERVICE_ERROR); - } - } - - @Override - - public void sendOpenSucceededMsg(String corpId, String appType, List userList) { - if(CollectionUtils.isEmpty(userList)){ - return; - } - JSONObject jsonObject = new JSONObject(); - jsonObject.put("userList", userList); - jsonObject.put("appType", appType); - jsonObject.put("corpId", corpId); - simpleMessageService.send(jsonObject.toJSONString(), RocketMqTagEnum.OPEN_SUCCEEDED_MSG_QUEUE); - } - - @Override - public void sync(String eid, String userName, String userId, Long regionId) { + public void sync(String userName, String userId, Long regionId) { DataSourceHelper.reset(); - EnterpriseConfigDO enterpriseConfigDO = enterpriseConfigDAO.selectByEnterpriseId(eid); + EnterpriseConfigDO enterpriseConfigDO = enterpriseConfigDAO.selectByEnterpriseId(); try { DataSourceHelper.changeToSpecificDataSource(enterpriseConfigDO.getDbName()); - newSyncFsDept(eid, regionId); + newSyncFsDept(regionId); //如果没有开通钉钉同步，需要先同步部门，人员同步根据部门同步 - syncSpecifyNodeUser(eid,regionId, true); + syncSpecifyNodeUser(regionId, true); }catch (Exception e){ - //无论是否失败，删除节点同步信息锁 - redisUtilPool.delKey(redisConstantUtil.getSyncLockKey(eid)); - //任务无论完成失败，都删除区域和门店缓存 - String regionKey = redisConstantUtil.getSyncRegionKey(eid); - String storeKey = redisConstantUtil.getSyncStoreKey(eid); - redisUtilPool.delKey(regionKey); - redisUtilPool.delKey(storeKey); + } } - public void syncSpecifyNodeUser(String eid,Long regionId, Boolean isSyncRoleAndAuth) { - log.info("开始同步用户eid:{}", eid); + public void syncSpecifyNodeUser(Long regionId, Boolean isSyncRoleAndAuth) { + log.info("开始同步用户eid:{}"); //前置准备：获得企业配置信息、数据库名等 DataSourceHelper.reset(); - EnterpriseConfigDO config = enterpriseConfigDAO.selectByEnterpriseId(eid); + EnterpriseConfigDO config = enterpriseConfigDAO.selectByEnterpriseId(); String corpId = config.getDingCorpId(); String dbName = config.getDbName(); //这次同步的用户id Set dingUserIdList = new HashSet<>(); //切换企业库 DataSourceHelper.changeToSpecificDataSource(dbName); - RegionDO regionDO = regionDAO.getByRegionId(eid, regionId); + RegionDO regionDO = regionDAO.getByRegionId(regionId); List deptList = new ArrayList<>(); //遍历部门列表以及对应的用户列表 regionDO为null的时候遍历所有的用户 if (regionId==null||regionDO==null){ - deptList = sysDepartmentDAO.getSyncDeptTreeList(eid); + deptList = sysDepartmentDAO.getSyncDeptTreeList(); }else { //查询指定部门的子部门(包括当前部门) String synDingDeptId = regionDO.getSynDingDeptId(); @@ -211,7 +134,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { List deptIds = deptList.stream().map(SyncTreeNode::getId).collect(Collectors.toList()); for (String deptId : deptIds) { - syncFsDeptUser(corpId, eid, dbName, dingUserIdList, deptId, config.getAppType()); + syncFsDeptUser(corpId, dbName, dingUserIdList, deptId, config.getAppType()); } log.info("dingUserIdList:{}",JSONObject.toJSONString(dingUserIdList)); @@ -220,9 +143,9 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { //删除门店库中和钉钉对应的用户、剩下的为待删除用户 List coolUserIdList = new ArrayList<>(); if (regionId!=null){ - coolUserIdList = enterpriseUserDAO.selectSpecifyNodeUserIds(eid, regionDO.getSynDingDeptId()); + coolUserIdList = enterpriseUserDAO.selectSpecifyNodeUserIds(regionDO.getSynDingDeptId()); }else { - coolUserIdList = enterpriseUserDAO.selectAllUserId(eid); + coolUserIdList = enterpriseUserDAO.selectAllUserId(); } List finalCoolUserIdList = coolUserIdList; dingUserIdList.forEach(dingUserId -> { @@ -231,63 +154,47 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { } }); - List mainAdminIds = enterpriseUserDAO.getMainAdminUserIds(eid); + List mainAdminIds = enterpriseUserDAO.getMainAdminUserIds(); //如果是节点同步,不执行人员删除操作 if(regionId!=null){ - log.info("节点用户同步完成eid:{}，regionId={}", eid,regionId); + log.info("节点用户同步完成eid:{}，regionId={}",regionId); return; } for (String coolUserId : coolUserIdList) { try { //不能删除AI用户和主管理员 if (!CommonConstants.AI_USER_ID.equals(coolUserId) && !mainAdminIds.contains(coolUserId)) { - syncDeleteUser(eid, coolUserId, dbName); + syncDeleteUser(coolUserId, dbName); } } catch (Exception e) { log.info("fullSyncUser corpId={}", e, corpId); } } - log.info("同步用户完成eid:{}", eid); + log.info("同步用户完成eid:{}"); } - public void syncDeleteUser(String eid, String userId, String dbName) { + public void syncDeleteUser(String userId, String dbName) { //删除企业库对应的映射关系 DataSourceHelper.changeToSpecificDataSource(dbName); // 1.更新用户信息 - EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(eid, userId); + EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(userId); if (enterpriseUser != null) { enterpriseUser.setActive(false); - enterpriseUserDAO.updateEnterpriseUser(eid, enterpriseUser); + enterpriseUserDAO.updateEnterpriseUser(enterpriseUser); } // 2.删除用户角色映射关系 //获得用户在cool中的角色列表 - List userRoleIds = enterpriseUserRoleDAO.selectIdsByUserId(eid, userId); - // 3.删除该用户的部门信息 - List userDepartmentIds = enterpriseUserDepartmentDAO.getIdsByUserId(eid, userId); + List userRoleIds = enterpriseUserRoleDAO.selectIdsByUserId(userId); //删除用户和区域的关联关系 - userRegionMappingDAO.deletedByUserIds(eid, Arrays.asList(userId)); - //删除用户的下属 - subordinateMappingDAO.deletedByUserIds(eid, Arrays.asList(userId)); - // 4.删除该用户的可见范围映射信息 - List userAuthIds = userAuthMappingDAO.selectIdsByUserId(eid, userId); + userRegionMappingDAO.deletedByUserIds(Arrays.asList(userId)); if (userRoleIds != null) { Lists.partition(userRoleIds, CommonConstants.DEAL_RECORD_MAX_SIZE).forEach(deleteUserRoleIds -> { - enterpriseUserRoleDAO.deleteBatchByPrimaryKey(eid, deleteUserRoleIds); - }); - } - if (userDepartmentIds != null) { - Lists.partition(userDepartmentIds, CommonConstants.DEAL_RECORD_MAX_SIZE).forEach(userDeptDeleteList -> { - enterpriseUserDepartmentDAO.deleteByIdList(eid, userDeptDeleteList); - }); - } - if (userAuthIds != null) { - Lists.partition(userAuthIds, CommonConstants.DEAL_RECORD_MAX_SIZE).forEach(deleteUserAuths -> { - userAuthMappingDAO.deleteAuthMappingByIds(eid, deleteUserAuths); + enterpriseUserRoleDAO.deleteBatchByPrimaryKey(deleteUserRoleIds); }); } } - private void syncFsDeptUser(String corpId, String eid, String dbName, Set dingUserIdList, String deptId, String appType){ + private void syncFsDeptUser(String corpId, String dbName, Set dingUserIdList, String deptId, String appType){ List deptUsers =isvHttpRequest.getDeptUsers(corpId, deptId, appType); log.info("获取飞书部门下用户的部门id {} ,返回用户详情列表 {} ", deptId, JSONObject.toJSONString(deptUsers)); if (CollectionUtils.isEmpty(deptUsers)){ @@ -298,7 +205,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { dingUserIdList.add(deptUser.getEnterpriseUserDO().getUserId()); try { String userId = deptUser.getEnterpriseUserDO().getUserId(); - syncFsUser(corpId, userId, eid, dbName, appType); + syncFsUser(corpId, userId, dbName, appType); } catch (Exception e) { log.error("syncFsDeptUser,当前用户同步失败 {} ", deptUser.getEnterpriseUserDO().getUserId(), e); } @@ -306,10 +213,10 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { } } - public void syncFsUser(String corpId, String userId, String eid, String dbName, String appType) { + public void syncFsUser(String corpId, String userId, String dbName, String appType) { //获得企业微信用户详情 DataSourceHelper.changeToSpecificDataSource(dbName); - Long employeeRoleId = sysRoleDAO.getRoleIdByRoleEnum(eid, RoleEnum.EMPLOYEE.getRoleEnum()); + Long employeeRoleId = sysRoleDAO.getRoleIdByRoleEnum(RoleEnum.EMPLOYEE.getRoleEnum()); DataSourceHelper.reset(); EnterpriseUserRequest fsEnterpriseUser = getFsUserDetail(corpId, userId, String.valueOf(employeeRoleId), appType); @@ -330,9 +237,9 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { //先处理企业库 DataSourceHelper.changeToSpecificDataSource(dbName); //设置用户部门全路劲 - Pair, Map> tuple = getAllDeptInfo(eid); + Pair, Map> tuple = getAllDeptInfo(); enterpriseUserService.updateUserDeptPath(fsEnterpriseUser, tuple.getValue()); - EnterpriseUserDO coolEnterpriseUser = enterpriseUserService.selectByUserIdIgnoreActive(eid, userId); + EnterpriseUserDO coolEnterpriseUser = enterpriseUserService.selectByUserIdIgnoreActive(userId); log.info("数智门店企业用户信息 {} ", JSONObject.toJSONString(coolEnterpriseUser)); if (coolEnterpriseUser != null) { //设置下级是否变动 @@ -342,10 +249,10 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { fsEnterpriseUser.getEnterpriseUserDO().setUserStatus(coolEnterpriseUser.getUserStatus()); } } - syncEntUser(fsEnterpriseUser, eid, appType); + syncEntUser(fsEnterpriseUser, appType); } - public EnterpriseUserRequest getFsUserDetail(String corpId, String userId, String employeeRoleId, String appType) { + public EnterpriseUserRequest getFsUserDetail(String corpId, String userId, String employeeRole, String appType) { EnterpriseUserDTO enterpriseUserDTO = null; try { enterpriseUserDTO = isvHttpRequest.getUserDetailByUserId(corpId, userId, appType); @@ -375,7 +282,6 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { enterpriseUser.setCreateTime(new Date()); enterpriseUser.setUnionid(enterpriseUserDTO.getUnionid()); enterpriseUser.setIsAdmin(false); - enterpriseUser.setRoles(employeeRoleId); enterpriseUser.setRemark(enterpriseUserDTO.getUserId()); enterpriseUser.setUserId(enterpriseUserDTO.getUserId()); enterpriseUser.setName(enterpriseUserDTO.getName()); @@ -386,14 +292,14 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { } - public Pair, Map> getAllDeptInfo(String eid) { - List allDeptList = sysDepartmentDAO.selectAllDepts(eid); + public Pair, Map> getAllDeptInfo() { + List allDeptList = sysDepartmentDAO.selectAllDepts(); Set deptIdSet = allDeptList.stream().map(SysDepartmentDO::getId).collect(Collectors.toSet()); Map deptIdMap = allDeptList.stream().filter(d -> d.getParentId() != null).collect(Collectors.toMap(SysDepartmentDO::getId, SysDepartmentDO::getParentId)); return new Pair<>(deptIdSet, deptIdMap); } - public void syncEntUser(EnterpriseUserRequest request, String eid, String appType) { + public void syncEntUser(EnterpriseUserRequest request, String appType) { EnterpriseUserDO enterpriseUser = request.getEnterpriseUserDO(); if (Objects.isNull(enterpriseUser)) { return; @@ -403,28 +309,25 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { //TODO 一.插入或者更新用户信息 if (enterpriseUser.getId() == null) { enterpriseUser.setId(UUIDUtils.get32UUID()); - enterpriseUserDAO.insertEnterpriseUser(eid, enterpriseUser); + enterpriseUserDAO.insertEnterpriseUser(enterpriseUser); } else { - enterpriseUserDAO.updateEnterpriseUser(eid, enterpriseUser); + enterpriseUserDAO.updateEnterpriseUser(enterpriseUser); } //TODO 二.更新该用户的部门信息 //ding部门id列表 List fsDeptIds = request.getDepartmentLists(); - //该用户在cool中的部门列表,该部门id为cool的id。 - syncUserDepartment(eid, userId, fsDeptIds); //同步用户的部门权限 List manageDeptIds = JSONObject.parseArray(request.getEnterpriseUserDO().getIsLeaderInDepts(), String.class); - syncUserDepartmentAuth(eid, userId, manageDeptIds); //同步用户和区域的关系 - syncUserRegionMapping(eid, userId, ListUtils.emptyIfNull(fsDeptIds).stream().map(a -> String.valueOf(a)).collect(Collectors.toList())); + syncUserRegionMapping(userId, ListUtils.emptyIfNull(fsDeptIds).stream().map(a -> String.valueOf(a)).collect(Collectors.toList())); //补全该用户的user_region_ids - enterpriseUserService.updateUserRegionPathList(eid, Arrays.asList(userId)); + enterpriseUserService.updateUserRegionPathList(Arrays.asList(userId)); //如果用户是企微管理员，同步为门店的管理员 if (enterpriseUser.getIsAdmin()) { - EnterpriseUserRole masterRole = enterpriseUserRoleDAO.selectByUserIdAndRoleId(eid, enterpriseUser.getUserId(), RoleEnum.MASTER.getId()); + EnterpriseUserRole masterRole = enterpriseUserRoleDAO.selectByUserIdAndRoleId(enterpriseUser.getUserId(), RoleEnum.MASTER.getId()); if (masterRole == null) { - Long roleIdByRoleEnum = sysRoleDAO.getRoleIdByRoleEnum(eid, RoleEnum.MASTER.getRoleEnum()); - enterpriseUserRoleDAO.save(eid, new EnterpriseUserRole(roleIdByRoleEnum.toString(), userId)); + Long roleIdByRoleEnum = sysRoleDAO.getRoleIdByRoleEnum(RoleEnum.MASTER.getRoleEnum()); + enterpriseUserRoleDAO.save(new EnterpriseUserRole(roleIdByRoleEnum.toString(), userId)); } } //TODO 三更新该用户的角色信息：新增或者删除 @@ -439,50 +342,20 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { leaderInDept = Arrays.stream(leaderDeptStr.split(",")).map(String::valueOf).collect(Collectors.toList()); } } - //自建私服直接去字段 - if(AppTypeEnum.isWxSelfAndPrivateType(appType) && CollectionUtils.isNotEmpty(request.getLeaderInDepts())){ - leaderInDept = request.getLeaderInDepts(); - } - if (fsDeptIds.size() != leaderInDept.size()) { return; } for (int i = 0; i < fsDeptIds.size(); i++) { leaderMap.put(fsDeptIds.get(i), CommonConstants.ONE_STR.equals(leaderInDept.get(i))); } - syncUserAuth(userId, eid, fsDeptIds, enterpriseUser.getPosition(), leaderMap, appType); } - public void syncUserAuth(String userId, String eid, List deptIds, String position, Map leaderMap, String appType) { - List dingUserAuthList = getSyncAuthMappingList(leaderMap, position, userId, eid, deptIds, appType); - //用户在cool中已有的可视范围映射关系 - List coolUserAuthList = userAuthMappingDAO.listUserAuthMappingByUserId(eid, userId); - Map userAuthMap = ListUtils.emptyIfNull(coolUserAuthList) - .stream() - .collect(Collectors.toMap(UserAuthMappingDO::getMappingId, data -> data, (a, b) -> a)); - for (UserAuthMappingDO userAuth : dingUserAuthList) { - UserAuthMappingDO auth = userAuthMap == null ? null : userAuthMap.get(userAuth.getMappingId()); - if (auth == null) { - userAuthMappingDAO.insertUserAuthMapping(eid, userAuth); - } else { - coolUserAuthList.remove(auth); - } - } - if (CollectionUtils.isNotEmpty(coolUserAuthList)) { - List deleteAuthIds = coolUserAuthList.stream() - .filter(data -> "sync".equals(data.getSource()) ) - .map(UserAuthMappingDO::getId).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(deleteAuthIds)){ - userAuthMappingDAO.deleteAuthMappingByIds(eid, deleteAuthIds); - } - } - } private List getSyncAuthMappingList(Map map - , String position, String userId, String eid, List deptIds, String appType) { + , String position, String userId, List deptIds, String appType) { //该用户相关区域 3-25现在用户可视权限不涉及门店，只需要考虑区域,而且区域信息表中会冗余门店的信息，根据区域类型判断是否是门店 - List regions = regionDAO.getRegionByDingDeptIds(eid, deptIds); -// List stores = storeMapper.getStoreByDingDeptIds(eid, dingDeptIds); 获得所有的门店类型 2021-5-6 区域表修改，不在冗余门店类型的区域 + List regions = regionDAO.getRegionByDingDeptIds(deptIds); +// List stores = storeMapper.getStoreByDingDeptIds(dingDeptIds); 获得所有的门店类型 2021-5-6 区域表修改，不在冗余门店类型的区域 //添加人员权限映射表，即用户可见范围 List userAuthMappingDOList = new ArrayList<>(); //判断是否是自定义区域权限 @@ -503,14 +376,14 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { return userAuthMappingDOList; } - public void syncUserRegionMapping(String eid, String userId, List deptIds) { + public void syncUserRegionMapping(String userId, List deptIds) { //现在已经存在的用户和区域的映射关系 - List userRegionMappingDOS = userRegionMappingDAO.listUserRegionMappingByUserId(eid, Arrays.asList(userId)); + List userRegionMappingDOS = userRegionMappingDAO.listUserRegionMappingByUserId(Arrays.asList(userId)); Map userRegionMap = ListUtils.emptyIfNull(userRegionMappingDOS) .stream() .collect(Collectors.toMap(UserRegionMappingDO::getRegionId, data -> data, (a, b) -> a)); //db查询区域表的数据，找到映射的区域 - List regionIds = regionDAO.getRegionIdsBySynDingDeptIds(eid, deptIds); + List regionIds = regionDAO.getRegionIdsBySynDingDeptIds(deptIds); if (CollectionUtils.isEmpty(regionIds)) { //没有任何映射的区域放在未分组下 regionIds.add(CommonConstants.UNGROUPED_DEPT_ID); @@ -530,7 +403,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { userRegionMappings.add(userRegion); } if (userRegionMappings.size() > CommonConstants.DEAL_RECORD_MAX_SIZE) { - userRegionMappingDAO.batchInsertRegionMapping(eid, userRegionMappings); + userRegionMappingDAO.batchInsertRegionMapping(userRegionMappings); userRegionMappings.clear(); } } @@ -538,7 +411,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { //批量新增 if (CollectionUtils.isNotEmpty(userRegionMappings)) { Lists.partition(userRegionMappings, CommonConstants.DEAL_RECORD_MAX_SIZE).forEach(p -> { - userRegionMappingDAO.batchInsertRegionMapping(eid, p); + userRegionMappingDAO.batchInsertRegionMapping(p); }); } //删除用户移除的区域关系 @@ -546,81 +419,18 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { List deleteUserRegions = userRegionMappingDOS.stream() .map(UserRegionMappingDO::getId) .collect(Collectors.toList()); - userRegionMappingDAO.deletedByIds(eid, deleteUserRegions); + userRegionMappingDAO.deletedByIds(deleteUserRegions); } } - public void syncUserDepartmentAuth(String eid, String userId, List deptIds) { - if (CollectionUtils.isEmpty(deptIds)) { - return; - } - //该用户在cool中的部门列表,该部门id为cool的id。 - List userDepartmentsAuth = enterpriseUserDepartmentDAO.selectUserDeptAuthByUserId(eid, userId); - Map userDeptAuthMap = ListUtils.emptyIfNull(userDepartmentsAuth) - .stream() - .collect(Collectors.toMap(EnterpriseUserDepartmentDO::getDepartmentId, data -> data, (a, b) -> a)); - List enterpriseUserDepartmentDOS = new ArrayList<>(); - for (String deptId : deptIds) { - EnterpriseUserDepartmentDO userDepartmentDO = userDeptAuthMap.get(deptId); - if (Objects.nonNull(userDepartmentDO)) { - userDepartmentsAuth.remove(userDepartmentDO); - } else { - //换成批量新增 - EnterpriseUserDepartmentDO departmentDO = new EnterpriseUserDepartmentDO(userId, deptId, Boolean.TRUE); - enterpriseUserDepartmentDOS.add(departmentDO); - } - } - batchInsertOrDelUserDepartment(enterpriseUserDepartmentDOS, eid, userDepartmentsAuth); - } - - public void syncUserDepartment(String eid, String userId, List deptIds) { - if (CollectionUtils.isEmpty(deptIds)) { - return; - } - //该用户在cool中的部门列表,该部门id为cool的id。 - List userDepartments = enterpriseUserDepartmentDAO.selectUserDeptByUserId(eid, userId); - Map userDeptMap = ListUtils.emptyIfNull(userDepartments) - .stream() - .collect(Collectors.toMap(EnterpriseUserDepartmentDO::getDepartmentId, data -> data, (a, b) -> a)); - List dos = new ArrayList<>(); - deptIds.forEach(deptId -> { - EnterpriseUserDepartmentDO userDepartmentDO = userDeptMap.get(deptId); - if (Objects.nonNull(userDepartmentDO)) { - userDepartments.remove(userDepartmentDO); - } else { - //换成批量新增 - EnterpriseUserDepartmentDO departmentDO = new EnterpriseUserDepartmentDO(userId, deptId, Boolean.FALSE); - dos.add(departmentDO); - } - }); - //批量新增 - batchInsertOrDelUserDepartment(dos, eid, userDepartments); - } - - private void batchInsertOrDelUserDepartment(List enterpriseUserDepartmentDOS, String eid, - List userDepartmentsAuth) { - //批量新增 - if (CollectionUtils.isNotEmpty(enterpriseUserDepartmentDOS)) { - Lists.partition(enterpriseUserDepartmentDOS, CommonConstants.DEAL_RECORD_MAX_SIZE).forEach(p -> { - enterpriseUserDepartmentDAO.batchInsert(eid, p); - }); - } - if (CollectionUtils.isNotEmpty(userDepartmentsAuth)) { - List deleteUserDeptIds = userDepartmentsAuth.stream() - .map(EnterpriseUserDepartmentDO::getId) - .collect(Collectors.toList()); - enterpriseUserDepartmentDAO.deleteByIdList(eid, deleteUserDeptIds); - } - } - - public void newSyncFsDept(String eid, Long regionId){ + public void newSyncFsDept(Long regionId){ DataSourceHelper.reset(); - EnterpriseConfigDO config = enterpriseConfigDAO.selectByEnterpriseId(eid); - EnterpriseDO enterpriseDO = enterpriseDAO.getEnterpriseById(eid); - Set deleteDeptIds = syncDept(config.getDingCorpId(), config.getAppType(), eid, config.getDbName()); + EnterpriseConfigDO config = enterpriseConfigDAO.selectByEnterpriseId(); + EnterpriseDO enterpriseDO = enterpriseDAO.getEnterpriseById(); + Set deleteDeptIds = syncDept(config.getDingCorpId(), config.getAppType(), config.getDbName()); if (CollectionUtils.isNotEmpty(deleteDeptIds)) { //删除不存在的数据 - sysDepartmentDAO.deleteByNotInIds(eid, new ArrayList<>(deleteDeptIds)); + sysDepartmentDAO.deleteByNotInIds(new ArrayList<>(deleteDeptIds)); } //先获得这次同步的数据范围 regionId 不为null 指定部门ID List deptIds = new ArrayList<>(); @@ -628,7 +438,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { RegionDO regionDO =null; if (regionId!=null){ DataSourceHelper.changeToSpecificDataSource(config.getDbName()); - regionDO = regionDAO.getByRegionId(eid, regionId); + regionDO = regionDAO.getByRegionId(regionId); deptIds.add(regionDO.getSynDingDeptId()); unitId = regionDO.getSynDingDeptId(); } @@ -671,10 +481,10 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { } List deptRegionList = transDeptToRegion(departmentList, config.getAppType()); regionList.addAll(deptRegionList); - newSyncOrgAll(eid,regionId, unitId, regionList); + newSyncOrgAll(regionId, unitId, regionList); } - public void newSyncOrgAll(String eid,Long regionId ,String unitId, List resultList) { + public void newSyncOrgAll(Long regionId ,String unitId, List resultList) { if(CollectionUtils.isEmpty(resultList)){ return; } @@ -682,12 +492,10 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { resultList = resultList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(RegionDTO::getSynDingDeptId))), ArrayList::new)); DataSourceHelper.reset(); - EnterpriseConfigDO enterpriseConfigDO = enterpriseConfigDAO.selectByEnterpriseId(eid); + EnterpriseConfigDO enterpriseConfigDO = enterpriseConfigDAO.selectByEnterpriseId(); DataSourceHelper.changeToSpecificDataSource(enterpriseConfigDO.getDbName()); String userId = ""; - String regionKey = redisConstantUtil.getSyncRegionKey(eid); - String storeKey = redisConstantUtil.getSyncStoreKey(eid); Map mapResult = resultList.stream().collect(Collectors.toMap(RegionDTO::getSynDingDeptId, org -> org)); //取的是跟节点或者指定节点 @@ -717,7 +525,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { root.setId(regionId); } //构建数据 - RegionDO rootRegion = prepareRegionRoot(eid, userId, root); + RegionDO rootRegion = prepareRegionRoot(userId, root); if(rootRegion == null){ return; } @@ -726,10 +534,10 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { //节点同步的时候，需要将该节点个regionPath拿到，之后的数据都是基于该regionPath if (regionId!=null){ - RegionDO regionDO = regionDAO.getByRegionId(eid, regionId); + RegionDO regionDO = regionDAO.getByRegionId(regionId); rootRegion.setRegionPath(regionDO.getRegionPath()); } - List regionList = regionDAO.getSpecifiedRegionIdAndDeptId(eid,regionId); + List regionList = regionDAO.getSpecifiedRegionIdAndDeptId(regionId); List regionSelfList = new ArrayList<>(); Map regionMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(regionList)) { @@ -739,16 +547,10 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { regionMap = regionList.stream().filter((RegionSyncDTO s) -> StringUtils.isNotBlank(s.getSynDingDeptId())&&s.getId()!=null).collect(Collectors.toMap(RegionSyncDTO::getSynDingDeptId, RegionSyncDTO::getId)); } - List storeDOList = storeDAO.getSpecifiedStoreIdsAndDeptId(eid,regionId); List removeStoreList = new ArrayList<>(); Map storeMap = new HashMap<>(); - if (CollectionUtils.isNotEmpty(storeDOList)) { - removeStoreList = storeDOList.stream() - .filter((RegionSyncDTO s) -> StringUtils.isBlank(s.getSynDingDeptId())) - .map(e -> String.valueOf(e.getId())).collect(Collectors.toList()); - storeMap = storeDOList.stream().filter((RegionSyncDTO s) -> - StringUtils.isNotBlank(s.getSynDingDeptId())&&s.getId()!=null).collect(Collectors.toMap(RegionSyncDTO::getSynDingDeptId, RegionSyncDTO::getId)); - } + String storeKey = "hsay_store"; + String regionKey = "hsay_region"; //有效期一天 完成任务删除 redisUtil.putAll(storeKey, storeMap, 1L, TimeUnit.DAYS); //有效期一天 @@ -833,7 +635,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { log.info("regionUpdateList：int"); for(RegionDO regionDO : regionUpdateList){ //批量插入或更新 - regionService.saveRegionAndStore(eid, regionDO, userId); + regionService.saveRegionAndStore(regionDO, userId); } queue.addAll(regionUpdateList); } @@ -843,10 +645,10 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { try { for(RegionDO regionDO : regionInsertList){ //批量插入或更新 - regionService.saveRegionAndStore(eid, regionDO, userId); + regionService.saveRegionAndStore(regionDO, userId); } } catch (Exception e) { - log.error("保存部门异常 eid :{} deptId :{} deptName :{}", eid, deptInfo.getId(), deptInfo.getName()); + log.error("保存部门异常 eid :{} deptId :{} deptName :{}", deptInfo.getId(), deptInfo.getName()); log.error("保存部门异常细节",e); if (e instanceof DuplicateKeyException) { throw new ServiceException(deptInfo.getName() + "[" + deptInfo.getId() + "] 下级部门和其他同步部门有上下级关系"); @@ -871,11 +673,11 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { } //移除删除的钉钉区域 if (CollectionUtils.isNotEmpty(regionIdList)) { - regionService.removeRegions(eid, regionIdList); + regionService.removeRegions(regionIdList); } //移除自有的区域 if (CollectionUtils.isNotEmpty(regionSelfList)) { - Lists.partition(regionSelfList, CommonConstants.DEAL_RECORD_MAX_SIZE).forEach(idList -> regionService.removeRegions(eid, idList)); + Lists.partition(regionSelfList, CommonConstants.DEAL_RECORD_MAX_SIZE).forEach(idList -> regionService.removeRegions(idList)); } Map leftStoreMap = redisUtil.entries(storeKey); if (!leftStoreMap.isEmpty()) { @@ -883,23 +685,14 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { removeStoreList.add(entry.getValue().toString()); } } - //移除无用门店 - if (CollectionUtils.isNotEmpty(removeStoreList)) { - List storeIds = storeDAO.getStoreIdByIdList(eid, removeStoreList); - if(CollectionUtils.isNotEmpty(storeIds)){ - Lists.partition(storeIds, CommonConstants.DEAL_RECORD_MAX_SIZE).forEach(idList -> regionService.deleteByStoreIds(eid, idList, userId)); - } - } - //发消息计算门店数量 - //simpleMessageService.send(JSONObject.toJSONString(new RegionStoreNumRecursionMsgDTO(eid, Long.valueOf(SyncConfig.ROOT_DEPT_ID))), RocketMqTagEnum.CAL_REGION_STORE_NUM); } - private RegionDO prepareRegionRoot(String eid, String userId, RegionDTO deptRoot) { + private RegionDO prepareRegionRoot(String userId, RegionDTO deptRoot) { - RegionNode regionDelete = regionDAO.getRegionById(eid, CommonConstants.DELETE_DEPT_ID); + RegionNode regionDelete = regionDAO.getRegionById(CommonConstants.DELETE_DEPT_ID); if (regionDelete == null) { - regionDAO.insertRegion(eid, RegionDO.builder().name("删除区域") + regionDAO.insertRegion(RegionDO.builder().name("删除区域") .createName(userId) .createTime(System.currentTimeMillis()) .id(Long.valueOf(CommonConstants.DELETE_DEPT_ID)) @@ -924,12 +717,12 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { rootDO.setId(Long.valueOf(CommonConstants.ROOT_DEPT_ID_STR)); rootDO.setParentId("0"); } - regionDAO.insertOrUpdate(rootDO, eid); + regionDAO.insertOrUpdate(rootDO); return rootDO; } - public Set syncDept(String corpId, String appType, String enterpriseId, String dbName) { + public Set syncDept(String corpId, String appType, String dbName) { List sysDepartments = getFsDepartmentsV1(corpId, appType); Set idSet = new HashSet<>(); log.info("{} get depts size={}", corpId, sysDepartments.size()); @@ -938,7 +731,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { //分开批量插入 if (CollectionUtils.isNotEmpty(sysDepartments)) { Lists.partition(sysDepartments, CommonConstants.DEAL_RECORD_MAX_SIZE).forEach(p -> { - sysDepartmentDAO.batchInsertOrUpdate(enterpriseId, p); + sysDepartmentDAO.batchInsertOrUpdate(p); }); } return idSet; @@ -1081,38 +874,38 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { } } - public void dealUsers(List users, String eid, String corpId, String dbName, + public void dealUsers(List users, String corpId, String dbName, Map deptIdMap, Long unclassifiedRegionId, AuthInfoDTO authInfo, Set handlerUserIds) { DataSourceHelper.changeToSpecificDataSource(dbName); try { - insertUserRelatedInfo(users, eid, dbName, authInfo, handlerUserIds); + insertUserRelatedInfo(users, dbName, authInfo, handlerUserIds); //处理用户和区域的关系 - handlerUserRegionMapping(eid, users, unclassifiedRegionId); + handlerUserRegionMapping(users, unclassifiedRegionId); } catch (Exception e) { log.error("dealUsers insertUserRelatedInfo error, corpId={}", corpId, e); } } - public void insertUserRelatedInfo(List deptUsers, String eid, String dbName, AuthInfoDTO authInfo, Set handlerUserIds) { + public void insertUserRelatedInfo(List deptUsers, String dbName, AuthInfoDTO authInfo, Set handlerUserIds) { if (CollectionUtils.isEmpty(deptUsers)) { - log.info("insertUserRelatedInfo deptUsers is empty,eid:{}",eid); + log.info("insertUserRelatedInfo deptUsers is empty,eid:{}"); return; } - log.info("insertUserRelatedInfo-{}, deptUsersSize：{}",eid, deptUsers.size()); + log.info("insertUserRelatedInfo-{}, deptUsersSize：{}",deptUsers.size()); DataSourceHelper.reset(); //提取enterpriseUserDO List collect = ListUtils.emptyIfNull(deptUsers).stream() .map(EnterpriseUserRequest::getEnterpriseUserDO) .collect(Collectors.toList()); DataSourceHelper.changeToSpecificDataSource(dbName); - enterpriseUserDAO.batchInsertOrUpdate(eid, collect); + enterpriseUserDAO.batchInsertOrUpdate(collect); // 同步用户与角色的关系 - Long masterRoleId = sysRoleDAO.getRoleIdByRoleEnum(eid, RoleEnum.MASTER.getRoleEnum()); - Long employeeRoleId = sysRoleDAO.getRoleIdByRoleEnum(eid, RoleEnum.EMPLOYEE.getRoleEnum()); - Long subMaster = sysRoleDAO.getRoleIdByRoleEnum(eid, RoleEnum.SUB_MASTER.getRoleEnum()); - Long shopOwner = sysRoleDAO.getRoleIdByRoleEnum(eid, RoleEnum.SHOPOWNER.getRoleEnum()); + Long masterRoleId = sysRoleDAO.getRoleIdByRoleEnum(RoleEnum.MASTER.getRoleEnum()); + Long employeeRoleId = sysRoleDAO.getRoleIdByRoleEnum(RoleEnum.EMPLOYEE.getRoleEnum()); + Long subMaster = sysRoleDAO.getRoleIdByRoleEnum(RoleEnum.SUB_MASTER.getRoleEnum()); + Long shopOwner = sysRoleDAO.getRoleIdByRoleEnum(RoleEnum.SHOPOWNER.getRoleEnum()); List userRoles = new ArrayList<>(); collect.forEach(f -> { if (Objects.nonNull(f)) { @@ -1134,16 +927,16 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { } }); if (CollectionUtils.isNotEmpty(userRoles)) { - enterpriseUserRoleDAO.insertBatchUserRole(eid, userRoles); + enterpriseUserRoleDAO.insertBatchUserRole(userRoles); } } /** * 处理用户和区域的关系 - * @param eid + * @param * @param enterpriseUserRequests */ - public void handlerUserRegionMapping(String eid, List enterpriseUserRequests, Long unclassifiedRegionId) { + public void handlerUserRegionMapping(List enterpriseUserRequests, Long unclassifiedRegionId) { //用户区域映射关系 List userRegionMappings = new ArrayList<>(); List userIds = new ArrayList<>(); @@ -1162,7 +955,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { regionIds.add(unclassifiedRegionId); } else { //db查询区域表的数据，找到映射的区域 - List regionIdsBySynDingDeptIds = regionDAO.getRegionIdsBySynDingDeptIds(eid, deptIds.stream().map(a -> a).collect(Collectors.toList())); + List regionIdsBySynDingDeptIds = regionDAO.getRegionIdsBySynDingDeptIds(deptIds.stream().map(a -> a).collect(Collectors.toList())); if (CollectionUtils.isNotEmpty(regionIdsBySynDingDeptIds)) { regionIds.addAll(regionIdsBySynDingDeptIds); } else { @@ -1183,7 +976,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { //移除不在授权范围内的部门的主管部门 List leaderDeptIds = user.getLeaderInDepts(); if (CollectionUtils.isNotEmpty(leaderDeptIds)) { - List regionIdsBySynDingDeptIds = regionDAO.getRegionIdsBySynDingDeptIds(eid, leaderDeptIds.stream().map(a->a).collect(Collectors.toList())); + List regionIdsBySynDingDeptIds = regionDAO.getRegionIdsBySynDingDeptIds(leaderDeptIds.stream().map(a->a).collect(Collectors.toList())); if (CollectionUtils.isNotEmpty(regionIdsBySynDingDeptIds)) { regionIds.addAll(regionIdsBySynDingDeptIds); } @@ -1195,10 +988,10 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { if (userRegionMappings.size() > CommonConstants.DEAL_RECORD_MAX_SIZE) { //先删除 后新增 //用户和区域的映射关系 - userRegionMappingDAO.deletedByUserIds(eid, userIds); - userRegionMappingDAO.batchInsertRegionMapping(eid, userRegionMappings); + userRegionMappingDAO.deletedByUserIds(userIds); + userRegionMappingDAO.batchInsertRegionMapping(userRegionMappings); //调用订正用户表字段user_region_ids - enterpriseUserService.updateUserRegionPathList(eid, userIds); + enterpriseUserService.updateUserRegionPathList(userIds); userRegionMappings.clear(); userIds.clear(); } @@ -1206,10 +999,10 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { if (CollectionUtils.isNotEmpty(userRegionMappings)) { //先删除 后新增 //用户和区域的映射关系 - userRegionMappingDAO.deletedByUserIds(eid, userIds); - userRegionMappingDAO.batchInsertRegionMapping(eid, userRegionMappings); + userRegionMappingDAO.deletedByUserIds(userIds); + userRegionMappingDAO.batchInsertRegionMapping(userRegionMappings); //调用订正用户表字段user_region_ids - enterpriseUserService.updateUserRegionPathList(eid, userIds); + enterpriseUserService.updateUserRegionPathList(userIds); } } @@ -1220,7 +1013,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { return userRegionMappingDO; } - public void initRootRegion(List sysDepartmentDTOS, String eid, String dbName) { + public void initRootRegion(List sysDepartmentDTOS, String dbName) { try { Optional first = sysDepartmentDTOS.stream() @@ -1239,19 +1032,19 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { regionDO.setUnclassifiedFlag(CommonConstants.ZERO); regionDO.setRegionPath(null); regionDO.setStoreNum(CommonConstants.ONE); - regionDAO.insertRegion(eid, regionDO); + regionDAO.insertRegion(regionDO); //同步部门为区域节点 - initRegionByDepartment(eid, CommonConstants.ROOT_DEPT_ID_STR); + initRegionByDepartment(CommonConstants.ROOT_DEPT_ID_STR); } } catch (Exception e) { - log.error("enterpriseInit initRootRegion error,eid:{}", eid, e); + log.error("enterpriseInit initRootRegion error,eid:{}", e); throw new ServiceException(ErrorCodeEnum.FEISHU_SERVICE_ERROR); } } - public void initRegionByDepartment(String eid, String deptId) { + public void initRegionByDepartment(String deptId) { //首次获取 获取根部门下一级的所有数据 - List queryDeptChildDTOS = sysDepartmentDAO.getDeptChildListByParentId(eid, deptId); + List queryDeptChildDTOS = sysDepartmentDAO.getDeptChildListByParentId(deptId); if (CollectionUtils.isEmpty(queryDeptChildDTOS)) { return; } @@ -1275,25 +1068,25 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { syncDingDeptIds.add(String.valueOf(deptChildDTO.getId())); if (regionDOS.size() > CommonConstants.DEAL_RECORD_MAX_SIZE) { //批量插入或更新 - regionDAO.batchInsertRegions(regionDOS, eid); + regionDAO.batchInsertRegions(regionDOS); regionDOS.clear(); } } if (CollectionUtils.isNotEmpty(regionDOS)) { //批量插入或更新 - regionDAO.batchInsertRegions(regionDOS, eid); + regionDAO.batchInsertRegions(regionDOS); } //递归调用，接着获取下一层级的数据进行处理 //获取region的id和部门id映射关系 - Map regionIdMap = regionDAO.getRegionSynDeptIdAndIdMapping(eid, syncDingDeptIds); - handlerSubRegions(eid, queryDeptChildDTOS, regionIdMap); + Map regionIdMap = regionDAO.getRegionSynDeptIdAndIdMapping(syncDingDeptIds); + handlerSubRegions(queryDeptChildDTOS, regionIdMap); } - public void initUser(List sysDepartmentDTOS, String corpId, String eid, String appType, String dbName, + public void initUser(List sysDepartmentDTOS, String corpId, String appType, String dbName, List adminList, AuthInfoDTO authInfo, Set handlerUserIds) { try { //先查询是否存在未分组区域 - RegionDO unclassifiedRegionDO = regionDAO.getUnclassifiedRegionDO(eid); + RegionDO unclassifiedRegionDO = regionDAO.getUnclassifiedRegionDO(); //获取通讯录授权范围 AuthScopeDTO authScope = isvHttpRequest.getAuthScope(corpId, appType); List enterpriseUserDTOS = null; @@ -1327,7 +1120,7 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { authUsers.add(tempRequest); } } - dealUsers(authUsers,eid,corpId,dbName, deptIdMap, unclassifiedRegionDO.getId(), authInfo, handlerUserIds); + dealUsers(authUsers,corpId,dbName, deptIdMap, unclassifiedRegionDO.getId(), authInfo, handlerUserIds); List deptUsers; if (CollectionUtils.isNotEmpty(sysDepartmentDTOS)) { @@ -1344,24 +1137,24 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { if (CollectionUtils.isNotEmpty(deptUsers)) { log.info("enterpriseInit initUser deptUsersInfo, corpId={}, deptId={}, userSize={}", corpId, sysDepartmentDTO.getId(), deptUsers.size()); - dealUsers(deptUsers, eid, corpId, dbName, deptIdMap, unclassifiedRegionDO.getId(), authInfo, handlerUserIds); + dealUsers(deptUsers, corpId, dbName, deptIdMap, unclassifiedRegionDO.getId(), authInfo, handlerUserIds); } } } } catch (Exception e) { - log.error("enterpriseInit initUser error,eid:{},appType:{}", eid, appType, e); + log.error("enterpriseInit initUser error,eid:{},appType:{}", appType, e); throw new ServiceException(ErrorCodeEnum.FEISHU_SERVICE_ERROR); } } - public void handlerSubRegions(String eid, List depts, Map regionIdMap) { + public void handlerSubRegions(List depts, Map regionIdMap) { List regionDOS = new ArrayList<>(); //暂存一层级的数据 List results = new ArrayList<>(); List syncDingDeptIds = new ArrayList<>(); for (QueryDeptChildDTO dept : depts) { //获取该层级的子节点处理 - List childDTOS = sysDepartmentDAO.getDeptChildListByParentId(eid, String.valueOf(dept.getId())); + List childDTOS = sysDepartmentDAO.getDeptChildListByParentId(String.valueOf(dept.getId())); for (QueryDeptChildDTO deptChildDTO : childDTOS) { //设置上级区域的path，方便后续的追溯 deptChildDTO.setPath(dept.getPath() + regionIdMap.get(deptChildDTO.getParentId()) + "/"); @@ -1385,26 +1178,26 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { } if (regionDOS.size() > CommonConstants.DEAL_RECORD_MAX_SIZE) { //批量插入或更新 - regionDAO.batchInsertRegions(regionDOS, eid); + regionDAO.batchInsertRegions(regionDOS); regionDOS.clear(); } } if (CollectionUtils.isNotEmpty(regionDOS)) { //批量插入或更新 - regionDAO.batchInsertRegions(regionDOS, eid); + regionDAO.batchInsertRegions(regionDOS); } //递归调用 if (CollectionUtils.isNotEmpty(results)) { //一次用完即清理 regionIdMap.clear(); //添加这一层的region的id和部门id映射关系 - regionIdMap.putAll(regionDAO.getRegionSynDeptIdAndIdMapping(eid, syncDingDeptIds)); - handlerSubRegions(eid, results, regionIdMap); + regionIdMap.putAll(regionDAO.getRegionSynDeptIdAndIdMapping(syncDingDeptIds)); + handlerSubRegions(results, regionIdMap); } } - public List initDept(String corpId, String eid, String appType, String dbName) { + public List initDept(String corpId, String appType, String dbName) { List departments = null; try { //获取所有部门 @@ -1417,14 +1210,14 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { for (SysDepartmentDTO department : departments) { sysDepartmentDOS.add(convertSysDepartmentDTO2SysDepartmentDO(department, appType)); if(sysDepartmentDOS.size() > CommonConstants.DEAL_RECORD_MAX_SIZE){ - sysDepartmentDAO.batchInsertOrUpdate(eid, sysDepartmentDOS); + sysDepartmentDAO.batchInsertOrUpdate(sysDepartmentDOS); sysDepartmentDOS.clear(); } } DataSourceHelper.changeToSpecificDataSource(dbName); if(CollectionUtils.isNotEmpty(sysDepartmentDOS)){ - sysDepartmentDAO.batchInsertOrUpdate(eid, sysDepartmentDOS); + sysDepartmentDAO.batchInsertOrUpdate(sysDepartmentDOS); } } catch (Exception e) { log.error("enterpriseInit initDept error,corpId:{},appType:{}", corpId, appType, e); @@ -1452,15 +1245,15 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { log.info("初始化开通用户"); if (StringUtils.isNotBlank(msg.getAuthUserId())) { //初始化开通用户 - initAuthUser(msg.getEid(), msg.getCorpId(), msg.getAppType(), msg.getAuthUserId(), userId, msg.getDbName()); + initAuthUser(msg.getCorpId(), msg.getAppType(), msg.getAuthUserId(), userId, msg.getDbName()); } } - public void initAuthUser(String eid, String corpId, String appType, String authUserId, String userId, String dbName) { + public void initAuthUser(String corpId, String appType, String authUserId, String userId, String dbName) { List userRoles = new ArrayList<>(); - Long roleIdByRoleEnum = sysRoleDAO.getRoleIdByRoleEnum(eid, RoleEnum.MASTER.getRoleEnum()); - Long shopOwner = sysRoleDAO.getRoleIdByRoleEnum(eid, RoleEnum.SHOPOWNER.getRoleEnum()); - Long subMaster = sysRoleDAO.getRoleIdByRoleEnum(eid, RoleEnum.SUB_MASTER.getRoleEnum()); + Long roleIdByRoleEnum = sysRoleDAO.getRoleIdByRoleEnum(RoleEnum.MASTER.getRoleEnum()); + Long shopOwner = sysRoleDAO.getRoleIdByRoleEnum(RoleEnum.SHOPOWNER.getRoleEnum()); + Long subMaster = sysRoleDAO.getRoleIdByRoleEnum(RoleEnum.SUB_MASTER.getRoleEnum()); //钉钉或者企业走用户，app开通不需要 EnterpriseUserDTO userDTO = null; try { @@ -1471,11 +1264,11 @@ public class EnterpriseInitServiceImpl implements EnterpriseInitService { EnterpriseUserDO userDO = EnterpriseUserDTO.transUserDtoToDo(userDTO); userDO.setMainAdmin(true); userDO.setIsAdmin(true); - enterpriseUserDAO.batchInsertOrUpdate(eid, Collections.singletonList(userDO)); + enterpriseUserDAO.batchInsertOrUpdate(Collections.singletonList(userDO)); userRoles.add(new EnterpriseUserRole(roleIdByRoleEnum.toString(), userId)); userRoles.add(new EnterpriseUserRole(shopOwner.toString(), userId)); userRoles.add(new EnterpriseUserRole(subMaster.toString(), userId)); - enterpriseUserRoleDAO.insertBatchUserRole(eid, userRoles); + enterpriseUserRoleDAO.insertBatchUserRole(userRoles); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserGroupServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserGroupServiceImpl.java deleted file mode 100644 index 9e0b0d4b3..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserGroupServiceImpl.java +++ /dev/null @@ -1,389 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.cool.store.constants.CommonConstants; -import com.cool.store.context.CurrentUser; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.EnterpriseUserGroupDAO; -import com.cool.store.dao.EnterpriseUserGroupMappingDAO; -import com.cool.store.dao.EnterpriseUserRoleDAO; -import com.cool.store.dto.auth.AuthRegionStoreDTO; -import com.cool.store.dto.buser.SubordinateUserRangeDTO; -import com.cool.store.dto.usergroup.UserGroupAddRequest; -import com.cool.store.dto.usergroup.UserGroupDTO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.EnterpriseUserGroupDO; -import com.cool.store.entity.EnterpriseUserGroupMappingDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.service.AuthVisualService; -import com.cool.store.service.EnterpriseUserGroupService; -import com.cool.store.service.EnterpriseUserService; -import com.cool.store.service.SubordinateMappingService; -import com.cool.store.utils.UUIDUtils; -import com.cool.store.vo.buser.EnterpriseUserPageVO; -import com.cool.store.vo.usergroup.UserGroupVO; -import com.cool.store.vo.usergroup.UserSimpleDTO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @Author wxp - * @Date 2022/12/29 11:18 - * @Version 1.0 - */ -@Service -@Slf4j -public class EnterpriseUserGroupServiceImpl implements EnterpriseUserGroupService { - - @Resource - private EnterpriseUserGroupDAO enterpriseUserGroupDAO; - @Resource - private EnterpriseUserGroupMappingDAO enterpriseUserGroupMappingDAO; - @Autowired - public EnterpriseUserService enterpriseUserService; - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - @Resource - private AuthVisualService visualService; - @Resource - private SubordinateMappingService subordinateMappingService; - @Resource - private EnterpriseUserRoleDAO enterpriseUserRoleDAO; - - @Override - public Boolean saveOrUpdateUserGroup(String enterpriseId, UserGroupAddRequest userGroupAddRequest, CurrentUser currentUser) { - int count = enterpriseUserGroupDAO.countByGroupName(enterpriseId, userGroupAddRequest.getGroupName(), userGroupAddRequest.getGroupId()); - if (count > 0) { - throw new ServiceException(ErrorCodeEnum.USER_GROUP_NAME_EXIST); - } - EnterpriseUserGroupDO userGroupDO = translateToUserGroupDO(userGroupAddRequest, currentUser); - if(StringUtils.isBlank(userGroupAddRequest.getGroupId())){ - enterpriseUserGroupDAO.insertSelective(userGroupDO, enterpriseId); - }else { - enterpriseUserGroupDAO.updateByGroupId(userGroupDO, enterpriseId); - } - List userIdList = userGroupAddRequest.getUserIdList(); - if(CollectionUtils.isEmpty(userIdList)){ - return Boolean.TRUE; - } - enterpriseUserGroupMappingDAO.deleteUserGroupMappingByGroupId(enterpriseId, userGroupDO.getGroupId()); - List userGroupMappingDOList = new ArrayList<>(); - for (String userId: userIdList) { - EnterpriseUserGroupMappingDO userGroupMappingDO = new EnterpriseUserGroupMappingDO(); - userGroupMappingDO.setUserId(userId); - userGroupMappingDO.setGroupId(userGroupDO.getGroupId()); - userGroupMappingDO.setCreateUserId(currentUser.getUserId()); - userGroupMappingDO.setUpdateUserId(currentUser.getUserId()); - userGroupMappingDOList.add(userGroupMappingDO); - } - if (CollectionUtils.isNotEmpty(userGroupMappingDOList)) { - enterpriseUserGroupMappingDAO.batchInsertOrUpdateUserGroupMapping(enterpriseId, userGroupMappingDOList); - } - return Boolean.TRUE; - } - - @Override - public Boolean updateUserGroup(String enterpriseId, Long userGroupId, List userIdList){ - enterpriseUserGroupMappingDAO.deleteUserGroupMappingByGroupId(enterpriseId, String.valueOf(userGroupId)); - List userGroupMappingDOList = new ArrayList<>(); - for (String userId: userIdList) { - EnterpriseUserGroupMappingDO userGroupMappingDO = new EnterpriseUserGroupMappingDO(); - userGroupMappingDO.setUserId(userId); - userGroupMappingDO.setGroupId(String.valueOf(userGroupId)); - userGroupMappingDO.setCreateUserId(""); - userGroupMappingDO.setUpdateUserId(""); - userGroupMappingDOList.add(userGroupMappingDO); - } - if (CollectionUtils.isNotEmpty(userGroupMappingDOList)) { - enterpriseUserGroupMappingDAO.batchInsertOrUpdateUserGroupMapping(enterpriseId, userGroupMappingDOList); - } - return Boolean.TRUE; - } - - @Override - public void batchDeleteGroup(String enterpriseId, String groupId, List userIdList) { - enterpriseUserGroupMappingDAO.deleteMappingByGroupIdList(enterpriseId, groupId, userIdList); - if(CollectionUtils.isEmpty(userIdList)){ - enterpriseUserGroupDAO.deleteByGroupIdList(enterpriseId, Collections.singletonList(groupId)); - } - } - - @Override - public List listUserGroup(String enterpriseId, String groupName, CurrentUser user) { - List userGroupDOList = enterpriseUserGroupDAO.listUserGroup(enterpriseId,groupName); - List resultList = new ArrayList<>(); - if (CollectionUtils.isEmpty(userGroupDOList)) { - return resultList; - } - List groupIdList = userGroupDOList.stream().map(EnterpriseUserGroupDO::getGroupId).collect(Collectors.toList()); - Set userIdSet = userGroupDOList.stream() - .flatMap(c->Stream.of(c.getCreateUserId(),c.getUpdateUserId())) - .collect(Collectors.toSet()); - List userDOList = enterpriseUserDAO.selectUsersByUserIds(enterpriseId, new ArrayList<>(userIdSet)); - Map userMap = userDOList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, Function.identity())); - List userGroupMappingDOList = enterpriseUserGroupMappingDAO.listByGroupIdList(enterpriseId, groupIdList); - Map> userGroupMappingMap = userGroupMappingDOList.stream() - .collect(Collectors.groupingBy(EnterpriseUserGroupMappingDO::getGroupId)); - for (EnterpriseUserGroupDO enterpriseUserGroupDO : userGroupDOList) { - UserGroupVO userGroupVO = new UserGroupVO(); - userGroupVO.setCreateUserId(enterpriseUserGroupDO.getCreateUserId()); - userGroupVO.setGroupId(enterpriseUserGroupDO.getGroupId()); - userGroupVO.setGroupName(enterpriseUserGroupDO.getGroupName()); - userGroupVO.setCreateTime(enterpriseUserGroupDO.getCreateTime()); - userGroupVO.setUpdateTime(enterpriseUserGroupDO.getUpdateTime()); - EnterpriseUserDO createUser = userMap.get(enterpriseUserGroupDO.getCreateUserId()); - if (createUser != null) { - userGroupVO.setCreateUserName(createUser.getName()); - } - EnterpriseUserDO updateUser = userMap.get(enterpriseUserGroupDO.getUpdateUserId()); - if (updateUser != null) { - userGroupVO.setUpdateUserName(updateUser.getName()); - } - if(!CollectionUtils.isEmpty(userGroupMappingMap.get(enterpriseUserGroupDO.getGroupId()))){ - userGroupVO.setUserCount(userGroupMappingMap.get(enterpriseUserGroupDO.getGroupId()).size()); - } - userGroupVO.setEditFlag(checkUserEditFlag(enterpriseId, enterpriseUserGroupDO, user.getUserId())); - resultList.add(userGroupVO); - } - return resultList; - } - - @Override - public UserGroupVO getGroupInfo(String enterpriseId, String groupId, CurrentUser user) { - EnterpriseUserGroupDO userGroupDO = enterpriseUserGroupDAO.getByGroupId(enterpriseId, groupId); - if (userGroupDO == null) { - throw new ServiceException(ErrorCodeEnum.USER_GROUP_NOT_EXIST); - } - UserGroupVO userGroupVO = new UserGroupVO(); - BeanUtils.copyProperties(userGroupDO, userGroupVO); - fillUserGroupVO(enterpriseId, userGroupDO, userGroupVO); - userGroupVO.setEditFlag(checkUserEditFlag(enterpriseId, userGroupDO, user.getUserId())); - return userGroupVO; - } - - @Override - public PageInfo listUserByGroupId(String enterpriseId, String groupId, String userName, Integer pageNum, Integer pageSize, CurrentUser currentUser) { - PageHelper.startPage(pageNum,pageSize); - List enterpriseUserList = enterpriseUserDAO.listUserByGroupId(enterpriseId, groupId, userName, null); - PageInfo pageInfo = new PageInfo<>(); - if (CollectionUtils.isEmpty(enterpriseUserList)) { - return pageInfo; - } - List resultList = new ArrayList<>(); - resultList = EnterpriseUserPageVO.transUserDOToVO(enterpriseUserList); - pageInfo = new PageInfo<>(resultList); - //填充角色信息如果存在角色信息 - List userIdList = enterpriseUserService.initUserRole(enterpriseId, resultList); - List authRegionStoreDTOList = visualService.authRegionStoreByUserList(enterpriseId, userIdList); - Map authRegionStoreMap = ListUtils.emptyIfNull(authRegionStoreDTOList) - .stream() - .collect(Collectors.toMap(AuthRegionStoreDTO::getUserId, data -> data, (a, b) -> a)); - Map subordinateUserRangeMap = enterpriseUserService.fillUserSubordinateNames(enterpriseId, userIdList); - Map userRegionMap = enterpriseUserService.getUserRegion(enterpriseId, userIdList); - - Boolean haveAllSubordinateUser = subordinateMappingService.checkHaveAllSubordinateUser(enterpriseId, currentUser.getUserId()); - List userSubordinateList = Lists.newArrayList(); - if(!haveAllSubordinateUser){ - userSubordinateList = subordinateMappingService.getSubordinateUserIdList(enterpriseId, currentUser.getUserId(),Boolean.TRUE); - } - List finalUserSubordinateList = userSubordinateList; - resultList.stream() - .forEach(data->{ - if(MapUtils.isNotEmpty(authRegionStoreMap)&&authRegionStoreMap.get(data.getUserId())!=null){ - AuthRegionStoreDTO authRegionStoreDTO = authRegionStoreMap.get(data.getUserId()); - data.setAuthRegionStoreList(authRegionStoreDTO.getAuthRegionStoreUserList()); - } - // 填充下属用户 - if (subordinateUserRangeMap.get(data.getUserId()) != null){ - data.setSubordinateUserRange(subordinateUserRangeMap.get(data.getUserId()).getSubordinateUserRange()); - data.setSourceList(subordinateUserRangeMap.get(data.getUserId()).getSourceList()); - data.setMySubordinates(subordinateUserRangeMap.get(data.getUserId()).getMySubordinates()); - } - data.setDepartment(userRegionMap.get(data.getUserId())); - if(haveAllSubordinateUser){ - data.setSelectFlag(true); - }else { - data.setSelectFlag(finalUserSubordinateList.contains(data.getUserId())); - } - }); - return pageInfo; - } - - @Override - public void updateUserGroup(String enterpriseId, List groupIdList, String userId, CurrentUser currentUser) { - if(CollectionUtils.isEmpty(groupIdList)){ - return; - } - enterpriseUserGroupMappingDAO.deleteMappingByUserIdList(enterpriseId, Collections.singletonList(userId)); - List userGroupMappingDOList = new ArrayList<>(); - for (String groupId: groupIdList) { - EnterpriseUserGroupMappingDO userGroupMappingDO = new EnterpriseUserGroupMappingDO(); - userGroupMappingDO.setUserId(userId); - userGroupMappingDO.setGroupId(groupId); - userGroupMappingDO.setCreateUserId(currentUser.getUserId()); - userGroupMappingDO.setUpdateUserId(currentUser.getUserId()); - userGroupMappingDOList.add(userGroupMappingDO); - } - if (CollectionUtils.isNotEmpty(userGroupMappingDOList)) { - enterpriseUserGroupMappingDAO.batchInsertOrUpdateUserGroupMapping(enterpriseId, userGroupMappingDOList); - } - } - - @Override - public Boolean configUser(String enterpriseId, UserGroupAddRequest userGroupAddRequest, CurrentUser currentUser) { - EnterpriseUserGroupDO userGroupDO = enterpriseUserGroupDAO.getByGroupId(enterpriseId, userGroupAddRequest.getGroupId()); - if (userGroupDO == null) { - throw new ServiceException(ErrorCodeEnum.USER_GROUP_NOT_EXIST); - } - List userIdList = userGroupAddRequest.getUserIdList(); - if(CollectionUtils.isEmpty(userIdList)){ - return Boolean.TRUE; - } - List userGroupMappingDOList = new ArrayList<>(); - for (String userId: userIdList) { - EnterpriseUserGroupMappingDO userGroupMappingDO = new EnterpriseUserGroupMappingDO(); - userGroupMappingDO.setUserId(userId); - userGroupMappingDO.setGroupId(userGroupDO.getGroupId()); - userGroupMappingDO.setCreateUserId(currentUser.getUserId()); - userGroupMappingDO.setUpdateUserId(currentUser.getUserId()); - userGroupMappingDOList.add(userGroupMappingDO); - } - if (CollectionUtils.isNotEmpty(userGroupMappingDOList)) { - enterpriseUserGroupMappingDAO.batchInsertOrUpdateUserGroupMapping(enterpriseId, userGroupMappingDOList); - } - return Boolean.TRUE; - } - - @Override - public Map> getUserGroupMap(String enterpriseId, List userIdList) { - Map> resultMap = Maps.newHashMap(); - if(CollectionUtils.isEmpty(userIdList)){ - return resultMap; - } - List enterpriseUserGroupMappingDOList = enterpriseUserGroupMappingDAO.listByUserIdList(enterpriseId, userIdList); - List allGroupIdList = ListUtils.emptyIfNull(enterpriseUserGroupMappingDOList) - .stream().map(EnterpriseUserGroupMappingDO::getGroupId) - .collect(Collectors.toList()); - List userGroupDOList = enterpriseUserGroupDAO.listByGroupIdList(enterpriseId, allGroupIdList); - //封装 userId-userGroup map,以表示一个用户对应几个分组 - Map> userGroupMap = ListUtils.emptyIfNull(enterpriseUserGroupMappingDOList) - .stream().collect(Collectors.groupingBy(EnterpriseUserGroupMappingDO::getUserId, - Collectors.mapping(EnterpriseUserGroupMappingDO::getGroupId, Collectors.toSet()))); - //获得分组id -分组名称的map - Map groupNameMap = ListUtils.emptyIfNull(userGroupDOList) - .stream() - .filter(data -> StringUtils.isNotBlank(data.getGroupName())) - .collect(Collectors.toMap(EnterpriseUserGroupDO::getGroupId, EnterpriseUserGroupDO::getGroupName, (a, b) -> a)); - userIdList.forEach(userId -> { - Set groupIdList = userGroupMap.get(userId); - if (CollectionUtils.isNotEmpty(groupIdList)) { - List userGroupDTOList = resultMap.get(userId); - if (CollectionUtils.isEmpty(userGroupDTOList)) { - userGroupDTOList = Lists.newArrayList(); - resultMap.put(userId, userGroupDTOList); - } - for (String groupId: groupIdList) { - UserGroupDTO userGroupDTO = new UserGroupDTO(); - userGroupDTO.setGroupId(groupId); - userGroupDTO.setGroupName(groupNameMap.get(groupId)); - userGroupDTOList.add(userGroupDTO); - } - } - }); - return resultMap; - } - - private void fillUserGroupVO(String enterpriseId, EnterpriseUserGroupDO userGroupDO, UserGroupVO userGroupVO) { - List userGroupMappingDOList = enterpriseUserGroupMappingDAO.listByGroupIdList(enterpriseId, Collections.singletonList(userGroupDO.getGroupId())); - if (CollectionUtils.isNotEmpty(userGroupMappingDOList)){ - List configUserIdList = userGroupMappingDOList.stream().map(EnterpriseUserGroupMappingDO::getUserId).collect(Collectors.toList()); - List enterpriseUserDOList = enterpriseUserDAO.selectUsersByUserIds(enterpriseId, configUserIdList); - List configUserList = ListUtils.emptyIfNull(enterpriseUserDOList).stream() - .map(this::translateToUserSimpleDTO) - .collect(Collectors.toList()); - userGroupVO.setConfigUserList(configUserList); - } - if(StringUtils.isNotBlank(userGroupDO.getCommonEditUserids())){ - List commonEditUserIdList = StrUtil.splitTrim(userGroupDO.getCommonEditUserids(), ","); - List enterpriseUserDOList = enterpriseUserDAO.selectUsersByUserIds(enterpriseId, commonEditUserIdList); - List commonEditUserList = ListUtils.emptyIfNull(enterpriseUserDOList).stream() - .map(this::translateToUserSimpleDTO) - .collect(Collectors.toList()); - userGroupVO.setCommonEditUserList(commonEditUserList); - } - - List userIdList = Lists.newArrayList(); - userIdList.add(userGroupDO.getCreateUserId()); - userIdList.add(userGroupDO.getUpdateUserId()); - List userDOList = enterpriseUserDAO.selectUsersByUserIds(enterpriseId, userIdList); - Map userMap = userDOList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, Function.identity())); - EnterpriseUserDO createUser = userMap.get(userGroupDO.getCreateUserId()); - if (createUser != null) { - userGroupVO.setCreateUserName(createUser.getName()); - } - EnterpriseUserDO updateUser = userMap.get(userGroupDO.getUpdateUserId()); - if (updateUser != null) { - userGroupVO.setUpdateUserName(updateUser.getName()); - } - if (CommonConstants.SYSTEM_USER_ID.equals(userGroupDO.getCreateUserId())) { - userGroupVO.setCreateUserName(CommonConstants.SYSTEM_USER_ID); - } - } - - private UserSimpleDTO translateToUserSimpleDTO(EnterpriseUserDO enterpriseUserDO) { - UserSimpleDTO userSimpleDTO = new UserSimpleDTO(); - userSimpleDTO.setUserId(enterpriseUserDO.getUserId()); - userSimpleDTO.setUserName(enterpriseUserDO.getName()); - return userSimpleDTO; - } - - public EnterpriseUserGroupDO translateToUserGroupDO(UserGroupAddRequest request, CurrentUser user) { - EnterpriseUserGroupDO userGroupDO = new EnterpriseUserGroupDO(); - String groupId = StringUtils.isNotBlank(request.getGroupId()) ? request.getGroupId() : UUIDUtils.get32UUID(); - userGroupDO.setGroupId(groupId); - userGroupDO.setGroupName(request.getGroupName()); - if(CollectionUtils.isNotEmpty(request.getCommonEditUserIdList())){ - userGroupDO.setCommonEditUserids(CommonConstants.COMMA + StringUtils.join(request.getCommonEditUserIdList(), CommonConstants.COMMA) + CommonConstants.COMMA); - }else { - userGroupDO.setCommonEditUserids(""); - } - if(StringUtils.isNotBlank(request.getGroupId())){ - userGroupDO.setUpdateTime(new Date()); - userGroupDO.setUpdateUserId(user.getUserId()); - }else { - userGroupDO.setCreateTime(new Date()); - userGroupDO.setCreateUserId(user.getUserId()); - } - return userGroupDO; - } - - - // 校验用户是否有编辑权限 - public Boolean checkUserEditFlag(String eid, EnterpriseUserGroupDO enterpriseUserGroupDO, String userId){ - // 是否管理员 - boolean isAdmin = enterpriseUserRoleDAO.checkIsAdmin(eid, userId); - if(isAdmin || userId.equals(enterpriseUserGroupDO.getCreateUserId()) || (StringUtils.isNotBlank(enterpriseUserGroupDO.getCommonEditUserids()) && enterpriseUserGroupDO.getCommonEditUserids().contains(userId))){ - return true; - } - return false; - } - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java index 17f9b918f..7e9eadef3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java @@ -4,19 +4,9 @@ import cn.hutool.core.util.StrUtil; import com.cool.store.constants.CommonConstants; import com.cool.store.context.CurrentUser; import com.cool.store.dao.*; -import com.cool.store.dto.auth.AuthRegionStoreDTO; -import com.cool.store.dto.auth.AuthStoreCountDTO; -import com.cool.store.dto.buser.MySubordinatesDTO; -import com.cool.store.dto.buser.SubordinateUserRangeDTO; import com.cool.store.dto.buser.UserRoleDTO; -import com.cool.store.dto.region.RegionPathDTO; -import com.cool.store.dto.usergroup.UserGroupDTO; import com.cool.store.entity.*; -import com.cool.store.enums.SubordinateSourceEnum; -import com.cool.store.enums.UserSelectRangeEnum; import com.cool.store.request.EnterpriseUserRequest; -import com.cool.store.service.AuthVisualService; -import com.cool.store.service.EnterpriseUserGroupService; import com.cool.store.service.EnterpriseUserService; import com.cool.store.vo.buser.EnterpriseUserPageVO; import com.github.pagehelper.PageHelper; @@ -51,27 +41,21 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { @Resource private EnterpriseUserDAO enterpriseUserDAO; @Resource - private AuthVisualService authVisualService; - @Resource private EnterpriseUserRoleDAO enterpriseUserRoleDAO; - @Resource - private EnterpriseUserGroupService enterpriseUserGroupService; - @Resource - private SubordinateMappingDAO subordinateMappingDAO; @Override - public void updateUserRegionPathList(String enterpriseId, List userIds) { + public void updateUserRegionPathList(List userIds) { if (CollectionUtils.isEmpty(userIds)) { return; } //查询该人员的最新部门情况 同步到enterpriseUser 表usereginIds表中 - List userRegionMappingDOS = userRegionMappingDAO.listUserRegionMappingByUserId(enterpriseId, userIds); + List userRegionMappingDOS = userRegionMappingDAO.listUserRegionMappingByUserId(userIds); Map> userRegionMappingMap = ListUtils.emptyIfNull(userRegionMappingDOS) .stream() .collect(Collectors.groupingBy(UserRegionMappingDO::getUserId)); List regionIds = userRegionMappingDOS.stream() .map(UserRegionMappingDO::getRegionId).distinct().collect(Collectors.toList()); - List regionDOS = regionDAO.getRegionByRegionIds(enterpriseId, regionIds); + List regionDOS = regionDAO.getRegionByRegionIds(regionIds); Map regionMap = regionDOS.stream() .collect(Collectors.toMap(RegionDO::getRegionId, data -> data)); @@ -89,9 +73,9 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { if (CollectionUtils.isEmpty(userRegionMappingList)){ log.info("getUserRegionPathListStr exception 该人员没有任何部门"); //查询未分组 - RegionDO unclassifiedRegionDO = regionDAO.getUnclassifiedRegionDO(enterpriseId); + RegionDO unclassifiedRegionDO = regionDAO.getUnclassifiedRegionDO(); //将人添加到未分组中 - addUserRegionMappingDO(enterpriseId,userId,unclassifiedRegionDO.getRegionId(),new CurrentUser()); + addUserRegionMappingDO(userId,unclassifiedRegionDO.getRegionId(),new CurrentUser()); regionDOList.add(unclassifiedRegionDO); } @@ -111,11 +95,11 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { } enterpriseUserList.add(enterpriseUserDO); } - enterpriseUserDAO.batchUpdateDiffUserDiffRegionIds(enterpriseId, enterpriseUserList); + enterpriseUserDAO.batchUpdateDiffUserDiffRegionIds(enterpriseUserList); } @Override - public List listUser(String enterpriseId, String userName, String deptId, + public List listUser(String userName, String deptId, String orderBy, String orderRule, Long roleId, Integer userStatus, Integer pageNum, Integer pageSize, String jobNumber, String regionId, Boolean hasPage) { if (hasPage){ @@ -124,9 +108,9 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { List enterpriseUserList = new ArrayList<>(); //企微用户 用户名在数据表中加密，需要再次请求企业端接口根据名称去筛选数据 if(roleId!=null){ - enterpriseUserList = enterpriseUserDAO.fuzzyUsersByDepartment(enterpriseId, deptId, roleId, orderBy, orderRule, userName, jobNumber, userStatus, null,regionId); + enterpriseUserList = enterpriseUserDAO.fuzzyUsersByDepartment(deptId, roleId, orderBy, orderRule, userName, jobNumber, userStatus, null,regionId); }else { - enterpriseUserList= enterpriseUserDAO.fuzzyUsersByNotRole(enterpriseId, deptId, orderBy, orderRule, userName, jobNumber, userStatus, null,regionId); + enterpriseUserList= enterpriseUserDAO.fuzzyUsersByNotRole(deptId, orderBy, orderRule, userName, jobNumber, userStatus, null,regionId); } List resultList = new ArrayList<>(); if(CollectionUtils.isEmpty(enterpriseUserList)){ @@ -134,15 +118,15 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { } resultList = EnterpriseUserPageVO.transUserDOToVO(enterpriseUserList); //填充角色信息如果存在角色信息 - List userIdList = initUserRole(enterpriseId, resultList); + List userIdList = initUserRole(resultList); //根据人员查询该人员所在部门集合 - List userRegionMappingDOS = userRegionMappingDAO.listUserRegionMappingByUserId(enterpriseId, userIdList); + List userRegionMappingDOS = userRegionMappingDAO.listUserRegionMappingByUserId(userIdList); //regionids 集合 List regionIds = ListUtils.emptyIfNull(userRegionMappingDOS).stream().map(UserRegionMappingDO::getRegionId).distinct().collect(Collectors.toList()); List regionDOs = new ArrayList<>(); if (CollectionUtils.isNotEmpty(regionIds)){ - regionDOs = regionDAO.getRegionByRegionIds(enterpriseId, regionIds); + regionDOs = regionDAO.getRegionByRegionIds(regionIds); } //部门map KV key-部门id value-部门名称 Map regionMap = ListUtils.emptyIfNull(regionDOs) @@ -155,33 +139,8 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { .collect(Collectors.groupingBy(UserRegionMappingDO::getUserId, Collectors.mapping(UserRegionMappingDO::getRegionId, Collectors.toSet()))); - //填充门店总数以及权限区域列表 - List authRegionStoreDTOList = authVisualService.authRegionStoreByUserList(enterpriseId, userIdList); - List authStoreCountDTOS = authVisualService.authStoreCount(enterpriseId, userIdList, false); - Map storeCountMap = ListUtils.emptyIfNull(authStoreCountDTOS) - .stream() - .collect(Collectors.toMap(AuthStoreCountDTO::getUserId, data -> data, (a, b) -> a)); - Map authRegionStoreMap = ListUtils.emptyIfNull(authRegionStoreDTOList) - .stream() - .collect(Collectors.toMap(AuthRegionStoreDTO::getUserId, data -> data, (a, b) -> a)); - - Map> userGroupMap = enterpriseUserGroupService.getUserGroupMap(enterpriseId, userIdList); - Map subordinateUserRangeMap = fillUserSubordinateNames(enterpriseId, userIdList); - resultList.stream() .forEach(data->{ - if(MapUtils.isNotEmpty(authRegionStoreMap)&&authRegionStoreMap.get(data.getUserId())!=null){ - AuthRegionStoreDTO authRegionStoreDTO = authRegionStoreMap.get(data.getUserId()); - data.setAuthRegionStoreList(authRegionStoreDTO.getAuthRegionStoreUserList()); - } - if(MapUtils.isNotEmpty(storeCountMap)&&storeCountMap.get(data.getUserId())!=null){ - AuthStoreCountDTO authStoreCountDTO = storeCountMap.get(data.getUserId()); - if(authStoreCountDTO.getStoreCount()!=null){ - data.setStoreCount(authStoreCountDTO.getStoreCount()); - }else { - data.setStoreCount(0); - } - } if(MapUtils.isNotEmpty(userRegionMap)&&MapUtils.isNotEmpty(regionMap)) { Set regions = userRegionMap.get(data.getUserId()); String deptNames = SetUtils.emptyIfNull(regions) @@ -191,14 +150,6 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { .collect(Collectors.joining(CommonConstants.COMMA)); data.setDepartment(deptNames); } - //填充用户分组 - data.setUserGroupList(userGroupMap.get(data.getUserId())); - // 填充下属用户 - if (subordinateUserRangeMap.get(data.getUserId()) != null){ - data.setSubordinateUserRange(subordinateUserRangeMap.get(data.getUserId()).getSubordinateUserRange()); - data.setSourceList(subordinateUserRangeMap.get(data.getUserId()).getSourceList()); - data.setMySubordinates(subordinateUserRangeMap.get(data.getUserId()).getMySubordinates()); - } }); // 添加至常用联系人 if (StringUtils.isNotBlank(userName)) { @@ -208,7 +159,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { return resultList; } - private void addUserRegionMappingDO(String enterpriseId,String userId,String regionId,CurrentUser currentUser){ + private void addUserRegionMappingDO(String userId,String regionId,CurrentUser currentUser){ UserRegionMappingDO userRegionMappingDO = new UserRegionMappingDO(); userRegionMappingDO.setUserId(userId); userRegionMappingDO.setRegionId(regionId); @@ -217,88 +168,18 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { userRegionMappingDO.setCreateTime(System.currentTimeMillis()); userRegionMappingDO.setUpdateTime(System.currentTimeMillis()); //将用户添加到未分组 - userRegionMappingDAO.batchInsertRegionMapping(enterpriseId, Arrays.asList(userRegionMappingDO)); + userRegionMappingDAO.batchInsertRegionMapping(Arrays.asList(userRegionMappingDO)); } @Override - public Map fillUserSubordinateNames(String enterpriseId, List userIdList) { - Map subordinateUserRangeMap = Maps.newHashMap(); - if (CollectionUtils.isNotEmpty(userIdList)) { - //查询该用户的下属 - List subordinateMappingDOS = subordinateMappingDAO.selectByUserIds(enterpriseId, userIdList); - - List enterpriseUserDOS = enterpriseUserDAO.selectUsersByUserIds(enterpriseId, userIdList); - Map subordinateRangeMap = ListUtils.emptyIfNull(enterpriseUserDOS).stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, EnterpriseUserDO::getSubordinateRange)); - - List defineSelectMappingLit = subordinateMappingDOS.stream().filter(x -> SubordinateSourceEnum.SELECT.getCode().equals(x.getSource())).collect(Collectors.toList()); - Map> defineSelectMappingMap = ListUtils.emptyIfNull(defineSelectMappingLit).stream() - .collect(Collectors.groupingBy(SubordinateMappingDO::getUserId)); - userIdList.forEach(userId -> { - SubordinateUserRangeDTO subordinateUserRangeDTO = new SubordinateUserRangeDTO(); - subordinateUserRangeMap.put(userId, subordinateUserRangeDTO); - String subordinateUserRange = subordinateRangeMap.get(userId); - if (StringUtils.isNotBlank(subordinateUserRange)) { - subordinateUserRangeDTO.setSubordinateUserRange(subordinateUserRange); - if (UserSelectRangeEnum.DEFINE.getCode().equals(subordinateUserRange)) { - List myDefineSelectMappingLit = defineSelectMappingMap.get(userId); - List regionIds = ListUtils.emptyIfNull(myDefineSelectMappingLit).stream().filter(x -> StringUtils.isNotBlank(x.getRegionId())) - .map(SubordinateMappingDO::getRegionId).collect(Collectors.toList()); - Map regionMap = new HashMap<>(); - List regionPathByList = regionDAO.getRegionPathByList(enterpriseId, regionIds); - regionMap = regionPathByList.stream().collect(Collectors.toMap(RegionPathDTO::getRegionId, RegionPathDTO::getRegionName)); - - List personalIds = ListUtils.emptyIfNull(myDefineSelectMappingLit).stream().filter(x -> StringUtils.isNotBlank(x.getPersonalId())) - .map(SubordinateMappingDO::getPersonalId).collect(Collectors.toList()); - - List personalList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(personalIds)) { - personalList = enterpriseUserDAO.selectUsersByUserIds(enterpriseId, personalIds); - } - Map personalMap = personalList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, EnterpriseUserDO::getName)); - - List nodeTypeList = new ArrayList<>(); - - if (CollectionUtils.isNotEmpty(myDefineSelectMappingLit)) { - for (SubordinateMappingDO item : myDefineSelectMappingLit) { - MySubordinatesDTO nodeTypeDTO = new MySubordinatesDTO(); - if (StringUtils.isNotBlank(item.getRegionId())) { - String regionName = regionMap.get(item.getRegionId()); - nodeTypeDTO.setNodeType("region"); - nodeTypeDTO.setRegionName(regionName); - nodeTypeDTO.setRegionId(item.getRegionId()); - } - if (StringUtils.isNotBlank(item.getPersonalId())) { - String personalName = personalMap.get(item.getPersonalId()); - nodeTypeDTO.setNodeType("personal"); - nodeTypeDTO.setPersonalName(personalName); - nodeTypeDTO.setPersonalId(item.getPersonalId()); - } - nodeTypeList.add(nodeTypeDTO); - } - } - List sourceList = subordinateMappingDOS.stream().filter(x -> StringUtils.isNotBlank(x.getSource())) - .map(SubordinateMappingDO::getSource).distinct().collect(Collectors.toList()); - subordinateUserRangeDTO.setSourceList(sourceList); - if (CollectionUtils.isEmpty(sourceList)) { - subordinateUserRangeDTO.setSourceList(Collections.singletonList(SubordinateSourceEnum.AUTO.getCode())); - } - subordinateUserRangeDTO.setMySubordinates(nodeTypeList); - } - } - }); - } - return subordinateUserRangeMap; - } - - @Override - public List initUserRole(String enterpriseId, List enterpriseUserList) { + public List initUserRole(List enterpriseUserList) { List userIdList = ListUtils.emptyIfNull(enterpriseUserList) .stream() .map(EnterpriseUserPageVO::getUserId) .collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(userIdList)){ - List userRoleDTOS = enterpriseUserRoleDAO.getUserAndRolesByUserId(enterpriseId, userIdList); + List userRoleDTOS = enterpriseUserRoleDAO.getUserAndRolesByUserId(userIdList); //封装 userId-userRole map,以表示一个用户对应几个角色 Map> userRoleDtoMap = new HashMap<>(); userRoleDTOS.forEach(roleDto -> { @@ -332,17 +213,17 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { } @Override - public Map getUserRegion(String enterpriseId, List userIdList) { + public Map getUserRegion(List userIdList) { Map resultMap = Maps.newHashMap(); //根据人员查询该人员所在部门集合 - List userRegionMappingDOS = userRegionMappingDAO.listUserRegionMappingByUserId(enterpriseId, userIdList); + List userRegionMappingDOS = userRegionMappingDAO.listUserRegionMappingByUserId(userIdList); //regionids 集合 List regionIds = ListUtils.emptyIfNull(userRegionMappingDOS).stream() .map(UserRegionMappingDO::getRegionId).distinct().collect(Collectors.toList()); List regionDOs = new ArrayList<>(); if (CollectionUtils.isNotEmpty(regionIds)){ - regionDOs = regionDAO.getRegionByRegionIds(enterpriseId, regionIds); + regionDOs = regionDAO.getRegionByRegionIds(regionIds); } //部门map KV key-部门id value-部门名称 Map regionMap = ListUtils.emptyIfNull(regionDOs) @@ -395,7 +276,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { } @Override - public EnterpriseUserDO selectByUserIdIgnoreActive(String enterpriseId, String userId) { - return enterpriseUserDAO.selectByUserIdIgnoreActive(enterpriseId, userId); + public EnterpriseUserDO selectByUserIdIgnoreActive(String userId) { + return enterpriseUserDAO.selectByUserIdIgnoreActive(userId); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java index 6a1b502ae..c68149380 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java @@ -62,7 +62,7 @@ public class LoginServiceImpl implements LoginService { if (enterpriseConfig == null) { throw new ServiceException(ErrorCodeEnum.ENTERPRISE_INIT); } - EnterpriseDO enterprise = enterpriseDAO.getEnterpriseById(enterpriseConfig.getEnterpriseId()); + EnterpriseDO enterprise = enterpriseDAO.getEnterpriseById(); if (enterprise == null || enterprise.getStatus() == CommonConstants.ZERO) { throw new ServiceException(ErrorCodeEnum.ENTERPRISE_INIT); } @@ -72,7 +72,7 @@ public class LoginServiceImpl implements LoginService { // 切到企业库 DataSourceContext.setDataSourceType(dbName); // 查企业用户 - EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(enterprise.getId(), userId); + EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(userId); if(enterpriseUser == null){ throw new ServiceException(ErrorCodeEnum.NOT_AUTH); } @@ -80,7 +80,7 @@ public class LoginServiceImpl implements LoginService { if (enterprise.getStatus() == CommonConstants.HUNDRED && !StringUtils.equals(enterpriseUser.getUserId(), "a100000001")) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR.getCode(), "企业被冻结"); } - SysRoleDO sysRole = sysRoleDAO.getHighestPrioritySysRoleDoByUserId(enterprise.getId(), userId); + SysRoleDO sysRole = sysRoleDAO.getHighestPrioritySysRoleDoByUserId(userId); if(Objects.isNull(sysRole)){ log.info("当前用户没角色：{}", userId); throw new ServiceException(ErrorCodeEnum.NOT_AUTH); @@ -120,7 +120,7 @@ public class LoginServiceImpl implements LoginService { redisUtilPool.setString(currentUser.getUserId(), token); redisUtilPool.setString(CommonConstants.REFRESH_TOKEN_KEY+":"+refreshToken,JSON.toJSONString(refreshUser), CommonConstants.REFRESH_TOKEN_EXPIRE); jsonObject.put("refresh_token",refreshToken); - loginRecordDAO.addLoginRecord(currentUser.getEnterpriseId(),currentUser.getUserId()); + loginRecordDAO.addLoginRecord(currentUser.getUserId()); log.info("[" + enterpriseUser.getName() + "; action_token："+ token + "; userId：" + currentUser.getUserId() +"]登入系统成功"); return jsonObject; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java index 41d9938be..6510b4524 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java @@ -1,36 +1,18 @@ package com.cool.store.service.impl; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import com.cool.store.dao.RegionDAO; -import com.cool.store.dao.StoreDAO; -import com.cool.store.dao.UserAuthMappingDAO; -import com.cool.store.dto.region.RegionStoreNumMsgDTO; import com.cool.store.entity.RegionDO; -import com.cool.store.entity.StoreDO; import com.cool.store.enums.RegionTypeEnum; -import com.cool.store.enums.RocketMqTagEnum; -import com.cool.store.enums.StoreIsDeleteEnum; -import com.cool.store.enums.UserAuthMappingTypeEnum; import com.cool.store.mq.producer.SimpleMessageService; import com.cool.store.service.RegionService; import com.cool.store.utils.RedisConstantUtil; import com.cool.store.utils.RedisUtil; import com.cool.store.utils.UUIDUtils; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Calendar; -import java.util.Collection; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * @author zhangchenbiao @@ -46,106 +28,38 @@ public class RegionServiceImpl implements RegionService { @Resource private RedisConstantUtil redisConstantUtil; @Resource - private StoreDAO storeDAO; - @Resource private RegionDAO regionDAO; @Resource - private UserAuthMappingDAO userAuthMappingDAO; - @Resource private SimpleMessageService simpleMessageService; @Transactional(rollbackFor = Exception.class) @Override - public void saveRegionAndStore(String eid, RegionDO regionDO, String userId) { - String storeKey = redisConstantUtil.getSyncStoreKey(eid); + public void saveRegionAndStore(RegionDO regionDO, String userId) { String storeId = null; if(regionDO.getStoreRange()){ - StoreDO storeDO = storeDAO.getStoreBySynId(eid, regionDO.getSynDingDeptId()); - if(storeDO != null && StringUtils.isNotBlank(storeDO.getStoreId())){ - storeId = storeDO.getStoreId(); - }else { - storeId = UUIDUtils.get32UUID(); - } + storeId = UUIDUtils.get32UUID(); } regionDO.setStoreId(storeId); regionDO.setRegionType(RegionTypeEnum.PATH.getType()); - RegionDO oldRegion = regionDAO.getBySynDingDeptId(eid, regionDO.getSynDingDeptId()); + RegionDO oldRegion = regionDAO.getBySynDingDeptId(regionDO.getSynDingDeptId()); boolean isAdd = oldRegion == null; if (isAdd) { if(regionDO.getStoreRange()){ regionDO.setStoreId(storeId); regionDO.setRegionType(RegionTypeEnum.STORE.getType()); } - regionDAO.ignoreInsert(eid, regionDO); + regionDAO.ignoreInsert(regionDO); } else { if(regionDO.getStoreRange()){ regionDO.setRegionType(RegionTypeEnum.STORE.getType()); } - regionDAO.updateSyncRegion(eid, regionDO); - } - if (regionDO.getStoreRange()) { - StoreDO store = new StoreDO(); - store.setStoreName(regionDO.getName()); - store.setRegionPath(regionDO.getFullRegionPath()); - store.setIsDelete(StoreIsDeleteEnum.EFFECTIVE.getValue()); - store.setRegionId(Long.valueOf(regionDO.getParentId())); - store.setSource("sync"); - store.setStoreAddress(regionDO.getAddress()); - store.setLocationAddress(regionDO.getAddress()); - store.setStoreNum(regionDO.getStoreCode()); - store.setLatitude(regionDO.getLatitude()); - store.setLongitude(regionDO.getLongitude()); - store.setStoreId(storeId); - String id = redisUtil.hashGetString(storeKey, regionDO.getSynDingDeptId()); - if (StringUtils.isNotBlank(id)) { - store.setId(Long.valueOf(id)); - //删除对应的已有redis key缓存 - redisUtil.delete(storeKey, regionDO.getSynDingDeptId()); - store.setUpdateName(userId); - store.setUpdateTime(System.currentTimeMillis()); - storeDAO.updateStore(eid, store); - } else { - store.setIsLock("not_locked"); - store.setStoreStatus("open"); - store.setSynDingDeptId(regionDO.getSynDingDeptId()); - store.setCreateName(userId); - store.setCreateTime(System.currentTimeMillis()); - storeDAO.insertStore(eid, store); - } + regionDAO.updateSyncRegion(regionDO); } } @Override - public void removeRegions(String eid, List regionIds) { - regionDAO.removeRegion(eid, regionIds); - } - - @Override - public void deleteByStoreIds(String enterpriseId, List storeIds, String userId) { - //获取门店基本信息 - List storeList = storeDAO.getStoreListByStoreIds(enterpriseId, storeIds); - if (CollectionUtils.isEmpty(storeList)) { - return; - } - // 删除门店绑定的权限 - userAuthMappingDAO.deleteAuthMappingByIdAndType(enterpriseId, storeIds, UserAuthMappingTypeEnum.STORE.getCode()); - // 删除门店本身 - storeDAO.deleteStoreByStoreIds(enterpriseId, storeIds, userId, Calendar.getInstance().getTimeInMillis()); - //更新区域内的门店数量 - List regionIdList = ListUtils.emptyIfNull(storeList) - .stream() - .map(StoreDO::getRegionId) - .collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(regionIdList)) { - List regionDOList = regionDAO.listStoreRegionByIds(enterpriseId, regionIdList); - List updateRegionIdList = ListUtils.emptyIfNull(regionDOList) - .stream() - .map(data -> StrUtil.splitTrim(data.getFullRegionPath(), "/")) - .flatMap(Collection::stream) - .map(Long::valueOf) - .collect(Collectors.toList()); - simpleMessageService.send(JSONObject.toJSONString(new RegionStoreNumMsgDTO(enterpriseId, updateRegionIdList)), RocketMqTagEnum.REGION_STORE_NUM_UPDATE); - } + public void removeRegions(List regionIds) { + regionDAO.removeRegion(regionIds); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SubordinateMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SubordinateMappingServiceImpl.java deleted file mode 100644 index 2bf6bd19e..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SubordinateMappingServiceImpl.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.EnterpriseUserRoleDAO; -import com.cool.store.dao.SubordinateMappingDAO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.SubordinateMappingDO; -import com.cool.store.entity.UserAuthMappingDO; -import com.cool.store.enums.SubordinateSourceEnum; -import com.cool.store.enums.UserSelectRangeEnum; -import com.cool.store.mapper.EnterpriseUserMapper; -import com.cool.store.mapper.UserAuthMappingMapper; -import com.cool.store.service.EnterpriseUserService; -import com.cool.store.service.SubordinateMappingService; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @Author wxp - * @Date 2023/1/6 11:18 - * @Version 1.0 - */ -@Service -@Slf4j -public class SubordinateMappingServiceImpl implements SubordinateMappingService { - - @Resource - private SubordinateMappingDAO subordinateMappingDAO; - @Autowired - private EnterpriseUserService enterpriseUserService; - @Resource - private EnterpriseUserMapper enterpriseUserMapper; - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - @Resource - private EnterpriseUserRoleDAO enterpriseUserRoleDAO; - @Resource - private UserAuthMappingMapper userAuthMappingMapper; - - /** - * 判断用户是否管辖全部用户 - * @param enterpriseId - * @param currentUserId - * @return - */ - @Override - public Boolean checkHaveAllSubordinateUser(String enterpriseId, String currentUserId) { - if(CommonConstants.SYSTEM_USER_ID.equals(currentUserId)){ - return true; - } - // 判断是否是管理员 - boolean isAdmin = enterpriseUserRoleDAO.checkIsAdmin(enterpriseId, currentUserId); - EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(enterpriseId, currentUserId); - //失效人员没有权限 - if(user == null){ - return false; - } - if(isAdmin || UserSelectRangeEnum.ALL.getCode().equals(user.getSubordinateRange())){ - return true; - } - return false; - } - - /** - * 获取管辖用户 - * @param enterpriseId - * @param currentUserId - * @return - */ - @Override - public List getSubordinateUserIdList(String enterpriseId, String currentUserId,Boolean addCurrentFlag) { - - List allUserIdList = Lists.newArrayList(); - if (addCurrentFlag){ - allUserIdList.add(currentUserId); - } - EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(enterpriseId, currentUserId); - // 查询管辖用户 - List subordinateMappingList = subordinateMappingDAO.selectByUserIds(enterpriseId, Collections.singletonList(currentUserId)); - // 如果用户关联用户配置是自定义，但是没有具体数据，默认关联区域门店区域权限下的人 - if(user != null && UserSelectRangeEnum.DEFINE.getCode().equals(user.getSubordinateRange()) && CollectionUtils.isEmpty(subordinateMappingList)){ - subordinateMappingList = Lists.newArrayList(); - SubordinateMappingDO subordinateMappingDO = fillDefaultAutoSubordinate(currentUserId, UserSelectRangeEnum.DEFINE.getCode(), SubordinateSourceEnum.AUTO.getCode()); - subordinateMappingList.add(subordinateMappingDO); - subordinateMappingDAO.batchInsertSubordinateMapping(enterpriseId, subordinateMappingList); - } - - List sourceList = ListUtils.emptyIfNull(subordinateMappingList).stream().filter(x -> StringUtils.isNotBlank(x.getSource())) - .map(SubordinateMappingDO::getSource).distinct().collect(Collectors.toList()); - - //自动关联单独查询 过滤自动关联 - subordinateMappingList = ListUtils.emptyIfNull(subordinateMappingList).stream().filter(o -> !SubordinateSourceEnum.AUTO.getCode().equals(o.getSource())).collect(Collectors.toList()); - - List regionIds = ListUtils.emptyIfNull(subordinateMappingList).stream().filter(x -> StringUtils.isNotBlank(x.getRegionId())) - .map(SubordinateMappingDO::getRegionId).collect(Collectors.toList()); - List personalIds = ListUtils.emptyIfNull(subordinateMappingList).stream().filter(x -> StringUtils.isNotBlank(x.getPersonalId())) - .map(SubordinateMappingDO::getPersonalId).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(personalIds)) { - allUserIdList.addAll(personalIds); - } - - if(CollectionUtils.isNotEmpty(sourceList) && sourceList.contains(SubordinateSourceEnum.AUTO.getCode())) { - List userAuthList = userAuthMappingMapper.listUserAuthMappingByUserId(enterpriseId, currentUserId); - List authRegionIdList = ListUtils.emptyIfNull(userAuthList) - .stream().map(UserAuthMappingDO::getMappingId) - .collect(Collectors.toList()); - regionIds.addAll(authRegionIdList); - } - if(CollectionUtils.isNotEmpty(regionIds)) { - List enterpriseUserDOList = enterpriseUserMapper.listByRegionIdList(enterpriseId, regionIds); - if (CollectionUtils.isNotEmpty(enterpriseUserDOList)) { - List enterpriseUserIds = enterpriseUserDOList.stream() - .map(EnterpriseUserDO::getUserId) - .collect(Collectors.toList()); - allUserIdList.addAll(enterpriseUserIds); - } - } - allUserIdList = allUserIdList.stream().distinct().collect(Collectors.toList()); - return allUserIdList; - } - - /** - * 保留管辖用户 userId管辖用户范围 - * @param enterpriseId - * @param currentUserId - * @param userIdList - * @return - */ - @Override - public List retainSubordinateUserIdList(String enterpriseId, String currentUserId, List userIdList,Boolean addCurrentFlag) { - Boolean flag = this.checkHaveAllSubordinateUser(enterpriseId, currentUserId); - if(flag){ - return userIdList; - } - List subordinateUserIdList = getSubordinateUserIdList(enterpriseId, currentUserId,addCurrentFlag); - userIdList.retainAll(subordinateUserIdList); - return userIdList; - } - - - private SubordinateMappingDO fillDefaultAutoSubordinate(String userId, String userRange, String source) { - SubordinateMappingDO subordinateMappingDO = new SubordinateMappingDO(); - subordinateMappingDO.setUserId(userId); - subordinateMappingDO.setRegionId(CommonConstants.ZERO_STR); - subordinateMappingDO.setCreateId(CommonConstants.SYSTEM_USER_ID); - subordinateMappingDO.setUpdateId(CommonConstants.SYSTEM_USER_ID); - subordinateMappingDO.setType(CommonConstants.ZERO); - subordinateMappingDO.setUserRange(userRange); - subordinateMappingDO.setSource(source); - return subordinateMappingDO; - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java index bed8fe201..890019e5f 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java @@ -29,8 +29,7 @@ public class EnterpriseUserController { public EnterpriseUserService enterpriseUserService; @GetMapping(path = "/dept/userList") - public ResponseResult> getUserList(@PathVariable(value = "enterpriseId", required = true) String eid, - @RequestParam(name = "user_name", required = false) String userName, + public ResponseResult> getUserList(@RequestParam(name = "user_name", required = false) String userName, @RequestParam(name = "dept_id", required = false) String deptId, @RequestParam(name = "role_id", required = false) Long roleId, @RequestParam(name = "order_by", required = false) String orderBy, @@ -42,7 +41,7 @@ public class EnterpriseUserController { @RequestParam(name = "region_id", required = false) String regionId, @RequestParam(name = "has_page", required = false,defaultValue = "true") Boolean hasPage) { DataSourceHelper.changeToMy(); - List deptUserList = enterpriseUserService.listUser(eid, userName, deptId, orderBy, orderRule, roleId, userStatus, pageNum, pageSize, jobNumber,regionId,hasPage); + List deptUserList = enterpriseUserService.listUser(userName, deptId, orderBy, orderRule, roleId, userStatus, pageNum, pageSize, jobNumber,regionId,hasPage); if(CollectionUtils.isNotEmpty(deptUserList)){ return ResponseResult.success(new PageInfo<>(deptUserList)); }else { diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java index c669b43d5..fe8cabf8b 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java @@ -25,16 +25,9 @@ import javax.annotation.Resource; @RequestMapping("test/") public class TestController { - @Resource - private EnterpriseConfigService enterpriseConfigService; @Resource private SimpleMessageService simpleMessageService; - @GetMapping("/selectByEnterpriseId") - public EnterpriseConfigDO selectByEnterpriseId(@RequestParam("enterpriseId") String enterpriseId){ - return enterpriseConfigService.selectByEnterpriseId(enterpriseId); - } - @GetMapping("/sendMq") public ResponseResult sendMq(){ String msg = UUIDUtils.get8UUID();