This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch mp-query
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/mp-query by this push:
new c1eee114d [Improve] mybatis-plus query improvement
c1eee114d is described below
commit c1eee114d450ea4958672e287a3e7f7631ca8e0a
Author: benjobs <[email protected]>
AuthorDate: Sun Jan 12 19:28:38 2025 +0800
[Improve] mybatis-plus query improvement
---
.../console/system/mapper/MemberMapper.java | 16 ----------------
.../streampark/console/system/mapper/RoleMapper.java | 6 ------
.../streampark/console/system/mapper/TeamMapper.java | 6 ------
.../streampark/console/system/mapper/UserMapper.java | 4 ----
.../system/service/impl/MemberServiceImpl.java | 4 ++--
.../console/system/service/impl/RoleServiceImpl.java | 4 +++-
.../console/system/service/impl/TeamServiceImpl.java | 6 +++++-
.../console/system/service/impl/UserServiceImpl.java | 9 +++++++--
.../main/resources/mapper/system/MemberMapper.xml | 12 ------------
.../src/main/resources/mapper/system/RoleMapper.xml | 20 --------------------
.../src/main/resources/mapper/system/TeamMapper.xml | 20 --------------------
.../src/main/resources/mapper/system/UserMapper.xml | 12 ------------
12 files changed, 17 insertions(+), 102 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/MemberMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/MemberMapper.java
index 8669336d9..9893db1ae 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/MemberMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/MemberMapper.java
@@ -30,22 +30,6 @@ import java.util.List;
public interface MemberMapper extends BaseMapper<Member> {
- /**
- * delete role by user id
- *
- * @param userId user id
- * @return boolean
- */
- boolean deleteByUserId(@Param("userId") Long userId);
-
- /**
- * delete user by role id
- *
- * @param roleId role id
- * @return boolean
- */
- boolean deleteByRoleId(@Param("roleId") Long roleId);
-
IPage<Member> selectPage(Page<Member> page, @Param("member") Member
member);
List<User> selectUsersNotInTeam(@Param("teamId") Long teamId);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/RoleMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/RoleMapper.java
index 1039c8198..0e6aab877 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/RoleMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/RoleMapper.java
@@ -19,13 +19,7 @@ package org.apache.streampark.console.system.mapper;
import org.apache.streampark.console.system.entity.Role;
-import org.apache.ibatis.annotations.Param;
-
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
public interface RoleMapper extends BaseMapper<Role> {
-
- IPage<Role> selectPage(Page<Role> page, @Param("role") Role role);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/TeamMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/TeamMapper.java
index 6beabd0b2..16a572260 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/TeamMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/TeamMapper.java
@@ -19,17 +19,11 @@ package org.apache.streampark.console.system.mapper;
import org.apache.streampark.console.system.entity.Team;
-import org.apache.ibatis.annotations.Param;
-
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
public interface TeamMapper extends BaseMapper<Team> {
- IPage<Team> selectPage(Page<Team> page, @Param("team") Team team);
-
List<Team> selectTeamsByUserId(Long userId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/UserMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/UserMapper.java
index d43a679a2..bfc72b509 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/UserMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/UserMapper.java
@@ -34,8 +34,4 @@ public interface UserMapper extends BaseMapper<User> {
List<User> selectNoTokenUsers();
List<User> selectUsersByAppOwner(@Param("teamId") Long teamId);
-
- void clearLastTeamByUserId(@Param("userId") Long userId);
-
- void clearLastTeamByTeamId(@Param("teamId") Long teamId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
index 45c027ddc..e7ea0de90 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
@@ -58,13 +58,13 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
@Override
@Transactional
public void removeByRoleIds(String[] roleIds) {
- Arrays.stream(roleIds).forEach(id ->
baseMapper.deleteByRoleId(Long.valueOf(id)));
+ this.lambdaUpdate().in(Member::getRoleId,
Arrays.asList(roleIds)).remove();
}
@Override
@Transactional
public void removeByUserId(Long userId) {
- baseMapper.deleteByUserId(userId);
+ this.lambdaUpdate().eq(Member::getUserId, userId).remove();
}
@Override
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
index c841c5f7b..eefb80b8a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleServiceImpl.java
@@ -63,7 +63,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,
Role> implements Ro
@Override
public IPage<Role> getPage(Role role, RestRequest request) {
Page<Role> page = MybatisPager.getPage(request);
- return this.baseMapper.selectPage(page, role);
+ return this.lambdaQuery()
+ .like(StringUtils.isNotBlank(role.getRoleName()),
Role::getRoleName, role.getRoleName())
+ .page(page);
}
@Override
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
index d40ee2741..0820c5ba9 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/TeamServiceImpl.java
@@ -33,6 +33,8 @@ import
org.apache.streampark.console.system.service.MemberService;
import org.apache.streampark.console.system.service.TeamService;
import org.apache.streampark.console.system.service.UserService;
+import org.apache.commons.lang3.StringUtils;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -68,7 +70,9 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper,
Team> implements Te
@Override
public IPage<Team> getPage(Team team, RestRequest request) {
Page<Team> page = MybatisPager.getPage(request);
- return this.baseMapper.selectPage(page, team);
+ return this.lambdaQuery()
+ .like(StringUtils.isNotBlank(team.getTeamName()),
Team::getTeamName, team.getTeamName())
+ .page(page);
}
@Override
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index dc2095ee6..383dfba80 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -216,12 +216,17 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
if (!teamId.equals(user.getLastTeamId())) {
return;
}
- this.baseMapper.clearLastTeamByUserId(userId);
+ this.lambdaUpdate()
+ .eq(User::getUserId, userId)
+ .set(User::getLastTeamId, null)
+ .update();
}
@Override
public void clearLastTeam(Long teamId) {
- this.baseMapper.clearLastTeamByTeamId(teamId);
+ this.lambdaUpdate().eq(User::getLastTeamId, teamId)
+ .set(User::getLastTeamId, null)
+ .update();
}
@Override
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
index dc2c633bc..03aba47f3 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/MemberMapper.xml
@@ -18,18 +18,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
<mapper namespace="org.apache.streampark.console.system.mapper.MemberMapper">
- <delete id="deleteByUserId">
- delete
- from t_member
- where user_id = #{userId}
- </delete>
-
- <delete id="deleteByRoleId">
- delete
- from t_member
- where role_id = #{roleId}
- </delete>
-
<select id="selectPage"
resultType="org.apache.streampark.console.system.entity.Member"
parameterType="org.apache.streampark.console.system.entity.Member">
select tur.*,
u.username,
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
index 6868610a0..1b307870c 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/RoleMapper.xml
@@ -17,24 +17,4 @@
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
<mapper namespace="org.apache.streampark.console.system.mapper.RoleMapper">
- <select id="selectPage"
resultType="org.apache.streampark.console.system.entity.Role"
parameterType="org.apache.streampark.console.system.entity.Role">
- select * from t_role
- <where>
- <if test="role.roleName != null and role.roleName != ''">
- <if test="_databaseId == 'mysql'">
- and role_name like concat('%', #{role.roleName},'%')
- </if>
- <if test="_databaseId == 'pgsql'">
- and role_name like '%' || #{role.roleName} || '%'
- </if>
- </if>
- <if test="role.createTimeFrom != null and role.createTimeFrom
!=''">
- and create_time > #{role.createTimeFrom}
- </if>
- <if test="role.createTimeTo!= null and role.createTimeTo !=''">
- and create_time < #{role.createTimeTo}
- </if>
- </where>
- </select>
-
</mapper>
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
index 0188161ea..38cb61997 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/TeamMapper.xml
@@ -17,26 +17,6 @@
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
<mapper namespace="org.apache.streampark.console.system.mapper.TeamMapper">
- <select id="selectPage"
resultType="org.apache.streampark.console.system.entity.Team"
parameterType="org.apache.streampark.console.system.entity.Team">
- select * from t_team
- <where>
- <if test="team.teamName != null and team.teamName != ''">
- <if test="_databaseId == 'mysql'">
- and team_name like concat('%', #{team.teamName},'%')
- </if>
- <if test="_databaseId == 'pgsql'">
- and team_name like '%' || #{team.teamName} || '%'
- </if>
- </if>
- <if test="team.createTimeFrom != null and team.createTimeFrom
!=''">
- and create_time > #{team.createTimeFrom}
- </if>
- <if test="team.createTimeTo!= null and team.createTimeTo !=''">
- and create_time < #{team.createTimeTo}
- </if>
- </where>
- </select>
-
<select id="selectTeamsByUserId"
resultType="org.apache.streampark.console.system.entity.Team"
parameterType="org.apache.streampark.console.system.entity.Team">
select t.* from t_team t
join t_member m
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
index 6f311094f..e61d65de2 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/system/UserMapper.xml
@@ -102,16 +102,4 @@
on u.user_id = t.user_id
</select>
- <update id="clearLastTeamByUserId" parameterType="java.lang.Long">
- update t_user
- set last_team_id = null
- where user_id = #{userId}
- </update>
-
- <update id="clearLastTeamByTeamId" parameterType="java.lang.Long">
- update t_user
- set last_team_id = null
- where last_team_id = #{teamId}
- </update>
-
</mapper>
