You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2022/11/02 05:21:22 UTC
[incubator-streampark] branch dev updated: [Improve] Unified Mapper (#1943)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 3a2607278 [Improve] Unified Mapper (#1943)
3a2607278 is described below
commit 3a2607278fc88cbc1c14e10fa7bdc4b32fdb62e2
Author: ChunFu Wu <31...@qq.com>
AuthorDate: Wed Nov 2 13:21:17 2022 +0800
[Improve] Unified Mapper (#1943)
---
.../console/system/controller/RoleController.java | 2 +-
.../streampark/console/system/mapper/MenuMapper.java | 4 ----
.../streampark/console/system/service/RoleMenuServie.java | 6 +++---
.../console/system/service/impl/MenuServiceImpl.java | 15 +++++++++------
.../console/system/service/impl/RoleMenuServiceImpl.java | 6 +++---
.../console/system/service/impl/RoleServiceImpl.java | 2 +-
.../src/main/resources/mapper/system/MemberMapper.xml | 2 +-
.../src/main/resources/mapper/system/RoleMapper.xml | 2 +-
.../src/main/resources/mapper/system/TeamMapper.xml | 4 ++--
.../src/main/resources/mapper/system/UserMapper.xml | 6 +++---
10 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
index 3e10c0c6f..f4762a708 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/RoleController.java
@@ -67,7 +67,7 @@ public class RoleController {
@PostMapping("menu")
public RestResponse getRoleMenus(@NotBlank(message = "{required}") String roleId) {
- List<RoleMenu> list = this.roleMenuServie.getRoleMenusByRoleId(roleId);
+ List<RoleMenu> list = this.roleMenuServie.getByRoleId(roleId);
List<String> roleMenus = list.stream()
.map(roleMenu -> String.valueOf(roleMenu.getMenuId()))
.collect(Collectors.toList());
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/MenuMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/MenuMapper.java
index ed47b16dd..84f9d1af4 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/MenuMapper.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/mapper/MenuMapper.java
@@ -20,7 +20,6 @@ package org.apache.streampark.console.system.mapper;
import org.apache.streampark.console.system.entity.Menu;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -45,7 +44,4 @@ public interface MenuMapper extends BaseMapper<Menu> {
* @param menuId menuId
*/
void deleteMenus(String menuId);
-
- @Delete("delete from t_role_menu where menu_id = #{menuId}")
- void deleteRoleMenuByMenuId(@Param("menuId") Long menuId);
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
index 4ce55e7bf..a11fca370 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/RoleMenuServie.java
@@ -25,9 +25,9 @@ import java.util.List;
public interface RoleMenuServie extends IService<RoleMenu> {
- void deleteRoleMenusByRoleId(Long roleId);
+ void deleteByRoleId(Long roleId);
- void deleteRoleMenusByMenuId(String[] menuIds);
+ void deleteByMenuId(String[] menuIds);
- List<RoleMenu> getRoleMenusByRoleId(String roleId);
+ List<RoleMenu> getByRoleId(String roleId);
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
index 049c5f428..88dd59701 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MenuServiceImpl.java
@@ -27,6 +27,7 @@ import org.apache.streampark.console.system.entity.Menu;
import org.apache.streampark.console.system.entity.User;
import org.apache.streampark.console.system.mapper.MenuMapper;
import org.apache.streampark.console.system.service.MenuService;
+import org.apache.streampark.console.system.service.RoleMenuServie;
import org.apache.streampark.console.system.service.UserService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -39,6 +40,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -54,6 +56,9 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
@Autowired
private UserService userService;
+ @Autowired
+ private RoleMenuServie roleMenuServie;
+
@Override
public List<String> findUserPermissions(Long userId, Long teamId) {
User user = Optional.ofNullable(userService.getById(userId))
@@ -131,12 +136,10 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteMenus(String[] menuIds) throws Exception {
- for (String menuId : menuIds) {
- // Find users associated with these menus/buttons
- this.baseMapper.deleteRoleMenuByMenuId(Long.parseLong(menuId));
- // Recursively delete these menus/buttons
- this.baseMapper.deleteById(menuId);
- }
+ // Find users associated with these menus/buttons
+ this.roleMenuServie.deleteByMenuId(menuIds);
+ // Recursively delete these menus/buttons
+ this.removeByIds(Arrays.asList(menuIds));
}
@Override
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
index 8490d47c6..56fb313fd 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/RoleMenuServiceImpl.java
@@ -37,19 +37,19 @@ public class RoleMenuServiceImpl extends ServiceImpl<RoleMenuMapper, RoleMenu>
@Override
@Transactional
- public void deleteRoleMenusByRoleId(Long roleId) {
+ public void deleteByRoleId(Long roleId) {
baseMapper.delete(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId));
}
@Override
@Transactional
- public void deleteRoleMenusByMenuId(String[] menuIds) {
+ public void deleteByMenuId(String[] menuIds) {
List<String> list = Arrays.asList(menuIds);
baseMapper.delete(new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getMenuId, list));
}
@Override
- public List<RoleMenu> getRoleMenusByRoleId(String roleId) {
+ public List<RoleMenu> getByRoleId(String roleId) {
return baseMapper.selectList(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId));
}
}
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 272f6a80d..7b7ac411f 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
@@ -89,7 +89,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
AssertUtils.isTrue(userIdsByRoleId == null || userIdsByRoleId.isEmpty(),
String.format("There are some users are bound to role %s , please unbind it first.", role.getRoleName()));
this.removeById(roleId);
- this.roleMenuService.deleteRoleMenusByRoleId(roleId);
+ this.roleMenuService.deleteByRoleId(roleId);
}
@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 f5eb27b34..5796ee3d6 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
@@ -41,7 +41,7 @@
where role_id = #{roleId}
</delete>
- <select id="findUsers" resultType="member" parameterType="member">
+ <select id="findUsers" resultType="org.apache.streampark.console.system.entity.Member" parameterType="org.apache.streampark.console.system.entity.Member">
select tur.*,
u.username,
r.role_name
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 5e115d919..2ff645861 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
@@ -28,7 +28,7 @@
<result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/>
</resultMap>
- <select id="findRole" resultType="role" parameterType="role">
+ <select id="findRole" 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 != ''">
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 f7af5214b..5db918a0c 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
@@ -27,7 +27,7 @@
<result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/>
</resultMap>
- <select id="findTeam" resultType="team" parameterType="team">
+ <select id="findTeam" 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 != ''">
@@ -45,7 +45,7 @@
</if>
</select>
- <select id="findUserTeams" resultType="team" parameterType="team">
+ <select id="findUserTeams" 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
on t.id = m.team_id
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 621676d37..794d1cf5c 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
@@ -36,7 +36,7 @@
<result column="team_id" jdbcType="BIGINT" property="teamId"/>
</resultMap>
- <select id="findUserDetail" resultType="user" parameterType="user">
+ <select id="findUserDetail" resultType="org.apache.streampark.console.system.entity.User" parameterType="org.apache.streampark.console.system.entity.User">
select * from t_user
<where>
<if test="user.username != null and user.username != ''">
@@ -60,13 +60,13 @@
</if>
</select>
- <select id="getNoTokenUser" resultType="user" parameterType="user">
+ <select id="getNoTokenUser" resultType="org.apache.streampark.console.system.entity.User" parameterType="org.apache.streampark.console.system.entity.User">
select u.* from t_user u left join t_access_token t
on u.user_id = t.user_id
where t.user_id is null
</select>
- <select id="findByAppOwner" resultType="user" parameterType="user">
+ <select id="findByAppOwner" resultType="org.apache.streampark.console.system.entity.User" parameterType="org.apache.streampark.console.system.entity.User">
select u.* from t_user u inner join (
select distinct(user_id) as user_id
from t_flink_app