refactor(SQL分层): 剩余 85 条注解 SQL 全量迁进 mapper XML,等价性改由 MyBatis 自己判

96 条语句现在全在 src/main/resources/mapper/<模块>/ 下,注解侧 SQL 归零;判据从"基线清单"
改成完成态(逐接口必须为 0 + XML 语句总数 96 + 反向钉:XML 有则注解必须无)。

搬法上踩实了一个坑:注解参数是 Java 表达式("…" + CLIENT_MODULE_TYPES + "…"),
用只认字面量的抽取器搬家会把常量整段吞掉——上一轮生成的 26 份 XML 里因此出现
IN ()、AS status 前面没有表达式(MySQL 语法错),<script> 形态还被多转义一次变成 &amp;lt;。
更糟的是当时"搬迁前快照"与 XML 由同一个抽取器产出,两边一起错所以逐字比对全绿,
抓到现场的是既有的语义用例(TaskCenter 15 条 + 店铺查重那条断 <> 的)。

所以 MigratedSqlEquivalenceTest 改成:账本存注解原文,Java 侧现场用
getDefaultScriptingLanguageInstance().createSqlSource 编译原文,与 XML 解析出的
MappedStatement 各渲染一遍 BoundSql 对撞(空参数 + foreach 喂满 2 元素各一次),
转义对不对由 MyBatis 判定而不是由生成器判定;账本自己再钉 <script>/<if> 成对、不许出现 IN ()。
resultType 那一支不变:期望值由接口签名反射反推,66 条分母钉住。

取数入口跟着换:6 支原本读 @Select 注解的守卫(TaskCenter/Dedupe/店铺查重/通知保留/
鉴权形状/后台扩权)改走 MapperXmlSupport,断言内容一字未动;后台扩权那条"不许有 wrapper
投影"从全文 doesNotContain(".select(") 改成只扫可执行行——接口里现在只剩签名,
而 javadoc 正写着"别用 selectList(.select(...))",全文判会被自己的注释喂饱。

隔离树全量 4059 例 0 红(基线 4054,+5 为新增等价性与 XML 用例)。这批要生效得随下一版 jar 发版。
This commit is contained in:
2026-10-08 12:00:43 +08:00
parent 4d2f3fc754
commit 419ab3be64
62 changed files with 1490 additions and 890 deletions
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.time.LocalDateTime;
@@ -20,12 +19,6 @@ public interface AdminUserMapper extends BaseMapper<AdminUserEntity> {
* 遍历时解引用即 NPE,而这里正是每次登录与每个鉴权请求都要走的读出口。MIN 忽略 NULL,
* 无行时结果集仍是单行单列,直接映射成 null。</p>
*/
@Select("""
SELECT MIN(expires_at)
FROM users
WHERE role = 'company_super_admin'
AND company_id = #{companyId}
""")
LocalDateTime selectCompanySuperAdminEarliestExpiry(@Param("companyId") Long companyId);
/**
@@ -38,17 +31,5 @@ public interface AdminUserMapper extends BaseMapper<AdminUserEntity> {
* 残留授权行会让账号"进得了后台、菜单树却是空的"——入口门与 {@code getUserColumnPermissions}
* 的下发集要用同一个公司口径,否则两处各判一次就留下静默死链。</p>
*/
@Select("""
<script>
SELECT COUNT(1)
FROM user_column_permission ucp
JOIN columns cm ON cm.id = ucp.column_id
WHERE ucp.user_id = #{userId}
AND cm.menu_type = 'admin'
<if test="companyId != null">
AND cm.company_id = #{companyId}
</if>
</script>
""")
Long countAdminMenuGrants(@Param("userId") Long userId, @Param("companyId") Long companyId);
}
@@ -4,164 +4,39 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface ShopManageGroupMapper extends BaseMapper<ShopManageGroupEntity> {
@Select("""
SELECT DISTINCT accessible_group_id
FROM (
SELECT g.id AS accessible_group_id
FROM biz_shop_manage_group g
WHERE g.created_by_id = #{operatorId}
OR g.user_id = #{operatorId}
UNION
SELECT gm.group_id AS accessible_group_id
FROM biz_shop_manage_group_member gm
WHERE gm.user_id = #{operatorId}
UNION
SELECT g2.id AS accessible_group_id
FROM biz_shop_manage_group_member gm
INNER JOIN biz_shop_manage_group g1 ON g1.id = gm.group_id
INNER JOIN biz_shop_manage_group g2
ON g2.created_by_id = COALESCE(g1.created_by_id, g1.user_id)
OR g2.user_id = COALESCE(g1.created_by_id, g1.user_id)
WHERE gm.user_id = #{operatorId}
AND COALESCE(g1.created_by_id, g1.user_id) IS NOT NULL
UNION
SELECT member_groups.id AS accessible_group_id
FROM biz_shop_manage_group leader_group
INNER JOIN biz_shop_manage_group_member direct_member ON direct_member.group_id = leader_group.id
INNER JOIN biz_shop_manage_group member_groups
ON member_groups.created_by_id = direct_member.user_id
OR member_groups.user_id = direct_member.user_id
WHERE leader_group.created_by_id = #{operatorId}
OR leader_group.user_id = #{operatorId}
) accessible_groups
WHERE accessible_group_id IS NOT NULL
ORDER BY accessible_group_id ASC
""")
List<Long> selectAccessibleGroupIds(@Param("operatorId") Long operatorId);
@Select("""
SELECT DISTINCT visible_user_id
FROM (
SELECT #{operatorId} AS visible_user_id
UNION
SELECT direct_member.user_id AS visible_user_id
FROM biz_shop_manage_group leader_group
INNER JOIN biz_shop_manage_group_member direct_member ON direct_member.group_id = leader_group.id
WHERE leader_group.created_by_id = #{operatorId}
OR leader_group.user_id = #{operatorId}
UNION
SELECT COALESCE(direct_group.created_by_id, direct_group.user_id) AS visible_user_id
FROM biz_shop_manage_group_member membership
INNER JOIN biz_shop_manage_group direct_group ON direct_group.id = membership.group_id
WHERE membership.user_id = #{operatorId}
AND COALESCE(direct_group.created_by_id, direct_group.user_id) IS NOT NULL
) visible_users
WHERE visible_user_id IS NOT NULL
ORDER BY visible_user_id ASC
""")
List<Long> selectAccessibleCreatorUserIds(@Param("operatorId") Long operatorId);
@Select("""
SELECT DISTINCT gm.user_id
FROM biz_shop_manage_group g
INNER JOIN biz_shop_manage_group_member gm ON gm.group_id = g.id
INNER JOIN users u ON u.id = gm.user_id
WHERE g.created_by_id = #{operatorId}
OR g.user_id = #{operatorId}
ORDER BY gm.user_id ASC
""")
List<Long> selectManagedMemberUserIds(@Param("operatorId") Long operatorId);
@Select("""
<script>
SELECT DISTINCT visible_user_id
FROM (
SELECT COALESCE(g.created_by_id, g.user_id) AS visible_user_id
FROM biz_shop_manage_group g
WHERE g.id IN
<foreach collection='groupIds' item='groupId' open='(' separator=',' close=')'>
#{groupId}
</foreach>
UNION
SELECT gm.user_id AS visible_user_id
FROM biz_shop_manage_group_member gm
WHERE gm.group_id IN
<foreach collection='groupIds' item='groupId' open='(' separator=',' close=')'>
#{groupId}
</foreach>
) visible_users
WHERE visible_user_id IS NOT NULL
ORDER BY visible_user_id ASC
</script>
""")
List<Long> selectUserIdsByGroupIds(@Param("groupIds") List<Long> groupIds);
/**
* 批量查用户所属分组名:分组归属按「分组的创建人(created_by_id/user_id) = 用户的创建人」判定,
* 即主管名下的子账户归入该主管创建的分组(成员表 biz_shop_manage_group_member 生产上基本未使用)。
*/
@Select("""
<script>
SELECT u.id AS userId, g.group_name AS groupName
FROM users u
INNER JOIN biz_shop_manage_group g
ON g.created_by_id = u.created_by_id OR g.user_id = u.created_by_id
WHERE u.created_by_id IS NOT NULL
AND u.id IN
<foreach collection='userIds' item='userId' open='(' separator=',' close=')'>
#{userId}
</foreach>
ORDER BY g.id ASC
</script>
""")
List<com.nanri.aiimage.modules.shopkey.model.dto.UserGroupRef> selectGroupNamesByUserIds(
@Param("userIds") List<Long> userIds);
/** 某分组下的用户:该分组创建人(组长)本人 + 其名下子账户。 */
@Select("""
SELECT u.id AS userId
FROM users u
INNER JOIN biz_shop_manage_group g ON g.id = #{groupId}
WHERE u.id = COALESCE(g.created_by_id, g.user_id)
OR u.created_by_id = COALESCE(g.created_by_id, g.user_id)
ORDER BY u.id ASC
""")
List<Long> selectUserIdsByGroupId(@Param("groupId") Long groupId);
/** 某人作为组长(创建人)的分组(密钥管理等按组隔离场景用)。 */
@Select("""
SELECT g.id AS id, g.group_name AS groupName
FROM biz_shop_manage_group g
WHERE g.created_by_id = #{operatorId} OR g.user_id = #{operatorId}
ORDER BY g.id ASC
""")
List<ShopManageGroupEntity> selectLedGroups(@Param("operatorId") Long operatorId);
/**
* 某用户所属分组(成员表)的组长 id 集合(到期级联用,AccountExpiryService)。
* 与数据可见范围同源:组长的旧字段 user_id 与新字段 created_by_id 都算(COALESCE 取新优先旧兜底)。
*/
@Select("""
SELECT DISTINCT COALESCE(g.created_by_id, g.user_id) AS leader_id
FROM biz_shop_manage_group_member gm
INNER JOIN biz_shop_manage_group g ON g.id = gm.group_id
WHERE gm.user_id = #{userId}
AND COALESCE(g.created_by_id, g.user_id) IS NOT NULL
""")
List<Long> selectLeaderIdsByMemberUserId(@Param("userId") Long userId);
/** 全部分组(超管筛选项用)。 */
@Select("""
SELECT g.id AS id, g.group_name AS groupName
FROM biz_shop_manage_group g
ORDER BY g.id ASC
""")
List<ShopManageGroupEntity> selectAllGroups();
}