style: 移除 ` 符号的使用,保持数据库无关性

This commit is contained in:
Charles7c 2024-02-17 13:37:47 +08:00
parent 1ca48a6620
commit d6b07bd6d1
14 changed files with 91 additions and 93 deletions

View File

@ -3,46 +3,46 @@
<mapper namespace="top.charles7c.continew.admin.monitor.mapper.LogMapper"> <mapper namespace="top.charles7c.continew.admin.monitor.mapper.LogMapper">
<select id="selectDashboardTotal" resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp"> <select id="selectDashboardTotal" resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp">
SELECT SELECT
(SELECT COUNT(*) FROM `sys_log`) AS pvCount, (SELECT COUNT(*) FROM sys_log) AS pvCount,
(SELECT COUNT(DISTINCT `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) = CURDATE()) AS todayPvCount,
(SELECT COUNT(*) FROM `sys_log` WHERE DATE(`create_time`) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)) AS yesterdayPvCount (SELECT COUNT(*) FROM sys_log WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)) AS yesterdayPvCount
</select> </select>
<select id="selectListDashboardAccessTrend" <select id="selectListDashboardAccessTrend"
resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp"> resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp">
SELECT SELECT
DATE(`create_time`) AS date, DATE(create_time) AS date,
COUNT(*) AS pvCount, COUNT(*) AS pvCount,
COUNT(DISTINCT `ip`) AS ipCount COUNT(DISTINCT ip) AS ipCount
FROM `sys_log` FROM sys_log
GROUP BY DATE(`create_time`) GROUP BY DATE(create_time)
HAVING `date` != CURDATE() HAVING date != CURDATE()
ORDER BY DATE(`create_time`) DESC ORDER BY DATE(create_time) DESC
LIMIT #{days} LIMIT #{days}
</select> </select>
<select id="selectListDashboardPopularModule" <select id="selectListDashboardPopularModule"
resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp"> resultType="top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp">
SELECT SELECT
`module`, module,
COUNT(*) AS pvCount, COUNT(*) AS pvCount,
SUM(CASE WHEN DATE(`create_time`) = CURDATE() THEN 1 ELSE 0 END) AS todayPvCount, SUM(CASE WHEN DATE(create_time) = CURDATE() THEN 1 ELSE 0 END) AS todayPvCount,
SUM(CASE WHEN DATE(`create_time`) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) THEN 1 ELSE 0 END) AS yesterdayPvCount SUM(CASE WHEN DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) THEN 1 ELSE 0 END) AS yesterdayPvCount
FROM `sys_log` FROM sys_log
GROUP BY `module` GROUP BY module
HAVING `module` != '验证码' AND `module` != '登录' HAVING module != '验证码' AND module != '登录'
ORDER BY `pvCount` DESC ORDER BY pvCount DESC
LIMIT 10 LIMIT 10
</select> </select>
<select id="selectListDashboardGeoDistribution" resultType="java.util.Map"> <select id="selectListDashboardGeoDistribution" resultType="java.util.Map">
SELECT SELECT
SUBSTRING_INDEX(`address`, ' ', 1) AS name, SUBSTRING_INDEX(address, ' ', 1) AS name,
COUNT(DISTINCT `ip`) AS value COUNT(DISTINCT ip) AS value
FROM `sys_log` FROM sys_log
GROUP BY `name` GROUP BY name
ORDER BY COUNT(DISTINCT `ip`) DESC ORDER BY COUNT(DISTINCT ip) DESC
LIMIT 10 LIMIT 10
</select> </select>
</mapper> </mapper>

View File

@ -16,14 +16,13 @@
package top.charles7c.continew.admin.system.mapper; package top.charles7c.continew.admin.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import top.charles7c.continew.admin.system.model.entity.RoleDeptDO; import top.charles7c.continew.admin.system.model.entity.RoleDeptDO;
import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
import java.util.List;
/** /**
* 角色和部门 Mapper * 角色和部门 Mapper
* *
@ -38,6 +37,6 @@ public interface RoleDeptMapper extends BaseMapper<RoleDeptDO> {
* @param roleId 角色 ID * @param roleId 角色 ID
* @return 部门 ID 列表 * @return 部门 ID 列表
*/ */
@Select("SELECT `dept_id` FROM `sys_role_dept` WHERE `role_id` = #{roleId}") @Select("SELECT dept_id FROM sys_role_dept WHERE role_id = #{roleId}")
List<Long> selectDeptIdByRoleId(@Param("roleId") Long roleId); List<Long> selectDeptIdByRoleId(@Param("roleId") Long roleId);
} }

View File

@ -37,7 +37,7 @@ public interface UserMapper extends DataPermissionMapper<UserDO> {
* @param username 用户名 * @param username 用户名
* @return 用户信息 * @return 用户信息
*/ */
@Select("SELECT * FROM `sys_user` WHERE `username` = #{username}") @Select("SELECT * FROM sys_user WHERE username = #{username}")
UserDO selectByUsername(@Param("username") String username); UserDO selectByUsername(@Param("username") String username);
/** /**
@ -46,7 +46,7 @@ public interface UserMapper extends DataPermissionMapper<UserDO> {
* @param phone 手机号 * @param phone 手机号
* @return 用户信息 * @return 用户信息
*/ */
@Select("SELECT * FROM `sys_user` WHERE `phone` = #{phone}") @Select("SELECT * FROM sys_user WHERE phone = #{phone}")
UserDO selectByPhone(@FieldEncrypt @Param("phone") String phone); UserDO selectByPhone(@FieldEncrypt @Param("phone") String phone);
/** /**
@ -55,7 +55,7 @@ public interface UserMapper extends DataPermissionMapper<UserDO> {
* @param email 邮箱 * @param email 邮箱
* @return 用户信息 * @return 用户信息
*/ */
@Select("SELECT * FROM `sys_user` WHERE `email` = #{email}") @Select("SELECT * FROM sys_user WHERE email = #{email}")
UserDO selectByEmail(@FieldEncrypt @Param("email") String email); UserDO selectByEmail(@FieldEncrypt @Param("email") String email);
/** /**
@ -64,6 +64,6 @@ public interface UserMapper extends DataPermissionMapper<UserDO> {
* @param id ID * @param id ID
* @return 昵称 * @return 昵称
*/ */
@Select("SELECT `nickname` FROM `sys_user` WHERE `id` = #{id}") @Select("SELECT nickname FROM sys_user WHERE id = #{id}")
String selectNicknameById(@Param("id") Long id); String selectNicknameById(@Param("id") Long id);
} }

View File

@ -38,6 +38,6 @@ public interface UserRoleMapper extends BaseMapper<UserRoleDO> {
* @param userId 用户 ID * @param userId 用户 ID
* @return 角色 ID 列表 * @return 角色 ID 列表
*/ */
@Select("SELECT `role_id` FROM `sys_user_role` WHERE `user_id` = #{userId}") @Select("SELECT role_id FROM sys_user_role WHERE user_id = #{userId}")
List<Long> selectRoleIdByUserId(@Param("userId") Long userId); List<Long> selectRoleIdByUserId(@Param("userId") Long userId);
} }

View File

@ -155,7 +155,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptRes
* @return 子部门列表 * @return 子部门列表
*/ */
private List<DeptDO> listChildren(Long id) { private List<DeptDO> listChildren(Long id) {
return baseMapper.lambdaQuery().apply(String.format("find_in_set(%s, `ancestors`)", id)).list(); return baseMapper.lambdaQuery().apply(String.format("find_in_set(%s, ancestors)", id)).list();
} }
/** /**
@ -170,7 +170,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptRes
return 0L; return 0L;
} }
return ids.stream() return ids.stream()
.mapToLong(id -> baseMapper.lambdaQuery().apply(String.format("find_in_set(%s, `ancestors`)", id)).count()) .mapToLong(id -> baseMapper.lambdaQuery().apply(String.format("find_in_set(%s, ancestors)", id)).count())
.sum(); .sum();
} }

View File

@ -5,11 +5,11 @@
<select id="selectDashboardList" <select id="selectDashboardList"
resultType="top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp"> resultType="top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp">
SELECT SELECT
`id`, `title`, `type` id, title, type
FROM `sys_announcement` FROM sys_announcement
WHERE (`effective_time` IS NULL OR NOW() > `effective_time`) WHERE (effective_time IS NULL OR NOW() > effective_time)
AND (`terminate_time` IS NULL OR `terminate_time` > NOW()) AND (terminate_time IS NULL OR terminate_time > NOW())
ORDER BY `sort` ASC, `effective_time` DESC ORDER BY sort ASC, effective_time DESC
LIMIT 5 LIMIT 5
</select> </select>
</mapper> </mapper>

View File

@ -2,10 +2,10 @@
<!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.charles7c.continew.admin.system.mapper.DictItemMapper"> <mapper namespace="top.charles7c.continew.admin.system.mapper.DictItemMapper">
<select id="listByDictCode" resultType="top.charles7c.continew.admin.common.model.resp.LabelValueResp"> <select id="listByDictCode" resultType="top.charles7c.continew.admin.common.model.resp.LabelValueResp">
SELECT t1.`label`, t1.`value`, t1.`color` SELECT t1.label, t1.value, t1.color
FROM `sys_dict_item` AS t1 FROM sys_dict_item AS t1
LEFT JOIN `sys_dict` AS t2 ON t1.`dict_id` = t2.`id` LEFT JOIN sys_dict AS t2 ON t1.dict_id = t2.id
WHERE t2.`code` = #{dictCode} WHERE t2.code = #{dictCode}
ORDER BY t1.`sort` ASC ORDER BY t1.sort ASC
</select> </select>
</mapper> </mapper>

View File

@ -2,25 +2,25 @@
<!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.charles7c.continew.admin.system.mapper.MenuMapper"> <mapper namespace="top.charles7c.continew.admin.system.mapper.MenuMapper">
<select id="selectPermissionByUserId" resultType="java.lang.String"> <select id="selectPermissionByUserId" resultType="java.lang.String">
SELECT DISTINCT t1.`permission` SELECT DISTINCT t1.permission
FROM `sys_menu` AS t1 FROM sys_menu AS t1
LEFT JOIN `sys_role_menu` AS t2 ON t2.`menu_id` = t1.`id` LEFT JOIN sys_role_menu AS t2 ON t2.menu_id = t1.id
LEFT JOIN `sys_role` AS t3 ON t3.`id` = t2.`role_id` LEFT JOIN sys_role AS t3 ON t3.id = t2.role_id
LEFT JOIN `sys_user_role` AS t4 ON t4.`role_id` = t3.`id` LEFT JOIN sys_user_role AS t4 ON t4.role_id = t3.id
LEFT JOIN `sys_user` AS t5 ON t5.`id` = t4.`user_id` LEFT JOIN sys_user AS t5 ON t5.id = t4.user_id
WHERE t5.`id` = #{userId} WHERE t5.id = #{userId}
AND t1.`type` IN (2, 3) AND t1.type IN (2, 3)
AND t1.`status` = 1 AND t1.status = 1
AND t3.`status` = 1 AND t3.status = 1
</select> </select>
<select id="selectListByRoleCode" resultType="top.charles7c.continew.admin.system.model.entity.MenuDO"> <select id="selectListByRoleCode" resultType="top.charles7c.continew.admin.system.model.entity.MenuDO">
SELECT t1.* SELECT t1.*
FROM `sys_menu` AS t1 FROM sys_menu AS t1
LEFT JOIN `sys_role_menu` AS t2 ON t2.`menu_id` = t1.`id` LEFT JOIN sys_role_menu AS t2 ON t2.menu_id = t1.id
LEFT JOIN `sys_role` AS t3 ON t3.`id` = t2.`role_id` LEFT JOIN sys_role AS t3 ON t3.id = t2.role_id
WHERE t3.`code` = #{roleCode} WHERE t3.code = #{roleCode}
AND t1.`status` = 1 AND t1.status = 1
AND t3.`status` = 1 AND t3.status = 1
</select> </select>
</mapper> </mapper>

View File

@ -4,11 +4,11 @@
<select id="selectPageByUserId" resultType="top.charles7c.continew.admin.system.model.resp.MessageResp"> <select id="selectPageByUserId" resultType="top.charles7c.continew.admin.system.model.resp.MessageResp">
SELECT SELECT
t1.*, t1.*,
t2.`user_id`, t2.user_id,
t2.`is_read`, t2.is_read,
t2.`read_time` t2.read_time
FROM `sys_message` AS t1 FROM sys_message AS t1
LEFT JOIN `sys_message_user` AS t2 ON t2.`message_id` = t1.`id` LEFT JOIN sys_message_user AS t2 ON t2.message_id = t1.id
${ew.getCustomSqlSegment} ${ew.getCustomSqlSegment}
</select> </select>
</mapper> </mapper>

View File

@ -3,12 +3,12 @@
<mapper namespace="top.charles7c.continew.admin.system.mapper.MessageUserMapper"> <mapper namespace="top.charles7c.continew.admin.system.mapper.MessageUserMapper">
<select id="selectUnreadCountByUserIdAndType" resultType="Long"> <select id="selectUnreadCountByUserIdAndType" resultType="Long">
SELECT SELECT
COUNT(t1.`message_id`) COUNT(t1.message_id)
FROM `sys_message_user` AS t1 FROM sys_message_user AS t1
LEFT JOIN `sys_message` AS t2 ON t2.`id` = t1.`message_id` LEFT JOIN sys_message AS t2 ON t2.id = t1.message_id
WHERE t1.`user_id` = #{userId} AND t1.`is_read` = 0 WHERE t1.user_id = #{userId} AND t1.is_read = 0
<if test="type != null"> <if test="type != null">
AND t2.`type` = #{type} AND t2.type = #{type}
</if> </if>
</select> </select>
</mapper> </mapper>

View File

@ -2,9 +2,9 @@
<!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.charles7c.continew.admin.system.mapper.RoleMenuMapper"> <mapper namespace="top.charles7c.continew.admin.system.mapper.RoleMenuMapper">
<select id="selectMenuIdByRoleIds" resultType="java.lang.Long"> <select id="selectMenuIdByRoleIds" resultType="java.lang.Long">
SELECT `menu_id` SELECT menu_id
FROM `sys_role_menu` FROM sys_role_menu
WHERE `role_id` IN WHERE role_id IN
<foreach collection="list" item="roleId" open="(" close=")" separator=","> <foreach collection="list" item="roleId" open="(" close=")" separator=",">
#{roleId} #{roleId}
</foreach> </foreach>

View File

@ -4,8 +4,8 @@
<select id="selectBySourceAndOpenId" <select id="selectBySourceAndOpenId"
resultType="top.charles7c.continew.admin.system.model.entity.UserSocialDO"> resultType="top.charles7c.continew.admin.system.model.entity.UserSocialDO">
SELECT t1.* SELECT t1.*
FROM `sys_user_social` AS t1 FROM sys_user_social AS t1
LEFT JOIN `sys_user` AS t2 ON t2.`id` = t1.`user_id` LEFT JOIN sys_user AS t2 ON t2.id = t1.user_id
WHERE t1.`source` = #{source} AND t1.`open_id` = #{openId} WHERE t1.source = #{source} AND t1.open_id = #{openId}
</select> </select>
</mapper> </mapper>

View File

@ -32,72 +32,72 @@ import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum;
public enum QueryTypeEnum implements IBaseEnum<Integer> { public enum QueryTypeEnum implements IBaseEnum<Integer> {
/** /**
* 等于 =例如WHERE `age` = 18 * 等于 =例如WHERE age = 18
*/ */
EQ(1, "="), EQ(1, "="),
/** /**
* 不等于 !=例如WHERE `age` != 18 * 不等于 !=例如WHERE age != 18
*/ */
NE(2, "!="), NE(2, "!="),
/** /**
* 大于 >例如WHERE `age` > 18 * 大于 >例如WHERE age > 18
*/ */
GT(3, ">"), GT(3, ">"),
/** /**
* 大于等于 >= 例如WHERE `age` >= 18 * 大于等于 >= 例如WHERE age >= 18
*/ */
GE(4, ">="), GE(4, ">="),
/** /**
* 小于 <例如WHERE `age` < 18 * 小于 <例如WHERE age < 18
*/ */
LT(5, "<"), LT(5, "<"),
/** /**
* 小于等于 <=例如WHERE `age` <= 18 * 小于等于 <=例如WHERE age <= 18
*/ */
LE(6, "<="), LE(6, "<="),
/** /**
* 范围查询例如WHERE `age` BETWEEN 10 AND 18 * 范围查询例如WHERE age BETWEEN 10 AND 18
*/ */
BETWEEN(7, "BETWEEN"), BETWEEN(7, "BETWEEN"),
/** /**
* LIKE '%%'例如WHERE `nickname` LIKE '%s%' * LIKE '%%'例如WHERE nickname LIKE '%s%'
*/ */
LIKE(8, "LIKE '%s%'"), LIKE(8, "LIKE '%s%'"),
/** /**
* LIKE '%'例如WHERE `nickname` LIKE '%s' * LIKE '%'例如WHERE nickname LIKE '%s'
*/ */
LIKE_LEFT(9, "LIKE '%s'"), LIKE_LEFT(9, "LIKE '%s'"),
/** /**
* LIKE '%'例如WHERE `nickname` LIKE 's%' * LIKE '%'例如WHERE nickname LIKE 's%'
*/ */
LIKE_RIGHT(10, "LIKE 's%'"), LIKE_RIGHT(10, "LIKE 's%'"),
/** /**
* 包含查询例如WHERE `age` IN (10, 20, 30) * 包含查询例如WHERE age IN (10, 20, 30)
*/ */
IN(11, "IN"), IN(11, "IN"),
/** /**
* 不包含查询例如WHERE `age` NOT IN (20, 30) * 不包含查询例如WHERE age NOT IN (20, 30)
*/ */
NOT_IN(12, "NOT IN"), NOT_IN(12, "NOT IN"),
/** /**
* 空查询例如WHERE `email` IS NULL * 空查询例如WHERE email IS NULL
*/ */
IS_NULL(13, "IS NULL"), IS_NULL(13, "IS NULL"),
/** /**
* 非空查询例如WHERE `email` IS NOT NULL * 非空查询例如WHERE email IS NOT NULL
*/ */
IS_NOT_NULL(14, "IS NOT NULL"),; IS_NOT_NULL(14, "IS NOT NULL"),;

View File

@ -16,14 +16,13 @@
package top.charles7c.continew.admin.tool.mapper; package top.charles7c.continew.admin.tool.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import top.charles7c.continew.admin.tool.model.entity.FieldConfigDO; import top.charles7c.continew.admin.tool.model.entity.FieldConfigDO;
import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
import java.util.List;
/** /**
* 字段配置 Mapper * 字段配置 Mapper
* *
@ -38,6 +37,6 @@ public interface FieldConfigMapper extends BaseMapper<FieldConfigDO> {
* @param tableName 表名称 * @param tableName 表名称
* @return 字段配置信息 * @return 字段配置信息
*/ */
@Select("SELECT * FROM `gen_field_config` WHERE `table_name` = #{tableName}") @Select("SELECT * FROM gen_field_config WHERE table_name = #{tableName}")
List<FieldConfigDO> selectListByTableName(@Param("tableName") String tableName); List<FieldConfigDO> selectListByTableName(@Param("tableName") String tableName);
} }