实现user/needCachingUserInfoByUserId/{userId}接口

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -5,16 +5,8 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.service.UserInvitationRecordService;
 import com.elink.esua.epdc.service.UserService;
@@ -411,7 +403,6 @@ public class EpdcAppUserController {
      */
     @GetMapping("needCachingUserInfoByUserId/{userId}")
     public Result<CachingUserInfoDTO> needCachingUserInfoByUserId(@PathVariable("userId") String userId) {
-        //TODO:尹作梅
-        return null;
+        return userService.cachingUserInfoByUserId(userId);
     }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -176,4 +176,13 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @Date 2019/12/18 14:12
      **/
     CachingUserInfoDTO selectCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId);
+
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.dto.CachingUserInfoDTO
+     * @Author yinzuomei
+     * @Description 根据用户id查询CachingUserInfoDTO
+     * @Date 2020/1/15 17:43
+     **/
+    CachingUserInfoDTO selectCachingUserInfoDTOByUserId(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -22,16 +22,8 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 
 import java.util.List;
@@ -289,5 +281,12 @@ public interface UserService extends BaseService<UserEntity> {
      **/
     Result handleUserPoints(EpdcUserPointsFormDTO formDTO);
 
-
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @Author yinzuomei
+     * @Description 获取用户缓存信息
+     * @Date 2020/1/15 17:40
+     **/
+    Result<CachingUserInfoDTO> cachingUserInfoByUserId(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -38,7 +37,6 @@ import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.MessageUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.AuthenticatedConsant;
 import com.elink.esua.epdc.constant.UserFieldConsant;
@@ -46,22 +44,14 @@ import com.elink.esua.epdc.dao.*;
 import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.entity.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.enums.AppUserStatesEnum;
-import com.elink.esua.epdc.exception.UserModuleErrorCode;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.PartyMembersService;
 import com.elink.esua.epdc.service.UserGridRelationService;
@@ -72,7 +62,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 用户信息表
@@ -1067,6 +1060,22 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result();
     }
 
+    /**
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @Author yinzuomei
+     * @Description 获取用户缓存信息
+     * @Date 2020/1/15 17:40
+     **/
+    @Override
+    public Result<CachingUserInfoDTO> cachingUserInfoByUserId(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            throw new RenException("userId不能为空");
+        }
+        CachingUserInfoDTO cachingUserInfoDTO = baseDao.selectCachingUserInfoDTOByUserId(userId);
+        return new Result<CachingUserInfoDTO>().ok(cachingUserInfoDTO);
+    }
+
     /**
      * 根据微信信息查询用户
      *

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -422,9 +422,9 @@
             limit 1
         )as grid
         FROM
-            epdc_user eu
+        epdc_user eu
         WHERE
-            eu.DEL_FLAG = '0'
+        eu.DEL_FLAG = '0'
         <if test="openId!=null and openId!=''">
             and eu.WX_OPEN_ID=#{openId}
         </if>
@@ -432,4 +432,35 @@
             and eu.WX_UNION_ID=#{unionId}
         </if>
     </select>
+
+    <!-- 根据用户id查询CachingUserInfoDTO   -->
+    <select id="selectCachingUserInfoDTOByUserId" parameterType="java.lang.String" resultMap="CachingUserInfoDTOMap">
+        SELECT
+            eu.ID,
+            eu.NICKNAME,
+            eu.MOBILE,
+            eu.FACE_IMG,
+            eu.SEX,
+            eu.REAL_NAME,
+            eu.STATE,
+            eu.REMARK,
+        (select r.GRID_ID
+            from epdc_user_grid_relation r
+            where r.USER_ID=eu.ID
+            order by r.CREATED_TIME desc
+            limit 1
+        )as gridId,
+        (
+            select r.GRID
+            from epdc_user_grid_relation r
+            where r.USER_ID=eu.ID
+            order by r.CREATED_TIME desc
+            limit 1
+        )as grid
+        FROM
+            epdc_user eu
+        WHERE
+            eu.DEL_FLAG = '0'
+            and eu.id=#{userId}
+    </select>
 </mapper>