Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期

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

@@ -35,7 +35,7 @@ public class GeneralController {
     }
     //获取角色地区权限列表
     @PostMapping("/roleMarkets")
-    public Result getRoleMarkets(@RequestBody AdminVo adminVo){
+    public Result getRoleMarkets(@RequestBody AdminVo adminVo) throws Exception {
         String account = adminVo.getAccount();
         List<String> list = generalService.getRoleMarket(account);
         return Result.success(list);

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

@@ -59,6 +59,13 @@ public class RoleController {
         List<RoleVo> list=roleService.selectSubRole(id);
         return Result.success(list);
     }
+    //获取当前角色的上级角色
+    @PostMapping("/selectFather")
+    public Result selectFather(@RequestBody RoleVo roleVo) {
+        Integer id = roleVo.getId();
+        RoleVo role = roleService.selectFather(id);
+        return Result.success(role);
+    }
 
     //角色明细筛选
     @PostMapping("/selectBy")

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

@@ -52,7 +52,7 @@ public class WorkbenchController {
      */
     @PostMapping("getCard")
     public ResponseEntity<WorkbenchCard> card1(@RequestBody WorkbenchCard workbench,
-        @AuthenticationPrincipal Admin admin) {
+        @AuthenticationPrincipal Admin admin) throws Exception{
             if (admin != null) {
                 String account = admin.getAccount();
                 List<String> markets = generalService.getRoleMarket(account);
@@ -73,12 +73,12 @@ public class WorkbenchController {
   /*
   更新统计表并获取卡片数据
    */
-    @PostMapping("updateCard")
+    /*@PostMapping("updateCard")
     public ResponseEntity<WorkbenchCard> updateCard(@RequestBody WorkbenchCard workbench){
         statisticsService.runHourlyTaskPart1(); //更新余量数据
         statisticsService.runHourlyTaskPart2(); //更新余量外数据
 
         WorkbenchCard result =workbenchService.getCard(workbench.getMarkets());   //获取卡片数据
         return ResponseEntity.ok(result);
-    }
+    }*/
 }

src/main/java/com/example/demo/mapper/RoleMapper.java

@@ -44,4 +44,6 @@ public interface RoleMapper {
 
     //删除角色菜单
     void deleteRoleMenu(RoleVo roleVo);
+    //获取当前角色的上级角色
+    RoleVo selectFather(Integer id);
 }

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

@@ -33,5 +33,5 @@ public interface GeneralService {
     //获取时间段内的所有日期（包含起始和结束日）
     List<Date> getAllDatesBetween(Date start, Date end);
     //获取角色的地区权限列表
-    List<String> getRoleMarket(String account);
+    List<String> getRoleMarket(String account) throws Exception;
 }

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

@@ -32,4 +32,6 @@ public interface RoleService {
 
     //删除角色
     Result deleteRole(RoleVo roleVo);
+    //获取当前角色的上级角色
+    RoleVo selectFather(Integer id);
 }

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

@@ -112,8 +112,10 @@ public class GeneralServiceImpl implements GeneralService {
     获取角色的地区权限列表
      */
     @Override
-    public List<String> getRoleMarket(String account) {
+    public List<String> getRoleMarket(String account) throws Exception {
         String market = generalMapper.getRoleMarket(account);
+        if (market == null)
+            throw new Exception("没有地区权限");
         List<String> list = Arrays.asList(market.split(","));
         return list;
     }

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

@@ -97,6 +97,12 @@ public class RoleServiceImpl implements RoleService {
         return Result.success("删除成功");
     }
 
+    @Override
+    public RoleVo selectFather(Integer id) {
+
+        return roleMapper.selectFather(id);
+    }
+
     //查找全部角色
     @Override
     public List<RoleVo> selectAllRole() {

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

@@ -99,7 +99,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 
     @Override
     public WorkbenchCard getCardCache(List<String> markets) {
-        //markets = generalService.getMarket();
+        markets = generalService.getMarket();
         //从缓存中获取工作台数据
         WorkbenchCard cached = redisTemplate.opsForValue().get(CACHE_KEY);
         if (cached != null) {

src/main/resources/mapper/RoleMapper.xml

@@ -63,5 +63,10 @@
         </where>
         ORDER BY r.priority DESC
     </select>
+    <!--获取当前角色的上级角色-->
+    <select id="selectFather" resultType="com.example.demo.domain.vo.RoleVo">
+        select father_id as id from role
+        where id = #{id}
+    </select>
 
 </mapper>