ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-11-04 10:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: MyBatis XML 完善适配多数据库 SQL 语法差异

Browse Source 
Co-authored-by: Billy<378012098@qq.com>



# message auto-generated for no-merge-commit merge:
merge billy into dev

分析页面相关接口以及用户密码历史记录接口 支持 pgsql 数据库

Created-by: onekr-billy
Commit-by: Billy
Merged-by: Charles_7c
Description: <!--
  非常感谢您的 PR！在提交之前，请务必确保您 PR 的代码经过了完整测试，并且通过了代码规范检查。
-->

<!-- 在 [] 中输入 x 来勾选) -->

## PR 类型

<!-- 您的 PR 引入了哪种类型的变更？ -->
<!-- 只支持选择一种类型，如果有多种类型，可以在更新日志中增加 “类型” 列。 -->

- [ ] 新 feature
- [ ] Bug 修复
- [x] 功能增强
- [ ] 文档变更
- [ ] 代码样式变更
- [ ] 重构
- [ ] 性能改进
- [ ] 单元测试
- [ ] CI/CD
- [ ] 其他

## PR 目的

<!-- 描述一下您的 PR 解决了什么问题。如果可以，请链接到相关 issues。 -->

## 解决方案

<!-- 详细描述您是如何解决的问题 -->

## PR 测试

<!-- 如果可以，请为您的 PR 添加或更新单元测试。 -->
<!-- 请描述一下您是如何测试 PR 的。例如：创建/更新单元测试或添加相关的截图。 -->

## Changelog

| 模块  | Changelog | Related issues |
|-----|-----------| -------------- |
|     |           |                |

<!-- 如果有多种类型的变更，可以在变更日志表中增加 “类型” 列，该列的值与上方 “PR 类型” 相同。 -->
<!-- Related issues 格式为 Closes #<issue号>，或者 Fixes #<issue号>，或者 Resolves #<issue号>。 -->

## 其他信息

<!-- 请描述一下还有哪些注意事项。例如：如果引入了一个不向下兼容的变更，请描述其影响。 -->

## 提交前确认

- [x] PR 代码经过了完整测试，并且通过了代码规范检查
- [ ] 已经完整填写 Changelog，并链接到了相关 issues
- [x] PR 代码将要提交到 dev 分支

See merge request: continew/continew-admin!6
This commit is contained in:
onekr-billy
2025-07-03 11:39:18 +08:00
committed by Charles_7c
parent 151a0faeb0
commit 7ff516694e
2 changed files with 74 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
continew-system/src/main/resources/mapper/LogMapper.xml
View File

@@ -41,21 +41,34 @@
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
<select id="selectDashboardOverviewPv" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp"> <select id="selectDashboardOverviewPv" databaseId="mysql" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
SELECT SELECT
(SELECT COUNT(*) FROM sys_log) AS total, (SELECT COUNT(*) FROM sys_log) AS total,
(SELECT COUNT(*) FROM sys_log WHERE create_time >= CURDATE() AND create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today, (SELECT COUNT(*) FROM sys_log WHERE create_time >= CURDATE() AND create_time <![CDATA[ < ]]> DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today,
(SELECT COUNT(*) FROM sys_log WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY) AND create_time &lt; CURDATE()) AS yesterday (SELECT COUNT(*) FROM sys_log WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY) AND create_time <![CDATA[ < ]]> CURDATE()) AS yesterday
</select>
<select id="selectDashboardOverviewPv" databaseId="pgsql" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
SELECT
(SELECT COUNT(*) FROM sys_log) AS total,
(SELECT COUNT(*) FROM sys_log WHERE create_time >= CURRENT_DATE AND create_time <![CDATA[ < ]]> CURRENT_DATE + INTERVAL '1 day') AS today,
(SELECT COUNT(*) FROM sys_log WHERE create_time >= CURRENT_DATE - INTERVAL '1 day' AND create_time <![CDATA[ < ]]> CURRENT_DATE) AS yesterday
</select> </select>
<select id="selectDashboardOverviewIp" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp"> <select id="selectDashboardOverviewIp" databaseId="mysql" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
SELECT SELECT
(SELECT COUNT(DISTINCT ip) FROM sys_log) AS total, (SELECT COUNT(DISTINCT ip) FROM sys_log) AS total,
(SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= CURDATE() AND create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today, (SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= CURDATE() AND create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today,
(SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY) AND create_time &lt; CURDATE()) AS yesterday (SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY) AND create_time &lt; CURDATE()) AS yesterday
</select> </select>
<select id="selectDashboardOverviewIp" databaseId="pgsql" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
SELECT
(SELECT COUNT(DISTINCT ip) FROM sys_log) AS total,
(SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= CURRENT_DATE AND create_time <![CDATA[ < ]]> CURRENT_DATE + INTERVAL '1 day') AS today,
(SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= CURRENT_DATE - INTERVAL '1 day' AND create_time <![CDATA[ < ]]> CURRENT_DATE) AS yesterday
</select>
<select id="selectListDashboardAnalysisPv" <select id="selectListDashboardAnalysisPv" databaseId="mysql"
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp"> resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT SELECT
DATE_FORMAT(create_time, '%Y-%m') AS name, DATE_FORMAT(create_time, '%Y-%m') AS name,
@@ -68,8 +81,21 @@
GROUP BY name GROUP BY name
ORDER BY name ORDER BY name
</select> </select>
<select id="selectListDashboardAnalysisPv" databaseId="pgsql"
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT
TO_CHAR(create_time, 'YYYY-MM') AS name,
COUNT(*) AS value
FROM sys_log
WHERE TO_CHAR(create_time, 'YYYY-MM') IN
<foreach collection="months" item="month" separator="," open="(" close=")">
#{month}
</foreach>
GROUP BY name
ORDER BY name
</select>
<select id="selectListDashboardAnalysisIp" <select id="selectListDashboardAnalysisIp" databaseId="mysql"
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp"> resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT SELECT
DATE_FORMAT(create_time, '%Y-%m') AS name, DATE_FORMAT(create_time, '%Y-%m') AS name,
@@ -82,6 +108,19 @@
GROUP BY name GROUP BY name
ORDER BY name ORDER BY name
</select> </select>
<select id="selectListDashboardAnalysisIp" databaseId="pgsql"
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT
TO_CHAR(create_time, 'YYYY-MM') AS name,
COUNT(DISTINCT ip) AS value
FROM sys_log
WHERE TO_CHAR(create_time, 'YYYY-MM') IN
<foreach collection="months" item="month" separator="," open="(" close=")">
#{month}
</foreach>
GROUP BY name
ORDER BY name
</select>
<select id="selectListDashboardAnalysisGeo" resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp"> <select id="selectListDashboardAnalysisGeo" resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT SELECT
@@ -110,7 +149,14 @@
<select id="selectListDashboardAnalysisTimeslot" <select id="selectListDashboardAnalysisTimeslot"
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp"> resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT SELECT
LPAD(CONCAT(FLOOR(HOUR(create_time) / 2) * 2, ':00'), 5, '0') AS name, <choose>
<when test="_databaseId =='mysql'">
LPAD(CONCAT(FLOOR(HOUR(create_time) / 2) * 2, ':00'), 5, '0') AS name,
</when>
<when test="_databaseId =='pgsql'">
LPAD((FLOOR(EXTRACT(HOUR FROM create_time) / 2) * 2)::text || ':00', 5, '0') AS name,
</when>
</choose>
COUNT(*) AS value COUNT(*) AS value
FROM sys_log FROM sys_log
GROUP BY name GROUP BY name
@@ -144,7 +190,14 @@
<select id="selectListDashboardAnalysisBrowser" <select id="selectListDashboardAnalysisBrowser"
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp"> resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT SELECT
SUBSTRING_INDEX(browser, ' ', 1) AS name, <choose>
<when test="_databaseId =='mysql'">
SUBSTRING_INDEX(browser, ' ', 1) AS name,
</when>
<when test="_databaseId =='pgsql'">
SPLIT_PART(browser, ' ', 1) AS name,
</when>
</choose>
COUNT(*) AS value COUNT(*) AS value
FROM sys_log FROM sys_log
WHERE browser IS NOT NULL WHERE browser IS NOT NULL

15
continew-system/src/main/resources/mapper/user/UserPasswordHistoryMapper.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="top.continew.admin.system.mapper.user.UserPasswordHistoryMapper"> <mapper namespace="top.continew.admin.system.mapper.user.UserPasswordHistoryMapper">
<delete id="deleteExpired"> <delete id="deleteExpired" databaseId="mysql">
DELETE t1 FROM sys_user_password_history AS t1 DELETE t1 FROM sys_user_password_history AS t1
LEFT JOIN ( LEFT JOIN (
SELECT id SELECT id
FROM sys_user_password_history FROM sys_user_password_history
WHERE user_id = #{userId} WHERE user_id = #{userId}
@@ -12,4 +12,15 @@
) AS t2 ON t2.id = t1.id ) AS t2 ON t2.id = t1.id
WHERE t2.id IS NULL WHERE t2.id IS NULL
</delete> </delete>
<delete id="deleteExpired" databaseId="pgsql">
DELETE FROM sys_user_password_history AS t1
WHERE user_id = #{userId}
AND id NOT IN (
SELECT id
FROM sys_user_password_history
WHERE user_id = #{userId}
ORDER BY create_time DESC
LIMIT #{count}
)
</delete>
</mapper> </mapper>