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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/TopicInfoResultDTO.java

@@ -47,6 +47,8 @@ public class TopicInfoResultDTO implements Serializable {
      */
     private String topicPublishMobile;
 
+    private String groupId;
+
     @JsonIgnore
     private String topicUserId;
 

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java

@@ -40,4 +40,9 @@ public class TopicInfoDTO implements Serializable {
      */
     private Long publishedTime = 0L;
 
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    private String groupType;
+
 }

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

@@ -5,14 +5,12 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueAppQueryFormDTO;
 import com.epmet.dto.form.IssueApplicationIdFormDTO;
-import com.epmet.dto.result.AllGridsByUserIdResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.ApplicationHistoryResDTO;
-import com.epmet.dto.result.IssueApplicationResDTO;
-import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
+import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.service.GroupIssueService;
 import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
@@ -20,6 +18,10 @@ import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
 import com.epmet.resi.group.dto.group.result.*;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
+import com.epmet.resi.group.dto.group.result.TopicInfoResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -74,7 +76,26 @@ public class GroupIssueServiceImpl implements GroupIssueService {
         userIds.add(data.getUserId());
         TopicInfoResultDTO topicInfoResultDTO = resiGroupDao.selectTopicInfo(data.getTopicId());
         userIds.add(topicInfoResultDTO.getTopicUserId());
-        Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        // 查询小组类别
+        ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(topicInfoResultDTO.getGroupId());
+        if (null == resiGroupEntity){
+            throw new RenException("此小组信息不存在");
+        }
+        List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroupEntity.getGroupType(), userIds);
+        if(CollectionUtils.isEmpty(userInfos)){
+            throw new RenException("未查询到用户信息");
+        }
+        userInfos.forEach(u -> {
+            if (u.getUserId().equals(data.getUserId())){
+                data.setIssuePublisher(u.getReleaseUserName());
+                data.setIssuePublisherMobile(u.getMobile());
+            }
+            if (u.getUserId().equals(topicInfoResultDTO.getTopicUserId())){
+                topicInfoResultDTO.setPublishedUser(u.getReleaseUserName());
+                topicInfoResultDTO.setTopicPublishMobile(u.getMobile());
+            }
+        });
+        /*Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
         if (!listResult.success()){
             throw new RenException("查询话题创建者，议题创建者失败......");
         }
@@ -87,7 +108,7 @@ public class GroupIssueServiceImpl implements GroupIssueService {
                 topicInfoResultDTO.setPublishedUser(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender())));
                 topicInfoResultDTO.setTopicPublishMobile(user.getMobile());
             }
-        });
+        });*/
         List<String> gridIds = new ArrayList<>();
         gridIds.add(data.getGridId());
         Result<List<AllGridsByUserIdResultDTO>> gridListByGridIds = govOrgOpenFeignClient.getGridListByGridIds(gridIds);

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

@@ -1450,18 +1450,35 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             topicInfo.setTopicImgs(attachmentUrls);
         }
         //话题发起人
-        IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO();
+        if("branch".equals(topicInfo.getGroupType())){//支部小组话题发起人显示真实姓名
-        issueInitiator.setUserId(topicInfo.getPublishedUser());
+            List<String> userIdList = new ArrayList<>();
-        Result<IssueInitiatorResultDTO> r = epmetUserFeignClient.selectIssueInitiator(issueInitiator);
+            userIdList.add(topicInfo.getPublishedUser());
-        if (!r.success()){
+            Result<List<UserBaseInfoResultDTO>> result = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
-            throw new RenException("查询话题发起人失败......");
+            if (!result.success()) {
-        }
+                throw new RenException("调用user服务，获取用户基础数据失败");
-        if (null != r.getData()){
+            }
-            IssueInitiatorResultDTO issueInitiatorResult = r.getData();
+            List<UserBaseInfoResultDTO> resultDTOList = result.getData();
-            if (!StringUtils.isBlank(issueInitiatorResult.getIssueInitiator())) {
+            resultDTOList.forEach(re->{
-                topicInfo.setPublishedUser(issueInitiatorResult.getIssueInitiator());
+                if(topicInfo.getPublishedUser().equals(re.getUserId())){
+                    //话题发起人
+                    topicInfo.setPublishedUser(re.getRealName() == null ? "" : re.getRealName());
+                }
+            });
+        } else {
+            IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO();
+            issueInitiator.setUserId(topicInfo.getPublishedUser());
+            Result<IssueInitiatorResultDTO> r = epmetUserFeignClient.selectIssueInitiator(issueInitiator);
+            if (!r.success()){
+                throw new RenException("查询话题发起人失败......");
+            }
+            if (null != r.getData()){
+                IssueInitiatorResultDTO issueInitiatorResult = r.getData();
+                if (!StringUtils.isBlank(issueInitiatorResult.getIssueInitiator())) {
+                    topicInfo.setPublishedUser(issueInitiatorResult.getIssueInitiator());
+                }
             }
         }
+
         return topicInfo;
     }
 
@@ -2581,6 +2598,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             UserInfoResultDTO ui = new UserInfoResultDTO();
             ui.setUserId(u.getUserId());
             ui.setReleaseUserHeadPhoto(u.getHeadImgUrl());
+            ui.setMobile(u.getMobile());
             if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){
                 ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName());
             }else {

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

@@ -708,13 +708,29 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         result.setVoiceList(voiceUrls);
 
         //3.拿取用户信息
-        ResiGroupMemberInfoRedisDTO memberRedis =
+        /*ResiGroupMemberInfoRedisDTO memberRedis =
                 resiGroupMemberRedis.get(entity.getGroupId(),entity.getCreatedBy());
         if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
             result.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
             result.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto());
+        }*/
+        // 查询小组类型，并且根据类型赋值用户姓名
+        ResiGroupEntity resiGroup = resiGroupDao.selectById(entity.getGroupId());
+        if (null == resiGroup){
+            throw new RenException("此小组信息不存在");
         }
-
+        List<String> userIds = new ArrayList<>();
+        userIds.add(entity.getCreatedBy());
+        List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroup.getGroupType(), userIds);
+        if (CollectionUtils.isEmpty(userInfos)){
+            throw new RenException("未查询到用户信息");
+        }
+        userInfos.forEach(u -> {
+            if (u.getUserId().equals(entity.getCreatedBy())){
+                result.setReleaseUserName(u.getReleaseUserName());
+                result.setReleaseUserHeadPhoto(u.getReleaseUserHeadPhoto());
+            }
+        });
         return result;
     }
 

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -456,6 +456,7 @@
         <result property="topicContent" column="topicContent"/>
         <result property="topicId" column="topicId"/>
         <result property="topicUserId" column="topicUserId"/>
+        <result property="groupId" column="groupId"/>
         <collection property="topicImgs" ofType="java.lang.String">
             <result column="imgUrl"/>
             <result column="id"/>
@@ -467,7 +468,8 @@
             rt.CREATED_BY AS topicUserId,
             UNIX_TIMESTAMP(rt.CREATED_TIME) AS publishedTime,
             rt.TOPIC_CONTENT as topicContent,
-            ta.ATTACHMENT_URL AS imgUrl
+            ta.ATTACHMENT_URL AS imgUrl,
+            rt.GROUP_ID
         FROM resi_topic rt
         LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = rt.ID
         WHERE rt.DEL_FLAG = '0'

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -378,15 +378,18 @@
     <!-- 根据topicId查询话题信息 （议题详情——话题信息） -->
     <select id="selectDetail" parameterType="com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO" resultType="com.epmet.resi.group.dto.topic.TopicInfoDTO">
         SELECT
-            id AS topicId,
+            rt.id AS topicId,
-            topic_content AS topicContent,
+            rt.topic_content AS topicContent,
-            created_by AS publishedUser,
+            rt.created_by AS publishedUser,
-            UNIX_TIMESTAMP( created_time ) AS publishedTime
+            UNIX_TIMESTAMP(rt.created_time) AS publishedTime,
+            rg.group_type AS groupType
         FROM
-            resi_topic
+            resi_topic rt
+        LEFT JOIN resi_group rg ON rt.group_id = rg.id
         WHERE
-            id = #{topicId}
+            rt.del_flag = '0'
-            AND del_flag = 0
+        AND rg.del_flag = '0'
+        AND rt.id = #{topicId}
     </select>
 
     <!-- 通过topicId查询话题所在组的网格Id和客户Id -->

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java

@@ -40,4 +40,10 @@ public class TopicInfoDTO implements Serializable {
      */
     private Long publishedTime;
 
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    private String groupType;
+
+
 }

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java

@@ -16,5 +16,9 @@ public class IssueInitiatorResultDTO implements Serializable {
      * 议题发起人（山东路168-尹女士）
      */
     private String issueInitiator;
+    /**
+     * 议题发起人真实姓名
+     */
+    private String realUserName;
 
 }

epmet-module/resi-hall/resi-hall-server/pom.xml

@@ -51,6 +51,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -45,6 +45,8 @@ public class IssueServiceImpl implements IssueService {
     private GovIssueOpenFeignClient govIssueOpenFeignClient;
     @Autowired
     private LoginUserUtil loginUserUtil;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     /**
      * @param issueDetail
@@ -62,13 +64,7 @@ public class IssueServiceImpl implements IssueService {
             return issueDetailResult;
         }
         BeanUtils.copyProperties(issueResult, issueDetailResult);
-        //话题发起人
+
-        IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO();
-        initiatorFormDTO.setUserId(issueResult.getUserId());
-        if (!StringUtils.isBlank(issueResult.getUserId())) {
-            IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData();
-            issueDetailResult.setIssueInitiator(initiatorResult == null ? HallConstat.NULL_CHARACTER_STRING : initiatorResult.getIssueInitiator());
-        }
         //网格名称
         BelongGridNameFormDTO belongGridName = new BelongGridNameFormDTO();
         belongGridName.setGridId(issueResult.getGridId());
@@ -79,10 +75,35 @@ public class IssueServiceImpl implements IssueService {
         //话题信息
         TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO();
         topicInfoFormDTO.setTopicId(issueResult.getTopicId());
+        TopicInfoDTO topicInfoDTOResult = new TopicInfoDTO();
         if (!StringUtils.isBlank(issueResult.getTopicId())) {
-            TopicInfoDTO topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData();
+            topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData();
             issueDetailResult.setTopicInfo(topicInfoDTOResult == null ? new TopicInfoDTO() : topicInfoDTOResult);
         }
+        if("branch".equals(topicInfoDTOResult.getGroupType())){//支部小组话题发起人显示真实姓名
+            List<String> userIdList = new ArrayList<>();
+            userIdList.add(issueResult.getUserId());
+            Result<List<UserBaseInfoResultDTO>> result = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
+            if (!result.success()) {
+                throw new RenException("调用user服务，获取用户基础数据失败");
+            }
+            List<UserBaseInfoResultDTO> resultDTOList = result.getData();
+            resultDTOList.forEach(re->{
+                if(issueResult.getUserId().equals(re.getUserId())){
+                    //话题发起人
+                    issueDetailResult.setIssueInitiator(re.getRealName() == null ? "" : re.getRealName());
+                }
+            });
+        } else {
+            //话题发起人
+            IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO();
+            initiatorFormDTO.setUserId(issueResult.getUserId());
+            if (!StringUtils.isBlank(issueResult.getUserId())) {
+                IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData();
+                issueDetailResult.setIssueInitiator(initiatorResult == null ? HallConstat.NULL_CHARACTER_STRING : initiatorResult.getIssueInitiator());
+            }
+        }
+
         //判断是否投票
         CheckVoteFormDTO formDTO = new CheckVoteFormDTO();
         formDTO.setIssueId(issueDetail.getIssueId());

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

@@ -16,5 +16,9 @@ public class IssueInitiatorResultDTO implements Serializable {
      * 议题发起人（山东路168-尹女士）
      */
     private String issueInitiator;
+    /**
+     * 议题发起人真实姓名
+     */
+    private String realUserName;
 
 }

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

@@ -25,4 +25,9 @@ public class UserInfoResultDTO implements Serializable {
      * 话题发布者的头像Url
      */
     private String releaseUserHeadPhoto;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
 }

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

@@ -142,13 +142,20 @@
                 '-',
                 uri.surname,
                 CASE
-                    WHEN uw.sex = '1' THEN
+            WHEN uw.sex = '1' THEN
-                    '先生'
+                '先生'
-                    WHEN uw.sex = '2' THEN
+            WHEN uw.sex = '2' THEN
-                    '女士'
+                '女士'
-                    ELSE '先生/女士'
+            ELSE
-                END
+                '先生/女士'
-                ) AS issueInitiator
+            END
+            ) AS issueInitiator,
+            CONCAT(
+                uri.street,
+                '-',
+                uri.surname,
+                uriNAME
+            ) AS realUserName
         FROM
             user_resi_info uri
             LEFT JOIN user_wechat uw ON uw.user_id = uri.user_id