manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

缓存工具类新增timeToLiveInSeconds支持；优化分页接口

Browse Source
This commit is contained in:
thinkgem
2018-09-23 23:40:56 +08:00
parent d9e18a70c7
commit 7d6e99c8fb
13 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/java/com/jeesite/modules/sys/service/EmpUserService.java
View File

@@ -68,8 +68,8 @@ public class EmpUserService extends CrudService<EmpUserDao, EmpUser> {
* 分页查询数据
*/
@Override
public Page<EmpUser> findPage(Page<EmpUser> page, EmpUser empUser) {
return super.findPage(page, empUser);
public Page<EmpUser> findPage(EmpUser empUser) {
return super.findPage(empUser);
}
/**

4
modules/core/src/main/java/com/jeesite/modules/sys/service/EmployeeService.java
View File

@@ -41,8 +41,8 @@ public class EmployeeService extends CrudService<EmployeeDao, Employee> {
* 查询分页数据
*/
@Override
public Page<Employee> findPage(Page<Employee> page, Employee employee) {
return super.findPage(page, employee);
public Page<Employee> findPage(Employee employee) {
return super.findPage(employee);
}
/**

4
modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java
View File

@@ -25,7 +25,7 @@ public class LogService extends CrudService<LogDao, Log> {
* 查询日志记录
*/
@Override
public Page<Log> findPage(Page<Log> page, Log log) {
public Page<Log> 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<LogDao, Log> {
if (!log.getCurrentUser().isAdmin()){
log.setCreateBy(log.getCurrentUser().getUserCode());
}
return super.findPage(page, log);
return super.findPage(log);
}

6
modules/core/src/main/java/com/jeesite/modules/sys/service/PostService.java
View File

@@ -38,11 +38,11 @@ public class PostService extends CrudService<PostDao, Post> {
}
/**
* 查询可分页的岗位列表
* 查询岗位
*/
@Override
public Page<Post> findPage(Page<Post> page, Post post) {
return super.findPage(page, post);
public Page<Post> findPage(Post post) {
return super.findPage(post);
}
/**

3
modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java
View File

@@ -65,7 +65,8 @@ public class LogController extends BaseController {
@RequestMapping(value = "listData")
@ResponseBody
public Page<Log> listData(Log log, HttpServletRequest request, HttpServletResponse response) {
Page<Log> page = logService.findPage(new Page<Log>(request, response), log);
log.setPage(new Page<>(request, response));
Page<Log> page = logService.findPage(log);
return page;
}

3
modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java
View File

@@ -51,7 +51,8 @@ public class PostController extends BaseController {
@RequestMapping(value = {"listData"})
@ResponseBody
public Page<Post> listData(Post post, HttpServletRequest request, HttpServletResponse response) {
Page<Post> page = postService.findPage(new Page<Post>(request, response), post);
post.setPage(new Page<>(request, response));
Page<Post> page = postService.findPage(post);
return page;
}

3
modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
View File

@@ -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<User> page = userService.findPage(new Page<User>(request, response), user);
user.setPage(new Page<>(request, response));
Page<User> page = userService.findPage(user);
return page;
}

2
modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
View File

@@ -98,7 +98,7 @@ public class EmpUserController extends BaseController {
if (!(isAll != null && isAll)){
empUserService.addDataScopeFilter(empUser, UserDataScope.CTRL_PERMI_MANAGE);
}
empUser.setPage(new Page<EmpUser>(request, response));
empUser.setPage(new Page<>(request, response));
Page<EmpUser> page = empUserService.findPage(empUser);
return page;
}

3
modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java
View File

@@ -55,7 +55,8 @@ public class SecAdminController extends BaseController {
@ResponseBody
public Page<User> listData(User user, HttpServletRequest request, HttpServletResponse response) {
user.setMgrType(User.MGR_TYPE_SEC_ADMIN); // 二级管理员
Page<User> page = userService.findPage(new Page<User>(request, response), user);
user.setPage(new Page<>(request, response));
Page<User> page = userService.findPage(user);
return page;
}

3
modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
View File

@@ -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;
}
<% } %>

8
modules/core/src/main/resources/templates/modules/gen/crud/service.xml
View File

@@ -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{ %>

4
web/src/main/java/com/jeesite/modules/test/service/TestDataService.java
View File

@@ -52,7 +52,7 @@ public class TestDataService extends CrudService<TestDataDao, TestData> {
* @return
*/
@Override
public Page<TestData> findPage(Page<TestData> page, TestData testData) {
public Page<TestData> findPage(TestData testData) {
// // 演示Map参数和返回值，支持分页
// Page<Map<String, Object>> pageMap = new Page<>();
@@ -63,7 +63,7 @@ public class TestDataService extends CrudService<TestDataDao, TestData> {
// System.out.println(pageMap.getList());
// System.out.println(pageMap.getCount());
return super.findPage(page, testData);
return super.findPage(testData);
}
/**

3
web/src/main/java/com/jeesite/modules/test/web/TestDataController.java
View File

@@ -59,7 +59,8 @@ public class TestDataController extends BaseController {
@RequestMapping(value = "listData")
@ResponseBody
public Page<TestData> listData(TestData testData, HttpServletRequest request, HttpServletResponse response) {
Page<TestData> page = testDataService.findPage(new Page<TestData>(request, response), testData);
testData.setPage(new Page<>(request, response));
Page<TestData> page = testDataService.findPage(testData);
return page;
}