zh

src/main/java/com/zh/project0512/controller/UtilsController.java

@@ -198,7 +198,6 @@ public class UtilsController {
 
 
     public static void main(String[] args) {
-        System.out.println(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM")));
 //        String a = m.find() ? m.group(1) : url;
 //        System.out.println(a);
 //        int b = StringUtils.countOccurrencesOf(a, "https://v.douyin");

src/main/java/com/zh/project0512/controller/manage/AdminController.java

@@ -1,11 +1,15 @@
 package com.zh.project0512.controller.manage;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation;
 import com.zh.project0512.annotation.AdminTokenValid;
 import com.zh.project0512.model.Admin;
+import com.zh.project0512.model.dto.AdminJurisdictionFBIDTO;
+import com.zh.project0512.model.vo.AdminJurisdictionFBRIVo;
+import com.zh.project0512.service.IAdminJurisdictionService;
 import com.zh.project0512.service.IAdminService;
 import com.zh.project0512.utils.*;
 import com.zh.project0512.utils.result.HttpStatusEnum;
@@ -18,9 +22,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -37,7 +43,8 @@ public class AdminController {
 
     @Autowired
     private IAdminService adminService;
-
+    @Resource
+    IAdminJurisdictionService userJurisdictionService;
     @Data
     static class LoginParam {
         @NotNull(message = "name不能为空")
@@ -67,7 +74,20 @@ public class AdminController {
         UpdateWrapper<Admin> uw = new UpdateWrapper<>();
         uw.eq("id", admin.getId()).set("token", token).set("lastLoginAt", LocalDateTime.now());
         adminService.update(uw);
-        return Result.success(admin);
+        String roleIdsStr = admin.getRoleIds();
+        if (roleIdsStr != null && !roleIdsStr.trim().equals("")) {
+            String[] roleIds = roleIdsStr.split(",");
+            if (roleIds.length > 1) {
+                return Result.success(admin,"暂不支持多角色的用户菜单列表展示");
+            }
+        }
+        AdminJurisdictionFBIDTO adminJurisdictionFBIDTO = new AdminJurisdictionFBIDTO();
+        adminJurisdictionFBIDTO.setRoleId(Integer.valueOf(roleIdsStr));
+        List<AdminJurisdictionFBRIVo> byRoleId = userJurisdictionService.findByRoleId(adminJurisdictionFBIDTO);
+        JSONObject obj = new JSONObject();
+        obj.put("admin",admin);
+        obj.put("role",byRoleId);
+        return Result.success(obj);
     }
 
     @Data