Add visualis user maintenance logic.

Author: jinyangrao

db/ddl.sql

@@ -29,9 +29,9 @@ CREATE TABLE `visualis_project` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=313 DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=COMPACT;
 
----- visualis使用这个表做权限管理
---DROP TABLE IF EXISTS `linkis_user`;
-CREATE TABLE `linkis_user` (
+-- visualis使用该表做权限管理
+DROP TABLE IF EXISTS `visualis_user`;
+CREATE TABLE `visualis_user` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `email` varchar(255) DEFAULT NULL,
   `username` varchar(255) NOT NULL,

server/src/main/java/edp/davinci/core/inteceptor/CurrentUserMethodArgumentResolver.java

@@ -50,17 +50,34 @@ public boolean supportsParameter(MethodParameter parameter) {
                 && parameter.hasParameterAnnotation(CurrentUser.class);
     }
 
+    /**
+     * 动机:
+     * 由于之前Visualis依赖于linkis_user表，存在极大的耦合，
+     *
+     * 解决方式:
+     * 新建一张visualis_user表，复用原来的权限逻辑，
+     * 如果访问Visualis时，使用该注解，没有该用户，即插入用户，录入用户信息。
+     */
     @Override
     public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
-        try
-        {
+        try {
             String dssUser = (String) ((ServletWebRequest) webRequest).getRequest().getAttribute("dss-user");
-            if(StringUtils.isNotBlank(dssUser)){
+            if (StringUtils.isNotBlank(dssUser)) {
                 return userMapper.selectByUsername(dssUser);
             }
-            return (User)userMapper.selectByUsername(SecurityFilter.getLoginUsername(webRequest.getNativeRequest(HttpServletRequest.class)));
-        }catch (Throwable e){
-            log.error("Failed to get user:",e);
+            String accessUsername = SecurityFilter.getLoginUsername(webRequest.getNativeRequest(HttpServletRequest.class));
+            User visualisUser = (User) userMapper.selectByUsername(accessUsername);
+            User user = new User();
+            if(null == visualisUser) {
+                user.setUsername(accessUsername);
+                user.setName(accessUsername);
+                user.setPassword(null);
+                userMapper.insert(user);
+                return user;
+            }
+            return visualisUser;
+        } catch (Throwable e) {
+            log.error("Failed to get user: ", e);
             throw e;
         }
     }

server/src/main/java/edp/davinci/dao/RelUserOrganizationMapper.java

@@ -47,7 +47,7 @@ public interface RelUserOrganizationMapper {
             "SELECT ruo.id, u.id AS 'user.id', ",
             "    IF(u.`name` is NULL,u.username,u.`name`) AS 'user.username', ",
             "    u.email, u.avatar AS 'user.avatar', ruo.role AS 'user.role'",
-            "FROM `linkis_user` u",
+            "FROM `visualis_user` u",
             "LEFT JOIN rel_user_organization ruo on ruo.user_id = u.id",
             "LEFT JOIN organization o on o.id = ruo.org_id",
             "WHERE ruo.org_id = #{orgId}"

server/src/main/java/edp/davinci/dao/StarMapper.java

@@ -55,14 +55,14 @@ public interface StarMapper {
 
 
     @Select({
-            "select p.*, u.id as 'createBy.id', IF(u.`name` is NULL,u.username,u.`name`) as 'createBy.username', u.avatar as 'createBy.avatar'  from visualis_project p left join linkis_user u on u.id = p.user_id ",
+            "select p.*, u.id as 'createBy.id', IF(u.`name` is NULL,u.username,u.`name`) as 'createBy.username' from visualis_project p left join dss_user u on u.id = p.user_id ",
             "where p.id in (select target_id from star where target = #{target} and user_id = #{userId})"
     })
     List<ProjectWithCreateBy> getStarProjectListByUser(@Param("userId") Long userId, @Param("target") String target);
 
 
     @Select({
-            "select u.id, IF(u.`name` is NULL,u.username,u.`name`) as username, u.email, u.avatar, s.star_time from star s left join linkis_user u on u.id = s.user_id",
+            "select u.id, IF(u.`name` is NULL,u.username,u.`name`) as username, u.email, u.avatar, s.star_time from star s left join visualis_user u on u.id = s.user_id",
             "where s.target = #{target} and s.target_id = #{targetId}"
     })
     List<StarUser> getStarUserListByTarget(@Param("targetId") Long targetId, @Param("target") String target);

server/src/main/java/edp/davinci/dao/UserMapper.java

@@ -34,10 +34,10 @@ public interface UserMapper {
     int insert(User user);
 
 
-    @Select({"select * from `linkis_user` where id = #{id}"})
+    @Select({"select * from `visualis_user` where id = #{id}"})
     User getById(@Param("id") Long id);
 
-    @Select({"select * from `linkis_user` where `username` = #{username} or `email` = #{username} or `name` = #{username}"})
+    @Select({"select * from `visualis_user` where `username` = #{username} or `email` = #{username} or `name` = #{username}"})
     User selectByUsername(@Param("username") String username);
 
     @Select({"select * from `user` where `email` = #{email}"})
@@ -47,29 +47,29 @@ public interface UserMapper {
     List<UserBaseInfo> getUsersByKeyword(@Param("keyword") String keyword, @Param("orgId") Long orgId);
 
 
-    @Update({"update `linkis_user` set `name` = #{name}, description = #{description}, department = #{department}, update_time = #{updateTime}",
+    @Update({"update `visualis_user` set `name` = #{name}, description = #{description}, department = #{department}, update_time = #{updateTime}",
             "where id = #{id}"})
     int updateBaseInfo(User user);
 
-    @Update({"update linkis_user set `avatar` = #{avatar}, update_time = #{updateTime}  where id = #{id}"})
+    @Update({"update visualis_user set `avatar` = #{avatar}, update_time = #{updateTime}  where id = #{id}"})
     int updateAvatar(User user);
 
-    @Select({"select id from linkis_user where (LOWER(`username`) = LOWER(#{name}) or LOWER(`email`) = LOWER(#{name}) or LOWER(`name`) = LOWER(#{name}))"})
+    @Select({"select id from visualis_user where (LOWER(`username`) = LOWER(#{name}) or LOWER(`email`) = LOWER(#{name}) or LOWER(`name`) = LOWER(#{name}))"})
     Long getIdByName(@Param("name") String name);
 
-    @Update({"update `linkis_user` set `active` = #{active}, `update_time` = #{updateTime}  where id = #{id}"})
+    @Update({"update `visualis_user` set `active` = #{active}, `update_time` = #{updateTime}  where id = #{id}"})
     int activeUser(User user);
 
-    @Update({"update `linkis_user` set `password` = #{password}, `update_time` = #{updateTime}  where id = #{id}"})
+    @Update({"update `visualis_user` set `password` = #{password}, `update_time` = #{updateTime}  where id = #{id}"})
     int changePassword(User user);
 
     List<User> getByIds(@Param("userIds") List<Long> userIds);
 
-    @Select({"select count(id) from `linkis_user` where `email` = #{email}"})
+    @Select({"select count(id) from `visualis_user` where `email` = #{email}"})
     boolean existEmail(@Param("email") String email);
 
 
-    @Select({"select count(id) from `linkis_user` where `username` = #{username}"})
+    @Select({"select count(id) from `visualis_user` where `username` = #{username}"})
     boolean existUsername(@Param("username") String username);
 
 }

server/src/main/java/edp/davinci/dto/userDto/UserBaseInfo.java

@@ -27,7 +27,8 @@ public class UserBaseInfo {
 
     String username;
 
-    String avatar;
+    // 用户头像路径
+    String avatar = null;
 
     String email;
 }

server/src/main/resources/mybatis/mapper/ProjectMapper.xml

@@ -140,7 +140,7 @@
         IF(u.`name` is NULL, u.`username`, u.`name`) as 'createBy.username',
         u.`avatar` as 'createBy.avatar'
         from visualis_project p
-        left join `linkis_user` u on u.`id` = p.`user_id`
+        left join `visualis_user` u on u.`id` = p.`user_id`
         left join star s on (s.target_id = p.id and s.`target` = 'project' and s.user_id = #{userId})
         where p.isArchive != 1 and p.id in (
         <!-- 当前用户是project的创建者或管理员 -->
@@ -259,7 +259,7 @@
                o.`update_by`                                AS 'organization.updateBy'
         FROM visualis_project p
                  LEFT JOIN organization o on o.`id` = p.`org_id`
-                 LEFT JOIN `linkis_user` u on u.`id` = p.`user_id`
+                 LEFT JOIN `visualis_user` u on u.`id` = p.`user_id`
         WHERE p.`id` = #{id}
     </select>
 

server/src/main/resources/mybatis/mapper/UserMapper.xml

@@ -25,7 +25,7 @@
         <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="id">
             SELECT LAST_INSERT_ID() AS id
         </selectKey>
-        insert `linkis_user`
+        insert `visualis_user`
         <trim prefix="(" suffix=")" suffixOverrides=",">
             `email`,
             `username`,
@@ -74,7 +74,7 @@
 
     <select id="getUsersByKeyword" resultType="edp.davinci.dto.userDto.UserBaseInfo">
         select DISTINCT u.id, IF(u.`name` is NULL,u.`username`,u.`name`) as username, u.`email`, u.`avatar`
-        from `linkis_user` u
+        from `visualis_user` u
         LEFT JOIN rel_user_organization r on r.user_id = u.id
         where
         <if test='orgId != null and orgId > 0 '>
@@ -86,7 +86,7 @@
     </select>
 
     <select id="getByIds" resultType="edp.davinci.model.User">
-        select * from `linkis_user` where
+        select * from `visualis_user` where
         <if test="userIds != null and userIds.size > 0">
             id in
             <foreach collection="userIds" index="index" item="item" open="(" close=")" separator=",">