From 095a01aa341c9360902d5e59ab41e6b125ed154d Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Thu, 14 Apr 2016 11:29:23 +0800
Subject: [PATCH] platform permission add paging

---
 .../web/controller/PermissionsController.java      | 29 +++++++++-------------
 .../operate/web/controller/RolesController.java    |  2 +-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
index 171a474..799d595 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
@@ -61,14 +61,16 @@ public class PermissionsController extends BaseController {
      */
     @RequestMapping(value = "/permissions", method = RequestMethod.GET)
     @TokenRequired
-    public void getPermissions(HttpServletResponse response, @RequestParam(value = "type") Integer type) {
+    public void getPermissions(HttpServletResponse response) {
         PermissionsQuery permissionsQuery = new PermissionsQuery();
-        permissionsQuery.setType(type);
         permissionsQuery.setYn(YnEnums.YES.getId());
         List<Permissions> permissionses = permissionsService.queryPermissions(permissionsQuery);
         ResultUtils.buildSuccessResultAndWrite(response, permissionses);
     }
 
+
+
+
     @TokenRequired
     @RequestMapping(value = "/accesspermissions", method = RequestMethod.GET)
     @ResponseBody
@@ -103,9 +105,7 @@ public class PermissionsController extends BaseController {
                                @RequestParam(value = "permissionName") String permissionName,
                                @RequestParam(value = "action") String action,
                                @RequestParam(value = "ext", required = false) String ext,
-                               @RequestParam(value = "url", required = false) String url,
-                               @RequestParam("functionCode") String functionCode,
-                               @RequestParam("moduleCode") String moduleCode) {
+                               @RequestParam(value = "weight") Integer weight) {
         if (StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(functionName) || StringUtils.isEmpty(permissionName) || StringUtils.isEmpty(action)) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
             return;
@@ -115,20 +115,17 @@ public class PermissionsController extends BaseController {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         Users users = usersService.getUsersByLoginCenterId(loginState.getId());
 
-
         Permissions permissions = new Permissions();
 
         permissions.setType(TYPE);
-        permissions.setFunctionCode(functionCode);
-        permissions.setModuleCode(moduleCode);
         permissions.setModuleName(moduleName);
         permissions.setFunctionName(functionName);
         permissions.setPermissionName(permissionName);
         permissions.setAction(action);
         permissions.setExt(ext);
-        permissions.setUrl(url);
         permissions.setPublishId(users.getId());
         permissions.setPublishName(users.getName());
+        permissions.setWeight(weight);
         permissions.setYn(YnEnums.YES.getId());
         permissions.setModified(new Date());
         permissions.setCreated(new Date());
@@ -142,14 +139,13 @@ public class PermissionsController extends BaseController {
     @RequestMapping(value = "/permissions/{id}", method = RequestMethod.PUT)
     @TokenRequired
     public void updatePermissions(HttpServletResponse response,
+                                  @PathVariable Integer id,
                                   @RequestParam(value = "moduleName") String moduleName,
                                   @RequestParam(value = "functionName") String functionName,
-                                  @PathVariable Integer id, String permissionName,
+                                  @RequestParam(value = "permissionName") String permissionName,
                                   @RequestParam(value = "action") String action,
                                   @RequestParam(value = "ext", required = false) String ext,
-                                  @RequestParam(value = "url", required = false) String url,
-                                  @RequestParam("functionCode") String functionCode,
-                                  @RequestParam("moduleCode") String moduleCode) {
+                                  @RequestParam(value = "weight") Integer weight) {
 
         Permissions permissions = permissionsService.getPermissions(id);
 
@@ -162,16 +158,15 @@ public class PermissionsController extends BaseController {
             ResultUtils.buildParameterErrorResultAndWrite(response);
             return;
         }
-        permissions.setFunctionCode(functionCode);
-        permissions.setModuleCode(moduleCode);
-        permissions.setId(id);
         permissions.setModuleName(moduleName);
         permissions.setFunctionName(functionName);
         permissions.setPermissionName(permissionName);
         permissions.setAction(action);
         permissions.setExt(ext);
-        permissions.setUrl(url);
+        permissions.setWeight(weight);
+        permissions.setYn(YnEnums.YES.getId());
         permissions.setModified(new Date());
+
         permissionsService.updatePermissions(permissions);
         ResultUtils.buildSuccessResultAndWrite(response);
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
index 571479f..e67ff6a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
@@ -40,7 +40,7 @@ public class RolesController extends BaseController {
 
 
     /**
-     * 角色权限
+     * 管理员角色权限配置
      */
     @RequestMapping(value = "/roles/permission", method = RequestMethod.POST)
     @TokenRequired
-- 
1.8.3.1