管理员数据转移

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserApiService.java

 package com.gic.auth.service;
 
+import java.util.List;
+
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.UserDTO;
+import com.gic.auth.dto.UserDataShowDTO;
 import com.gic.auth.dto.UserListDTO;
-import com.gic.auth.dto.UserManagerDataDTO;
 import com.gic.auth.qo.UserListQO;
 
-import java.util.List;
-
 /**
  * @author guojx
  * @date 2019/7/16 6:48 PM
@@ -313,7 +313,7 @@ public interface UserApiService {
      * @param pageSize
      * @return
      */
-    ServiceResponse<Page<UserManagerDataDTO>> queryUserManagerData(Integer dataScene, Integer userId, Integer pageNum, Integer pageSize);
+    ServiceResponse<Page<UserDataShowDTO>> queryUserManagerData(Integer dataScene, Integer userId, Integer pageNum, Integer pageSize);
 
     /**
      * 查询用户可以转移数据的管理员列表
@@ -324,4 +324,12 @@ public interface UserApiService {
      * @return
      */
     ServiceResponse<Page<UserDTO>> queryUserTransferObject(Integer userId, String search, Integer pageNum, Integer pageSize);
+
+    /**
+     * 转移管理员数据
+     * @param oldUserId
+     * @param newUserId
+     * @return
+     */
+    ServiceResponse<Void> transferUserData(Integer oldUserId, Integer newUserId);
 }

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserDataShowApiService.java

@@ -29,10 +29,36 @@ public interface UserDataShowApiService {
     ServiceResponse<Void> editUserDataBusinessName(String userDataBusinessId, String userDataBusinessName, Integer userDataSceneType);
 
     /**
+     * 批量修改管理员ID
+     * @param oldUserId
+     * @param newUserId
+     * @param userDataSceneType
+     * @return
+     */
+    ServiceResponse<Void> tmpUpdateUserId(Integer oldUserId, Integer newUserId, Integer userDataSceneType);
+
+    /**
+     * 业务方数据修改管理员ID
+     * @param toUserId
+     * @param userDataBusinessId
+     * @param userDataSceneType
+     * @return
+     */
+    ServiceResponse<Void> updateUserIdByUserDataBusinessId(Integer toUserId, String userDataBusinessId, Integer userDataSceneType);
+
+    /**
      * 删除数据
      * @param userDataBusinessId
      * @param userDataSceneType 业务方 枚举 ManagerDataEnum
      * @return
      */
     ServiceResponse<Void> deleteUserData(String userDataBusinessId, Integer userDataSceneType);
+
+    /**
+     * 删除数据
+     * @param toUserId
+     * @param userDataSceneType
+     * @return
+     */
+    ServiceResponse<Void> tmpDeleteUserData(Integer toUserId, Integer userDataSceneType);
 }

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

@@ -2,6 +2,9 @@ package com.gic.auth.dao.mapper;
 
 import com.gic.auth.entity.TabUserDataShow;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 管理员数据
  * @ClassName:
@@ -70,4 +73,44 @@ public interface TabUserDataShowMapper {
      * @return
      */
     int deleteUserData(@Param("userDataBusinessId")String userDataBusinessId,@Param("userDataSceneType") Integer userDataSceneType);
+
+    /**
+     * 批量修改管理员ID
+     * @param oldUserId
+     * @param newUserId
+     * @param userDataSceneType
+     * @return
+     */
+    int tmpUpdateUserId(@Param("oldUserId") Integer oldUserId,
+                        @Param("newUserId") Integer newUserId,
+                        @Param("userDataSceneType") Integer userDataSceneType);
+
+    /**
+     * 修改管理员ID
+     * @param toUserId
+     * @param userDataBusinessId
+     * @param userDataSceneType
+     * @return
+     */
+    int updateUserIdByUserDataBusinessId(@Param("toUserId") Integer toUserId,
+                                         @Param("userDataBusinessId") String userDataBusinessId,
+                                         @Param("userDataSceneType") Integer userDataSceneType);
+
+    /**
+     * 删除
+     * @param toUserId
+     * @param userDataSceneType
+     * @return
+     */
+    int tmpDeleteUserData(@Param("toUserId") Integer toUserId,
+                          @Param("userDataSceneType") Integer userDataSceneType);
+
+    /**
+     * 分页查询
+     * @param dataType
+     * @param userId
+     * @return
+     */
+    List<TabUserDataShow> page(@Param("dataType") Integer dataType,
+                               @Param("userId") Integer userId);
 }
\ No newline at end of file

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

 package com.gic.auth.service;
 
 import com.gic.auth.dto.UserDataShowSaveDTO;
+import com.gic.auth.entity.TabUserDataShow;
+import com.github.pagehelper.Page;
 
 /**
  * 管理员数据
@@ -30,4 +32,37 @@ public interface UserDataShowService {
      * @param userDataSceneType 业务方 枚举 ManagerDataEnum
      */
     void deleteUserData(String userDataBusinessId, Integer userDataSceneType);
+
+    /**
+     * 批量调整管理员ID
+     * @param oldUserId
+     * @param newUserId
+     * @param userDataSceneType
+     */
+    void tmpUpdateUserId(Integer oldUserId, Integer newUserId, Integer userDataSceneType);
+
+    /**
+     * 修改管理员ID
+     * @param toUserId
+     * @param userDataBusinessId
+     * @param userDataSceneType
+     */
+    void updateUserIdByUserDataBusinessId(Integer toUserId, String userDataBusinessId, Integer userDataSceneType);
+
+    /**
+     * 批量删除
+     * @param toUserId
+     * @param userDataSceneType
+     */
+    void tmpDeleteUserData(Integer toUserId, Integer userDataSceneType);
+
+    /**
+     * 分页查询
+     * @param dataType 业务方类型
+     * @param userId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    Page<TabUserDataShow> page(Integer dataType, Integer userId, Integer pageNum, Integer pageSize);
 }

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

@@ -6,9 +6,13 @@ import com.gic.auth.dto.UserDataShowSaveDTO;
 import com.gic.auth.entity.TabUserDataShow;
 import com.gic.auth.service.UserDataShowService;
 import com.gic.commons.util.EntityUtil;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 管理员数据
@@ -17,6 +21,7 @@ import java.util.Date;
  * @author guojuxing

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

  */
+@Service("userDataShowService")
 public class UserDataShowServiceImpl implements UserDataShowService{
     @Autowired
     private TabUserDataShowMapper tabUserDataShowMapper;
@@ -39,4 +44,32 @@ public class UserDataShowServiceImpl implements UserDataShowService{
     public void deleteUserData(String userDataBusinessId, Integer userDataSceneType) {
         tabUserDataShowMapper.deleteUserData(userDataBusinessId, userDataSceneType);
     }
+
+    @Override
+    public void tmpUpdateUserId(Integer oldUserId, Integer newUserId, Integer userDataSceneType) {
+        tabUserDataShowMapper.tmpUpdateUserId(oldUserId, newUserId, userDataSceneType);
+    }
+
+    @Override
+    public void updateUserIdByUserDataBusinessId(Integer toUserId, String userDataBusinessId, Integer userDataSceneType) {
+        tabUserDataShowMapper.updateUserIdByUserDataBusinessId(toUserId, userDataBusinessId, userDataSceneType);
+    }
+
+    @Override
+    public void tmpDeleteUserData(Integer toUserId, Integer userDataSceneType) {
+        tabUserDataShowMapper.tmpDeleteUserData(toUserId, userDataSceneType);
+    }
+
+    @Override
+    public Page<TabUserDataShow> page(Integer dataType, Integer userId, Integer pageNum, Integer pageSize) {
+        if (pageNum == null) {
+            pageNum = 1;
+        }
+        if (pageSize == null) {
+            pageSize = 20;
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        List<TabUserDataShow> list = tabUserDataShowMapper.page(dataType, userId);
+        return (Page<TabUserDataShow>) list;
+    }
 }

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

 package com.gic.auth.service.outer.impl;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.constant.*;
@@ -11,26 +26,14 @@ import com.gic.auth.utils.ValidSplitUtils;
 import com.gic.auth.utils.qrcode.QrcodeUtils;
 import com.gic.auth.utils.transfer.ManagerDataUtils;
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.GICMQClientUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.constant.QrcodeTypeEnum;
 import com.gic.enterprise.constants.Constants;
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.store.utils.valid.ValidUtil;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
 
 /**
  * @author guojx
@@ -59,6 +62,8 @@ public class UserApiServiceImpl implements UserApiService {
     private AccountGroupService accountGroupService;
     @Autowired
     private AuditedGroupUserRelService auditedGroupUserRelService;
+    @Autowired
+    private UserMoveApiService userMoveApiService;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -365,6 +370,13 @@ public class UserApiServiceImpl implements UserApiService {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
                     "用户类型错误，不是" + LoginUserTypeEnum.GIC_USER.getMessage());
         }
+
+        //验证是否有创建的数据
+        ServiceResponse<List<Integer>> userDataResponse = listManagerDataScene(userId);
+        if (userDataResponse.isSuccess() && CollectionUtils.isNotEmpty(userDataResponse.getResult())) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "用户有自己创建的数据，请先转移");
+        }
+
         //删除角色关联
         userRoleService.deleteByUserId(userId);
         //删除资源关联
@@ -569,9 +581,9 @@ public class UserApiServiceImpl implements UserApiService {
         Integer pageNum = 1;
         Integer pageSize = 1;
 
-        Page<UserManagerDataDTO> page;
+        Page<UserDataShowDTO> page;
         for (ManagerDataEnum managerDataEnum : ManagerDataEnum.values()) {
-            page = ManagerDataUtils.queryData(managerDataEnum.getCode(), userId, pageNum, pageSize);
+            page = ManagerDataUtils.queryDataFromLocal(managerDataEnum.getCode(), userId, pageNum, pageSize);
             boolean hasData = page != null && CollectionUtils.isNotEmpty(page.getResult());
             if (hasData) {
                 result.add(managerDataEnum.getCode());
@@ -581,9 +593,9 @@ public class UserApiServiceImpl implements UserApiService {
     }
 
     @Override
-    public ServiceResponse<Page<UserManagerDataDTO>> queryUserManagerData(Integer dataScene, Integer userId,
+    public ServiceResponse<Page<UserDataShowDTO>> queryUserManagerData(Integer dataScene, Integer userId,
                                                                           Integer pageNum, Integer pageSize) {
-        return ServiceResponse.success(ManagerDataUtils.queryData(dataScene, userId, pageNum, pageSize));
+        return ServiceResponse.success(ManagerDataUtils.queryDataFromLocal(dataScene, userId, pageNum, pageSize));
     }
 
     @Override
@@ -593,30 +605,10 @@ public class UserApiServiceImpl implements UserApiService {
         if (tabUser == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "用户ID输入有误，无此数据");
         }
-        //前置条件 权限集和资源组大于等于的管理员（包括超管）
-        //角色集
-        List<UserRoleDTO> userRoleDTOList = userRoleService.listUserRoleByUserId(userId);
-        List<Integer> roleIdList = new ArrayList<>();
-        for (UserRoleDTO userRoleDTO : userRoleDTOList) {
-            roleIdList.add(userRoleDTO.getRoleId());
-        }
-        //权限集大于等于的管理员
-        List<Integer> userIdListByRole = userRoleService.listUserId(roleIdList, tabUser.getEnterpriseId());
-
-        List<Integer> resourceIdList = new ArrayList<>();
-        List<UserResourceDTO> userResourceDTOList = userResourceService.listUserResourceByUserId(userId);
-        for (UserResourceDTO userResourceDTO : userResourceDTOList) {
-            resourceIdList.add(userResourceDTO.getResourceId());
-        }
-        //资源组大于等于的管理员
-        List<Integer> userIdListByResource = userResourceService.listUserId(resourceIdList, tabUser.getEnterpriseId());
-
-        //取交集，因为是并且关系
-        userIdListByRole.retainAll(userIdListByResource);
-
         TabSysUser admin = userService.getUserByEnterpriseId(tabUser.getEnterpriseId());
 
-        if (CollectionUtils.isEmpty(userIdListByRole)) {
+        List<Integer> transferUserList = queryCouldTransferUserList(userId, tabUser.getEnterpriseId());
+        if (CollectionUtils.isEmpty(transferUserList)) {
             //只有超管
             Page<UserDTO> tempPage = new Page<>();
             List<UserDTO> tempList = new ArrayList<>(1);
@@ -627,7 +619,7 @@ public class UserApiServiceImpl implements UserApiService {
         }
 
         UserListQO params = new UserListQO();
-        params.setUserIdList(userIdListByRole);
+        params.setUserIdList(transferUserList);
         params.setSearch(search);
         params.setCurrentPage(pageNum);
         params.setPageSize(pageSize);
@@ -643,6 +635,65 @@ public class UserApiServiceImpl implements UserApiService {
         return ServiceResponse.success(resultPage);
     }
 
+    @Override
+    public ServiceResponse<Void> transferUserData(Integer oldUserId, Integer newUserId) {
+        TabSysUser tabUser = userService.getUserById(oldUserId);
+        if (tabUser == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "用户ID输入有误，无此数据");
+        }
+        List<Integer> transferUserList = queryCouldTransferUserList(oldUserId, tabUser.getEnterpriseId());
+        if (!transferUserList.contains(newUserId)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "转移对象不符合条件");
+        }
+        //转移
+        userMoveApiService.saveUserMove(tabUser.getEnterpriseId(), oldUserId, newUserId);
+        //发布消息，业务方自己调用
+        transferUserDataMQ(oldUserId, newUserId);
+        return ServiceResponse.success();
+    }
+
+    private void transferUserDataMQ(Integer oldUserId, Integer newUserId) {
+        GicMQClient client = GICMQClientUtil.getClientInstance();
+        Map<String, Object> params = new HashMap<>(4);
+        params.put("oldUserId", oldUserId);
+        params.put("newUserId", newUserId);
+        try {
+            client.sendMessage("transferUserDataMQ", JSONObject.toJSONString(params));
+        } catch (Exception e) {
+            LOGGER.warn("管理员转移数据路由:{}", e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 查询符合条件的转移对象
+     * @param userId
+     * @param enterpriseId
+     * @return
+     */
+    private List<Integer> queryCouldTransferUserList(Integer userId, Integer enterpriseId) {
+        //前置条件 权限集和资源组大于等于的管理员（包括超管）
+        //角色集
+        List<UserRoleDTO> userRoleDTOList = userRoleService.listUserRoleByUserId(userId);
+        List<Integer> roleIdList = new ArrayList<>();
+        for (UserRoleDTO userRoleDTO : userRoleDTOList) {
+            roleIdList.add(userRoleDTO.getRoleId());
+        }
+        //权限集大于等于的管理员
+        List<Integer> userIdListByRole = userRoleService.listUserId(roleIdList, enterpriseId);
+
+        List<Integer> resourceIdList = new ArrayList<>();
+        List<UserResourceDTO> userResourceDTOList = userResourceService.listUserResourceByUserId(userId);
+        for (UserResourceDTO userResourceDTO : userResourceDTOList) {
+            resourceIdList.add(userResourceDTO.getResourceId());
+        }
+        //资源组大于等于的管理员
+        List<Integer> userIdListByResource = userResourceService.listUserId(resourceIdList, enterpriseId);
+
+        //取交集，因为是并且关系
+        userIdListByRole.retainAll(userIdListByResource);
+        return userIdListByRole;
+    }
+
     /**
      * 保存关联数据，角色关联、资源关联
      * @Title: saveRole


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

@@ -3,6 +3,8 @@ package com.gic.auth.service.outer.impl;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.UserDataShowSaveDTO;
 import com.gic.auth.service.UserDataShowApiService;
+import com.gic.auth.service.UserDataShowService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 /**
  * 管理员数据
@@ -13,18 +15,41 @@ import org.springframework.stereotype.Service;
  */
 @Service("userDataShowApiService")
 public class UserDataShowApiServiceImpl implements UserDataShowApiService{
+    @Autowired
+    private UserDataShowService userDataShowService;
     @Override
     public ServiceResponse<Void> saveUserData(UserDataShowSaveDTO data) {
+        userDataShowService.saveUserData(data);
         return ServiceResponse.success();
     }
 
     @Override
     public ServiceResponse<Void> editUserDataBusinessName(String userDataBusinessId, String userDataBusinessName, Integer userDataSceneType) {
+        userDataShowService.editUserDataBusinessName(userDataBusinessId, userDataBusinessName, userDataSceneType);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> tmpUpdateUserId(Integer oldUserId, Integer newUserId, Integer userDataSceneType) {
+        userDataShowService.tmpUpdateUserId(oldUserId, newUserId, userDataSceneType);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> updateUserIdByUserDataBusinessId(Integer toUserId, String userDataBusinessId, Integer userDataSceneType) {
+        userDataShowService.updateUserIdByUserDataBusinessId(toUserId, userDataBusinessId, userDataSceneType);
         return ServiceResponse.success();
     }
 
     @Override
     public ServiceResponse<Void> deleteUserData(String userDataBusinessId, Integer userDataSceneType) {
+        userDataShowService.deleteUserData(userDataBusinessId, userDataSceneType);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> tmpDeleteUserData(Integer toUserId, Integer userDataSceneType) {
+        userDataShowService.tmpDeleteUserData(toUserId, userDataSceneType);
         return ServiceResponse.success();
     }
 }

gic-platform-auth-service/src/main/java/com/gic/auth/utils/transfer/CouponData.java

@@ -3,7 +3,7 @@ package com.gic.auth.utils.transfer;
 import org.springframework.stereotype.Component;
 
 import com.gic.api.base.commons.Page;
-import com.gic.auth.dto.UserManagerDataDTO;
+import com.gic.auth.dto.UserDataShowDTO;
 /**
  * 卡券数据
  * @ClassName:
@@ -15,7 +15,7 @@ import com.gic.auth.dto.UserManagerDataDTO;
 public class CouponData implements IManagerData{
 
     @Override
-    public Page<UserManagerDataDTO> queryData(Integer userId, Integer pageNum, Integer pageSize) {
+    public Page<UserDataShowDTO> queryData(Integer userId, Integer pageNum, Integer pageSize) {
         //todo
         return null;
     }

gic-platform-auth-service/src/main/java/com/gic/auth/utils/transfer/CustomGroupData.java

@@ -3,7 +3,7 @@ package com.gic.auth.utils.transfer;
 import org.springframework.stereotype.Component;
 
 import com.gic.api.base.commons.Page;
-import com.gic.auth.dto.UserManagerDataDTO;
+import com.gic.auth.dto.UserDataShowDTO;
 
 /**
  * 用户分组数据
@@ -16,7 +16,7 @@ import com.gic.auth.dto.UserManagerDataDTO;
 public class CustomGroupData implements IManagerData{
 
     @Override
-    public Page<UserManagerDataDTO> queryData(Integer userId, Integer pageNum, Integer pageSize) {
+    public Page<UserDataShowDTO> queryData(Integer userId, Integer pageNum, Integer pageSize) {
         //todo
         return null;
     }

gic-platform-auth-service/src/main/java/com/gic/auth/utils/transfer/IManagerData.java

 package com.gic.auth.utils.transfer;
 
 import com.gic.api.base.commons.Page;
-import com.gic.auth.dto.UserManagerDataDTO;
+import com.gic.auth.dto.UserDataShowDTO;
 
 /**
  * 管理员创建的数据
@@ -19,5 +19,5 @@ public interface IManagerData {
      * @param pageSize
      * @return
      */
-    Page<UserManagerDataDTO> queryData(Integer userId, Integer pageNum, Integer pageSize);
+    Page<UserDataShowDTO> queryData(Integer userId, Integer pageNum, Integer pageSize);
 }

gic-platform-auth-service/src/main/java/com/gic/auth/utils/transfer/ManagerDataUtils.java

 package com.gic.auth.utils.transfer;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.gic.api.base.commons.Page;
 import com.gic.auth.constant.ManagerDataEnum;
-import com.gic.auth.dto.UserManagerDataDTO;
+import com.gic.auth.dto.UserDataShowDTO;
+import com.gic.auth.service.UserDataShowService;
 import com.gic.auth.utils.ApplicationContextUtils;
-
-import java.util.HashMap;
-import java.util.Map;
+import com.gic.commons.util.PageHelperUtils;
 
 /**
  * 管理员数据工具
@@ -25,12 +27,27 @@ public class ManagerDataUtils {
     }
 
     /**
-     * 查询管理员创建的数据
+     * 查询管理员创建的数据(调用业务方)
      * @param dataType 场景类型
      * @param userId 管理员ID
      * @return
      */
-    public static Page<UserManagerDataDTO> queryData(Integer dataType, Integer userId, Integer pageNum, Integer pageSize) {
+    public static Page<UserDataShowDTO> queryData(Integer dataType, Integer userId, Integer pageNum, Integer pageSize) {
         return map.get(dataType).queryData(userId, pageNum, pageSize);
     }
+
+    /**
+     * 查询管理员创建的数据(调用自己维护的表数据)
+     * @param dataType
+     * @param userId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    public static Page<UserDataShowDTO> queryDataFromLocal(Integer dataType, Integer userId, Integer pageNum, Integer pageSize) {
+        UserDataShowService userDataShowService = ApplicationContextUtils.getBean("userDataShowService");
+        com.github.pagehelper.Page page = userDataShowService.page(dataType, userId, pageNum, pageSize);
+        Page<UserDataShowDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(page);
+        return resultPage;
+    }
 }

gic-platform-auth-service/src/main/resources/dubbo-gic-platform-auth-service.xml

@@ -49,6 +49,8 @@
     <!--运营个管理员-->
     <dubbo:service interface="com.gic.auth.service.OperationUserApiService" ref="operationUserApiService" timeout="6000" />
     <dubbo:service interface="com.gic.auth.service.ResourceOpenApiService" ref="resourceOpenApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.auth.service.UserDataShowApiService" ref="userDataShowApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.auth.service.UserMoveApiService" ref="userMoveApiService" timeout="6000" />
     <!--角色-->
 
     <dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000"/>

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

@@ -149,4 +149,33 @@
     and user_data_scene_type = #{userDataSceneType}
     and user_data_business_id = #{userDataBusinessId}
   </update>
+
+  <update id="tmpUpdateUserId">
+    update tab_user_data_show set user_id = #{newUserId}
+    where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
+    and user_id = #{oldUserId}
+    and user_data_scene_type = #{userDataSceneType}
+  </update>
+
+  <update id="updateUserIdByUserDataBusinessId">
+    update tab_user_data_show set user_id = #{newUserId}
+    where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
+    and user_data_business_id = #{userDataBusinessId}
+    and user_data_scene_type = #{userDataSceneType}
+  </update>
+
+  <update id="tmpDeleteUserData">
+    update tab_user_data_show set delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@DELETE_STATUS}
+    where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
+    and user_id = #{toUserId}
+    and user_data_scene_type = #{userDataSceneType}
+  </update>
+
+  <select id="page" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_user_data_show
+    where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
+    and user_data_scene_type = #{dataType}
+    and user_id = #{userId}
+  </select>
 </mapper>
\ No newline at end of file

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/UserDataMoveController.java

+package com.gic.auth.web.controller;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.gic.auth.service.UserApiService;
+import com.gic.auth.service.UserMoveApiService;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.utils.ResultControllerUtils;
+
+/**
+ * 管理员数据转移
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:55 PM

+ */
+@RestController
+@RequestMapping("/user-data-move")
+public class UserDataMoveController {
+    private final Logger logger = LogManager.getLogger(UserDataMoveController.class);
+    @Autowired
+    private UserMoveApiService userMoveApiService;
+    @Autowired
+    private UserApiService userApiService;
+
+    /**
+     * 管理员是否有自己创建的数据
+     * @param userId
+     * @return 如果不为空，则说明有
+     */
+    @RequestMapping("/valid-have-owner-data")
+    public RestResponse validHaveOwnerData(Integer userId) {
+        return ResultControllerUtils.commonResult(userApiService.listManagerDataScene(userId));
+    }
+
+    /**
+     * 查询管理员数据
+     * @param dataScene
+     * @param userId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping("/query-user-data")
+    public RestResponse queryUserData(Integer dataScene, Integer userId, Integer pageNum, Integer pageSize) {
+        return ResultControllerUtils.commonResult(userApiService.queryUserManagerData(dataScene, userId, pageNum, pageSize));
+    }
+
+    /**
+     * 查询符合条件的转移对象
+     * @param userId
+     * @param search
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping("/query-transfer-user")
+    public RestResponse queryUserTransferObject(Integer userId, String search, Integer pageNum, Integer pageSize) {
+        return ResultControllerUtils.commonResult(userApiService.queryUserTransferObject(userId, search, pageNum, pageSize));
+    }
+
+    /**
+     * 转移管理员数据
+     * @param oldUserId
+     * @param newUserId
+     * @return
+     */
+    @RequestMapping("/transfer-user-data")
+    public RestResponse transferUserData(Integer oldUserId, Integer newUserId) {
+        return ResultControllerUtils.commonResult(userApiService.transferUserData(oldUserId, newUserId));
+    }
+}