From 935ee6a500e066f74ba95f4b8e6bed86d0dac2c1 Mon Sep 17 00:00:00 2001
From: wsw <wsw@winning.com.cn>
Date: Sat, 29 Jul 2023 17:10:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/AdminLogController.java           | 28 +++++++++++--------
 .../types/paginate/AdminLogPaginateFiler.java |  4 +++
 src/main/resources/mapper/AdminLogMapper.xml  | 12 ++++++++
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java b/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java
index 0c3982e..7c92cfc 100644
--- a/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java
+++ b/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java
@@ -38,6 +38,7 @@ import xyz.playedu.api.types.paginate.AdminLogPaginateFiler;
 import xyz.playedu.api.types.paginate.PaginationResult;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -65,6 +66,8 @@ public class AdminLogController {
         String module = MapUtils.getString(params, "module");
         String title = MapUtils.getString(params, "title");
         Integer opt = MapUtils.getInteger(params, "opt");
+        String startTime = MapUtils.getString(params, "start_time");
+        String endTime = MapUtils.getString(params, "end_time");
 
         AdminLogPaginateFiler filter = new AdminLogPaginateFiler();
         if (backendBus.isSuperAdmin()) {
@@ -75,22 +78,23 @@ public class AdminLogController {
         filter.setModule(module);
         filter.setTitle(title);
         filter.setOpt(opt);
+        filter.setStartTime(startTime);
+        filter.setEndTime(endTime);
         filter.setSortField(sortField);
         filter.setSortAlgo(sortAlgo);
 
         PaginationResult<AdminLog> result = adminLogService.paginate(page, size, filter);
-
-        Map<Integer, String> adminUserMap =
-                adminUserService
-                        .chunks(result.getData().stream().map(AdminLog::getAdminId).toList())
-                        .stream()
-                        .collect(Collectors.toMap(AdminUser::getId, AdminUser::getName));
-
-        result.getData()
-                .forEach(
-                        adminLog -> {
-                            adminLog.setAdminName(adminUserMap.get(adminLog.getAdminId()));
-                        });
+        if(result.getTotal() > 0){
+            List<AdminUser> adminUsers =  adminUserService.chunks(result.getData().stream().map(AdminLog::getAdminId).toList());
+            if(null != adminUsers && adminUsers.size() > 0){
+                Map<Integer, String> adminUserMap = adminUsers.stream().collect(Collectors.toMap(AdminUser::getId, AdminUser::getName));
+                result.getData()
+                        .forEach(
+                                adminLog -> {
+                                    adminLog.setAdminName(adminUserMap.get(adminLog.getAdminId()));
+                                });
+            }
+        }
 
         HashMap<String, Object> data = new HashMap<>();
         data.put("data", result.getData());
diff --git a/src/main/java/xyz/playedu/api/types/paginate/AdminLogPaginateFiler.java b/src/main/java/xyz/playedu/api/types/paginate/AdminLogPaginateFiler.java
index 61d1201..bcda5ea 100644
--- a/src/main/java/xyz/playedu/api/types/paginate/AdminLogPaginateFiler.java
+++ b/src/main/java/xyz/playedu/api/types/paginate/AdminLogPaginateFiler.java
@@ -28,6 +28,10 @@ public class AdminLogPaginateFiler {
 
     private Integer opt;
 
+    private String startTime;
+
+    private String endTime;
+
     private String sortField;
 
     private String sortAlgo;
diff --git a/src/main/resources/mapper/AdminLogMapper.xml b/src/main/resources/mapper/AdminLogMapper.xml
index 02da4fa..4f301e1 100644
--- a/src/main/resources/mapper/AdminLogMapper.xml
+++ b/src/main/resources/mapper/AdminLogMapper.xml
@@ -43,6 +43,12 @@
             <if test="opt != null">
                 AND `admin_logs`.`opt` = #{opt}
             </if>
+            <if test="startTime != null and startTime != ''">
+                AND `admin_logs`.`created_at` &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND `admin_logs`.`created_at` &lt;= #{endTime}
+            </if>
         </where>
 
         <if test="sortAlgo == 'asc'">
@@ -84,6 +90,12 @@
             <if test="opt != null">
                 AND `admin_logs`.`opt` = #{opt}
             </if>
+            <if test="startTime != null and startTime != ''">
+                AND `admin_logs`.`created_at` &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND `admin_logs`.`created_at` &lt;= #{endTime}
+            </if>
         </where>
     </select>
 </mapper>