From ab6eea084ccaa91f8d1369b6a5a121c2a2d809c8 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 24 Nov 2020 16:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E6=8C=82=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/ExtUserInfoResultDTO.java   | 16 ++++++++++++++++
 .../epmet/dto/result/UserBaseInfoResultDTO.java  |  5 +++++
 .../service/impl/UserBaseInfoServiceImpl.java    | 12 +++++++++++-
 .../main/resources/mapper/UserBaseInfoDao.xml    |  3 ++-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java
index a7649e03a2..36500de794 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java
@@ -75,6 +75,22 @@ public class ExtUserInfoResultDTO implements Serializable {
      * */
     private String gridName = "";
 
+    /**
+     * 手机号(注册手机号)
+     */
+    private String mobile;
+
+    /**
+     * 用户微信openId
+     * */
+    private String wxOpenId;
+
+    /**
+     * 性别（1男2女0未知）
+     */
+    private String gender;
+
+
     /**
      * 用户角色列表
      * */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
index c674685ee5..919a357771 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
@@ -97,6 +97,11 @@ public class UserBaseInfoResultDTO implements Serializable {
      * */
     private String showName;
 
+    /**
+     * 用户微信openId
+     * */
+    private String wxOpenId;
+
     /**
      * 微信基本信息
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 326e74912d..bb2c90b569 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -74,6 +74,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     private GridLatestDao gridLatestDao;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private UserBaseInfoDao userBaseInfoDao;
 
     @Override
     public PageData<UserBaseInfoDTO> page(Map<String, Object> params) {
@@ -319,11 +321,19 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             gridLatestDao.selectLatestGridInfoByUserId(param.getUserId());
         ExtUserInfoResultDTO result = new ExtUserInfoResultDTO();
         result.setUserId(param.getUserId());
-        UserBaseInfoResultDTO userMsg = userBaseInfoRedis.getUserInfo(param.getUserId());
+        //2020.11.24 sun 对外接口添加一个手机号返参和openId，因openId不在缓存中因此不在走缓存，直接掉sql查询  start
+        //UserBaseInfoResultDTO userMsg = userBaseInfoRedis.getUserInfo(param.getUserId());
+        UserBaseInfoResultDTO userMsg = userBaseInfoDao.selectListByUserIdList(param.getUserId());
+        // end
         if(null != userMsg) {
             result.setProfile(userMsg.getHeadImgUrl());
             result.setNickname(userMsg.getNickname());
             result.setRealName(userMsg.getRealName());
+            // 2020.11.24 sun  start
+            result.setMobile(StringUtils.isNotBlank(userMsg.getMobile()) ? userMsg.getMobile() : "");
+            result.setWxOpenId(StringUtils.isNotBlank(userMsg.getWxOpenId()) ? userMsg.getWxOpenId() : "");
+            result.setGender(StringUtils.isNotBlank(userMsg.getGender()) ? userMsg.getGender() : "");
+            //end
         }else{
             logger.error("com.epmet.service.impl.UserBaseInfoServiceImpl.extUserInfo,查询不到用户信息，用户Id:{}",param.getUserId());
             return result;
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
index cc86f83ccd..4c69f90542 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
@@ -40,7 +40,8 @@
         ubi.DISTRICT,
         ubi.BUILDING_ADDRESS,
         wechat.NICKNAME,
-        wechat.HEAD_IMG_URL
+        wechat.HEAD_IMG_URL,
+        wechat.WX_OPEN_ID AS "wxOpenId"
     FROM
         user_wechat wechat
         LEFT JOIN user_base_info ubi ON wechat.USER_ID = ubi.USER_ID