From 06da295d58680e013320eb7831729082e91f3d8c Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Tue, 5 Sep 2023 16:23:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/AdminLogController.java           | 21 +++++++++++++++----
 .../common/service/AdminLogService.java       |  2 ++
 .../service/impl/AdminLogServiceImpl.java     |  8 +++++++
 .../main/resources/mapper/AdminLogMapper.xml  |  4 +++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java
index 7528792..2f4cbed 100644
--- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java
+++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java
@@ -19,10 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
@@ -31,6 +28,7 @@ import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
 import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.AdminLog;
+import xyz.playedu.common.exception.ServiceException;
 import xyz.playedu.common.service.AdminLogService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.types.paginate.AdminLogPaginateFiler;
@@ -87,4 +85,19 @@ public class AdminLogController {
 
         return JsonResponse.data(data);
     }
+
+    @BackendPermission(slug = BPermissionConstant.ADMIN_LOG)
+    @GetMapping("/detail/{id}")
+    public JsonResponse detail(@PathVariable(name = "id") Integer id) {
+        Integer adminId = 0;
+        if (!backendBus.isSuperAdmin()) {
+            adminId = BCtx.getId();
+        }
+
+        AdminLog log = adminLogService.find(id, adminId);
+        if (log == null) {
+            throw new ServiceException("日志不存在");
+        }
+        return JsonResponse.data(log);
+    }
 }
diff --git a/playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java b/playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java
index 3a8c811..be28b7f 100644
--- a/playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java
+++ b/playedu-common/src/main/java/xyz/playedu/common/service/AdminLogService.java
@@ -28,4 +28,6 @@ import xyz.playedu.common.types.paginate.PaginationResult;
  */
 public interface AdminLogService extends IService<AdminLog> {
     PaginationResult<AdminLog> paginate(int page, int size, AdminLogPaginateFiler filter);
+
+    AdminLog find(Integer id, Integer adminId);
 }
diff --git a/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminLogServiceImpl.java b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminLogServiceImpl.java
index 411efe8..f39f79b 100644
--- a/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminLogServiceImpl.java
+++ b/playedu-common/src/main/java/xyz/playedu/common/service/impl/AdminLogServiceImpl.java
@@ -44,4 +44,12 @@ public class AdminLogServiceImpl extends ServiceImpl<AdminLogMapper, AdminLog>
 
         return pageResult;
     }
+
+    @Override
+    public AdminLog find(Integer id, Integer adminId) {
+        if (adminId == 0) {
+            return getOne(query().getWrapper().eq("id", id));
+        }
+        return getOne(query().getWrapper().eq("id", id).eq("admin_id", adminId));
+    }
 }
diff --git a/playedu-common/src/main/resources/mapper/AdminLogMapper.xml b/playedu-common/src/main/resources/mapper/AdminLogMapper.xml
index a1936d6..8deb05c 100644
--- a/playedu-common/src/main/resources/mapper/AdminLogMapper.xml
+++ b/playedu-common/src/main/resources/mapper/AdminLogMapper.xml
@@ -29,7 +29,9 @@
     </sql>
 
     <select id="paginate" resultType="xyz.playedu.common.domain.AdminLog">
-        SELECT `admin_logs`.*
+        SELECT `admin_logs`.`id`,`admin_logs`.`admin_id`,`admin_logs`.`admin_name`,`admin_logs`.`module`,`admin_logs`.`title`,
+        `admin_logs`.`opt`,`admin_logs`.`method`,`admin_logs`.`request_method`,`admin_logs`.`url`,`admin_logs`.`ip`,`admin_logs`.`param`,
+        `admin_logs`.`ip_area`,`admin_logs`.`created_at`
         FROM `admin_logs`
         <where>
             <if test="adminId != null">