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 impleme Map> resultMap = new TreeMap<>(); for (Map row : logSumList) { - String createTime = row.get(SysLog.Fields.createTime).toString(); + String createTime = formatCreateTime(row.get(SysLog.Fields.createTime)); Map logSum = resultMap.computeIfAbsent(createTime, key -> { Map item = new LinkedHashMap<>(); item.put(SysLog.Fields.createTime, key); @@ -139,4 +144,17 @@ public class SysLogServiceImpl extends ServiceImpl 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 + + + + + + + +