diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index f69619dfe..4c271d6a0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -39,12 +39,13 @@ import com.jsowell.pile.dto.*; import com.jsowell.pile.service.*; import com.jsowell.pile.service.orderlogic.AbstractOrderLogic; import com.jsowell.pile.service.orderlogic.OrderLogicFactory; +import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.OrderAmountDetailVO; import com.jsowell.pile.vo.base.OrderPeriodAmountVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.StationInfoVO; -import com.jsowell.pile.vo.uniapp.*; import com.jsowell.pile.vo.uniapp.InvoiceRecordVO; +import com.jsowell.pile.vo.uniapp.*; import com.jsowell.pile.vo.web.*; import com.jsowell.wxpay.response.WechatPayNotifyParameter; import org.apache.commons.collections4.CollectionUtils; @@ -666,7 +667,7 @@ public class OrderService { return false; } // 当前登录用户，是否可以结算该订单 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { log.info("人工结算订单-当前登录管理员无权限"); return false; 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 36655156a..0ae619f5e 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 @@ -73,9 +73,8 @@ public class MemberBasicInfoController extends BaseController { @GetMapping("/getMerchantListByAuth") public RestApiResponse getMerchantListByAuth() { RestApiResponse response = null; - List deptIds = getDeptIds(); // List list = memberBasicInfoService.getMerchantListByAuth(deptIds); - List list = memberBasicInfoService.getMerchantListByAuthV2(); + List list = memberBasicInfoService.getMerchantListByAuth(); if (CollectionUtils.isEmpty(list)) { list = new ArrayList<>(); } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 0e9944d09..db1952243 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -8,7 +8,6 @@ import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; -import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileMerchantInfo; @@ -19,6 +18,7 @@ import com.jsowell.pile.dto.QueryOrderDTO; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileMerchantInfoService; import com.jsowell.pile.service.IPileStationInfoService; +import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.web.OrderListVO; import com.jsowell.service.OrderService; import org.apache.commons.collections4.CollectionUtils; @@ -58,7 +58,7 @@ public class OrderBasicInfoController extends BaseController { @GetMapping("/order/list") public TableDataInfo list(QueryOrderDTO dto) { // 权限过滤 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return new TableDataInfo(); @@ -81,7 +81,7 @@ public class OrderBasicInfoController extends BaseController { @GetMapping("/order/totalData") public AjaxResult getOrderTotalData(QueryOrderDTO dto) { // 权限过滤 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return new AjaxResult(); @@ -110,7 +110,7 @@ public class OrderBasicInfoController extends BaseController { @PostMapping("/order/export") public void export(HttpServletResponse response, QueryOrderDTO orderBasicInfo) { // 权限过滤 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return; diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java b/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java index b71a99dfe..eef03dcb1 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java @@ -5,20 +5,14 @@ import com.github.pagehelper.PageInfo; import com.jsowell.common.constant.HttpStatus; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.domain.model.LoginUser; -import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.PageDomain; import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.core.page.TableSupport; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.util.DateUtils; -import com.jsowell.common.util.JWTUtils; -import com.jsowell.common.util.PageUtils; -import com.jsowell.common.util.SecurityUtils; -import com.jsowell.common.util.StringUtils; +import com.jsowell.common.util.*; import com.jsowell.common.util.sql.SqlUtil; -import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; @@ -26,7 +20,6 @@ import org.springframework.web.bind.annotation.InitBinder; import javax.servlet.http.HttpServletRequest; import java.beans.PropertyEditorSupport; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -204,7 +197,7 @@ public class BaseController { * 平台管理员账号会返回空数组 * @return */ - public List getDeptIds() { + /*public List getDeptIds() { // 获取登录账号信息 AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); if (authorizedMap == null) { @@ -215,5 +208,5 @@ public class BaseController { return merchantDeptIds; } return new ArrayList<>(); - } + }*/ } diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java index 7401cda80..b2aaaf448 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java @@ -1,21 +1,13 @@ package com.jsowell.common.util; -import com.alibaba.fastjson2.JSONObject; -import com.google.common.collect.Lists; import com.jsowell.common.constant.HttpStatus; -import com.jsowell.common.core.domain.entity.SysDept; -import com.jsowell.common.core.domain.entity.SysRole; -import com.jsowell.common.core.domain.entity.SysUser; import com.jsowell.common.core.domain.model.LoginUser; -import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.exception.ServiceException; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import java.util.List; - /** * 安全服务工具类 * @@ -108,7 +100,7 @@ public class SecurityUtils { } // 查询登录用户权限 - public static AuthorizedDeptVO getAuthorizedMap() { + /*public static AuthorizedDeptVO getAuthorizedMap() { // 登录用户 LoginUser loginUser = getLoginUser(); if (loginUser == null) { @@ -130,7 +122,6 @@ public class SecurityUtils { resultVO.setDeptId(deptId); log.info("用户id:{}, 所属部门信息:{}", user.getUserId(), JSONObject.toJSONString(dept)); // 登录用户角色 - List roles = user.getRoles(); Long parentId = dept.getParentId(); resultVO.setParentId(String.valueOf(parentId)); List merchantDeptIds = Lists.newArrayList(); @@ -147,5 +138,5 @@ public class SecurityUtils { resultVO.setStationDeptIds(stationDeptIds); } return resultVO; - } + }*/ } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java index 415c05e04..bde5cfbfc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java @@ -152,7 +152,5 @@ public interface IMemberBasicInfoService { /** * 获取当前会员中的运营商列表（带权限校验） */ - List getMerchantListByAuth(List deptIds); - - List getMerchantListByAuthV2(); + List getMerchantListByAuth(); } 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 289fb17d1..403b828d6 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 @@ -22,6 +22,7 @@ import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper; import com.jsowell.pile.mapper.MemberWalletInfoMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper; import com.jsowell.pile.service.*; +import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberVO; @@ -326,7 +327,8 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { sw.start("获取登录账号信息"); // 获取登录账号信息 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + // AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { return new ArrayList<>(); } @@ -427,15 +429,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { * 获取当前会员中的运营商列表（带权限校验） */ @Override - public List getMerchantListByAuth(List deptIds) { - return memberBasicInfoMapper.getMerchantListByAuth(deptIds); - } - - /** - * 获取当前会员中的运营商列表（带权限校验） - */ - @Override - public List getMerchantListByAuthV2() { + public List getMerchantListByAuth() { List resultList = Lists.newArrayList(); // 获取登录用户 所有有权限运营商 LoginUser loginUser = SecurityUtils.getLoginUser(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 9bb7cdde1..7e68518dc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -47,6 +47,7 @@ import com.jsowell.pile.service.orderlogic.OrderLogicFactory; import com.jsowell.pile.transaction.dto.ClearingBillTransactionDTO; import com.jsowell.pile.transaction.dto.OrderTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; +import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.*; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; @@ -196,7 +197,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { @Override public List selectOrderBasicInfoListWithAuth(QueryOrderDTO dto) { // 权限过滤 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return Lists.newArrayList(); @@ -1948,7 +1949,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { */ @Override public List getIndexOrderInfo(IndexQueryDTO dto) { - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { return Lists.newArrayList(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java index 6429b0950..b0f7648e7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java @@ -2,8 +2,6 @@ package com.jsowell.pile.service.impl; import com.google.common.collect.Lists; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; -import com.jsowell.common.util.DateUtils; -import com.jsowell.common.util.SecurityUtils; import com.jsowell.pile.domain.OrderInvoiceRecord; import com.jsowell.pile.dto.GetInvoiceInfoDTO; import com.jsowell.pile.dto.QueryInvoiceRecordDTO; @@ -11,6 +9,7 @@ import com.jsowell.pile.mapper.OrderInvoiceRecordMapper; import com.jsowell.pile.service.IMemberInvoiceTitleService; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IOrderInvoiceRecordService; +import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.OrderAmountDetailVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import com.jsowell.pile.vo.web.InvoiceRecordVO; @@ -96,7 +95,7 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService @Override public List getInvoiceListWithAuth(GetInvoiceInfoDTO dto) { // 获取登录账号信息 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { return new ArrayList<>(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index e18d560d7..6d912948f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -26,6 +26,7 @@ import com.jsowell.pile.mapper.PileBasicInfoMapper; import com.jsowell.pile.mapper.PileMerchantInfoMapper; import com.jsowell.pile.mapper.PileSimInfoMapper; import com.jsowell.pile.service.*; +import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.uniapp.GroundLockInfoVO; @@ -326,7 +327,7 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { */ @Override public List queryPileInfoList(QueryPileDTO queryPileDTO) { - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return Lists.newArrayList(); @@ -700,7 +701,7 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { */ @Override public IndexGeneralSituationVO getGeneralSituation(IndexQueryDTO dto) { - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { return new IndexGeneralSituationVO(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index 06a4d590b..e2a316b2e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -1,6 +1,5 @@ package com.jsowell.pile.service.impl; -import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -24,6 +23,7 @@ import com.jsowell.pile.service.IPileBasicInfoService; import com.jsowell.pile.service.IPileBillingTemplateService; import com.jsowell.pile.transaction.dto.BillingTemplateTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; +import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.uniapp.BillingPriceVO; import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; import com.jsowell.pile.vo.web.BillingDetailVO; @@ -426,7 +426,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi if (StringUtils.isBlank(stationId)) { return Lists.newArrayList(); } - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return Lists.newArrayList(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 0352eee02..1a8a33c64 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -9,13 +9,13 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.DictUtils; -import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; import com.jsowell.pile.dto.QueryMerchantInfoDTO; import com.jsowell.pile.mapper.PileMerchantInfoMapper; import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.web.MerchantSettleInfoVO; import com.jsowell.system.service.SysDeptService; @@ -74,7 +74,7 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { */ @Override public List selectPileMerchantInfoListWithAuth(PileMerchantInfo pileMerchantInfo) { - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return Lists.newArrayList(); @@ -371,7 +371,7 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { dto.setDeptIds(Lists.newArrayList()); } // 权限过滤 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return new ArrayList<>(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index ef608ec96..13deea66a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -24,6 +24,7 @@ import com.jsowell.pile.dto.QueryStationDTO; import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO; import com.jsowell.pile.mapper.PileStationInfoMapper; import com.jsowell.pile.service.*; +import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.StationInfoVO; @@ -396,7 +397,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { @Override // @DataScope(deptAlias = "t3") public List queryStationInfos(QueryStationDTO dto) { - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return Lists.newArrayList(); @@ -556,7 +557,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { */ @Override public List getStationSelectList(QueryStationDTO dto) { - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); if (authorizedMap == null) { // 为空表示没有权限，返回空数组 return Lists.newArrayList(); 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 new file mode 100644 index 000000000..bec522fde --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java @@ -0,0 +1,75 @@ +package com.jsowell.pile.util; + +import com.alibaba.fastjson2.JSONObject; +import com.google.common.collect.Lists; +import com.jsowell.common.core.domain.entity.SysDept; +import com.jsowell.common.core.domain.entity.SysUser; +import com.jsowell.common.core.domain.model.LoginUser; +import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; +import com.jsowell.common.util.SecurityUtils; +import com.jsowell.pile.service.IMemberBasicInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 后管登录用户工具类 + */ +// 1.将工具类注入到容器中 +@Slf4j +@Component +public class UserUtils { + + // 2.注入想引用的对象的静态实例 + private static IMemberBasicInfoService memberBasicInfoService; + + // 3.初始化有参构造器 + @Autowired + public UserUtils(IMemberBasicInfoService memberBasicInfoService) { + UserUtils.memberBasicInfoService = memberBasicInfoService; + } + + // 4.使用 + // 查询登录用户权限 + public static AuthorizedDeptVO getAuthorizedMap() { + // 登录用户 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser == null) { + return null; + } + // 用户 + SysUser user = loginUser.getUser(); + if (user == null) { + return null; + } + AuthorizedDeptVO resultVO = AuthorizedDeptVO.builder().build(); + // 登录用户所属部门（运营商或站点 根据父级id判断） + SysDept dept = user.getDept(); + if (dept == null) { + log.info("用户id:{}, 获取不到所属部门信息", user.getUserId()); + return null; + } + String deptId = String.valueOf(dept.getDeptId()); + resultVO.setDeptId(deptId); + log.info("用户id:{}, 所属部门信息:{}", user.getUserId(), JSONObject.toJSONString(dept)); + // 登录用户角色 + Long parentId = dept.getParentId(); + resultVO.setParentId(String.valueOf(parentId)); + List merchantDeptIds = Lists.newArrayList(); + List stationDeptIds = Lists.newArrayList(); + if (parentId == 0L) { + // 父级id是0，表明是该账号挂在平台下面，是系统管理员 + } else if (parentId == 100L) { + // 父级id是100，表明是该账号挂在运营商下面，是运营商管理员 + merchantDeptIds.add(deptId); + resultVO.setMerchantDeptIds(merchantDeptIds); + } else { + // 其他情况，表明是站点管理员 + stationDeptIds.add(deptId); + resultVO.setStationDeptIds(stationDeptIds); + } + return resultVO; + } +} \ No newline at end of file