From ea6940378cb24bc4ff1f81f2a58f1afda545c4ca Mon Sep 17 00:00:00 2001
From: PIGCLOUD <wangiegie@gmail.com>
Date: Sat, 25 Jul 2026 15:56:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(syslog):=20=E5=A2=9E=E5=8A=A0=E5=AF=B9?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=B1=87=E6=80=BB=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/MybatisPlusConfiguration.java     |  3 ++
 .../admin/service/impl/SysLogServiceImpl.java | 20 ++++++++-
 .../main/resources/mapper/SysLogMapper.xml    | 45 +++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java
index 852be5330..94ede760e 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java
@@ -172,7 +172,10 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer {
     public DatabaseIdProvider databaseIdProvider() {
         VendorDatabaseIdProvider databaseIdProvider = new VendorDatabaseIdProvider();
         Properties properties = new Properties();
+        properties.setProperty("Oracle", "oracle");
         properties.setProperty("SQL Server", "mssql");
+        properties.setProperty("DM DBMS", "dm");
+        properties.setProperty("KingbaseES", "kingbase");
         databaseIdProvider.setProperties(properties);
         return databaseIdProvider;
     }
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java
index bca26389a..579657b68 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java
@@ -19,6 +19,9 @@
 
 package com.pig4cloud.pigx.admin.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.TemporalAccessorUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -38,7 +41,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.temporal.TemporalAccessor;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -127,7 +132,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
         Map<String, Map<String, Object>> resultMap = new TreeMap<>();
 
         for (Map<String, Object> row : logSumList) {
-            String createTime = row.get(SysLog.Fields.createTime).toString();
+            String createTime = formatCreateTime(row.get(SysLog.Fields.createTime));
             Map<String, Object> logSum = resultMap.computeIfAbsent(createTime, key -> {
                 Map<String, Object> item = new LinkedHashMap<>();
                 item.put(SysLog.Fields.createTime, key);
@@ -139,4 +144,17 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
         return new ArrayList<>(resultMap.values());
     }
 
+    private String formatCreateTime(Object createTime) {
+        if (createTime == null) {
+            return StrUtil.EMPTY;
+        }
+        if (createTime instanceof Date date) {
+            return DateUtil.format(date, DatePattern.NORM_DATE_PATTERN);
+        }
+        if (createTime instanceof TemporalAccessor temporalAccessor) {
+            return TemporalAccessorUtil.format(temporalAccessor, DatePattern.NORM_DATE_PATTERN);
+        }
+        return createTime.toString();
+    }
+
 }
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml
index 29c135a54..3ab28a2c5 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml
@@ -27,8 +27,53 @@
 			COUNT(*) AS "logCount"
 		FROM sys_log
 		WHERE create_time >= #{startTime}
+		AND del_flag = '0'
 		GROUP BY DATE(create_time), log_type
 		ORDER BY DATE(create_time), log_type
 	</select>
 
+	<select id="selectLogSum" databaseId="oracle" resultType="java.util.Map">
+		SELECT TRUNC(create_time) AS "createTime",
+			log_type AS "logType",
+			COUNT(*) AS "logCount"
+		FROM sys_log
+		WHERE create_time >= #{startTime}
+		AND del_flag = '0'
+		GROUP BY TRUNC(create_time), log_type
+		ORDER BY TRUNC(create_time), log_type
+	</select>
+
+	<select id="selectLogSum" databaseId="mssql" resultType="java.util.Map">
+		SELECT CAST(create_time AS date) AS "createTime",
+			log_type AS "logType",
+			COUNT(*) AS "logCount"
+		FROM sys_log
+		WHERE create_time >= #{startTime}
+		AND del_flag = '0'
+		GROUP BY CAST(create_time AS date), log_type
+		ORDER BY CAST(create_time AS date), log_type
+	</select>
+
+	<select id="selectLogSum" databaseId="dm" resultType="java.util.Map">
+		SELECT TO_CHAR(create_time, 'YYYY-MM-DD') AS "createTime",
+			log_type AS "logType",
+			COUNT(*) AS "logCount"
+		FROM sys_log
+		WHERE create_time >= #{startTime}
+		AND del_flag = '0'
+		GROUP BY TO_CHAR(create_time, 'YYYY-MM-DD'), log_type
+		ORDER BY TO_CHAR(create_time, 'YYYY-MM-DD'), log_type
+	</select>
+
+	<select id="selectLogSum" databaseId="kingbase" resultType="java.util.Map">
+		SELECT TO_CHAR(create_time, 'YYYY-MM-DD') AS "createTime",
+			log_type AS "logType",
+			COUNT(*) AS "logCount"
+		FROM sys_log
+		WHERE create_time >= #{startTime}
+		AND del_flag = '0'
+		GROUP BY TO_CHAR(create_time, 'YYYY-MM-DD'), log_type
+		ORDER BY TO_CHAR(create_time, 'YYYY-MM-DD'), log_type
+	</select>
+
 </mapper>