Skip to content

Commit 7ff5166

Browse files
onekr-billyCharles7c
onekr-billy
authored and
Charles7c
committed
refactor: MyBatis XML 完善适配多数据库 SQL 语法差异
Co-authored-by: Billy<[email protected]> # 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
1 parent 151a0fa commit 7ff5166

File tree

2 files changed

+74
-10
lines changed

2 files changed

+74
-10
lines changed

‎continew-system/src/main/resources/mapper/LogMapper.xml‎

Lines changed: 61 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,34 @@
4141
${ew.customSqlSegment}
4242
</select>
4343

44-
<select id="selectDashboardOverviewPv" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
44+
<select id="selectDashboardOverviewPv" databaseId="mysql" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
4545
SELECT
4646
(SELECT COUNT(*) FROM sys_log) AS total,
47-
(SELECT COUNT(*) FROM sys_log WHERE create_time >= CURDATE() AND create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today,
48-
(SELECT COUNT(*) FROM sys_log WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY) AND create_time &lt; CURDATE()) AS yesterday
47+
(SELECT COUNT(*) FROM sys_log WHERE create_time >= CURDATE() AND create_time <![CDATA[ < ]]> DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today,
48+
(SELECT COUNT(*) FROM sys_log WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY) AND create_time <![CDATA[ < ]]> CURDATE()) AS yesterday
49+
50+
</select>
51+
<select id="selectDashboardOverviewPv" databaseId="pgsql" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
52+
SELECT
53+
(SELECT COUNT(*) FROM sys_log) AS total,
54+
(SELECT COUNT(*) FROM sys_log WHERE create_time >= CURRENT_DATE AND create_time <![CDATA[ < ]]> CURRENT_DATE + INTERVAL '1 day') AS today,
55+
(SELECT COUNT(*) FROM sys_log WHERE create_time >= CURRENT_DATE - INTERVAL '1 day' AND create_time <![CDATA[ < ]]> CURRENT_DATE) AS yesterday
4956
</select>
5057

51-
<select id="selectDashboardOverviewIp" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
58+
<select id="selectDashboardOverviewIp" databaseId="mysql" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
5259
SELECT
5360
(SELECT COUNT(DISTINCT ip) FROM sys_log) AS total,
5461
(SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= CURDATE() AND create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today,
5562
(SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY) AND create_time &lt; CURDATE()) AS yesterday
5663
</select>
64+
<select id="selectDashboardOverviewIp" databaseId="pgsql" resultType="top.continew.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
65+
SELECT
66+
(SELECT COUNT(DISTINCT ip) FROM sys_log) AS total,
67+
(SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= CURRENT_DATE AND create_time <![CDATA[ < ]]> CURRENT_DATE + INTERVAL '1 day') AS today,
68+
(SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= CURRENT_DATE - INTERVAL '1 day' AND create_time <![CDATA[ < ]]> CURRENT_DATE) AS yesterday
69+
</select>
5770

58-
<select id="selectListDashboardAnalysisPv"
71+
<select id="selectListDashboardAnalysisPv" databaseId="mysql"
5972
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
6073
SELECT
6174
DATE_FORMAT(create_time, '%Y-%m') AS name,
@@ -68,8 +81,21 @@
6881
GROUP BY name
6982
ORDER BY name
7083
</select>
84+
<select id="selectListDashboardAnalysisPv" databaseId="pgsql"
85+
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
86+
SELECT
87+
TO_CHAR(create_time, 'YYYY-MM') AS name,
88+
COUNT(*) AS value
89+
FROM sys_log
90+
WHERE TO_CHAR(create_time, 'YYYY-MM') IN
91+
<foreach collection="months" item="month" separator="," open="(" close=")">
92+
#{month}
93+
</foreach>
94+
GROUP BY name
95+
ORDER BY name
96+
</select>
7197

72-
<select id="selectListDashboardAnalysisIp"
98+
<select id="selectListDashboardAnalysisIp" databaseId="mysql"
7399
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
74100
SELECT
75101
DATE_FORMAT(create_time, '%Y-%m') AS name,
@@ -82,6 +108,19 @@
82108
GROUP BY name
83109
ORDER BY name
84110
</select>
111+
<select id="selectListDashboardAnalysisIp" databaseId="pgsql"
112+
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
113+
SELECT
114+
TO_CHAR(create_time, 'YYYY-MM') AS name,
115+
COUNT(DISTINCT ip) AS value
116+
FROM sys_log
117+
WHERE TO_CHAR(create_time, 'YYYY-MM') IN
118+
<foreach collection="months" item="month" separator="," open="(" close=")">
119+
#{month}
120+
</foreach>
121+
GROUP BY name
122+
ORDER BY name
123+
</select>
85124

86125
<select id="selectListDashboardAnalysisGeo" resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
87126
SELECT
@@ -110,7 +149,14 @@
110149
<select id="selectListDashboardAnalysisTimeslot"
111150
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
112151
SELECT
113-
LPAD(CONCAT(FLOOR(HOUR(create_time) / 2) * 2, ':00'), 5, '0') AS name,
152+
<choose>
153+
<when test="_databaseId =='mysql'">
154+
LPAD(CONCAT(FLOOR(HOUR(create_time) / 2) * 2, ':00'), 5, '0') AS name,
155+
</when>
156+
<when test="_databaseId =='pgsql'">
157+
LPAD((FLOOR(EXTRACT(HOUR FROM create_time) / 2) * 2)::text || ':00', 5, '0') AS name,
158+
</when>
159+
</choose>
114160
COUNT(*) AS value
115161
FROM sys_log
116162
GROUP BY name
@@ -144,7 +190,14 @@
144190
<select id="selectListDashboardAnalysisBrowser"
145191
resultType="top.continew.admin.system.model.resp.dashboard.DashboardChartCommonResp">
146192
SELECT
147-
SUBSTRING_INDEX(browser, ' ', 1) AS name,
193+
<choose>
194+
<when test="_databaseId =='mysql'">
195+
SUBSTRING_INDEX(browser, ' ', 1) AS name,
196+
</when>
197+
<when test="_databaseId =='pgsql'">
198+
SPLIT_PART(browser, ' ', 1) AS name,
199+
</when>
200+
</choose>
148201
COUNT(*) AS value
149202
FROM sys_log
150203
WHERE browser IS NOT NULL

‎continew-system/src/main/resources/mapper/user/UserPasswordHistoryMapper.xml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
33
<mapper namespace="top.continew.admin.system.mapper.user.UserPasswordHistoryMapper">
4-
<delete id="deleteExpired">
4+
<delete id="deleteExpired" databaseId="mysql">
55
DELETE t1 FROM sys_user_password_history AS t1
6-
LEFT JOIN (
6+
LEFT JOIN (
77
SELECT id
88
FROM sys_user_password_history
99
WHERE user_id = #{userId}
@@ -12,4 +12,15 @@
1212
) AS t2 ON t2.id = t1.id
1313
WHERE t2.id IS NULL
1414
</delete>
15+
<delete id="deleteExpired" databaseId="pgsql">
16+
DELETE FROM sys_user_password_history AS t1
17+
WHERE user_id = #{userId}
18+
AND id NOT IN (
19+
SELECT id
20+
FROM sys_user_password_history
21+
WHERE user_id = #{userId}
22+
ORDER BY create_time DESC
23+
LIMIT #{count}
24+
)
25+
</delete>
1526
</mapper>

0 commit comments

Comments
 (0)