更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/DepartmentController.java

@@ -27,9 +27,6 @@ public class DepartmentController {
     @Autowired
     private DepartmentService departmentService;
 
-    @ResourceAuth(value = "departmentManager", type = AuthType.Platform, remark = "部门管理_部门列表_1_Menu")
-    @ResourceAuth(value = "departmentManager", type = AuthType.Project, remark = "部门管理_部门列表_1_Menu")
-    @ResourceAuth(value = "departmentManager", type = AuthType.School, remark = "部门管理_部门列表_1_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/OrganizationController.java

@@ -30,7 +30,7 @@ public class OrganizationController {
     private OrganizationService organizationService;
 
     //------------------------------项目管理 start----------------------
-    @ResourceAuth(value = "saveProjectInfo", type = AuthType.Platform, remark = "项目管理_保存项目_1_Button")
+    @ResourceAuth(value = "saveProjectInfo", type = AuthType.Platform, remark = "园区项目管理_保存项目_11_Button")
     @ResourceAuth(value = "user", type = AuthType.User)
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @Operation(summary = "项目-保存", description = "项目-保存")
@@ -58,6 +58,7 @@ public class OrganizationController {
         return this.organizationService.getProjectDetail(oid);
     }
 
+    @ResourceAuth(value = "deleteProject", type = AuthType.Platform, remark = "园区项目管理_删除项目_12_Button")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "删除项目信息", description = "删除项目信息")
     @RequestMapping(value = "deleteProject", method = {RequestMethod.GET})

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/orgManager/OrganizationManagerController.java

@@ -49,7 +49,7 @@ public class OrganizationManagerController {
         return organizationManagerService.orgPage(param, pageable);
     }
 
-    @ResourceAuth(value = "saveOrgInfo", type = AuthType.Platform, remark = "项目管理_添加项目_1_Button")
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @Operation(summary = "机构信息-保存", description = "机构信息-保存")

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/DeviceBindController.java

@@ -34,12 +34,6 @@ public class DeviceBindController {
 
     //----------------------------设备基础信息 start------------------------
 
-    @ResourceAuth(value = "deviceManager", type = AuthType.Platform, remark = "设备管理_设备列表_1_Menu")
-    @ResourceAuth(value = "deviceManager", type = AuthType.Project, remark = "设备管理_设备列表_1_Menu")
-    @ResourceAuth(value = "deviceManager", type = AuthType.School, remark = "设备管理_设备列表_1_Menu")
-    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
-    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
-    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "设备列表-分页查询", description = "设备列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/OrgMenuController.java

@@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RestController;
 public class OrgMenuController {
 
 
-    @ResourceAuth(value = "projectOrgManager", type = AuthType.Project, remark = "机构管理_机构管理_10_Menu")
-    @ResourceAuth(value = "projectOrgManager", type = AuthType.School, remark = "机构管理_机构管理_10_Menu")
+    @ResourceAuth(value = "projectOrgManager", type = AuthType.Project, remark = "机构管理_机构管理_110_Menu")
+    @ResourceAuth(value = "projectOrgManager", type = AuthType.School, remark = "机构管理_机构管理_110_Menu")
     @ResourceAuth(value = "projectOrgManager", type = AuthType.BusinessMain, remark = "机构管理_机构管理_10_Menu")
-    @ResourceAuth(value = "projectOrgManager", type = AuthType.CommonOrg, remark = "机构管理_机构管理_10_Menu")
+    @ResourceAuth(value = "projectOrgManager", type = AuthType.CommonOrg, remark = "机构管理_机构管理_110_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -33,10 +33,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectUserManager", type = AuthType.Project, remark = "用户管理_用户列表_20_Menu")
-    @ResourceAuth(value = "projectUserManager", type = AuthType.School, remark = "用户管理_用户列表_20_Menu")
-    @ResourceAuth(value = "projectUserManager", type = AuthType.BusinessMain, remark = "用户管理_用户列表_20_Menu")
-    @ResourceAuth(value = "projectUserManager", type = AuthType.CommonOrg, remark = "用户管理_用户列表_20_Menu")
+    @ResourceAuth(value = "projectUserManager", type = AuthType.Project, remark = "用户管理_用户列表_120_Menu")
+    @ResourceAuth(value = "projectUserManager", type = AuthType.School, remark = "用户管理_用户列表_120_Menu")
+    @ResourceAuth(value = "projectUserManager", type = AuthType.BusinessMain, remark = "用户管理_用户列表_120_Menu")
+    @ResourceAuth(value = "projectUserManager", type = AuthType.CommonOrg, remark = "用户管理_用户列表_120_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -48,10 +48,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectPostionManager", type = AuthType.Project, remark = "用户管理_职位管理_21_Menu")
-    @ResourceAuth(value = "projectPostionManager", type = AuthType.School, remark = "用户管理_职位管理_21_Menu")
-    @ResourceAuth(value = "projectPostionManager", type = AuthType.BusinessMain, remark = "用户管理_职位管理_21_Menu")
-    @ResourceAuth(value = "projectPostionManager", type = AuthType.CommonOrg, remark = "用户管理_职位管理_21_Menu")
+    @ResourceAuth(value = "projectPostionManager", type = AuthType.Project, remark = "用户管理_职位管理_121_Menu")
+    @ResourceAuth(value = "projectPostionManager", type = AuthType.School, remark = "用户管理_职位管理_121_Menu")
+    @ResourceAuth(value = "projectPostionManager", type = AuthType.BusinessMain, remark = "用户管理_职位管理_121_Menu")
+    @ResourceAuth(value = "projectPostionManager", type = AuthType.CommonOrg, remark = "用户管理_职位管理_121_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -63,10 +63,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectRoleManager", type = AuthType.Project, remark = "用户管理_角色列表_22_Menu")
-    @ResourceAuth(value = "projectRoleManager", type = AuthType.School, remark = "用户管理_角色列表_22_Menu")
-    @ResourceAuth(value = "projectRoleManager", type = AuthType.BusinessMain, remark = "用户管理_角色列表_22_Menu")
-    @ResourceAuth(value = "projectRoleManager", type = AuthType.CommonOrg, remark = "用户管理_角色列表_22_Menu")
+    @ResourceAuth(value = "projectRoleManager", type = AuthType.Project, remark = "用户管理_角色列表_122_Menu")
+    @ResourceAuth(value = "projectRoleManager", type = AuthType.School, remark = "用户管理_角色列表_122_Menu")
+    @ResourceAuth(value = "projectRoleManager", type = AuthType.BusinessMain, remark = "用户管理_角色列表_122_Menu")
+    @ResourceAuth(value = "projectRoleManager", type = AuthType.CommonOrg, remark = "用户管理_角色列表_122_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -78,10 +78,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.Project, remark = "用户管理_部门管理_23_Menu")
-    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.School, remark = "用户管理_部门管理_23_Menu")
-    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.BusinessMain, remark = "用户管理_部门管理_23_Menu")
-    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.CommonOrg, remark = "用户管理_部门管理_23_Menu")
+    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.Project, remark = "用户管理_部门管理_123_Menu")
+    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.School, remark = "用户管理_部门管理_123_Menu")
+    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.BusinessMain, remark = "用户管理_部门管理_123_Menu")
+    @ResourceAuth(value = "projectDepartmentManager", type = AuthType.CommonOrg, remark = "用户管理_部门管理_123_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -93,10 +93,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectCardManager", type = AuthType.Project, remark = "卡片管理_卡片列表_30_Menu")
-    @ResourceAuth(value = "projectCardManager", type = AuthType.School, remark = "卡片管理_卡片列表_30_Menu")
-    @ResourceAuth(value = "projectCardManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片列表_30_Menu")
-    @ResourceAuth(value = "projectCardManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片列表_30_Menu")
+    @ResourceAuth(value = "projectCardManager", type = AuthType.Project, remark = "卡片管理_卡片列表_130_Menu")
+    @ResourceAuth(value = "projectCardManager", type = AuthType.School, remark = "卡片管理_卡片列表_130_Menu")
+    @ResourceAuth(value = "projectCardManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片列表_130_Menu")
+    @ResourceAuth(value = "projectCardManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片列表_130_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -108,10 +108,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.Project, remark = "卡片管理_卡片资源库_31_Menu")
-    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.School, remark = "卡片管理_卡片资源库_31_Menu")
-    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片资源库_31_Menu")
-    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片资源库_31_Menu")
+    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.Project, remark = "卡片管理_卡片资源库_131_Menu")
+    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.School, remark = "卡片管理_卡片资源库_131_Menu")
+    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.BusinessMain, remark = "卡片管理_卡片资源库_131_Menu")
+    @ResourceAuth(value = "projectCardPoolManager", type = AuthType.CommonOrg, remark = "卡片管理_卡片资源库_131_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -123,10 +123,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectDeviceManager", type = AuthType.Project, remark = "设备管理_设备列表_40_Menu")
-    @ResourceAuth(value = "projectDeviceManager", type = AuthType.School, remark = "设备管理_设备列表_40_Menu")
-    @ResourceAuth(value = "projectDeviceManager", type = AuthType.BusinessMain, remark = "设备管理_设备列表_40_Menu")
-    @ResourceAuth(value = "projectDeviceManager", type = AuthType.CommonOrg, remark = "设备管理_设备列表_40_Menu")
+    @ResourceAuth(value = "projectDeviceManager", type = AuthType.Project, remark = "设备管理_设备列表_140_Menu")
+    @ResourceAuth(value = "projectDeviceManager", type = AuthType.School, remark = "设备管理_设备列表_140_Menu")
+    @ResourceAuth(value = "projectDeviceManager", type = AuthType.BusinessMain, remark = "设备管理_设备列表_140_Menu")
+    @ResourceAuth(value = "projectDeviceManager", type = AuthType.CommonOrg, remark = "设备管理_设备列表_140_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -139,10 +139,10 @@ public class OrgMenuController {
     }
 
 
-    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.Project, remark = "设备管理_设备权限_41_Menu")
-    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.School, remark = "设备管理_设备权限_41_Menu")
-    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.BusinessMain, remark = "设备管理_设备权限_41_Menu")
-    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.CommonOrg, remark = "设备管理_设备权限_41_Menu")
+    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.Project, remark = "设备管理_设备权限_141_Menu")
+    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.School, remark = "设备管理_设备权限_141_Menu")
+    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.BusinessMain, remark = "设备管理_设备权限_141_Menu")
+    @ResourceAuth(value = "projectDevicePermissManager", type = AuthType.CommonOrg, remark = "设备管理_设备权限_141_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -155,10 +155,10 @@ public class OrgMenuController {
     }
 
 
-    @ResourceAuth(value = "projectFundManager", type = AuthType.Project, remark = "资金管理_资金概况_50_Menu")
-    @ResourceAuth(value = "projectFundManager", type = AuthType.School, remark = "资金管理_资金概况_50_Menu")
-    @ResourceAuth(value = "projectFundManager", type = AuthType.BusinessMain, remark = "资金管理_资金概况_50_Menu")
-    @ResourceAuth(value = "projectFundManager", type = AuthType.CommonOrg, remark = "资金管理_资金概况_50_Menu")
+    @ResourceAuth(value = "projectFundManager", type = AuthType.Project, remark = "资金管理_资金概况_150_Menu")
+    @ResourceAuth(value = "projectFundManager", type = AuthType.School, remark = "资金管理_资金概况_150_Menu")
+    @ResourceAuth(value = "projectFundManager", type = AuthType.BusinessMain, remark = "资金管理_资金概况_150_Menu")
+    @ResourceAuth(value = "projectFundManager", type = AuthType.CommonOrg, remark = "资金管理_资金概况_150_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -170,10 +170,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.Project, remark = "资金管理_支付订单_51_Menu")
-    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.School, remark = "资金管理_支付订单_51_Menu")
-    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.BusinessMain, remark = "资金管理_支付订单_51_Menu")
-    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.CommonOrg, remark = "资金管理_支付订单_51_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.Project, remark = "资金管理_支付订单_151_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.School, remark = "资金管理_支付订单_151_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.BusinessMain, remark = "资金管理_支付订单_151_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.CommonOrg, remark = "资金管理_支付订单_151_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -185,10 +185,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectPayShareManager", type = AuthType.Project, remark = "资金管理_分账单_52_Menu")
-    @ResourceAuth(value = "projectPayShareManager", type = AuthType.School, remark = "资金管理_分账单_52_Menu")
-    @ResourceAuth(value = "projectPayShareManager", type = AuthType.BusinessMain, remark = "资金管理_分账单_52_Menu")
-    @ResourceAuth(value = "projectPayShareManager", type = AuthType.CommonOrg, remark = "资金管理_分账单_52_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.Project, remark = "资金管理_分账单_152_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.School, remark = "资金管理_分账单_152_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.BusinessMain, remark = "资金管理_分账单_152_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.CommonOrg, remark = "资金管理_分账单_152_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -200,10 +200,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectPayReconManager", type = AuthType.Project, remark = "资金管理_对账单_53_Menu")
-    @ResourceAuth(value = "projectPayReconManager", type = AuthType.School, remark = "资金管理_对账单_53_Menu")
-    @ResourceAuth(value = "projectPayReconManager", type = AuthType.BusinessMain, remark = "资金管理_对账单_53_Menu")
-    @ResourceAuth(value = "projectPayReconManager", type = AuthType.CommonOrg, remark = "资金管理_对账单_53_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.Project, remark = "资金管理_对账单_153_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.School, remark = "资金管理_对账单_153_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.BusinessMain, remark = "资金管理_对账单_153_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.CommonOrg, remark = "资金管理_对账单_153_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -215,10 +215,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_60_Menu")
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.School, remark = "区域管理_区域列表_60_Menu")
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_60_Menu")
-    @ResourceAuth(value = "projectAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_60_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.School, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_160_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -230,10 +230,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Project, remark = "区域管理_区域类型_61_Menu")
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.School, remark = "区域管理_区域类型_61_Menu")
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.BusinessMain, remark = "区域管理_区域类型_61_Menu")
-    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.CommonOrg, remark = "区域管理_区域类型_61_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.BusinessMain, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.CommonOrg, remark = "区域管理_区域类型_161_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -245,10 +245,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.Project, remark = "OpenAPI_应用管理_70_Menu")
-    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.School, remark = "OpenAPI_应用管理_70_Menu")
-    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.BusinessMain, remark = "OpenAPI_应用管理_70_Menu")
-    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.CommonOrg, remark = "OpenAPI_应用管理_70_Menu")
+    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.Project, remark = "OpenAPI_应用管理_170_Menu")
+    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.School, remark = "OpenAPI_应用管理_170_Menu")
+    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.BusinessMain, remark = "OpenAPI_应用管理_170_Menu")
+    @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.CommonOrg, remark = "OpenAPI_应用管理_170_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -260,10 +260,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.Project, remark = "OpenAPI_日志管理_71_Menu")
-    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.School, remark = "OpenAPI_日志管理_71_Menu")
-    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.BusinessMain, remark = "OpenAPI_日志管理_71_Menu")
-    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.CommonOrg, remark = "OpenAPI_日志管理_71_Menu")
+    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.Project, remark = "OpenAPI_日志管理_171_Menu")
+    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.School, remark = "OpenAPI_日志管理_171_Menu")
+    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.BusinessMain, remark = "OpenAPI_日志管理_171_Menu")
+    @ResourceAuth(value = "projectOpenAPILogManager", type = AuthType.CommonOrg, remark = "OpenAPI_日志管理_171_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -275,10 +275,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.Project, remark = "项目配置_基本信息_80_Menu")
-    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.School, remark = "项目配置_基本信息_80_Menu")
-    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.BusinessMain, remark = "项目配置_基本信息_80_Menu")
-    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.CommonOrg, remark = "项目配置_基本信息_80_Menu")
+    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.Project, remark = "项目配置_基本信息_180_Menu")
+    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.School, remark = "项目配置_基本信息_180_Menu")
+    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.BusinessMain, remark = "项目配置_基本信息_180_Menu")
+    @ResourceAuth(value = "projectConfigBaseManager", type = AuthType.CommonOrg, remark = "项目配置_基本信息_180_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -290,10 +290,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.Project, remark = "项目配置_支付配置_81_Menu")
-    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.School, remark = "项目配置_支付配置_81_Menu")
-    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.BusinessMain, remark = "项目配置_支付配置_81_Menu")
-    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.CommonOrg, remark = "项目配置_支付配置_81_Menu")
+    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.Project, remark = "项目配置_支付配置_181_Menu")
+    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.School, remark = "项目配置_支付配置_181_Menu")
+    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.BusinessMain, remark = "项目配置_支付配置_181_Menu")
+    @ResourceAuth(value = "projectConfigPayManager", type = AuthType.CommonOrg, remark = "项目配置_支付配置_181_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -305,10 +305,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.Project, remark = "项目配置_小程序配置_82_Menu")
-    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.School, remark = "项目配置_小程序配置_82_Menu")
-    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.BusinessMain, remark = "项目配置_小程序配置_82_Menu")
-    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.CommonOrg, remark = "项目配置_小程序配置_82_Menu")
+    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.Project, remark = "项目配置_小程序配置_182_Menu")
+    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.School, remark = "项目配置_小程序配置_182_Menu")
+    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.BusinessMain, remark = "项目配置_小程序配置_182_Menu")
+    @ResourceAuth(value = "projectConfigXcxManager", type = AuthType.CommonOrg, remark = "项目配置_小程序配置_182_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -320,10 +320,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.Project, remark = "项目配置_AccessKey_83_Menu")
-    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.School, remark = "项目配置_AccessKey_83_Menu")
-    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.BusinessMain, remark = "项目配置_AccessKey_83_Menu")
-    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.CommonOrg, remark = "项目配置_AccessKey_83_Menu")
+    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.Project, remark = "项目配置_AccessKey_183_Menu")
+    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.School, remark = "项目配置_AccessKey_183_Menu")
+    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.BusinessMain, remark = "项目配置_AccessKey_183_Menu")
+    @ResourceAuth(value = "projectConfigAccessKeyManager", type = AuthType.CommonOrg, remark = "项目配置_AccessKey_183_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -335,10 +335,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.Project, remark = "项目配置_通用配置_84_Menu")
-    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.School, remark = "项目配置_通用配置_84_Menu")
-    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.BusinessMain, remark = "项目配置_通用配置_84_Menu")
-    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.CommonOrg, remark = "项目配置_通用配置_84_Menu")
+    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.Project, remark = "项目配置_通用配置_184_Menu")
+    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.School, remark = "项目配置_通用配置_184_Menu")
+    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.BusinessMain, remark = "项目配置_通用配置_184_Menu")
+    @ResourceAuth(value = "projectConfigCommonManager", type = AuthType.CommonOrg, remark = "项目配置_通用配置_184_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/PlatformMenuController.java

@@ -16,15 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Hidden
 public class PlatformMenuController {
 
-//    @ResourceAuth(value = "platMainManager", type = AuthType.Platform, remark = "主控台_主控台_1_Menu")
-//    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
-//    @ResourceAuth(value = "user", type = AuthType.User)
-//    @RequestMapping(value = "platMainManager", method = {RequestMethod.GET})
-//    public ResultContent platMainManager() {
-//        return ResultContent.buildSuccess();
-//    }
-
-    @ResourceAuth(value = "platProjectManager", type = AuthType.Platform, remark = "园区项目管理_项目列表_1_Menu")
+    @ResourceAuth(value = "platProjectManager", type = AuthType.Platform, remark = "园区项目管理_项目列表_10_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "platProjectManager", method = {RequestMethod.GET})
@@ -32,7 +24,7 @@ public class PlatformMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "platOrgManager", type = AuthType.Platform, remark = "机构管理_机构列表_2_Menu")
+    @ResourceAuth(value = "platOrgManager", type = AuthType.Platform, remark = "机构管理_机构列表_20_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "platOrgManager", method = {RequestMethod.GET})
@@ -40,7 +32,7 @@ public class PlatformMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "platUserManager", type = AuthType.Platform, remark = "用户管理_用户列表_3_Menu")
+    @ResourceAuth(value = "platUserManager", type = AuthType.Platform, remark = "用户管理_用户列表_30_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "platUserManager", method = {RequestMethod.GET})
@@ -48,7 +40,7 @@ public class PlatformMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "openAPIAppManager", type = AuthType.Platform, remark = "OpenAPI_应用管理_4_Menu")
+    @ResourceAuth(value = "openAPIAppManager", type = AuthType.Platform, remark = "OpenAPI_应用管理_40_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "openAPIAppManager", method = {RequestMethod.GET})
@@ -56,7 +48,7 @@ public class PlatformMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "openAPIInterface", type = AuthType.Platform, remark = "OpenAPI_接口管理_5_Menu")
+    @ResourceAuth(value = "openAPIInterface", type = AuthType.Platform, remark = "OpenAPI_接口管理_50_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "openAPIInterface", method = {RequestMethod.GET})
@@ -64,7 +56,7 @@ public class PlatformMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "openAPILog", type = AuthType.Platform, remark = "OpenAPI_日志管理_6_Menu")
+    @ResourceAuth(value = "openAPILog", type = AuthType.Platform, remark = "OpenAPI_日志管理_60_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "openAPILog", method = {RequestMethod.GET})
@@ -73,7 +65,7 @@ public class PlatformMenuController {
     }
 
 
-    @ResourceAuth(value = "platRoleManager", type = AuthType.Platform, remark = "权限管理_角色权限_7_Menu")
+    @ResourceAuth(value = "platRoleManager", type = AuthType.Platform, remark = "权限管理_角色权限_70_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "platRoleManager", method = {RequestMethod.GET})
@@ -81,7 +73,7 @@ public class PlatformMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "platPayManager", type = AuthType.Platform, remark = "支付管理_支付管理_8_Menu")
+    @ResourceAuth(value = "platPayManager", type = AuthType.Platform, remark = "支付管理_支付管理_80_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "platPayManager", method = {RequestMethod.GET})
@@ -89,7 +81,7 @@ public class PlatformMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "platSettingManager", type = AuthType.Platform, remark = "系统设置_平台基本信息_9_Menu")
+    @ResourceAuth(value = "platSettingManager", type = AuthType.Platform, remark = "系统设置_平台基本信息_90_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "platSettingManager", method = {RequestMethod.GET})
@@ -97,7 +89,7 @@ public class PlatformMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "platSettingPlatform", type = AuthType.Platform, remark = "系统设置_模板配置_10_Menu")
+    @ResourceAuth(value = "platSettingPlatform", type = AuthType.Platform, remark = "系统设置_模板配置_100_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "platSettingPlatform", method = {RequestMethod.GET})