规范用户转移表名称

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/UserMoveMapper.java

 package com.gic.auth.dao.mapper;
 
-import com.gic.auth.entity.TabGicUserMove;
+import com.gic.auth.entity.TabUserMove;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,7 +20,7 @@ public interface UserMoveMapper {
      * @param record 实体对象
      * @return 更新条目数
      */
-    int insert(TabGicUserMove record);
+    int insert(TabUserMove record);
 
     /**
      * 动态插入一条记录
@@ -28,7 +28,7 @@ public interface UserMoveMapper {
      * @param record 实体对象
      * @return 更新条目数
      */
-    int insertSelective(TabGicUserMove record);
+    int insertSelective(TabUserMove record);
 
     /**
      * 根据主键查询
@@ -36,7 +36,7 @@ public interface UserMoveMapper {
      * @param userMoveId 主键
      * @return 实体对象
      */
-    TabGicUserMove selectByPrimaryKey(Integer userMoveId);
+    TabUserMove selectByPrimaryKey(Integer userMoveId);
 
     /**
      * 根据主键动态更新记录
@@ -44,7 +44,7 @@ public interface UserMoveMapper {
      * @param record 实体对象
      * @return 更新条目数
      */
-    int updateByPrimaryKeySelective(TabGicUserMove record);
+    int updateByPrimaryKeySelective(TabUserMove record);
 
     /**
      * 根据主键更新记录
@@ -52,7 +52,7 @@ public interface UserMoveMapper {
      * @param record 实体对象
      * @return 更新条目数
      */
-    int updateByPrimaryKey(TabGicUserMove record);
+    int updateByPrimaryKey(TabUserMove record);
 
     /**
      * 查询fromUserId列表，如果为空，说明没有数据转移过给userId

gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabGicUserMove.java → gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabUserMove.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * @author guojuxing

  * @date 2021/1/7 2:47 PM

  */
-public class TabGicUserMove {
+public class TabUserMove {
     /**
      * id
      */
@@ -44,7 +44,7 @@ public class TabGicUserMove {
         return userMoveId;
     }
 
-    public TabGicUserMove setUserMoveId(Integer userMoveId) {
+    public TabUserMove setUserMoveId(Integer userMoveId) {
         this.userMoveId = userMoveId;
         return this;
     }
@@ -53,7 +53,7 @@ public class TabGicUserMove {
         return fromUserId;
     }
 
-    public TabGicUserMove setFromUserId(Integer fromUserId) {
+    public TabUserMove setFromUserId(Integer fromUserId) {
         this.fromUserId = fromUserId;
         return this;
     }
@@ -62,7 +62,7 @@ public class TabGicUserMove {
         return toUserId;
     }
 
-    public TabGicUserMove setToUserId(Integer toUserId) {
+    public TabUserMove setToUserId(Integer toUserId) {
         this.toUserId = toUserId;
         return this;
     }
@@ -71,7 +71,7 @@ public class TabGicUserMove {
         return enterpriseId;
     }
 
-    public TabGicUserMove setEnterpriseId(Integer enterpriseId) {
+    public TabUserMove setEnterpriseId(Integer enterpriseId) {
         this.enterpriseId = enterpriseId;
         return this;
     }
@@ -80,7 +80,7 @@ public class TabGicUserMove {
         return createTime;
     }
 
-    public TabGicUserMove setCreateTime(Date createTime) {
+    public TabUserMove setCreateTime(Date createTime) {
         this.createTime = createTime;
         return this;
     }
@@ -89,7 +89,7 @@ public class TabGicUserMove {
         return updateTime;
     }
 
-    public TabGicUserMove setUpdateTime(Date updateTime) {
+    public TabUserMove setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
         return this;
     }

gic-platform-auth-service/src/main/java/com/gic/auth/service/UserMoveService.java

 package com.gic.auth.service;
 
-import com.gic.auth.entity.TabGicUserMove;
+import com.gic.auth.entity.TabUserMove;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ public interface UserMoveService {
      * 转移记录
      * @param record
      */
-    void saveUserMove(TabGicUserMove record);
+    void saveUserMove(TabUserMove record);
 
     /**
      * 查询fromUserId列表，如果为空，说明没有数据转移过给userId

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UserMoveServiceImpl.java

 package com.gic.auth.service.impl;
 
 import com.gic.auth.dao.mapper.UserMoveMapper;
-import com.gic.auth.entity.TabGicUserMove;
+import com.gic.auth.entity.TabUserMove;
 import com.gic.auth.service.UserMoveService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +23,7 @@ public class UserMoveServiceImpl implements UserMoveService{
     private UserMoveMapper userMoveMapper;
 
     @Override
-    public void saveUserMove(TabGicUserMove record) {
+    public void saveUserMove(TabUserMove record) {
         record.setCreateTime(new Date()).setUpdateTime(new Date());
         userMoveMapper.insert(record);
     }

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserMoveApiServiceImpl.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.auth.entity.TabGicUserMove;
+import com.gic.auth.entity.TabUserMove;
 import com.gic.auth.service.UserMoveApiService;
 import com.gic.auth.service.UserMoveService;
 /**
@@ -27,7 +27,7 @@ public class UserMoveApiServiceImpl implements UserMoveApiService{
         //查询出转移过fromUserId的数据，用于一起转嫁到toUserId
         List<Integer> fromUserIdList = userMoveService.listTransferUserId(fromUserId);
 
-        TabGicUserMove record = new TabGicUserMove()
+        TabUserMove record = new TabUserMove()
                 .setEnterpriseId(enterpriseId)
                 .setFromUserId(fromUserId)
                 .setToUserId(toUserId);
@@ -35,7 +35,7 @@ public class UserMoveApiServiceImpl implements UserMoveApiService{
         //转嫁
         if (CollectionUtils.isNotEmpty(fromUserIdList)) {
             fromUserIdList.forEach(e -> {
-                userMoveService.saveUserMove(new TabGicUserMove()
+                userMoveService.saveUserMove(new TabUserMove()
                         .setToUserId(toUserId)
                         .setEnterpriseId(enterpriseId)
                         .setFromUserId(e)

gic-platform-auth-service/src/main/resources/mapper/UserMoveMapper.xml

 <?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="com.gic.auth.dao.mapper.UserMoveMapper">
-  <resultMap id="BaseResultMap" type="com.gic.auth.entity.TabGicUserMove">
+  <resultMap id="BaseResultMap" type="com.gic.auth.entity.TabUserMove">
     <id column="user_move_id" jdbcType="INTEGER" property="userMoveId" />
     <result column="from_user_id" jdbcType="INTEGER" property="fromUserId" />
     <result column="to_user_id" jdbcType="INTEGER" property="toUserId" />
@@ -15,19 +15,19 @@
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from tab_gic_user_move
+    from tab_user_move
     where user_move_id = #{userMoveId,jdbcType=INTEGER}
   </select>
-  <insert id="insert" parameterType="com.gic.auth.entity.TabGicUserMove">
-    insert into tab_gic_user_move (user_move_id, from_user_id, to_user_id, 
+  <insert id="insert" parameterType="com.gic.auth.entity.TabUserMove">
+    insert into tab_user_move (user_move_id, from_user_id, to_user_id,
       enterprise_id, create_time, update_time
       )
     values (#{userMoveId,jdbcType=INTEGER}, #{fromUserId,jdbcType=INTEGER}, #{toUserId,jdbcType=INTEGER}, 
       #{enterpriseId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.gic.auth.entity.TabGicUserMove">
-    insert into tab_gic_user_move
+  <insert id="insertSelective" parameterType="com.gic.auth.entity.TabUserMove">
+    insert into tab_user_move
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="userMoveId != null">
         user_move_id,
@@ -69,8 +69,8 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gic.auth.entity.TabGicUserMove">
-    update tab_gic_user_move
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.auth.entity.TabUserMove">
+    update tab_user_move
     <set>
       <if test="fromUserId != null">
         from_user_id = #{fromUserId,jdbcType=INTEGER},
@@ -90,8 +90,8 @@
     </set>
     where user_move_id = #{userMoveId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.gic.auth.entity.TabGicUserMove">
-    update tab_gic_user_move
+  <update id="updateByPrimaryKey" parameterType="com.gic.auth.entity.TabUserMove">
+    update tab_user_move
     set from_user_id = #{fromUserId,jdbcType=INTEGER},
       to_user_id = #{toUserId,jdbcType=INTEGER},
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
@@ -101,12 +101,12 @@
   </update>
 
   <select id="listTransferUserId" resultType="int">
-    select from_user_id from tab_gic_user_move
+    select from_user_id from tab_user_move
     where to_user_id = #{userId}
   </select>
 
   <select id="listTransferUserIdByUserIdList" resultType="int">
-    select from_user_id from tab_gic_user_move
+    select from_user_id from tab_user_move
     where to_user_id in
     <foreach collection="userIdList" index="index" item="item" open="(" separator="," close=")">
       #{item}