From 8a93ea8f3abc5df4abf86ffd78311ba6cd6c6b33 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sun, 17 Dec 2023 18:27:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8E?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=A1=A8=E7=BB=93=E6=9E=84=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/LogMapper.xml          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml b/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml
index 2113df1d..01994f5f 100644
--- a/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml
+++ b/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml
@@ -4,7 +4,7 @@
     <select id="selectDashboardTotal" resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp">
         SELECT
             (SELECT COUNT(*) FROM `sys_log`) AS pvCount,
-            (SELECT COUNT(DISTINCT `client_ip`) FROM `sys_log`) AS ipCount,
+            (SELECT COUNT(DISTINCT `ip`) FROM `sys_log`) AS ipCount,
             (SELECT COUNT(*) FROM `sys_log` WHERE DATE(`create_time`) = CURDATE()) AS todayPvCount,
             (SELECT COUNT(*) FROM `sys_log` WHERE DATE(`create_time`) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)) AS yesterdayPvCount
     </select>
@@ -14,7 +14,7 @@
         SELECT
             DATE(`create_time`) AS date,
             COUNT(*) AS pvCount,
-            COUNT(DISTINCT `client_ip`) AS ipCount
+            COUNT(DISTINCT `ip`) AS ipCount
         FROM `sys_log`
         GROUP BY DATE(`create_time`)
         HAVING `date` != CURDATE()
@@ -38,11 +38,11 @@
 
     <select id="selectListDashboardGeoDistribution" resultType="java.util.Map">
         SELECT
-            `location` AS name,
-            COUNT(DISTINCT `client_ip`) AS value
+            `address` AS name,
+            COUNT(DISTINCT `ip`) AS value
         FROM `sys_log`
-        GROUP BY `location`
-        ORDER BY COUNT(DISTINCT `client_ip`) DESC
+        GROUP BY `address`
+        ORDER BY COUNT(DISTINCT `ip`) DESC
         LIMIT 10
     </select>
 </mapper>
\ No newline at end of file