From 13582b25a9c99ac46a5721fa386b3c1ad0e010be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Tue, 19 Sep 2023 16:41:04 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=20=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/userInfo/model/UserRequestLog.java   |  2 ++
 .../mybatisMapper/UserInfoMapper.xml          | 26 +++++++++++++++++++
 .../adminPage/userLog/requestLog.html         | 16 ++++++++----
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserRequestLog.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserRequestLog.java
index 8f5711be..941a10eb 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserRequestLog.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserRequestLog.java
@@ -38,4 +38,6 @@ public class UserRequestLog extends BaseModel {
   @Column(name = "wrt_dt")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private LocalDateTime wrtDt;
+  @Transient
+  private String pageType;
 }
diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index 86a8d89d..47ae7330 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -418,6 +418,32 @@
       <if test='endDate != null and endDate != ""'>
         and wrt_dt &lt;= #{endDate}::date+1
       </if>
+      <choose>
+        <when test='pageType == "adminPage"'>
+          and request_url in (
+            '/codeMgt/codeMgtPage',
+            '/organMgt/organMgtPage',
+            '/menuMgt/menuMgtPage',
+            '/userMgt/userMgtPage',
+            '/authMgt/authMgtPage',
+            '/userMgt/userLog/requestLog',
+            '/userMgt/userLog/inoutLog',
+            '/userMgt/accessChangePage'
+          )
+        </when>
+        <when test='pageType == "userPage"'>
+          and request_url not in (
+            '/codeMgt/codeMgtPage',
+            '/organMgt/organMgtPage',
+            '/menuMgt/menuMgtPage',
+            '/userMgt/userMgtPage',
+            '/authMgt/authMgtPage',
+            '/userMgt/userLog/requestLog',
+            '/userMgt/userLog/inoutLog',
+            '/userMgt/accessChangePage'
+          )
+        </when>
+      </choose>
     </where>
   </sql>
   <select id="selectRequestLogList" resultType="UserRequestLog" parameterType="UserRequestLog">
diff --git a/src/main/resources/templates/adminPage/userLog/requestLog.html b/src/main/resources/templates/adminPage/userLog/requestLog.html
index e320979f..585b0bf6 100644
--- a/src/main/resources/templates/adminPage/userLog/requestLog.html
+++ b/src/main/resources/templates/adminPage/userLog/requestLog.html
@@ -44,14 +44,20 @@
                           <input type="text" class="form-control form-control-sm" name="requestUrl" placeholder="URL" th:value="${searchParams.requestUrl}">
                         </div>
                         <div class="col-2">
-                          <select class="form-select form-select-sm" name="requestMethod">
-                            <option value="">접근방식</option>
-                            <option value="GET" th:selected="${searchParams.requestMethod eq 'GET'}">GET</option>
-                            <option value="POST" th:selected="${searchParams.requestMethod eq 'POST'}">POST</option>
+                          <select class="form-select form-select-sm" name="pageType">
+                            <option value="">전체</option>
+                            <option value="adminPage" th:selected="${searchParams.pageType eq 'adminPage'}">관리자 페이지</option>
+                            <option value="userPage" th:selected="${searchParams.pageType eq 'userPage'}">일반 페이지</option>
                           </select>
                         </div>
                       </div>
-                      <div class="row justify-content-end">
+                      <div class="row justify-content-end"><div class="col-2">
+                        <select class="form-select form-select-sm" name="requestMethod">
+                          <option value="">접근방식</option>
+                          <option value="GET" th:selected="${searchParams.requestMethod eq 'GET'}">GET</option>
+                          <option value="POST" th:selected="${searchParams.requestMethod eq 'POST'}">POST</option>
+                        </select>
+                      </div>
                         <div class="col-2">
                           <input type="text" class="form-control form-control-sm" name="userBelong" placeholder="사용자" th:value="${searchParams.userBelong}">
                         </div>