refactor: 方法命名优化

cadecode · cadecode · commit fc2e447c3220 · 2023-05-04T14:44:15.000+08:00
diff --git a/application/src/main/java/top/cadecode/uniboot/controller/system/SysUserController.java b/application/src/main/java/top/cadecode/uniboot/controller/system/SysUserController.java
@@ -146,7 +146,7 @@ public boolean userAdd(@RequestBody @Valid SysUserAddRequest request) {
     @Transactional(rollbackFor = Exception.class)
     public boolean userDelete(@RequestBody @NotEmpty List<Long> userIdList) {
         // 清理用户角色绑定关系
-        sysRoleService.deleteRoleUserByUserIds(userIdList);
+        sysRoleService.removeRoleUserByUserIds(userIdList);
         return sysUserService.removeBatchByIds(userIdList);
     }
 
diff --git a/system/src/main/java/top/cadecode/uniboot/system/mapper/SysApiMapper.java b/system/src/main/java/top/cadecode/uniboot/system/mapper/SysApiMapper.java
@@ -17,5 +17,5 @@
 @Mapper
 public interface SysApiMapper extends BaseMapper<SysApi> {
 
-    List<SysApiRolesVo> listRolesVo(@Param("apiIds") List<Long> apiIds);
+    List<SysApiRolesVo> selectRolesVo(@Param("apiIds") List<Long> apiIds);
 }
diff --git a/system/src/main/java/top/cadecode/uniboot/system/mapper/SysMenuMapper.java b/system/src/main/java/top/cadecode/uniboot/system/mapper/SysMenuMapper.java
@@ -16,5 +16,5 @@
 @Mapper
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
-    List<SysMenu> listByRoles(@Param("roleCodes") List<String> roleCodes);
+    List<SysMenu> selectByRoles(@Param("roleCodes") List<String> roleCodes);
 }
diff --git a/system/src/main/java/top/cadecode/uniboot/system/mapper/SysRoleMapper.java b/system/src/main/java/top/cadecode/uniboot/system/mapper/SysRoleMapper.java
@@ -16,11 +16,11 @@
 @Mapper
 public interface SysRoleMapper extends BaseMapper<SysRole> {
 
-    List<SysRole> listByUserIds(@Param("userIds") List<Long> userIds);
+    List<SysRole> selectByUserIds(@Param("userIds") List<Long> userIds);
 
-    List<SysRole> listByMenuIds(@Param("menuIds") List<Long> menuIds);
+    List<SysRole> selectByMenuIds(@Param("menuIds") List<Long> menuIds);
 
-    List<SysRole> listByApiIds(@Param("apiIds") List<Long> apiIds);
+    List<SysRole> selectByApiIds(@Param("apiIds") List<Long> apiIds);
 
     int deleteRoleUserByUserIds(@Param("userIds") List<Long> userIds);
 
diff --git a/system/src/main/java/top/cadecode/uniboot/system/mapper/SysUserMapper.java b/system/src/main/java/top/cadecode/uniboot/system/mapper/SysUserMapper.java
@@ -18,10 +18,10 @@
 @Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    List<SysUserRolesVo> listRolesVoByUserIds(@Param("userIds") List<Long> userIds);
+    List<SysUserRolesVo> selectRolesVoByUserIds(@Param("userIds") List<Long> userIds);
 
-    List<SysUserRolesVo> listRolesVoByUsername(@Param("username") String username);
+    List<SysUserRolesVo> selectRolesVoByUsername(@Param("username") String username);
 
-    List<SysUserRolesVo> listRolesVo(@Param("request") SysUserRolesRequest request);
+    List<SysUserRolesVo> selectRolesVo(@Param("request") SysUserRolesRequest request);
 
 }
diff --git a/system/src/main/java/top/cadecode/uniboot/system/service/SysRoleService.java b/system/src/main/java/top/cadecode/uniboot/system/service/SysRoleService.java
@@ -19,15 +19,15 @@ public interface SysRoleService extends IService<SysRole> {
 
     List<SysRole> listByApiIds(List<Long> apiIds);
 
-    int deleteRoleUserByUserIds(List<Long> userIds);
+    int removeRoleUserByUserIds(List<Long> userIds);
 
-    int deleteRoleUserByRoleIds(List<Long> roleIds);
+    int removeRoleUserByRoleIds(List<Long> roleIds);
 
-    int deleteRoleMenuByMenuIds(List<Long> menuIds);
+    int removeRoleMenuByMenuIds(List<Long> menuIds);
 
-    int deleteRoleMenuByRoleIds(List<Long> roleIds);
+    int removeRoleMenuByRoleIds(List<Long> roleIds);
 
-    int deleteRoleApiByApiIds(List<Long> apiIds);
+    int removeRoleApiByApiIds(List<Long> apiIds);
 
-    int deleteRoleApiByRoleIds(List<Long> roleIds);
+    int removeRoleApiByRoleIds(List<Long> roleIds);
 }
diff --git a/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysApiServiceImpl.java b/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysApiServiceImpl.java
@@ -34,7 +34,7 @@ public List<SysApiRolesVo> listRolesVo() {
         List<SysApiRolesVo> sysApiRolesVos = RedisUtil.get(CacheKeyPrefix.API_ROLES, new TypeReference<List<SysApiRolesVo>>() {
         });
         return Optional.ofNullable(sysApiRolesVos).orElseGet(() -> {
-            List<SysApiRolesVo> voList = sysApiMapper.listRolesVo(null);
+            List<SysApiRolesVo> voList = sysApiMapper.selectRolesVo(null);
             // 每三十分钟刷新一次
             RedisUtil.set(CacheKeyPrefix.API_ROLES, voList, 30, TimeUnit.MINUTES);
             return voList;
diff --git a/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysMenuServiceImpl.java b/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysMenuServiceImpl.java
@@ -28,7 +28,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 
     @Override
     public List<SysMenu> listByRoles(List<String> roleCodes) {
-        return sysMenuMapper.listByRoles(roleCodes);
+        return sysMenuMapper.selectByRoles(roleCodes);
     }
 
     @Override
diff --git a/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysRoleServiceImpl.java b/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysRoleServiceImpl.java
@@ -23,47 +23,46 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     public List<SysRole> listByUserIds(List<Long> userIds) {
-        return sysRoleMapper.listByUserIds(userIds);
+        return sysRoleMapper.selectByUserIds(userIds);
     }
 
     @Override
     public List<SysRole> listByMenuIds(List<Long> menuIds) {
-        return sysRoleMapper.listByMenuIds(menuIds);
+        return sysRoleMapper.selectByMenuIds(menuIds);
     }
 
     @Override
     public List<SysRole> listByApiIds(List<Long> apiIds) {
-        return sysRoleMapper.listByApiIds(apiIds);
+        return sysRoleMapper.selectByApiIds(apiIds);
     }
 
     @Override
-    public int deleteRoleUserByUserIds(List<Long> userIds) {
+    public int removeRoleUserByUserIds(List<Long> userIds) {
         return sysRoleMapper.deleteRoleUserByUserIds(userIds);
     }
 
     @Override
-    public int deleteRoleUserByRoleIds(List<Long> roleIds) {
+    public int removeRoleUserByRoleIds(List<Long> roleIds) {
         return sysRoleMapper.deleteRoleUserByRoleIds(roleIds);
     }
 
     @Override
-    public int deleteRoleMenuByMenuIds(List<Long> menuIds) {
+    public int removeRoleMenuByMenuIds(List<Long> menuIds) {
         return sysRoleMapper.deleteRoleMenuByMenuIds(menuIds);
     }
 
     @Override
-    public int deleteRoleMenuByRoleIds(List<Long> roleIds) {
+    public int removeRoleMenuByRoleIds(List<Long> roleIds) {
         return sysRoleMapper.deleteRoleMenuByRoleIds(roleIds);
-
     }
 
     @Override
-    public int deleteRoleApiByApiIds(List<Long> apiIds) {
+    public int removeRoleApiByApiIds(List<Long> apiIds) {
         return sysRoleMapper.deleteRoleApiByApiIds(apiIds);
     }
 
     @Override
-    public int deleteRoleApiByRoleIds(List<Long> roleIds) {
+    public int removeRoleApiByRoleIds(List<Long> roleIds) {
         return sysRoleMapper.deleteRoleApiByRoleIds(roleIds);
     }
 }
diff --git a/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysUserServiceImpl.java b/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysUserServiceImpl.java
@@ -34,7 +34,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public UserDetails loadUserByUsername(String username) {
-        List<SysUserRolesVo> userRolesVoList = sysUserMapper.listRolesVoByUsername(username);
+        List<SysUserRolesVo> userRolesVoList = sysUserMapper.selectRolesVoByUsername(username);
         // 用户账户不存在
         if (ObjectUtil.isEmpty(userRolesVoList)) {
             throw UniException.of("该用户不存在");
@@ -49,17 +49,17 @@ public UserDetails loadUserByUsername(String username) {
 
     @Override
     public List<SysUserRolesVo> listRolesVoByUserIds(List<Long> userIds) {
-        return sysUserMapper.listRolesVoByUserIds(userIds);
+        return sysUserMapper.selectRolesVoByUserIds(userIds);
     }
 
     @Override
     public List<SysUserRolesVo> listRolesVo(SysUserRolesRequest request) {
-        return sysUserMapper.listRolesVo(request);
+        return sysUserMapper.selectRolesVo(request);
     }
 
     @Override
     public PageInfo<SysUserRolesVo> pageRolesVo(SysUserRolesRequest request) {
         return PageHelper.startPage(request.getPageNumber(), request.getPageSize())
-                .doSelectPageInfo(() -> sysUserMapper.listRolesVo(request));
+                .doSelectPageInfo(() -> sysUserMapper.selectRolesVo(request));
     }
 }
diff --git a/system/src/main/resources/mapper/SysApiMapper.xml b/system/src/main/resources/mapper/SysApiMapper.xml
@@ -12,7 +12,7 @@
             <result column="r_code"/>
         </collection>
     </resultMap>
-    <select id="listRolesVo" resultMap="SysApiRolesVoMap">
+    <select id="selectRolesVo" resultMap="SysApiRolesVoMap">
         SELECT sa.*, sr.code r_code
         FROM sys_api sa
         LEFT JOIN sys_role_api sra ON sra.api_id = sa.id
diff --git a/system/src/main/resources/mapper/SysMenuMapper.xml b/system/src/main/resources/mapper/SysMenuMapper.xml
@@ -1,7 +1,7 @@
 <?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" >
 <mapper namespace="top.cadecode.uniboot.system.mapper.SysMenuMapper">
-    <select id="listByRoles" resultType="top.cadecode.uniboot.system.bean.po.SysMenu">
+    <select id="selectByRoles" resultType="top.cadecode.uniboot.system.bean.po.SysMenu">
         SELECT DISTINCT sm.*
         FROM sys_menu sm LEFT JOIN sys_role_menu srm ON sm.id = srm.menu_id
         LEFT JOIN sys_role sr ON srm.role_id = sr.id
diff --git a/system/src/main/resources/mapper/SysRoleMapper.xml b/system/src/main/resources/mapper/SysRoleMapper.xml
@@ -1,7 +1,7 @@
 <?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" >
 <mapper namespace="top.cadecode.uniboot.system.mapper.SysRoleMapper">
-    <select id="listByUserIds" resultType="top.cadecode.uniboot.system.bean.po.SysRole">
+    <select id="selectByUserIds" resultType="top.cadecode.uniboot.system.bean.po.SysRole">
         SELECT *
         FROM sys_role_user ru
                  INNER JOIN sys_role r ON ru.role_id = r.id
@@ -13,7 +13,7 @@
             )
         </if>
     </select>
-    <select id="listByMenuIds" resultType="top.cadecode.uniboot.system.bean.po.SysRole">
+    <select id="selectByMenuIds" resultType="top.cadecode.uniboot.system.bean.po.SysRole">
         SELECT *
         FROM sys_role_menu rm
                  INNER JOIN sys_role r ON rm.role_id = r.id
@@ -25,7 +25,7 @@
             )
         </if>
     </select>
-    <select id="listByApiIds" resultType="top.cadecode.uniboot.system.bean.po.SysRole">
+    <select id="selectByApiIds" resultType="top.cadecode.uniboot.system.bean.po.SysRole">
         SELECT *
         FROM sys_role_api ra
                  INNER JOIN sys_role r ON ra.role_id = r.id
diff --git a/system/src/main/resources/mapper/SysUserMapper.xml b/system/src/main/resources/mapper/SysUserMapper.xml
@@ -19,7 +19,7 @@
             <result column="r_code"/>
         </collection>
     </resultMap>
-    <select id="listRolesVoByUserIds" resultMap="SysUserRolesVoMap">
+    <select id="selectRolesVoByUserIds" resultMap="SysUserRolesVoMap">
         SELECT su.*, sr.code r_code
         FROM sys_user su
         LEFT JOIN sys_role_user sru ON sru.user_id = su.id
@@ -33,15 +33,15 @@
         </if>
         GROUP BY su.username, sr.code
     </select>
-    <select id="listRolesVoByUsername" resultMap="SysUserRolesVoMap">
+    <select id="selectRolesVoByUsername" resultMap="SysUserRolesVoMap">
         SELECT su.*, sr.code r_code
         FROM sys_user su
         LEFT JOIN sys_role_user sru ON sru.user_id = su.id
         LEFT JOIN sys_role sr ON sru.role_id = sr.id
         WHERE su.username = #{username}
         GROUP BY su.username, sr.code
     </select>
-    <select id="listRolesVo" resultMap="SysUserRolesVoMap">
+    <select id="selectRolesVo" resultMap="SysUserRolesVoMap">
         SELECT su.*, sr.code r_code
         FROM sys_user su
         LEFT JOIN sys_role_user sru ON sru.user_id = su.id

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public boolean userAdd(@RequestBody @Valid SysUserAddRequest request) {`
`146`	`146`	`@Transactional(rollbackFor = Exception.class)`
`147`	`147`	`public boolean userDelete(@RequestBody @NotEmpty List<Long> userIdList) {`
`148`	`148`	`// 清理用户角色绑定关系`
`149`		`- sysRoleService.deleteRoleUserByUserIds(userIdList);`
	`149`	`+ sysRoleService.removeRoleUserByUserIds(userIdList);`
`150`	`150`	`return sysUserService.removeBatchByIds(userIdList);`
`151`	`151`	`}`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@`
`17`	`17`	`@Mapper`
`18`	`18`	`public interface SysApiMapper extends BaseMapper<SysApi> {`
`19`	`19`
`20`		`- List<SysApiRolesVo> listRolesVo(@Param("apiIds") List<Long> apiIds);`
	`20`	`+ List<SysApiRolesVo> selectRolesVo(@Param("apiIds") List<Long> apiIds);`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`	`@Mapper`
`17`	`17`	`public interface SysMenuMapper extends BaseMapper<SysMenu> {`
`18`	`18`
`19`		`- List<SysMenu> listByRoles(@Param("roleCodes") List<String> roleCodes);`
	`19`	`+ List<SysMenu> selectByRoles(@Param("roleCodes") List<String> roleCodes);`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public List<SysMenu> listByRoles(List<String> roleCodes) {`
`31`		`- return sysMenuMapper.listByRoles(roleCodes);`
	`31`	`+ return sysMenuMapper.selectByRoles(roleCodes);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -23,47 +23,46 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl`
`23`	`23`
`24`	`24`	`@Override`
`25`	`25`	`public List<SysRole> listByUserIds(List<Long> userIds) {`
`26`		`- return sysRoleMapper.listByUserIds(userIds);`
	`26`	`+ return sysRoleMapper.selectByUserIds(userIds);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public List<SysRole> listByMenuIds(List<Long> menuIds) {`
`31`		`- return sysRoleMapper.listByMenuIds(menuIds);`
	`31`	`+ return sysRoleMapper.selectByMenuIds(menuIds);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public List<SysRole> listByApiIds(List<Long> apiIds) {`
`36`		`- return sysRoleMapper.listByApiIds(apiIds);`
	`36`	`+ return sysRoleMapper.selectByApiIds(apiIds);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`		`- public int deleteRoleUserByUserIds(List<Long> userIds) {`
	`40`	`+ public int removeRoleUserByUserIds(List<Long> userIds) {`
`41`	`41`	`return sysRoleMapper.deleteRoleUserByUserIds(userIds);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`
`45`		`- public int deleteRoleUserByRoleIds(List<Long> roleIds) {`
	`45`	`+ public int removeRoleUserByRoleIds(List<Long> roleIds) {`
`46`	`46`	`return sysRoleMapper.deleteRoleUserByRoleIds(roleIds);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Override`
`50`		`- public int deleteRoleMenuByMenuIds(List<Long> menuIds) {`
	`50`	`+ public int removeRoleMenuByMenuIds(List<Long> menuIds) {`
`51`	`51`	`return sysRoleMapper.deleteRoleMenuByMenuIds(menuIds);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`		`- public int deleteRoleMenuByRoleIds(List<Long> roleIds) {`
	`55`	`+ public int removeRoleMenuByRoleIds(List<Long> roleIds) {`
`56`	`56`	`return sysRoleMapper.deleteRoleMenuByRoleIds(roleIds);`
`57`		`-`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`@Override`
`61`		`- public int deleteRoleApiByApiIds(List<Long> apiIds) {`
	`60`	`+ public int removeRoleApiByApiIds(List<Long> apiIds) {`
`62`	`61`	`return sysRoleMapper.deleteRoleApiByApiIds(apiIds);`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`@Override`
`66`		`- public int deleteRoleApiByRoleIds(List<Long> roleIds) {`
	`65`	`+ public int removeRoleApiByRoleIds(List<Long> roleIds) {`
`67`	`66`	`return sysRoleMapper.deleteRoleApiByRoleIds(roleIds);`
`68`	`67`	`}`
`69`	`68`	`}`