解耦合

src/main/java/com/example/demo/controller/ConsumeController.java

@@ -1,17 +1,25 @@
 package com.example.demo.controller;
 
+import com.example.demo.Util.JWTUtil;
+import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.UserGoldRecord;
 import com.example.demo.domain.vo.ConsumeUser;
 import com.example.demo.domain.vo.Gold;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.service.ConsumeService;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @program: gold-java
@@ -34,7 +42,7 @@ public class ConsumeController {
 
     //消耗明细
     @PostMapping("/selectAll")
-    public Result selcetAll(@RequestBody Page page) {
+    public Result selectAll(@RequestBody Page page) {
         try {
             //页码校验
             if (ObjectUtils.isEmpty(page.getPageNum())) {
@@ -44,6 +52,17 @@ public class ConsumeController {
             if (ObjectUtils.isEmpty(page.getPageSize())) {
                 return Result.error("页大小为空！");
             } else {
+                //解token权限
+                HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+                String token = request.getHeader("token");
+                Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    page.getConsumeUser().setMarkets(list);
+                }
+                else{
+                    return Result.error("角色为空");
+                }
                 return Result.success(consumeService.selectAll(page.getPageNum(), page.getPageSize(),page.getConsumeUser()));
             }
         } catch (Exception e) {
@@ -57,7 +76,7 @@ public class ConsumeController {
 
     //消耗明细筛选
     @PostMapping("/selectBy")
-    public Result selcetBy(@RequestBody Page page) {
+    public Result selectBy(@RequestBody Page page) {
         try {
             //页码校验
             if (ObjectUtils.isEmpty(page.getPageNum())) {
@@ -67,6 +86,17 @@ public class ConsumeController {
             if (ObjectUtils.isEmpty(page.getPageSize())) {
                 return Result.error("页大小为空！");
             } else {
+                //解token权限
+                HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+                String token = request.getHeader("token");
+                Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    page.getConsumeUser().setMarkets(list);
+                }
+                else{
+                    return Result.error("角色为空");
+                }
                 return Result.success(consumeService.selectBy(page.getPageNum(), page.getPageSize(), page.getConsumeUser()));
             }
         } catch (Exception e) {
@@ -80,6 +110,17 @@ public class ConsumeController {
     @PostMapping("/statsGold")
     public Result statsGold(@RequestBody ConsumeUser consumeUser) {
         try {
+            //解token权限
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String token = request.getHeader("token");
+            Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+            if (admin != null) {
+                List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                consumeUser.setMarkets(list);
+            }
+            else{
+                return Result.error("角色为空");
+            }
             Gold gold = consumeService.statsGold(consumeUser);
             return Result.success(gold);
         } catch (Exception e) {

src/main/java/com/example/demo/controller/PermissionController.java

@@ -1,5 +1,6 @@
 package com.example.demo.controller;
 
+import com.example.demo.Util.JWTUtil;
 import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.AdminRole;
 import com.example.demo.domain.vo.AdminVo;
@@ -7,11 +8,15 @@ import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Permission;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.service.PermissionService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * @program: GOLD
@@ -38,6 +43,22 @@ public class PermissionController {
     }
     @PostMapping("/getPermission")
     public Result getPermission(@RequestBody Page page){
+        try {
+            //解token权限
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String token = request.getHeader("token");
+            Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+            if (admin != null) {
+                List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                page.getPermission().setMarkets(list);
+            }
+            else{
+                return Result.error("角色为空");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error("获取地区失败");
+        }
         return Result.success(permissionService.getpermission(page.getPageNum(), page.getPageSize(), page.getPermission()));
     }
     //新增用户

src/main/java/com/example/demo/controller/RechargeController.java

@@ -1,13 +1,21 @@
 package com.example.demo.controller;
 
+import com.example.demo.Util.JWTUtil;
+import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.vo.*;
 import com.example.demo.service.ConsumeService;
 import com.example.demo.service.RechargeService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @program: gold-java
@@ -39,6 +47,17 @@ public class RechargeController {
             if (ObjectUtils.isEmpty(page.getPageSize())) {
                 return Result.error("页大小为空！");
             } else {
+                //解token权限
+                HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+                String token = request.getHeader("token");
+                Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    page.getRechargeUser().setMarkets(list);
+                }
+                else{
+                    return Result.error("角色为空");
+                }
                 return Result.success(rechargeService.selectAll(page.getPageNum(), page.getPageSize(),page.getRechargeUser()));
             }
         } catch (Exception e) {
@@ -59,6 +78,17 @@ public class RechargeController {
             if (ObjectUtils.isEmpty(page.getPageSize())) {
                 return Result.error("页大小为空！");
             } else {
+                //解token权限
+                HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+                String token = request.getHeader("token");
+                Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    page.getRechargeUser().setMarkets(list);
+                }
+                else{
+                    return Result.error("角色为空");
+                }
                 return Result.success(rechargeService.selectBy(page.getPageNum(), page.getPageSize(), page.getRechargeUser()));
             }
         } catch (Exception e) {
@@ -71,6 +101,17 @@ public class RechargeController {
     @PostMapping("/statsGold")
     public Result statsGold(@RequestBody RechargeUser rechargeUser) {
         try {
+            //解token权限
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String token = request.getHeader("token");
+            Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+            if (admin != null) {
+                List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                rechargeUser.setMarkets(list);
+            }
+            else{
+                return Result.error("角色为空");
+            }
             Gold gold = rechargeService.statsGold(rechargeUser);
             return Result.success(gold);
         } catch (Exception e) {

src/main/java/com/example/demo/controller/RefundController.java

@@ -1,14 +1,20 @@
 package com.example.demo.controller;
 
+import com.example.demo.Util.JWTUtil;
+import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.vo.*;
 import com.example.demo.service.ConsumeService;
 import com.example.demo.service.RefundService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -40,6 +46,16 @@ public class RefundController {
             if (ObjectUtils.isEmpty(page.getPageSize())) {
                 return Result.error("页大小为空！");
             } else {
+                //解token权限
+                HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+                String token = request.getHeader("token");
+                Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    page.getRefundUser().setMarkets(list);
+                } else {
+                    return Result.error("角色为空");
+                }
                 return Result.success(refundService.selectAll(page.getPageNum(), page.getPageSize(), page.getRefundUser()));
             }
         } catch (Exception e) {
@@ -58,7 +74,16 @@ public class RefundController {
             if (ObjectUtils.isEmpty(page.getPageSize())) {
                 return Result.error("页大小为空！");
             } else {
-
+                //解token权限
+                HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+                String token = request.getHeader("token");
+                Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    page.getRefundUser().setMarkets(list);
+                } else {
+                    return Result.error("角色为空");
+                }
                 return Result.success(refundService.selectBy(page.getPageNum(), page.getPageSize(), page.getRefundUser()));
             }
         } catch (Exception e) {
@@ -71,6 +96,17 @@ public class RefundController {
     @PostMapping("/statsGold")
     public Result statsGold(@RequestBody RefundUser refundUser) {
         try {
+            //解token权限
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String token = request.getHeader("token");
+            Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+            if (admin != null) {
+                List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                refundUser.setMarkets(list);
+            }
+            else{
+                return Result.error("角色为空");
+            }
             Gold gold = refundService.statsGold(refundUser);
             return Result.success(gold);
         } catch (Exception e) {
@@ -80,16 +116,14 @@ public class RefundController {
 
     //获取退款类型
     @PostMapping("/refundType")
-    public Result getRefundType()
-    {
+    public Result getRefundType() {
         List<String> list = refundService.getRefundType();
         return Result.success(list);
     }
 
     //筛选产品
     @PostMapping("/selectGoods")
-    public Result getSelectGoods(@RequestBody RefundUser refundUser)
-    {
+    public Result getSelectGoods(@RequestBody RefundUser refundUser) {
         List<RefundUser> list = refundService.selectGoods(refundUser.getJwcode());
         return Result.success(list);
     }

src/main/java/com/example/demo/controller/RoleController.java

@@ -1,17 +1,23 @@
 package com.example.demo.controller;
 
+import com.example.demo.Util.JWTUtil;
+import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.Role;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.domain.vo.RoleVo;
 import com.example.demo.service.RefundService;
 import com.example.demo.service.RoleService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -55,8 +61,7 @@ public class RoleController {
     //查找全部角色
     @PostMapping("/selectAll")
     public Result selectRole() {
-        List<RoleVo> list = roleService.selectAllRole();
-        return Result.success(list);
+        return roleService.selectAllRole();
     }
     //获取上级角色的下属角色列表
     @PostMapping("/selectSub")
@@ -85,6 +90,17 @@ public class RoleController {
             if (ObjectUtils.isEmpty(page.getPageSize())) {
                 return Result.error("页大小为空！");
             } else {
+                //解token权限
+                HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+                String token = request.getHeader("token");
+                Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    page.getRoleVo().setMarkets(list);
+                }
+                else{
+                    return Result.error("角色为空");
+                }
                 return Result.success(roleService.selectBy(page.getPageNum(), page.getPageSize(), page.getRoleVo()));
             }
         } catch (Exception e) {

src/main/java/com/example/demo/controller/UserController.java

@@ -34,8 +34,7 @@ public class UserController {
     @PostMapping("/selectUser")
     public Result selectUser(@RequestBody GoldUser user) {
         try {
-            user = userService.selectUser(user.getJwcode().toString());
-            return Result.success(user);
+            return userService.selectUser(user.getJwcode().toString());
         } catch (Exception e) {
             return Result.error("请检查输入精网号");
         }

src/main/java/com/example/demo/service/RoleService.java

@@ -24,7 +24,7 @@ public interface RoleService {
     //新增角色二期替补
     Result addRole2(RoleVo roleVo);
     //查找全部角色
-    List<RoleVo> selectAllRole();
+    Result selectAllRole();
     //根据父级id查找下属角色
     List<RoleVo> selectSubRole(Integer id);
 

src/main/java/com/example/demo/service/UserService.java

@@ -3,6 +3,7 @@ package com.example.demo.service;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.Gold;
 import com.example.demo.domain.vo.GoldUser;
+import com.example.demo.domain.vo.Result;
 
 import java.util.List;
 
@@ -18,7 +19,7 @@ import java.util.List;
 public interface UserService {
 
     //查找用户部分信息
-    GoldUser selectUser(String jwcode);
+    Result selectUser(String jwcode);
 
     //查找用户金币
     GoldUser selectgold(String jwcode);

src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java

@@ -45,17 +45,10 @@ public class ConsumeServiceImpl implements ConsumeService {
     @Autowired
     private UserMapper userMapper;
 
-    @Autowired
-    private AdminService adminService;
-    @Autowired
-    private GeneralService generalService;
 
     //消耗明细
     @Override
     public PageInfo<ConsumeUser> selectAll(Integer pageNum, Integer pageSize, ConsumeUser consumeUser){
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        consumeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<ConsumeUser> consumeUsers = consumeMapper.selectAll(consumeUser);
         return new PageInfo<>(consumeUsers);
@@ -64,9 +57,6 @@ public class ConsumeServiceImpl implements ConsumeService {
     //消耗金币统计
     @Override
     public Gold statsGold(ConsumeUser consumeUser) {
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        consumeUser.setMarkets(markets);
         Gold gold = new Gold();
         List<ConsumeUser> consumeUsers = consumeMapper.selectBy(consumeUser);
 
@@ -102,9 +92,6 @@ public class ConsumeServiceImpl implements ConsumeService {
     //消耗明细筛选
     @Override
     public PageInfo<ConsumeUser> selectBy(Integer pageNum, Integer pageSize, ConsumeUser consumeUser) {
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        consumeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<ConsumeUser> consumeUsers = consumeMapper.selectBy(consumeUser);
         return new PageInfo<>(consumeUsers);

src/main/java/com/example/demo/serviceImpl/ExportExcelServiceImpl.java

@@ -830,7 +830,7 @@ public class ExportExcelServiceImpl implements ExportExcelService {
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
-                    Result pageResult = consumeController.selcetBy(page);
+                    Result pageResult = consumeController.selectBy(page);
                     Integer code = pageResult.getCode();
                     Object data = pageResult.getData();
 

src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java

@@ -39,10 +39,6 @@ public class PermissionServiceImpl implements PermissionService {
     private PermissionMapper permissionMapper;
     @Autowired
     private AdminMapper adminMapper;
-    @Autowired
-    private AdminService adminService;
-    @Autowired
-    private GeneralService generalService;
 
     @Override
     public List<String> getposition(String token) {
@@ -56,9 +52,6 @@ public class PermissionServiceImpl implements PermissionService {
 
     @Override
     public PageInfo<Permission> getpermission(Integer pageNum, Integer pageSize, Permission permission) {
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        permission.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<Permission> list = permissionMapper.getPermission(permission);
         for (Permission item : list) {

src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java

@@ -41,18 +41,10 @@ public class RechargeServiceImpl implements RechargeService {
     private UserMapper userMapper;
 
 
-    @Autowired
-    private AdminService adminService;
-
-    @Autowired
-    private GeneralService generalService;
 
     //查询所有充值
     @Override
     public PageInfo<RechargeUser> selectAll(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) throws  Exception{
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        rechargeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RechargeUser> rechargeUsers = rechargeMapper.selectAll(rechargeUser);
         return new PageInfo<>(rechargeUsers);
@@ -61,9 +53,6 @@ public class RechargeServiceImpl implements RechargeService {
     //查询筛选充值
     @Override
     public PageInfo<RechargeUser> selectBy(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) throws  Exception{
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        rechargeUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RechargeUser> rechargeUsers = rechargeMapper.selectBy(rechargeUser);
         return new PageInfo<>(rechargeUsers);
@@ -72,9 +61,6 @@ public class RechargeServiceImpl implements RechargeService {
     //统计金币记录
     @Override
     public Gold statsGold(RechargeUser rechargeUser) {
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        rechargeUser.setMarkets(markets);
         Gold gold = new Gold();
         List<RechargeUser> rechargeUsers = rechargeMapper.selectBy(rechargeUser);
 

src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java

@@ -46,18 +46,10 @@ public class RefundServiceImpl implements RefundService {
     @Autowired
     private UserMapper userMapper;
 
-    @Autowired
-    private AdminService adminService;
-
-    @Autowired
-    private GeneralService generalService;
 
     //查找全部退款
     @Override
     public PageInfo<RefundUser> selectAll(Integer pageNum, Integer pageSize, RefundUser refundUser) throws  Exception{
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        refundUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RefundUser> refundUsers = refundMapper.selectAll(refundUser);
         return new PageInfo<>(refundUsers);
@@ -66,9 +58,6 @@ public class RefundServiceImpl implements RefundService {
     //统计退款金额
     @Override
     public Gold statsGold(RefundUser refundUser) {
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        refundUser.setMarkets(markets);
         Gold gold = new Gold();
         List<RefundUser> refundUsers = refundMapper.selectBy(refundUser);
 
@@ -104,9 +93,6 @@ public class RefundServiceImpl implements RefundService {
     //查找筛选退款
     @Override
     public PageInfo<RefundUser> selectBy(Integer pageNum, Integer pageSize, RefundUser refundUser)throws  Exception {
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        refundUser.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RefundUser> refundUsers = refundMapper.selectBy(refundUser);
         return new PageInfo<>(refundUsers);

src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java

@@ -1,5 +1,7 @@
 package com.example.demo.serviceImpl;
 
+import com.example.demo.Util.JWTUtil;
+import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.Role;
 import com.example.demo.domain.vo.ConsumeUser;
 import com.example.demo.domain.vo.MenuVo;
@@ -14,14 +16,14 @@ import com.example.demo.service.MenuService;
 import com.example.demo.service.RoleService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @program: gold-java
@@ -40,10 +42,6 @@ public class RoleServiceImpl implements RoleService {
     @Autowired
     private MenuService menuService;
     @Autowired
-    private AdminService adminService;
-    @Autowired
-    private GeneralService generalService;
-    @Autowired
     private MenuMapper menuMapper;
 
     //新增角色
@@ -218,10 +216,23 @@ public class RoleServiceImpl implements RoleService {
 
     //查找全部角色
     @Override
-    public List<RoleVo> selectAllRole() {
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        return roleMapper.selectAllRole(markets);
+    public Result selectAllRole() {
+        try {
+            //解token权限
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String token = request.getHeader("token");
+            Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+            if (admin == null) {
+                return Result.error("当前用户未登录");
+            }
+            List<String> list = Arrays.asList(admin.getMarkets().split(","));
+            List<RoleVo> listRole = roleMapper.selectAllRole(list);
+            return Result.success(listRole);
+        } catch (Exception e) {
+            return Result.error("查找失败");
+        }
+
+
     }
 
     @Override
@@ -232,9 +243,6 @@ public class RoleServiceImpl implements RoleService {
     //分页查找角色
     @Override
     public PageInfo<RoleVo> selectBy(Integer pageNum, Integer pageSize, RoleVo roleVo) {
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        roleVo.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RoleVo> roleVos = roleMapper.selectBy(roleVo);
         // 遍历 roleVos 列表

src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java

@@ -1,17 +1,24 @@
 package com.example.demo.serviceImpl;
 
+import com.example.demo.Util.JWTUtil;
+import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.Gold;
 import com.example.demo.domain.vo.GoldUser;
+import com.example.demo.domain.vo.Result;
 import com.example.demo.mapper.ConsumeMapper;
 import com.example.demo.mapper.UserMapper;
 import com.example.demo.service.AdminService;
 import com.example.demo.service.GeneralService;
 import com.example.demo.service.UserService;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -30,18 +37,28 @@ public class UserServiceImpl implements UserService {
 
     @Autowired
     private UserMapper userMapper;
-    @Autowired
-    private AdminService adminService;
-    @Autowired
-    private GeneralService generalService;
+
 
     //查找用户部分信息
     @Override
-    public GoldUser selectUser(String jwcode) {
-        String account = adminService.getCurrentAdminAccount();
-        List<String> markets = generalService.getAdminMarket(account);
-        GoldUser user = userMapper.selectUserCard(jwcode,markets);
-        return user;
+        public Result selectUser(String jwcode) {
+        //解token权限
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String token = request.getHeader("token");
+            Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+            if (admin != null) {
+                List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                GoldUser user = userMapper.selectUserCard(jwcode,list);
+                return Result.success(user);
+            }
+            else{
+                return Result.error("用户为空");
+            }
+        } catch (Exception e) {
+            return Result.error("用户查找不到");
+        }
+
     }
 
     //查找用户全部信息