菜单获取

api-common/src/main/java/api/common/util/ObjectUtil.java

@@ -160,6 +160,9 @@ public class ObjectUtil {
      * @return
      */
     public static <T> List<T> listToTree(List<T> list){
+        if(isNull(list)){
+            return new LinkedList<T>();
+        }
         return listToTree(list,"0");
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/open/ctrl/MonitorCtrl.java

@@ -36,9 +36,9 @@ public class MonitorCtrl {
 
         System.out.println("运行自动任务:"+ Calendar.getInstance().getTime()+"/"+paramMap.get("id"));
 
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        //return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
 
-//        return service.createAutomaticSubProject(param);
+        return service.createAutomaticSubProject(param);
 
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/system/mapper/MenuMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 @Repository
 public interface MenuMapper {
 
-    List<MenuVO> getMyMenuTree(@Param("userId") String userId);
+    List<MenuVO> getMyMenuTree(@Param("roleCode") String userId);
 
     List<MenuVO> getMenuTree();
 

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/MenuService.java

@@ -23,8 +23,8 @@ public class MenuService {
     }
 
     public List<MenuVO> getMyMenuTree() {
-        String userId = AuthUtil.getCurrentUserId();
-        List<MenuVO> menus = menuMapper.getMyMenuTree(userId);
+        String roleCode = AuthUtil.getCurrentUserRoleCode();
+        List<MenuVO> menus = menuMapper.getMyMenuTree(roleCode);
         List<MenuVO> menuVOS = ObjectUtil.listToTree(menus);//注解方式转tree
         return menuVOS;
     }

simulation-resource-server/src/main/resources/bootstrap-test.yaml

@@ -0,0 +1,10 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 47.93.135.21:8848
+        namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
+      config:
+        server-addr: 47.93.135.21:8848
+        namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
+        file-extension: yaml

simulation-resource-server/src/main/resources/mapper/system/MenuMapper.xml

@@ -12,11 +12,11 @@
             m.sort,
             m.parent_id,
             m.visible
-        FROM system_user_role ur
-		INNER JOIN system_role r ON r.id = ur.role_id AND r.visible='1' AND r.is_deleted='0'
-        INNER JOIN system_role_menu rm ON rm.role_id = ur.role_id AND rm.is_deleted='0'
+				FROM system_role r
+        INNER JOIN system_role_menu rm ON rm.role_id = r.id AND rm.is_deleted='0'
         INNER JOIN system_menu m ON m.id=rm.menu_id AND m.visible='1' AND m.is_deleted='0'
-        WHERE ur.user_id = #{userId,jdbcType=VARCHAR}
+        WHERE r.role_code = #{roleCode,jdbcType=VARCHAR}
+		  AND r.visible='1' AND r.is_deleted='0'
         ORDER BY m.sort
     </select>