Merge remote-tracking branch 'origin/dev_heart' into dev_heart

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -91,7 +91,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             this.grantActPoints(formDTO);
         }
         // 更新用户基础信息表 并 更新用户微信表
-        WxUserInfoFormDTO wxUserInfoFormDTO = ConvertUtils.sourceToTarget(formDTO, WxUserInfoFormDTO.class);
+        WxUserInfoFormDTO wxUserInfoFormDTO = this.packageWxUserInfo(formDTO);
         return epmetUserOpenFeignClient.updateUserBaseAndWxUserInfo(wxUserInfoFormDTO);
     }
 
@@ -118,4 +118,21 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             logger.error("志愿者认证事件发送失败");
         }
     }
+
+    /**
+     * 根据志愿者认证参数，组装微信基本信息
+     *
+     * @param formDTO
+     * @return com.epmet.dto.form.WxUserInfoFormDTO
+     * @Author zhangyong
+     * @Date 13:54 2020-07-28
+     **/
+    private WxUserInfoFormDTO packageWxUserInfo(ResiVolunteerAuthenticateFormDTO formDTO){
+        WxUserInfoFormDTO wxUserInfoFormDTO = new WxUserInfoFormDTO();
+        wxUserInfoFormDTO.setUserId(formDTO.getUserId());
+        wxUserInfoFormDTO.setNickName(formDTO.getNickname());
+        wxUserInfoFormDTO.setAvatarUrl(formDTO.getAvatarUrl());
+        wxUserInfoFormDTO.setGender(formDTO.getGender());
+        return wxUserInfoFormDTO;
+    }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserBaseInfoResultDTO.java

@@ -0,0 +1,66 @@
+package com.epmet.dto.result;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户基础信息 返回值
+ * @Auther: zhangyong
+ * @Date: 2020-07-28 14:40
+ */
+
+@Data
+public class ResiUserBaseInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 手机号(注册手机号)
+     */
+    private String mobile;
+
+    /**
+     * 姓氏
+     */
+    private String surname;
+
+    /**
+     * 名
+     */
+    private String name;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证号
+     */
+    private String idNum;
+
+    /**
+     * 性别（1男2女0未知）
+     */
+    private String gender;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 小区名称
+     */
+    private String district;
+
+    /**
+     * 楼栋单元
+     */
+    private String buildingAddress;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @Data
 public class UserBaseInfoResultDTO implements Serializable {
     private static final long serialVersionUID = 3124057264557384333L;
-    @JsonIgnore
+
     private String id;
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -24,8 +24,8 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:09
  */
-//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087")
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
 public interface EpmetUserOpenFeignClient {
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java

@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -28,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.excel.UserBaseInfoExcel;
@@ -50,7 +53,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("userbaseinfo")
 public class UserBaseInfoController {
-    
+
     @Autowired
     private UserBaseInfoService userBaseInfoService;
 
@@ -146,4 +149,17 @@ public class UserBaseInfoController {
     public Result<CustomerUserDetailResultDTO> customerUserDetail(@RequestBody IssueInitiatorFormDTO param){
        return new Result<CustomerUserDetailResultDTO>().ok(userBaseInfoService.customerUserDetail(param.getUserId()));
     }
+
+    /**
+     * 获取用户基础信息
+     *
+     * @param tokenDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiUserBaseInfoResultDTO>
+     * @Author zhangyong
+     * @Date 15:20 2020-07-28
+     **/
+    @PostMapping("selecuserbaseinfo")
+    public Result<ResiUserBaseInfoResultDTO> selecUserBaseInfo(@LoginUser TokenDto tokenDTO){
+        return userBaseInfoService.selecUserBaseInfoByUserId(tokenDTO.getUserId());
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java

@@ -139,7 +139,7 @@ public class UserController {
 	 * @Date 14:51 2020-07-23
 	 **/
 	@PostMapping("updateUserBaseAndWxUserInfo")
-	public Result updateUserBaseAndWxUserInfo(@RequestBody WxUserInfoFormDTO wxUserInfoFormDTO) { ;
+	public Result updateUserBaseAndWxUserInfo(@RequestBody WxUserInfoFormDTO wxUserInfoFormDTO) {
 		ValidatorUtils.validateEntity(wxUserInfoFormDTO);
 		return userService.updateWxUserInfo(wxUserInfoFormDTO);
 	}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java

@@ -18,10 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserWechatResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户基础信息
@@ -49,4 +52,14 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
      * @Date 2020/7/22 9:46
      **/
     UserWechatResultDTO selectUserWechatByUserId(String userId);
-}
+
+    /**
+     * 获取用户基础信息
+     *
+     * @param userId
+     * @return com.epmet.dto.result.ResiUserBaseInfoResultDTO
+     * @Author zhangyong
+     * @Date 15:20 2020-07-28
+     **/
+    ResiUserBaseInfoResultDTO selecUserBaseInfoByUserId(@Param("userId") String userId);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java

@@ -19,8 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 
@@ -130,4 +132,14 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
      * @date 2020.07.27 01:34
     **/
     CustomerUserDetailResultDTO customerUserDetail(String userId);
-}
+
+    /**
+     * 获取用户基础信息
+     *
+     * @param userId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiUserBaseInfoResultDTO>
+     * @Author zhangyong
+     * @Date 15:20 2020-07-28
+     **/
+    Result<ResiUserBaseInfoResultDTO> selecUserBaseInfoByUserId(String userId);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -32,6 +32,7 @@ import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.redis.UserBaseInfoRedis;
@@ -218,8 +219,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             return ;
         }
         UserBaseInfoResultDTO userBaseInfoResultDTO = baseDao.selectListByUserIdList(baseInfo.getUserId());
-        baseInfo.setRealName(new StringBuilder(baseInfo.getSurname()).append(baseInfo.getName()).toString());
-        if(null == userBaseInfoResultDTO || StringUtils.isBlank(userBaseInfoResultDTO.getId())){
+        if(StringUtils.isNotBlank(baseInfo.getSurname())) {
+            baseInfo.setRealName(new StringBuilder(baseInfo.getSurname()).append(baseInfo.getName()).toString());
+        }
+        if(null != userBaseInfoResultDTO && StringUtils.isNotBlank(userBaseInfoResultDTO.getId())){
             //更新
             baseInfo.setId(userBaseInfoResultDTO.getId());
             updateById(baseInfo);
@@ -252,5 +255,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         return null;
     }
 
-
-}
+    @Override
+    public Result<ResiUserBaseInfoResultDTO> selecUserBaseInfoByUserId(String userId) {
+        return new Result<ResiUserBaseInfoResultDTO>().ok(baseDao.selecUserBaseInfoByUserId(userId));
+    }
+}

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -68,4 +68,22 @@
             uw.DEL_FLAG = '0'
             AND uw.USER_ID = #{userId}
     </select>
-</mapper>
+
+    <!-- 根据用户id，查询用户基础信息-->
+    <select id="selecUserBaseInfoByUserId" resultType="com.epmet.dto.result.ResiUserBaseInfoResultDTO">
+       SELECT
+            USER_ID userId,
+            SURNAME surname,
+            `NAME` `name`,
+            REAL_NAME realName,
+            ID_NUM idNum,
+            GENDER gender,
+            MOBILE mobile,
+            STREET street,
+            DISTRICT district,
+            BUILDING_ADDRESS buildingAddress
+        FROM user_base_info
+        WHERE DEL_FLAG = '0'
+        AND USER_ID = #{userId}
+    </select>
+</mapper>