From 61e40908b2bdaabf64cd4702e7fb9a77fe2ce1ca Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 28 May 2024 11:54:57 +0800 Subject: [PATCH] Revert "update" This reverts commit 71be841f4d65a63a61059bb45bbc6e6f4bb35b42. --- .../pile/MemberBasicInfoController.java | 6 +- .../pile/MemberGroupController.java | 6 +- .../impl/MemberBasicInfoServiceImpl.java | 12 ++-- .../service/impl/PileAuthCardServiceImpl.java | 8 +-- .../java/com/jsowell/pile/util/UserUtils.java | 67 +++++++++++++------ 5 files changed, 62 insertions(+), 37 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index 137513fd5..01ebf156b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -108,9 +108,9 @@ public class MemberBasicInfoController extends BaseController { @GetMapping("/getMerchantListByAuth") public RestApiResponse getMerchantListByAuth() { RestApiResponse response = null; - // LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); - // logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail)); - List list = UserUtils.getMerchantInfoVOList(); + LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); + logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail)); + List list = loginUserDetail.getMerchantInfoVOList(); if (CollectionUtils.isEmpty(list)) { list = new ArrayList<>(); } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java index 050577f2e..8faeed5e5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java @@ -41,9 +41,9 @@ public class MemberGroupController extends BaseController { @PreAuthorize("@ss.hasPermi('member:memberGroup:list')") @GetMapping("/list") public TableDataInfo list(MemberGroupDTO memberGroup) { - // LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); - // logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail)); - List merchantInfoVOList = UserUtils.getMerchantInfoVOList(); + LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); + logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail)); + List merchantInfoVOList = loginUserDetail.getMerchantInfoVOList(); List collect = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); memberGroup.setMerchantIdList(collect); startPage(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 01982ad6e..93c18492f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -242,8 +242,8 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService { // 来自后管的充值，校验权限 if (StringUtils.equals(dto.getFromWeb(), Constants.ONE)) { - // LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); - List merchantInfoVOList = UserUtils.getMerchantInfoVOList(); + LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); + List merchantInfoVOList = loginUserDetail.getMerchantInfoVOList(); List collect = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); if (!collect.contains(targetMerchantId)) { throw new BusinessException(ReturnCodeEnum.CODE_PERMISSION_DENIED); @@ -520,8 +520,8 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService { // dto.setMerchantId(id); // } - // LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); - List firstMerchantIdList = UserUtils.getFirstMerchantIdList(); + LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); + List firstMerchantIdList = loginUserDetail.getFirstMerchantIdList(); if (CollectionUtils.isNotEmpty(firstMerchantIdList)) { dto.setFirstMerchantIds(firstMerchantIdList); } @@ -609,8 +609,8 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService { @Override public List queryMerchantVipList(QueryMemberInfoDTO dto) { // 获取后管登录用户的权限 - // LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); - List merchantInfoVOList = UserUtils.getMerchantInfoVOList(); + LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); + List merchantInfoVOList = loginUserDetail.getMerchantInfoVOList(); List merchantIdList = merchantInfoVOList.stream() .map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java index 64f40b591..225ad2ddd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java @@ -1,6 +1,5 @@ package com.jsowell.pile.service.impl; -import com.github.pagehelper.PageInfo; import com.jsowell.common.constant.Constants; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; @@ -90,13 +89,12 @@ public class PileAuthCardServiceImpl implements PileAuthCardService { */ @Override public List getPileAuthCardInfoList(PileAuthCardDTO dto) { - // LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); - List merchantInfoVOList = UserUtils.getMerchantInfoVOList(); + LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); + List merchantInfoVOList = loginUserDetail.getMerchantInfoVOList(); List merchantIdList = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); dto.setMerchantIdList(merchantIdList); PageUtils.startPage(); - List pileAuthCardInfoList = pileAuthCardMapper.getPileAuthCardInfoList(dto); - return pileAuthCardInfoList; + return pileAuthCardMapper.getPileAuthCardInfoList(dto); } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java index 18cb0b7f1..0f163262e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java @@ -16,7 +16,6 @@ import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.vo.base.LoginUserDetailVO; import com.jsowell.pile.vo.base.MerchantInfoVO; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -90,7 +89,53 @@ public class UserUtils { return resultVO; } - + /** + * 获取当前会员中的运营商列表（带权限校验） + */ + /*public static List getMerchantListByAuth() { + List resultList = Lists.newArrayList(); + // 获取登录用户 所有有权限运营商 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (Objects.isNull(loginUser)) { + return resultList; + } + // 获取登录用户对应的user对象 + SysUser user = loginUser.getUser(); + if (Objects.isNull(user)) { + return resultList; + } + // 获取所属部门id + SysDept dept = user.getDept(); + if (Objects.isNull(dept)) { + return resultList; + } + String deptLevel = dept.getDeptLevel(); + String deptId = String.valueOf(dept.getDeptId()); + if (Constants.ZERO.equals(deptLevel)) { + // 平台级权限 查询所有生效的运营商 + resultList = pileMerchantInfoService.selectAll(); + } else if (Constants.ONE.equals(deptLevel)) { + // 一级运营商权限 查询该一级运营商下面的所有运营商 + PileMerchantInfo merchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId); + resultList = pileMerchantInfoService.selectListByFirstMerchant(merchantInfo.getId() + ""); + } else if (Constants.TWO.equals(deptLevel) ) { + // 二级运营商权限 返回自身运营商 + MerchantInfoVO merchantInfoVO = pileMerchantInfoService.queryMerchantInfoVOByDeptId(deptId); + if (Objects.nonNull(merchantInfoVO)) { + resultList.add(merchantInfoVO); + } + } else if (Constants.THREE.equals(deptLevel)) { + // 站点权限 返回自身运营商 + PileStationInfo stationInfo = pileStationInfoService.queryInfoByDeptId(deptId); + if (Objects.nonNull(stationInfo)) { + MerchantInfoVO merchantInfoVO = pileMerchantInfoService.getMerchantInfoVO(stationInfo.getMerchantId() + ""); + if (Objects.nonNull(merchantInfoVO)) { + resultList.add(merchantInfoVO); + } + } + } + return resultList; + }*/ /** * 获取登录用户信息 @@ -176,22 +221,4 @@ public class UserUtils { resultVO.setFirstMerchantIdList(firstMerchantIdList); return resultVO; } - - /** - * 获取当前登录用户中有权限的运营商列表 - * @return - */ - public static List getMerchantInfoVOList() { - LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); - return loginUserDetail.getMerchantInfoVOList(); - } - - /** - * 获取当前登录用户有权限的一级运营商idList - * @return - */ - public static List getFirstMerchantIdList() { - LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); - return loginUserDetail.getFirstMerchantIdList(); - } } \ No newline at end of file