补充统一资源

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/rest/AppController.java.ftl

@@ -3,18 +3,15 @@ TARGET=PSSYSTEM
 </#ibiztemplate>
 package ${pub.getPKGCodeName()}.util.rest;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-
-
+import ${pub.getPKGCodeName()}.util.security.AuthenticationUser;
 
 @RestController
 @RequestMapping(value = "")
@@ -22,7 +19,14 @@ public class AppController {
 
 	@RequestMapping(method = RequestMethod.GET, value = "/appdata")
 	public ResponseEntity<JSONObject> getAppData() {
+
 		JSONObject appData = new JSONObject() ;
+		JSONArray uniRes=new JSONArray();
+		JSONObject userPermission=AuthenticationUser.getAuthenticationUser().getPermissionList();
+		if(!ObjectUtils.isEmpty(userPermission)){
+			uniRes = userPermission.getJSONArray("unires");
+		}
+		appData.put("unires",uniRes);
 		return ResponseEntity.status(HttpStatus.OK).body(appData);
 	}
 

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/security/AuthPermissionEvaluator.java.ftl

@@ -77,7 +77,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
             return false;
 
         //获取当前用户权限列表
-        JSONObject userPermission= AuthenticationUser.getAuthenticationUser().getPermisionList();
+        JSONObject userPermission= AuthenticationUser.getAuthenticationUser().getPermissionList();
 
         if(userPermission==null)
             return false;
@@ -91,7 +91,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
             String entityName = entity.getClass().getSimpleName();
 
             //获取实体行为权限信息
-            JSONObject permissionList=userPermission.getJSONObject("userPermissionList");
+            JSONObject permissionList=userPermission.getJSONObject("entities");
 
             //检查是否有操作权限[create.update.delete.read]
             if(!validDEActionHasPermission(permissionList,entityName,action)){
@@ -109,7 +109,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
             String entityName = entity.getClass().getSimpleName();
 
             //获取数据集权限信息
-            JSONObject permissionList=userPermission.getJSONObject("userPermissionList");
+            JSONObject permissionList=userPermission.getJSONObject("entities");
 
             if(StringUtils.isEmpty(entityName)|| StringUtils.isEmpty(dataSetName))
                 return false;
@@ -148,8 +148,8 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         if (StringUtils.isEmpty(entity))
             return false;
 
-        JSONObject userPermission= AuthenticationUser.getAuthenticationUser().getPermisionList();
-        JSONObject permissionList=userPermission.getJSONObject("userPermissionList");
+        JSONObject userPermission= AuthenticationUser.getAuthenticationUser().getPermissionList();
+        JSONObject permissionList=userPermission.getJSONObject("entities");
         String entityName = entity.getClass().getSimpleName();
 
         if(action.equalsIgnoreCase("create")){

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/security/AuthenticationUser.java.ftl

@@ -64,7 +64,7 @@ public class AuthenticationUser implements UserDetails
 	private   Collection<GrantedAuthority> authorities;
     @JsonIgnore
     private int superuser;
-    private JSONObject permisionList;
+    private JSONObject permissionList;
     private String orglevel;//单位级别
     private String deptlevel;//部门级别
     @JsonIgnore