Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserInfosResultDTO.java

@@ -17,5 +17,6 @@ public class UserInfosResultDTO implements Serializable {
     private String userId;
     private String userShowName;
     private String headPhoto;
+    private String realName;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupEntity.java

@@ -83,4 +83,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 * VISIT_SWITCH 小组是否允许参观:允许：open;不允许：closed
 	 */
 	private String visitSwitch;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java

@@ -5,9 +5,11 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.resigroup.ResiGroupDao;
 import com.epmet.dataaggre.dao.resigroup.ResiTopicDao;
 import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
+import com.epmet.dataaggre.dto.resigroup.ResiGroupDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
+import com.epmet.dataaggre.entity.resigroup.ResiGroupEntity;
 import com.epmet.dataaggre.redis.ResiGroupRedis;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
@@ -63,12 +65,18 @@ public class ResiGroupServiceImpl implements ResiGroupService {
         List<String> userIds = result.stream().map(m -> m.getUserId()).collect(Collectors.toList());
         // 查询用户信息【名字 头像】
         List<UserInfosResultDTO> userInfos = epmetUserService.selectUserInfosByUserIds(userIds);
+        //查询小组信息
+        ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId());
         result.forEach(r -> {
             if (!CollectionUtils.isEmpty(userInfos)){
                 userInfos.forEach(u -> {
                     if (r.getUserId().equals(u.getUserId())){
                         r.setHeadPhoto(u.getHeadPhoto());
-                        r.setUserShowName(u.getUserShowName());
+                        if("branch".equals(group.getGroupType())){
+                            r.setUserShowName(u.getRealName());
+                        }else {
+                            r.setUserShowName(u.getUserShowName());
+                        }
                     }
                 });
             }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml

@@ -12,7 +12,8 @@
                        WHEN GENDER = '2' THEN '女士'
                        ELSE '先生/女士' END
                 ) AS userShowName,
-            HEAD_IMG_URL AS headPhoto
+            HEAD_IMG_URL AS headPhoto,
+            REAL_NAME AS realName
         FROM user_base_info
         WHERE DEL_FLAG = 0
           AND

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java

@@ -51,8 +51,10 @@ public class WxLoginServiceImpl implements WxLoginService {
 		String resultStr = HttpClientManager.getInstance().sendGet(WxLoginConstant.WXCODE_BY_OPENID, map).getData();
 		HashMap<String, String> hashMap = JSON.parseObject(resultStr, HashMap.class);
 		if (null != hashMap.get("errcode")) {
-			logger.error("wxcode换取openid接口调用失败");
-			throw new RenException(hashMap.get("errmsg"));
+			//45011:API 调用太频繁，请稍候再试;40029:	code 无效 【错误码：https://developers.weixin.qq.com/doc/oplatform/Return_codes/Return_code_descriptions_new.html】
+			throw new RenException(String.format("wxcode换取用户基本信息失败，wxcode->%s,错误码->%s,错误信息->%s", wxCode, hashMap.get("errcode"), hashMap.get("errmsg")));
+			/*logger.error("wxcode换取openid接口调用失败");
+			throw new RenException(hashMap.get("errmsg"));*/
 		}
 		String openid = hashMap.get("openid");
 		String sessionKey = hashMap.get("session_key");

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -363,10 +363,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if (null == groupMemberDTO) {
 			return new Result<>();
 		}
+		// 查询小组信息，为了拿小组的类型，是支部还是楼院
+		ResiGroupEntity resiGroup = resiGroupDao.selectById(groupId);
 		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
 		resiUserInfoFormDTO.setCustomerId(customerId);
 		resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId());
-		return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+		Result<UserResiInfoResultDTO> userResiInfo = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+		if (!userResiInfo.success()){
+			throw new RenException("根据组id查询组长信息失败了");
+		}
+		if (null != resiGroup  && ModuleConstant.GROUP_TYPE_BRANCH.equals(resiGroup.getGroupType())){
+			UserResiInfoResultDTO data = userResiInfo.getData();
+			userResiInfo.getData().setShowName(data.getStreet()+"-"+data.getSurname()+data.getName());
+		}
+		return userResiInfo;
 	}
 
 	/**

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -38,6 +38,7 @@ import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CommonDataFilterResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -60,6 +61,7 @@ import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity;
 import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService;
+import com.epmet.modules.topic.service.impl.ResiTopicServiceImpl;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.EnterGroupTypeConstant;
 import com.epmet.resi.group.constant.LeaderFlagConstant;
@@ -401,9 +403,25 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		for (GroupMemberListResultDTO groupMemberListResultDTO : list) {
 			userIdList.add(groupMemberListResultDTO.getUserId());
 		}
+		ResiGroupEntity resiGroup = resiGroupDao.selectById(groupMemberListFormDTO.getGroupId());
+		if (null == resiGroup){
+			throw new RenException("此小组信息不存在");
+		}
 		UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO();
 		formDTO.setUserIdList(userIdList);
-		Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
+		List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroup.getGroupType(), userIdList);
+		if (CollectionUtils.isEmpty(userInfos)){
+			throw new RenException("查询用户信息失败了");
+		}
+		list.forEach(l -> {
+			userInfos.forEach(u -> {
+				if (l.getUserId().equals(u.getUserId())){
+					l.setUserShowName(u.getReleaseUserName());
+					l.setHeadPhoto(u.getReleaseUserHeadPhoto());
+				}
+			});
+		});
+		/*Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
 		if(userResiInfoDTOListResult.success()){
 			for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
 				for (GroupMemberListResultDTO groupMember : list) {
@@ -420,7 +438,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 					ServiceConstant.EPMET_USER_SERVER,
 					userResiInfoDTOListResult.getCode(),
 					userResiInfoDTOListResult.getMsg()));
-		}
+		}*/
 		//徽章信息
 		ResiGroupEntity group = resiGroupDao.selectById(groupMemberListFormDTO.getGroupId());
 		if(null != group && StringUtils.isNotBlank(group.getCustomerId())){

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java

@@ -32,7 +32,7 @@ import com.epmet.modules.notice.entity.NoticeEntity;
 import com.epmet.modules.notice.entity.NoticeReadRecordEntity;
 import com.epmet.modules.notice.redis.NoticeReadRecordRedis;
 import com.epmet.modules.notice.service.NoticeReadRecordService;
-import com.epmet.modules.topic.service.impl.ResiTopicServiceImpl;
+import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.resi.group.dto.group.result.UserReadFlagResultDTO;
 import com.epmet.resi.group.dto.notice.NoticeReadRecordDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeReadListFormDTO;
@@ -71,7 +71,7 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
     @Autowired
     private ResiGroupDao resiGroupDao;
     @Autowired
-    private ResiTopicServiceImpl topicServiceImpl;
+    private ResiTopicService topicServiceImpl;
 
     /**
      * @param formDTO

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 
 import com.epmet.dto.result.FirstTopicShiftedToIssueApplicationResultDTO;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.modules.topic.entity.ResiTopicEntity;
 import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
@@ -372,4 +373,13 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2021/4/21 下午4:08
      */
     List<GetPastTopicListV2ResultDTO> getPastTopicListV2(GetPastTopicListV2FormDTO formDTO);
+
+    /**
+     * @Description  查询用户信息【头像，名字】
+     * @Param groupType
+     * @Param userIds
+     * @author zxc
+     * @date 2021/4/27 下午1:50
+     */
+    List<UserInfoResultDTO> disPoseUserInfo(String groupType, List<String> userIds);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -2533,6 +2533,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @author zxc
      * @date 2021/4/20 下午5:54
      */
+    @Override
     public List<UserInfoResultDTO> disPoseUserInfo(String groupType,List<String> userIds){
         if (CollectionUtils.isEmpty(userIds)){
             return new ArrayList<>();

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java

@@ -42,6 +42,7 @@ import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.CommonDataFilterResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -61,10 +62,7 @@ import com.epmet.modules.topic.dao.ResiTopicDao;
 import com.epmet.modules.topic.dao.ResiTopicOperationDao;
 import com.epmet.modules.topic.dao.TopicDraftDao;
 import com.epmet.modules.topic.entity.*;
-import com.epmet.modules.topic.service.TopicDraftAttachmentService;
-import com.epmet.modules.topic.service.TopicDraftOperationService;
-import com.epmet.modules.topic.service.TopicDraftScanTaskService;
-import com.epmet.modules.topic.service.TopicDraftService;
+import com.epmet.modules.topic.service.*;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.MemberStateConstant;
 import com.epmet.resi.group.constant.TopicConstant;
@@ -159,6 +157,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
     private String voiceResultsMethod;
     @Autowired
     private GroupMessageDao groupMessageDao;
+    @Autowired
+    private ResiTopicService resiTopicService;
 
     @Override
     public PageData<TopicDraftDTO> page(Map<String, Object> params) {
@@ -641,13 +641,27 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         } else {
             result = baseDao.selectTopicDraftByGroup(formDTO.getGroupId(), formDTO.getStatus());
         }
-        result.forEach(item -> {
-            ResiGroupMemberInfoRedisDTO memberRedis =
-                    resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName());
-            if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
-                item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
-            }
-        });
+        //查询小组信息
+        ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId());
+        if ("branch".equals(group.getGroupType())) {
+            List<String> userIds = result.stream().map(m -> m.getUserName()).distinct().collect(Collectors.toList());
+            List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(group.getGroupType(), userIds);
+            result.forEach(item -> {
+                userInfos.forEach(u->{
+                    if(item.getUserName().equals(u.getUserId())){
+                        item.setUserName(u.getReleaseUserName());
+                    }
+                });
+            });
+        } else {
+            result.forEach(item -> {
+                ResiGroupMemberInfoRedisDTO memberRedis =
+                        resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName());
+                if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
+                    item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
+                }
+            });
+        }
         return result;
     }