From 7d6e99c8fb175fb606d90f1640d2f60f4fb6f901 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 23 Sep 2018 23:40:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E6=96=B0=E5=A2=9EtimeToLiveInSeconds=E6=94=AF=E6=8C=81?= =?UTF-8?q?=EF=BC=9B=E4=BC=98=E5=8C=96=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/modules/sys/service/EmpUserService.java | 4 ++-- .../com/jeesite/modules/sys/service/EmployeeService.java | 4 ++-- .../java/com/jeesite/modules/sys/service/LogService.java | 4 ++-- .../java/com/jeesite/modules/sys/service/PostService.java | 6 +++--- .../java/com/jeesite/modules/sys/web/LogController.java | 3 ++- .../java/com/jeesite/modules/sys/web/PostController.java | 3 ++- .../jeesite/modules/sys/web/user/CorpAdminController.java | 3 ++- .../jeesite/modules/sys/web/user/EmpUserController.java | 2 +- .../jeesite/modules/sys/web/user/SecAdminController.java | 3 ++- .../resources/templates/modules/gen/crud/controller.xml | 3 ++- .../main/resources/templates/modules/gen/crud/service.xml | 8 ++++---- .../com/jeesite/modules/test/service/TestDataService.java | 4 ++-- .../com/jeesite/modules/test/web/TestDataController.java | 3 ++- 13 files changed, 28 insertions(+), 22 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java index 8c023be9..1633879b 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java @@ -68,8 +68,8 @@ public class EmpUserService extends CrudService { * 分页查询数据 */ @Override - public Page findPage(Page page, EmpUser empUser) { - return super.findPage(page, empUser); + public Page findPage(EmpUser empUser) { + return super.findPage(empUser); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java index c82efe59..0a3f922a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java @@ -41,8 +41,8 @@ public class EmployeeService extends CrudService { * 查询分页数据 */ @Override - public Page findPage(Page page, Employee employee) { - return super.findPage(page, employee); + public Page findPage(Employee employee) { + return super.findPage(employee); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java index 4f64b11d..93772f74 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java @@ -25,7 +25,7 @@ public class LogService extends CrudService { * 查询日志记录 */ @Override - public Page findPage(Page page, Log log) { + public Page findPage(Log log) { // // 设置默认时间范围，默认当前月 // if (log.getCreateDate_gte() == null){ // log.setCreateDate_gte(DateUtils.setDays(new Date(), 1)); @@ -37,7 +37,7 @@ public class LogService extends CrudService { if (!log.getCurrentUser().isAdmin()){ log.setCreateBy(log.getCurrentUser().getUserCode()); } - return super.findPage(page, log); + return super.findPage(log); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java index 08c60c6e..14a71630 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java @@ -38,11 +38,11 @@ public class PostService extends CrudService { } /** - * 查询可分页的岗位列表 + * 查询岗位 */ @Override - public Page findPage(Page page, Post post) { - return super.findPage(page, post); + public Page findPage(Post post) { + return super.findPage(post); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java index 17a55046..33bdc98b 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java @@ -65,7 +65,8 @@ public class LogController extends BaseController { @RequestMapping(value = "listData") @ResponseBody public Page listData(Log log, HttpServletRequest request, HttpServletResponse response) { - Page page = logService.findPage(new Page(request, response), log); + log.setPage(new Page<>(request, response)); + Page page = logService.findPage(log); return page; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java index 56bda545..26d9f077 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java @@ -51,7 +51,8 @@ public class PostController extends BaseController { @RequestMapping(value = {"listData"}) @ResponseBody public Page listData(Post post, HttpServletRequest request, HttpServletResponse response) { - Page page = postService.findPage(new Page(request, response), post); + post.setPage(new Page<>(request, response)); + Page page = postService.findPage(post); return page; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java index cd2bb132..a90c2bcc 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java @@ -64,7 +64,8 @@ public class CorpAdminController extends BaseController { user.getSqlMap().getWhere().disableAutoAddCorpCodeWhere() .and("corp_code", QueryType.EQ, user.getCorpCode_()) .and("corp_name", QueryType.LIKE, user.getCorpName_()); - Page page = userService.findPage(new Page(request, response), user); + user.setPage(new Page<>(request, response)); + Page page = userService.findPage(user); return page; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index 83132fa0..cb0a732a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -98,7 +98,7 @@ public class EmpUserController extends BaseController { if (!(isAll != null && isAll)){ empUserService.addDataScopeFilter(empUser, UserDataScope.CTRL_PERMI_MANAGE); } - empUser.setPage(new Page(request, response)); + empUser.setPage(new Page<>(request, response)); Page page = empUserService.findPage(empUser); return page; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java index 06f37029..60e6dff6 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java @@ -55,7 +55,8 @@ public class SecAdminController extends BaseController { @ResponseBody public Page listData(User user, HttpServletRequest request, HttpServletResponse response) { user.setMgrType(User.MGR_TYPE_SEC_ADMIN); // 二级管理员 - Page page = userService.findPage(new Page(request, response), user); + user.setPage(new Page<>(request, response)); + Page page = userService.findPage(user); return page; } diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml index 9c511be5..c2203a53 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml @@ -100,7 +100,8 @@ public class ${ClassName}Controller extends BaseController { } <% }else{ %> public Page<${ClassName}> listData(${ClassName} ${className}, HttpServletRequest request, HttpServletResponse response) { - Page<${ClassName}> page = ${className}Service.findPage(new Page<${ClassName}>(request, response), ${className}); + ${className}.setPage(new Page<>(request, response)); + Page<${ClassName}> page = ${className}Service.findPage(${className}); return page; } <% } %> diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml index a6f7ab7b..b2786efc 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml @@ -68,13 +68,13 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv /** * 查询分页数据 - * @param page 分页对象 - * @param ${className} + * @param ${className} 查询条件 + * @param ${className}.page 分页对象 * @return */ @Override - public Page<${ClassName}> findPage(Page<${ClassName}> page, ${ClassName} ${className}) { - return super.findPage(page, ${className}); + public Page<${ClassName}> findPage(${ClassName} ${className}) { + return super.findPage(${className}); } <% }else{ %> diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java index e927e692..64296017 100644 --- a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java +++ b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java @@ -52,7 +52,7 @@ public class TestDataService extends CrudService { * @return */ @Override - public Page findPage(Page page, TestData testData) { + public Page findPage(TestData testData) { // // 演示Map参数和返回值，支持分页 // Page> pageMap = new Page<>(); @@ -63,7 +63,7 @@ public class TestDataService extends CrudService { // System.out.println(pageMap.getList()); // System.out.println(pageMap.getCount()); - return super.findPage(page, testData); + return super.findPage(testData); } /** diff --git a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java index 9c28e7cf..7cc4932f 100644 --- a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java +++ b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java @@ -59,7 +59,8 @@ public class TestDataController extends BaseController { @RequestMapping(value = "listData") @ResponseBody public Page listData(TestData testData, HttpServletRequest request, HttpServletResponse response) { - Page page = testDataService.findPage(new Page(request, response), testData); + testData.setPage(new Page<>(request, response)); + Page page = testDataService.findPage(testData); return page; }