更新wrapper名称

src/main/java/cn/stylefeng/guns/modular/system/controller/DeptController.java

@@ -27,8 +27,8 @@ import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.modular.system.entity.Dept;
 import cn.stylefeng.guns.modular.system.entity.Dept;
 import cn.stylefeng.guns.modular.system.model.DeptDto;
 import cn.stylefeng.guns.modular.system.model.DeptDto;
 import cn.stylefeng.guns.modular.system.service.DeptService;
 import cn.stylefeng.guns.modular.system.service.DeptService;
-import cn.stylefeng.guns.modular.system.warpper.DeptTreeWarpper;
-import cn.stylefeng.guns.modular.system.warpper.DeptWarpper;
+import cn.stylefeng.guns.modular.system.warpper.DeptTreeWrapper;
+import cn.stylefeng.guns.modular.system.warpper.DeptWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.treebuild.DefaultTreeBuildFactory;
 import cn.stylefeng.roses.core.treebuild.DefaultTreeBuildFactory;
@@ -134,7 +134,7 @@ public class DeptController extends BaseController {
         List<TreeviewNode> results = factory.doTreeBuild(treeviewNodes);
         List<TreeviewNode> results = factory.doTreeBuild(treeviewNodes);
 
 
         //把子节点为空的设为null
         //把子节点为空的设为null
-        DeptTreeWarpper.clearNull(results);
+        DeptTreeWrapper.clearNull(results);
 
 
         return results;
         return results;
     }
     }
@@ -166,7 +166,7 @@ public class DeptController extends BaseController {
     public Object list(@RequestParam(value = "condition", required = false) String condition,
     public Object list(@RequestParam(value = "condition", required = false) String condition,
                        @RequestParam(value = "deptId", required = false) String deptId) {
                        @RequestParam(value = "deptId", required = false) String deptId) {
         Page<Map<String, Object>> list = this.deptService.list(condition, deptId);
         Page<Map<String, Object>> list = this.deptService.list(condition, deptId);
-        Page<Map<String, Object>> wrap = new DeptWarpper(list).wrap();
+        Page<Map<String, Object>> wrap = new DeptWrapper(list).wrap();
         return LayuiPageFactory.createPageInfo(wrap);
         return LayuiPageFactory.createPageInfo(wrap);
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/controller/DictController.java

@@ -24,7 +24,7 @@ import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.core.log.LogObjectHolder;
 import cn.stylefeng.guns.modular.system.model.DictDto;
 import cn.stylefeng.guns.modular.system.model.DictDto;
 import cn.stylefeng.guns.modular.system.service.DictService;
 import cn.stylefeng.guns.modular.system.service.DictService;
-import cn.stylefeng.guns.modular.system.warpper.DictWarpper;
+import cn.stylefeng.guns.modular.system.warpper.DictWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -112,7 +112,7 @@ public class DictController extends BaseController {
     @ResponseBody
     @ResponseBody
     public Object list(String condition) {
     public Object list(String condition) {
         Page<Map<String, Object>> list = this.dictService.list(condition);
         Page<Map<String, Object>> list = this.dictService.list(condition);
-        Page<Map<String, Object>> warpper = new DictWarpper(list).wrap();
+        Page<Map<String, Object>> warpper = new DictWrapper(list).wrap();
         return LayuiPageFactory.createPageInfo(warpper);
         return LayuiPageFactory.createPageInfo(warpper);
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/controller/LogController.java

@@ -23,7 +23,7 @@ import cn.stylefeng.guns.core.common.constant.state.BizLogType;
 import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
 import cn.stylefeng.guns.modular.system.entity.OperationLog;
 import cn.stylefeng.guns.modular.system.entity.OperationLog;
 import cn.stylefeng.guns.modular.system.service.OperationLogService;
 import cn.stylefeng.guns.modular.system.service.OperationLogService;
-import cn.stylefeng.guns.modular.system.warpper.LogWarpper;
+import cn.stylefeng.guns.modular.system.warpper.LogWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
@@ -83,7 +83,7 @@ public class LogController extends BaseController {
         //根据条件查询操作日志
         //根据条件查询操作日志
         List<Map<String, Object>> result = operationLogService.getOperationLogs(page, beginTime, endTime, logName, BizLogType.valueOf(logType));
         List<Map<String, Object>> result = operationLogService.getOperationLogs(page, beginTime, endTime, logName, BizLogType.valueOf(logType));
 
 
-        page.setRecords(new LogWarpper(result).wrap());
+        page.setRecords(new LogWrapper(result).wrap());
 
 
         return LayuiPageFactory.createPageInfo(page);
         return LayuiPageFactory.createPageInfo(page);
     }
     }
@@ -100,7 +100,7 @@ public class LogController extends BaseController {
     public Object detail(@PathVariable Long id) {
     public Object detail(@PathVariable Long id) {
         OperationLog operationLog = operationLogService.getById(id);
         OperationLog operationLog = operationLogService.getById(id);
         Map<String, Object> stringObjectMap = BeanUtil.beanToMap(operationLog);
         Map<String, Object> stringObjectMap = BeanUtil.beanToMap(operationLog);
-        return super.warpObject(new LogWarpper(stringObjectMap));
+        return super.warpObject(new LogWrapper(stringObjectMap));
     }
     }
 
 
     /**
     /**

src/main/java/cn/stylefeng/guns/modular/system/controller/LoginLogController.java

@@ -20,7 +20,7 @@ import cn.stylefeng.guns.core.common.annotion.Permission;
 import cn.stylefeng.guns.core.common.constant.Const;
 import cn.stylefeng.guns.core.common.constant.Const;
 import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
 import cn.stylefeng.guns.modular.system.service.LoginLogService;
 import cn.stylefeng.guns.modular.system.service.LoginLogService;
-import cn.stylefeng.guns.modular.system.warpper.LogWarpper;
+import cn.stylefeng.guns.modular.system.warpper.LogWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
@@ -77,7 +77,7 @@ public class LoginLogController extends BaseController {
 
 
         //根据条件查询日志
         //根据条件查询日志
         List<Map<String, Object>> result = loginLogService.getLoginLogs(page, beginTime, endTime, logName);
         List<Map<String, Object>> result = loginLogService.getLoginLogs(page, beginTime, endTime, logName);
-        page.setRecords(new LogWarpper(result).wrap());
+        page.setRecords(new LogWrapper(result).wrap());
 
 
         return LayuiPageFactory.createPageInfo(page);
         return LayuiPageFactory.createPageInfo(page);
     }
     }

src/main/java/cn/stylefeng/guns/modular/system/controller/MenuController.java

@@ -29,7 +29,7 @@ import cn.stylefeng.guns.modular.system.entity.Menu;
 import cn.stylefeng.guns.modular.system.model.MenuDto;
 import cn.stylefeng.guns.modular.system.model.MenuDto;
 import cn.stylefeng.guns.modular.system.service.MenuService;
 import cn.stylefeng.guns.modular.system.service.MenuService;
 import cn.stylefeng.guns.modular.system.service.UserService;
 import cn.stylefeng.guns.modular.system.service.UserService;
-import cn.stylefeng.guns.modular.system.warpper.MenuWarpper;
+import cn.stylefeng.guns.modular.system.warpper.MenuWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
@@ -141,7 +141,7 @@ public class MenuController extends BaseController {
                        @RequestParam(required = false) String level,
                        @RequestParam(required = false) String level,
                        @RequestParam(required = false) Long menuId) {
                        @RequestParam(required = false) Long menuId) {
         Page<Map<String, Object>> menus = this.menuService.selectMenus(menuName, level, menuId);
         Page<Map<String, Object>> menus = this.menuService.selectMenus(menuName, level, menuId);
-        Page<Map<String, Object>> wrap = new MenuWarpper(menus).wrap();
+        Page<Map<String, Object>> wrap = new MenuWrapper(menus).wrap();
         return LayuiPageFactory.createPageInfo(wrap);
         return LayuiPageFactory.createPageInfo(wrap);
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/controller/RoleController.java

@@ -30,7 +30,7 @@ import cn.stylefeng.guns.modular.system.entity.User;
 import cn.stylefeng.guns.modular.system.model.RoleDto;
 import cn.stylefeng.guns.modular.system.model.RoleDto;
 import cn.stylefeng.guns.modular.system.service.RoleService;
 import cn.stylefeng.guns.modular.system.service.RoleService;
 import cn.stylefeng.guns.modular.system.service.UserService;
 import cn.stylefeng.guns.modular.system.service.UserService;
-import cn.stylefeng.guns.modular.system.warpper.RoleWarpper;
+import cn.stylefeng.guns.modular.system.warpper.RoleWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
@@ -131,7 +131,7 @@ public class RoleController extends BaseController {
     @ResponseBody
     @ResponseBody
     public Object list(@RequestParam(value = "roleName", required = false) String roleName) {
     public Object list(@RequestParam(value = "roleName", required = false) String roleName) {
         Page<Map<String, Object>> roles = this.roleService.selectRoles(roleName);
         Page<Map<String, Object>> roles = this.roleService.selectRoles(roleName);
-        Page<Map<String, Object>> wrap = new RoleWarpper(roles).wrap();
+        Page<Map<String, Object>> wrap = new RoleWrapper(roles).wrap();
         return LayuiPageFactory.createPageInfo(wrap);
         return LayuiPageFactory.createPageInfo(wrap);
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/controller/UserMgrController.java

@@ -31,7 +31,7 @@ import cn.stylefeng.guns.modular.system.entity.User;
 import cn.stylefeng.guns.modular.system.factory.UserFactory;
 import cn.stylefeng.guns.modular.system.factory.UserFactory;
 import cn.stylefeng.guns.modular.system.model.UserDto;
 import cn.stylefeng.guns.modular.system.model.UserDto;
 import cn.stylefeng.guns.modular.system.service.UserService;
 import cn.stylefeng.guns.modular.system.service.UserService;
-import cn.stylefeng.guns.modular.system.warpper.UserWarpper;
+import cn.stylefeng.guns.modular.system.warpper.UserWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import cn.stylefeng.roses.core.datascope.DataScope;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
@@ -191,12 +191,12 @@ public class UserMgrController extends BaseController {
 
 
         if (ShiroKit.isAdmin()) {
         if (ShiroKit.isAdmin()) {
             Page<Map<String, Object>> users = userService.selectUsers(null, name, beginTime, endTime, deptId);
             Page<Map<String, Object>> users = userService.selectUsers(null, name, beginTime, endTime, deptId);
-            Page wrapped = new UserWarpper(users).wrap();
+            Page wrapped = new UserWrapper(users).wrap();
             return LayuiPageFactory.createPageInfo(wrapped);
             return LayuiPageFactory.createPageInfo(wrapped);
         } else {
         } else {
             DataScope dataScope = new DataScope(ShiroKit.getDeptDataScope());
             DataScope dataScope = new DataScope(ShiroKit.getDeptDataScope());
             Page<Map<String, Object>> users = userService.selectUsers(dataScope, name, beginTime, endTime, deptId);
             Page<Map<String, Object>> users = userService.selectUsers(dataScope, name, beginTime, endTime, deptId);
-            Page wrapped = new UserWarpper(users).wrap();
+            Page wrapped = new UserWrapper(users).wrap();
             return LayuiPageFactory.createPageInfo(wrapped);
             return LayuiPageFactory.createPageInfo(wrapped);
         }
         }
     }
     }

src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptTreeWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptTreeWrapper.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017年4月25日 18:10:31
  * @date 2017年4月25日 18:10:31
  */
  */
-public class DeptTreeWarpper {
+public class DeptTreeWrapper {
 
 
     public static void clearNull(List<TreeviewNode> list) {
     public static void clearNull(List<TreeviewNode> list) {
         if (list == null) {
         if (list == null) {

src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWrapper.java

@@ -30,21 +30,21 @@ import java.util.Map;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017年4月25日 18:10:31
  * @date 2017年4月25日 18:10:31
  */
  */
-public class DeptWarpper extends BaseControllerWrapper {
+public class DeptWrapper extends BaseControllerWrapper {
 
 
-    public DeptWarpper(Map<String, Object> single) {
+    public DeptWrapper(Map<String, Object> single) {
         super(single);
         super(single);
     }
     }
 
 
-    public DeptWarpper(List<Map<String, Object>> multi) {
+    public DeptWrapper(List<Map<String, Object>> multi) {
         super(multi);
         super(multi);
     }
     }
 
 
-    public DeptWarpper(Page<Map<String, Object>> page) {
+    public DeptWrapper(Page<Map<String, Object>> page) {
         super(page);
         super(page);
     }
     }
 
 
-    public DeptWarpper(PageResult<Map<String, Object>> pageResult) {
+    public DeptWrapper(PageResult<Map<String, Object>> pageResult) {
         super(pageResult);
         super(pageResult);
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/warpper/DictWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/DictWrapper.java

@@ -31,9 +31,9 @@ import java.util.Map;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017年4月25日 18:10:31
  * @date 2017年4月25日 18:10:31
  */
  */
-public class DictWarpper extends BaseControllerWrapper {
+public class DictWrapper extends BaseControllerWrapper {
 
 
-    public DictWarpper(Page<Map<String, Object>> page) {
+    public DictWrapper(Page<Map<String, Object>> page) {
         super(page);
         super(page);
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWrapper.java

@@ -29,13 +29,13 @@ import java.util.Map;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017年4月5日22:56:24
  * @date 2017年4月5日22:56:24
  */
  */
-public class LogWarpper extends BaseControllerWrapper {
+public class LogWrapper extends BaseControllerWrapper {
 
 
-    public LogWarpper(Map<String, Object> single) {
+    public LogWrapper(Map<String, Object> single) {
         super(single);
         super(single);
     }
     }
 
 
-    public LogWarpper(List<Map<String, Object>> multi) {
+    public LogWrapper(List<Map<String, Object>> multi) {
         super(multi);
         super(multi);
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/warpper/MenuWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/MenuWrapper.java

@@ -30,21 +30,21 @@ import java.util.Map;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017年2月19日15:07:29
  * @date 2017年2月19日15:07:29
  */
  */
-public class MenuWarpper extends BaseControllerWrapper {
+public class MenuWrapper extends BaseControllerWrapper {
 
 
-    public MenuWarpper(Map<String, Object> single) {
+    public MenuWrapper(Map<String, Object> single) {
         super(single);
         super(single);
     }
     }
 
 
-    public MenuWarpper(List<Map<String, Object>> multi) {
+    public MenuWrapper(List<Map<String, Object>> multi) {
         super(multi);
         super(multi);
     }
     }
 
 
-    public MenuWarpper(Page<Map<String, Object>> page) {
+    public MenuWrapper(Page<Map<String, Object>> page) {
         super(page);
         super(page);
     }
     }
 
 
-    public MenuWarpper(PageResult<Map<String, Object>> pageResult) {
+    public MenuWrapper(PageResult<Map<String, Object>> pageResult) {
         super(pageResult);
         super(pageResult);
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWrapper.java

@@ -29,21 +29,21 @@ import java.util.Map;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017年2月19日10:59:02
  * @date 2017年2月19日10:59:02
  */
  */
-public class RoleWarpper extends BaseControllerWrapper {
+public class RoleWrapper extends BaseControllerWrapper {
 
 
-    public RoleWarpper(Map<String, Object> single) {
+    public RoleWrapper(Map<String, Object> single) {
         super(single);
         super(single);
     }
     }
 
 
-    public RoleWarpper(List<Map<String, Object>> multi) {
+    public RoleWrapper(List<Map<String, Object>> multi) {
         super(multi);
         super(multi);
     }
     }
 
 
-    public RoleWarpper(Page<Map<String, Object>> page) {
+    public RoleWrapper(Page<Map<String, Object>> page) {
         super(page);
         super(page);
     }
     }
 
 
-    public RoleWarpper(PageResult<Map<String, Object>> pageResult) {
+    public RoleWrapper(PageResult<Map<String, Object>> pageResult) {
         super(pageResult);
         super(pageResult);
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWarpper.java → src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWrapper.java

@@ -29,21 +29,21 @@ import java.util.Map;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017年2月13日 下午10:47:03
  * @date 2017年2月13日 下午10:47:03
  */
  */
-public class UserWarpper extends BaseControllerWrapper {
+public class UserWrapper extends BaseControllerWrapper {
 
 
-    public UserWarpper(Map<String, Object> single) {
+    public UserWrapper(Map<String, Object> single) {
         super(single);
         super(single);
     }
     }
 
 
-    public UserWarpper(List<Map<String, Object>> multi) {
+    public UserWrapper(List<Map<String, Object>> multi) {
         super(multi);
         super(multi);
     }
     }
 
 
-    public UserWarpper(Page<Map<String, Object>> page) {
+    public UserWrapper(Page<Map<String, Object>> page) {
         super(page);
         super(page);
     }
     }
 
 
-    public UserWarpper(PageResult<Map<String, Object>> pageResult) {
+    public UserWrapper(PageResult<Map<String, Object>> pageResult) {
         super(pageResult);
         super(pageResult);
     }
     }