嵌套权限处理

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/rest/%ITEM%Resource.java.ftl

@@ -156,7 +156,7 @@ public class ${itemCodeName}Resource {
 
                 <#if deaction.codeName?lower_case == 'create'>
                     <#if noDEPrefield>
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
                     <#else>
     @PreAuthorize("hasPermission('','Create',{'${deStorageMode}',this.${itemCodeNameLC}Mapping,#${itemCodeNameLC}dto})")
                     </#if>
@@ -179,7 +179,7 @@ public class ${itemCodeName}Resource {
 
                 <#elseif deaction.codeName?lower_case == 'update'>
                     <#if noDEPrefield>
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
                     <#else>
     @PreAuthorize("hasPermission(#${itemCodeNameLC + keyCNLC},'Update',{'${deStorageMode}',this.${itemCodeNameLC}Mapping,#${itemCodeNameLC}dto})")
                     </#if>
@@ -202,7 +202,7 @@ public class ${itemCodeName}Resource {
     }
 
                 <#elseif deaction.codeName?lower_case == 'save'>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
     @ApiOperation(value = "${deaction.getLogicName()}", tags = {"${itemCodeName}" },  notes = "${deaction.getLogicName()}")
 	@RequestMapping(method = RequestMethod.${reqMtd}, value = "${fullPath}/${deactionCodeName?lower_case}")
     public ResponseEntity<Boolean> save(${etParams}) {
@@ -218,7 +218,7 @@ public class ${itemCodeName}Resource {
 
                 <#elseif deaction.codeName?lower_case == 'remove'>
                     <#if noDEPrefield>
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
                     <#else>
     @PreAuthorize("hasPermission(#${itemCodeNameLC + keyCNLC},'Remove',{'${deStorageMode}',this.${itemCodeNameLC}Mapping,this.permissionDTO})")
                     </#if>
@@ -238,7 +238,7 @@ public class ${itemCodeName}Resource {
 
                 <#elseif deaction.codeName?lower_case == 'get'>
                     <#if noDEPrefield>
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
                     <#else>
     @PreAuthorize("hasPermission(#${itemCodeNameLC + keyCNLC},'Get',{'${deStorageMode}',this.${itemCodeNameLC}Mapping,this.permissionDTO})")
                     </#if>
@@ -251,7 +251,7 @@ public class ${itemCodeName}Resource {
     }
 
                <#elseif deaction.codeName?lower_case == 'checkkey'>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
     @ApiOperation(value = "${deaction.getLogicName()}", tags = {"${itemCodeName}" },  notes = "${deaction.getLogicName()}")
 	@RequestMapping(method = RequestMethod.${reqMtd}, value = "${fullPath}/${deactionCodeName?lower_case}")
     public ResponseEntity<Boolean> checkKey(${etParams}) {
@@ -259,7 +259,7 @@ public class ${itemCodeName}Resource {
     }
 
                 <#elseif deaction.codeName?lower_case == 'getdraft'><#comment>前端支持临时模式，后台不做处理</#comment>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
     @ApiOperation(value = "${deaction.getLogicName()}", tags = {"${itemCodeName}" },  notes = "${deaction.getLogicName()}")
 	@RequestMapping(method = RequestMethod.${reqMtd}, value = "${fullPath}/${deactionCodeName?lower_case}")
     public ResponseEntity<${itemCodeName}DTO> ${deactionCodeName?uncap_first}() {
@@ -273,7 +273,7 @@ public class ${itemCodeName}Resource {
                <#elseif deaction.getUserTag()?? && deaction.getActionType()?? && deaction.getUserTag() == 'REGIST' && deaction.getActionType() == 'USERCREATE'>
 
                <#else>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
     @ApiOperation(value = "${deaction.getLogicName()}", tags = {"${itemCodeName}" },  notes = "${deaction.getLogicName()}")
 	@RequestMapping(method = RequestMethod.${reqMtd}, value = "${fullPath}/{${itemCodeNameLC + keyCNLC}}/${deactionCodeName?lower_case}")
 <#if de.getStorageMode()==4><#else>    @Transactional</#if>
@@ -418,7 +418,7 @@ public class ${itemCodeName}Resource {
                 <#assign deactionCodeName = deaction.getCodeName()>
                 <#if deaction.codeName?lower_case == 'create'>
                     <#if noDEPrefield>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
                     <#else>
     //@PreAuthorize("hasPermission('','Create',{'${deStorageMode}',this.${itemCodeNameLC}Mapping,#${itemCodeNameLC}dto})")
                     </#if>
@@ -446,7 +446,7 @@ public class ${itemCodeName}Resource {
 
                 <#elseif deaction.codeName?lower_case == 'update'>
                     <#if noDEPrefield>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
                     <#else>
     //@PreAuthorize("hasPermission(#${itemCodeNameLC + keyCNLC},'Update',{'${deStorageMode}',this.${itemCodeNameLC}Mapping,#${itemCodeNameLC}dto})")
                     </#if>
@@ -514,7 +514,7 @@ public class ${itemCodeName}Resource {
 
                 <#elseif deaction.codeName?lower_case == 'remove'>
                     <#if noDEPrefield>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
                     <#else>
     //@PreAuthorize("hasPermission(#${itemCodeNameLC + keyCNLC},'Remove',{'${deStorageMode}',this.${itemCodeNameLC}Mapping,this.permissionDTO})")
                     </#if>
@@ -533,7 +533,7 @@ public class ${itemCodeName}Resource {
     }
 
                 <#elseif deaction.codeName?lower_case == 'save'>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
     @ApiOperation(value = "${deaction.getLogicName()}${byParams}", tags = {"${itemCodeName}" },  notes = "${deaction.getLogicName()}${byParams}")
 	@RequestMapping(method = RequestMethod.${reqMtd}, value = "${fullPath}/${deactionCodeName?lower_case}")
     public ResponseEntity<Boolean> ${deactionCodeName?uncap_first}${byParams}(${etParams}) {
@@ -555,7 +555,7 @@ public class ${itemCodeName}Resource {
 
                 <#elseif deaction.codeName?lower_case == 'get'>
                     <#if noDEPrefield>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
                     <#else>
     //@PreAuthorize("hasPermission(#${itemCodeNameLC + keyCNLC},'Get',{'${deStorageMode}',this.${itemCodeNameLC}Mapping,this.permissionDTO})")
                     </#if>
@@ -568,7 +568,7 @@ public class ${itemCodeName}Resource {
     }
 
                <#elseif deaction.codeName?lower_case == 'checkkey'>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${sys.codeName}-${de.codeName}-${deaction.codeName}-all')")
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
     @ApiOperation(value = "${deaction.getLogicName()}${byParams}", tags = {"${itemCodeName}" },  notes = "${deaction.getLogicName()}${byParams}")
 	@RequestMapping(method = RequestMethod.${reqMtd}, value = "${fullPath}/${deactionCodeName?lower_case}")
     public ResponseEntity<Boolean> ${deactionCodeName?uncap_first}${byParams}(${etParams}) {
@@ -576,6 +576,7 @@ public class ${itemCodeName}Resource {
     }
 
                 <#elseif deaction.codeName?lower_case == 'getdraft'>
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
     @ApiOperation(value = "${deaction.getLogicName()}${byParams}", tags = {"${itemCodeName}" },  notes = "${deaction.getLogicName()}${byParams}")
     @RequestMapping(method = RequestMethod.${reqMtd}, value = "${fullPath}/${deactionCodeName?lower_case}")
     public ResponseEntity<${itemCodeName}DTO> ${deactionCodeName?uncap_first}${byParams}(${parentParams}) {
@@ -590,6 +591,7 @@ public class ${itemCodeName}Resource {
                <#elseif deaction.codeName?lower_case == 'savebatch'>
                <#elseif deaction.getUserTag()?? && deaction.getActionType()?? && deaction.getUserTag() == 'REGIST' && deaction.getActionType() == 'USERCREATE'>
                <#else>
+    <@outputHasAnyAuthorityAnnotation '${sys.codeName}-${de.codeName}-${deaction.codeName}-all'/>
     @ApiOperation(value = "${deaction.getLogicName()}${byParams}", tags = {"${itemCodeName}" },  notes = "${deaction.getLogicName()}${byParams}")
 	@RequestMapping(method = RequestMethod.${reqMtd}, value = "${fullPath}/{${itemCodeNameLC + dePKCodeNameLC}}/${deactionCodeName?lower_case}")
     <#if de.getStorageMode()==4><#else>    @Transactional</#if>
@@ -658,5 +660,5 @@ public class ${itemCodeName}Resource {
 
 <#comment>输出实体资源鉴权注解[hasAnyAuthority]</#comment>
 <#macro outputHasAnyAuthorityAnnotation permissionTag>
-    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${permissionTag}')")  test
+    //@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','${permissionTag}')")
 </#macro>
\ No newline at end of file