From a39d2d72bf8e44c037ffc55aec6af6d19679e0ba Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 16 六月 2023 16:17:22 +0800
Subject: [PATCH] 提取共用分页方法
---
src/main/java/com/whyc/service/UserLogService.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/UserLogService.java b/src/main/java/com/whyc/service/UserLogService.java
index 812a864..ba037b1 100644
--- a/src/main/java/com/whyc/service/UserLogService.java
+++ b/src/main/java/com/whyc/service/UserLogService.java
@@ -8,10 +8,7 @@
import com.whyc.mapper.CommonMapper;
import com.whyc.mapper.UserLogMapper;
import com.whyc.pojo.UserLog;
-import com.whyc.util.ActionUtil;
-import com.whyc.util.DateUtil;
-import com.whyc.util.ExcelUtil;
-import com.whyc.util.MathUtil;
+import com.whyc.util.*;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Service;
@@ -29,6 +26,9 @@
@Resource
private CommonMapper commonMapper;
+
+ @Resource
+ private SubTablePageInfoUtils subTablePageInfoUtils;
public PageInfo<UserLog>getPage(int pageNum, int pageSize, UserLog userLog) {
PageHelper.startPage(pageNum, pageSize, true);
@@ -129,12 +129,12 @@
}
/**鏍规嵁鏌ヨ浼樺寲鍒嗛〉鏌ヨ鏂瑰紡*/
- public PageInfo<UserLog>getPage2(int pageNum, int pageSize, UserLog userLog) throws ParseException {
+ public PageInfo<Object>getPage2(int pageNum, int pageSize, UserLog userLog) throws ParseException {
//PageHelper.startPage(pageNum,pageSize,true);
//鏍规嵁浼犲叆鐨勬煡璇㈡椂闂�,鑾峰彇鍒嗚〃鍙婇粯璁よ〃鐨勬媶鍒嗘煡璇�
Date startTime = userLog.getOperationTime();
Date endTime = userLog.getOperationTime2();
- Map<String, List<Date>> queryTimeForSubTables = DateUtil.getQueryTimeForSubTablesDesc(startTime, endTime);
+ /*Map<String, List<Date>> queryTimeForSubTables = DateUtil.getQueryTimeForSubTablesDesc(startTime, endTime);
//鏌ヨ鍒嗚〃鏄惁瀛樺湪,瀛樺湪鍒欐煡璇㈢粨鏋�
Map<String,Integer> queryCountMap = new LinkedHashMap<>();
Set<String> tableYearKeySet = queryTimeForSubTables.keySet();
@@ -160,7 +160,7 @@
//鍒嗛〉淇℃伅
//纭鎬婚〉鏁�,鎬昏褰曟暟
- PageInfo<UserLog> pageInfo = new PageInfo<>();
+ PageInfo<Object> pageInfo = new PageInfo<>();
int total = 0;
Set<String> queryKeySet = queryCountMap.keySet();
@@ -181,7 +181,7 @@
//鏍煎紡:{琛ㄥ悕,[limit 2,20]}
Map<String,List<Integer>> tableAndLimitMap = MathUtil.getQueryTableAndLimit(startNum,endNum,pageSize,queryCountMap);
Set<String> keySet = tableAndLimitMap.keySet();
- List<UserLog> userLogList = new LinkedList<>();
+ List<Object> userLogList = new LinkedList<>();
for (String key : keySet) {
List<Date> queryTime = queryTimeForSubTables.get(key);
userLog.setOperationTime(queryTime.get(0));
@@ -193,10 +193,14 @@
userLog.setRecordYear(key.equals("default")?"tb_user_log":"tb_user_log_"+key);
List<UserLog> list = mapper.getList2(userLog);
userLogList.addAll(list);
- }
+ }*/
+ PageInfo<Object> pageInfo = subTablePageInfoUtils.getPageInfo(pageNum, pageSize, startTime, endTime, "db_user", "tb_user_log", userLog);
+ List<Object> userLogList = pageInfo.getList();
+
//杩欎釜鎺ュ彛瑕佸吋瀹规柊鑰佸璁℃棩蹇楄褰曠殑鏌ヨ
//List<UserLog> userLogList = mapper.getList(userLog);
- userLogList.stream().forEach(userLog1 -> {
+ userLogList.stream().forEach(userLogTemp -> {
+ UserLog userLog1 = (UserLog)userLogTemp;
switch (userLog1.getOperationType()){
case 1: userLog1.setOperationTypeStr(UserOperation.TYPE_LOGIN.getTypeName());break;
case 2: userLog1.setOperationTypeStr(UserOperation.TYPE_LOGOUT.getTypeName());break;
--
Gitblit v1.9.1