Merge branch 'dev_youhua' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_youhua

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

@@ -365,7 +365,6 @@ public class EpdcAppUserController {
      */
     @PostMapping("needCachingUserInfo")
     public Result<CachingUserInfoDTO> needCachingUserInfo(@RequestBody EpdcAppQueryUserInfoFormDTO formDTO) {
-        //TODO:尹作梅
-        return null;
+        return userService.queryCachingUserInfo(formDTO);
     }
 }

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
@@ -156,4 +157,14 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @Date 2019/12/7 11:23
      **/
     List<EpdcWorkUserResultDTO> selectPartyAuthenticationFailedList(EpdcWorkUserFromDTO workUserFromDto);
+
+    /**
+     * @param openId
+     * @param unionId
+     * @return com.elink.esua.epdc.dto.CachingUserInfoDTO
+     * @Author yinzuomei
+     * @Description 获取用户缓存信息
+     * @Date 2019/12/18 14:12
+     **/
+	CachingUserInfoDTO selectCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId);
 }

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.UserTagInfo;
 import com.elink.esua.epdc.entity.UserTagEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -38,4 +39,6 @@ public interface UserTagDao extends BaseDao<UserTagEntity> {
 	 * @Date 2019/12/17 19:17
 	 **/
 	UserTagEntity selectByTagCode(String tagCode);
+
+	UserTagInfo selectByUserId(String userId);
 }

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

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 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;
@@ -258,4 +259,13 @@ public interface UserService extends BaseService<UserEntity> {
      * @Date 2019/12/7 13:58
      **/
     Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @Author yinzuomei
+     * @Description 获取用户缓存信息
+     * @Date 2019/12/18 14:01
+     **/
+    Result<CachingUserInfoDTO> queryCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
 }

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

@@ -36,6 +36,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.UserFieldConsant;
 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;
@@ -767,6 +768,30 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result();
     }
 
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
+     * @Author yinzuomei
+     * @Description 获取用户缓存信息
+     * @Date 2019/12/18 14:01
+     **/
+    @Override
+    public Result<CachingUserInfoDTO> queryCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getOpenId())) {
+            throw new RenException("openId不能为空");
+        }
+        CachingUserInfoDTO cachingUserInfoDTO = null;
+        if (StringUtils.isNotBlank(formDTO.getUnionId())) {
+            //根据unionId查询
+            cachingUserInfoDTO = this.baseDao.selectCachingUserInfoDTO(null, formDTO.getUnionId());
+        }
+        if (null == cachingUserInfoDTO) {
+            //根据openId查询
+            cachingUserInfoDTO = this.baseDao.selectCachingUserInfoDTO(formDTO.getOpenId(), null);
+        }
+        return new Result<CachingUserInfoDTO>().ok(cachingUserInfoDTO);
+    }
+
     /**
      * 根据微信信息查询用户
      *

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

@@ -352,4 +352,42 @@
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
+    <resultMap id="CachingUserInfoDTOMap" type="com.elink.esua.epdc.dto.CachingUserInfoDTO">
+        <result property="id" column="ID"/>
+        <result property="nickname" column="NICKNAME"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="faceImg" column="FACE_IMG"/>
+        <result property="sex" column="SEX"/>
+        <result property="realName" column="REAL_NAME"/>
+        <result property="gridId" column="gridId"/>
+        <collection property="userTagInfos" select="com.elink.esua.epdc.dao.UserTagDao.selectByUserId"
+                    column="id">
+        </collection>
+    </resultMap>
+    <!--  获取用户缓存信息  -->
+    <select id="selectCachingUserInfoDTO" parameterType="map" resultMap="CachingUserInfoDTOMap">
+        SELECT
+            eu.ID,
+            eu.NICKNAME,
+            eu.MOBILE,
+            eu.FACE_IMG,
+            eu.SEX,
+            eu.REAL_NAME,
+        (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
+        FROM
+            epdc_user eu
+        WHERE
+            eu.DEL_FLAG = '0'
+        <if test="openId!=null and openId!=''">
+            and eu.WX_OPEN_ID=#{openId}
+        </if>
+        <if test="unionId!=null and unionId!=''">
+            and eu.WX_UNION_ID=#{unionId}
+        </if>
+    </select>
 </mapper>

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

@@ -23,4 +23,19 @@
         where m.DEL_FLAG='0'
         and m.TAG_CODE=#{tagCode}
     </select>
+
+    <!--  根据用户id 查询用户标签信息 -->
+    <select id="selectByUserId" resultType="com.elink.esua.epdc.dto.UserTagInfo">
+    SELECT
+        u.id,
+        u.TAG_CODE  as tagCode
+    FROM
+        epdc_user_tag u
+    WHERE u.DEL_FLAG='0'
+       and u.ID IN ( SELECT r.TAG_ID
+                FROM epdc_user_tag_relation r
+                 WHERE r.DEL_FLAG = '0'
+                 AND r.USER_ID = #{userId}
+        )
+    </select>
 </mapper>