getstatus接口

5 years ago · 18767a5802
10 changed files with 155 additions and 37 deletions
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ShareLinkTypeFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ShareLinkTypeFormDTO.java
@ -0,0 +1,25 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 分享链接类型和Id入参
+ * @ClassName ShareLinkTypefFormDTO
+ * @Auth wangc
+ * @Date 2020-12-29 14:53
+ */
+@Data
+public class ShareLinkTypeFormDTO implements Serializable {
+
+	@NotBlank(message = "链接Id不能为空")
+	private String id;
+
+	@NotBlank(message = "链接类型不能为空")
+	private String type;
+
+	@NotBlank(message = "用户Id不能为空")
+	private String userId;
+}
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MemberRelationBetweenGroupAndGridResultDTO.java
@ -0,0 +1,31 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 通过链接进入小程序的用户与链接所在的小组与网格的关系
+ * @ClassName MemberRelationBetweenGroupAndGridResultDTO
+ * @Auth wangc
+ * @Date 2020-12-29 14:58
+ */
+@Data
+public class MemberRelationBetweenGroupAndGridResultDTO implements Serializable {
+	private static final long serialVersionUID = -5389490307870064071L;
+
+	/**
+	 * 是否存在入组待审核记录，true：存在，false：不存在
+	 */
+	private Boolean awaitAudit;
+
+	/**
+	 * 是否在群内标志，已经在群内:true, 不在群内:false
+	 */
+	private Boolean inGroup;
+
+	/**
+	 * 此人有没有加入所在小组所属网格下的任何一个小组，true：加入，false：未加入
+	 */
+	private Boolean inAnyGroup;
+}
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java
@ -10,11 +10,14 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.topic.service.TopicShareLinkRecordService;
+import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService;
 import com.epmet.resi.group.dto.topic.TopicShareLinkRecordDTO;
 import com.epmet.resi.group.dto.topic.form.CreateUrlFormDTO;
+import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicBelongGroupFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicVisitFormDTO;
 import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO;
+import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicVisitResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@ -108,4 +111,18 @@ public class TopicShareLinkRecordController {
        return new Result<TopicVisitResultDTO>().ok(topicShareLinkRecordService.topicVisit(formDTO,tokenDto));
    }

+    /**
+     * @Description 根据链接信息查询被邀请人在组/网格内的状态
+     * @param param
+     * @return com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO
+     * @author wangc
+     * @date 2020.12.29 15:01
+     */
+    @PostMapping("getstatus")
+    public Result<MemberRelationBetweenGroupAndGridResultDTO> getStatus(@LoginUser TokenDto token, @RequestBody ShareLinkTypeFormDTO param){
+        param.setUserId(token.getUserId());
+        ValidatorUtils.validateEntity(param);
+        return new Result<MemberRelationBetweenGroupAndGridResultDTO>().ok(topicShareLinkRecordService.getStatusByLinkAndInvitee(param));
+    }
+
 }
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkRecordService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkRecordService.java
@ -6,9 +6,11 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.modules.topic.entity.TopicShareLinkRecordEntity;
 import com.epmet.resi.group.dto.topic.TopicShareLinkRecordDTO;
 import com.epmet.resi.group.dto.topic.form.CreateUrlFormDTO;
+import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicBelongGroupFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicVisitFormDTO;
 import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO;
+import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicVisitResultDTO;

@ -107,4 +109,13 @@ public interface TopicShareLinkRecordService extends BaseService<TopicShareLinkR
     * @date 2020/12/18 下午3:34
     */
    TopicVisitResultDTO topicVisit(TopicVisitFormDTO formDTO,TokenDto tokenDto);
+
+    /**
+     * @Description 根据链接信息查询被邀请人在组/网格内的状态
+     * @param param
+     * @return com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO
+     * @author wangc
+     * @date 2020.12.29 15:01
+     */
+    MemberRelationBetweenGroupAndGridResultDTO getStatusByLinkAndInvitee(ShareLinkTypeFormDTO param);
 }
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkVisitRecordService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/TopicShareLinkVisitRecordService.java
@ -5,6 +5,8 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity;
 import com.epmet.resi.group.dto.topic.TopicShareLinkVisitRecordDTO;
 import com.epmet.resi.group.dto.topic.form.SharableTopicAndInviteeFormDTO;
+import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO;
+import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO;

 import java.util.List;
 import java.util.Map;
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@ -64,6 +64,7 @@ import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.ResiPublishCommentFormDTO;
 import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
+import com.google.common.base.CharMatcher;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@ -254,14 +255,16 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                pointEventMsg.setEventTag(mqBaseMsgDTO.getEventTag());
                //某某小组中评论话题“某某某…”
                StringBuilder builder = new StringBuilder(groupRedis.get(topic.getGroupId()).getGroupName()).append("小组中评论");
-                if(StringUtils.isNotBlank(topic.getTopicContent())){
+                String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent());
+                if(StringUtils.isNotBlank(content)){
                    builder.append("\"");
                    builder.append(
-                            topic.getTopicContent().length() > NumConstant.TEN ?
-                                    (topic.getTopicContent().substring(NumConstant.TEN) + "…") :
-                                    topic.getTopicContent());
+                            content.length() > NumConstant.TEN ?
+                                    (content.substring(NumConstant.ZERO,NumConstant.TEN) + "…") :
+                                    content);
                    builder.append("\"");
-                }
+                }else builder.append("语音话题");
+
                pointEventMsg.setRemark(builder.toString());
                pointEventMsgList.add(pointEventMsg);

--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@ -91,10 +91,12 @@ import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.common.base.CharMatcher;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jsoup.helper.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@ -1598,14 +1600,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                pointEventMsg.setIsCommon(false);

                //某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题
-
+                String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent());
 				pointEventMsg.setRemark(new StringBuilder(groupCache.getGroupName()).append("小组中发布的")
 						.append(
-						StringUtils.isBlank(topic.getTopicContent()) ? "语音话题" :
+						StringUtils.isBlank(content) ? "语音话题" :
 								"\"" +
-								topic.getTopicContent()
-										.substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN)
-										+ (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"")
+                                        content
+										.substring(NumConstant.ZERO,content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN)
+										+ (NumConstant.TEN > content.length() ? "\"" : "…\"")
 				).append("被转为议题").toString());
                pointEventMsgList.add(pointEventMsg);

@ -1619,11 +1621,10 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 				//将话题“某某某…” （前十个字后面省略号） 转为议题
 				pointEventMsg2.setRemark(new StringBuilder("将话题")
 						.append(
-								"\"" +
-										topic.getTopicContent()
-												.substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN)
-										+ (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"")
-						).append("转为议题").toString());
+                                new StringBuilder(new StringBuilder(pointEventMsg.getRemark().replaceFirst("小组中发布的",""))
+                                        .reverse().toString()
+                                        .replaceFirst("题议为转被","")).reverse()
+                        ).append("转为议题").toString());
                pointEventMsgList.add(pointEventMsg2);

                mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
@ -1733,14 +1734,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
            pointEventMsg.setIsCommon(false);
            pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_ISSUE.getEventTag());
            //某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题
-
+            String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent());
            pointEventMsg.setRemark(new StringBuilder(groupCache.getGroupName()).append("小组中发布的")
                    .append(
-                            StringUtils.isBlank(topic.getTopicContent()) ? "语音话题" :
+                            StringUtils.isBlank(content) ? "语音话题" :
                                    "\"" +
-                                            topic.getTopicContent()
-                                                    .substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN)
-                                            + (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"")
+                                            content
+                                                    .substring(NumConstant.ZERO,content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN)
+                                            + (NumConstant.TEN > content.length() ? "\"" : "…\"")
                    ).append("被转为议题").toString());
            pointEventMsgList.add(pointEventMsg);

@ -1754,10 +1755,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
            //将话题“某某某…” （前十个字后面省略号） 转为议题
            pointEventMsg2.setRemark(new StringBuilder("将话题")
                    .append(
-                            "\"" +
-                                    topic.getTopicContent()
-                                            .substring(topic.getTopicContent().length() < NumConstant.TEN ? topic.getTopicContent().length() : NumConstant.TEN)
-                                    + (NumConstant.TEN > topic.getTopicContent().length() ? "\"" : "…\"")
+                         new StringBuilder(new StringBuilder(pointEventMsg.getRemark().replaceFirst("小组中发布的","")).reverse()
+                                 .toString().replaceFirst("题议为转被","")).reverse()
                    ).append("转为议题").toString());
            pointEventMsgList.add(pointEventMsg2);

@ -1768,7 +1767,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
    }
        return issueInfo;
    }
-
    /**
     * @Description 政府端查看议题详情时的话题相关信息
     * @param govTopicIssueInfoFormDTO
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@ -72,6 +72,7 @@ import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.DraftDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.MyAuditingListResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicAuditResultDTO;
+import com.google.common.base.CharMatcher;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@ -657,13 +658,12 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD

            //发送积分
            StringBuilder breviary = new StringBuilder();
-            if(!StringUtils.isBlank(draft.getTopicContent())){
+            String content = CharMatcher.WHITESPACE.trimFrom(draft.getTopicContent());
+            if(!StringUtils.isBlank(content)){
                breviary.append("\"");
-                breviary.append(draft.getTopicContent().length() > NumConstant.TEN ?  (draft.getTopicContent().substring(NumConstant.TEN) + "…") : draft.getTopicContent());
+                breviary.append(content.length() > NumConstant.TEN ?  (content.substring(NumConstant.TEN) + "…") : content);
                breviary.append("\"");
-            }else {
-                breviary.append("语音话题");
-            }
+            }else breviary.append("话题");
            sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString());
        }
        //记录操作记录
@ -778,17 +778,16 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD

        TopicDraftEntity draft = baseDao.selectById(draftId);
        StringBuilder breviary = new StringBuilder();
-        if(!StringUtils.isBlank(draft.getTopicContent())){
+        String content = CharMatcher.WHITESPACE.trimFrom(draft.getTopicContent());
+        if(!StringUtils.isBlank(content)){
            breviary.append("\"");
-            breviary.append(draft.getTopicContent().length() > NumConstant.TEN ?  (draft.getTopicContent().substring(NumConstant.TEN) + "…") : draft.getTopicContent());
+            breviary.append(content.length() > NumConstant.TEN ?  (content.substring(NumConstant.ZERO,NumConstant.TEN) + "…") : content);
            breviary.append("\"");
-        }else {
-            breviary.append("语音话题");
-        }
+        }else breviary.append("语音话题");
        sendMqMsg(tokenDto.getUserId(), formDTO.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString());

    }
-    
+
    /**
     * @Description 发送积分事件
     * @param userId
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java
@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.modules.member.dao.GroupMemeberOperationDao;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.topic.dao.TopicShareLinkRecordDao;
@ -19,9 +20,11 @@ import com.epmet.modules.topic.service.TopicShareLinkRecordService;
 import com.epmet.resi.group.constant.TopicShareConstant;
 import com.epmet.resi.group.dto.topic.TopicShareLinkRecordDTO;
 import com.epmet.resi.group.dto.topic.form.CreateUrlFormDTO;
+import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicBelongGroupFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicVisitFormDTO;
 import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO;
+import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicVisitResultDTO;
 import org.apache.commons.lang3.StringUtils;
@ -48,6 +51,8 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
    private ResiGroupMemberDao resiGroupMemberDao;
    @Autowired
    private GroupMemeberOperationDao groupMemeberOperationDao;
+    @Autowired
+    private GovIssueOpenFeignClient issueClient;

    @Override
    public PageData<TopicShareLinkRecordDTO> page(Map<String, Object> params) {
@ -191,4 +196,26 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
        return result;
    }

+    /**
+     * @Description 根据链接信息查询被邀请人在组/网格内的状态
+     * @param param
+     * @return com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO
+     * @author wangc
+     * @date 2020.12.29 15:01
+     */
+    @Override
+    public MemberRelationBetweenGroupAndGridResultDTO getStatusByLinkAndInvitee(ShareLinkTypeFormDTO param) {
+        MemberRelationBetweenGroupAndGridResultDTO relation = new MemberRelationBetweenGroupAndGridResultDTO();
+        String group = null;
+        if(StringUtils.equals("topic",param.getType())){
+            TopicShareLinkRecordEntity shareLinkInfo = baseDao.selectById(param.getId());
+            if(null != shareLinkInfo && StringUtils.isNotBlank(shareLinkInfo.getGroupId())) group = shareLinkInfo.getGroupId();
+        }
+        if(StringUtils.isBlank(group)){
+
+        }
+
+        return null;
+    }
+
 }
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkVisitRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkVisitRecordServiceImpl.java
@ -6,12 +6,18 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.feign.GovIssueOpenFeignClient;
+import com.epmet.modules.member.dao.GroupMemeberOperationDao;
+import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.topic.dao.TopicShareLinkVisitRecordDao;
 import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity;
 import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService;
 import com.epmet.resi.group.dto.topic.TopicShareLinkVisitRecordDTO;
 import com.epmet.resi.group.dto.topic.form.SharableTopicAndInviteeFormDTO;
+import com.epmet.resi.group.dto.topic.form.ShareLinkTypeFormDTO;
+import com.epmet.resi.group.dto.topic.result.MemberRelationBetweenGroupAndGridResultDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@ -107,5 +113,4 @@ public class TopicShareLinkVisitRecordServiceImpl extends BaseServiceImpl<TopicS
    public TopicShareLinkVisitRecordEntity getByLinkIdAndInvitee(String linkId, String invitee) {
        return baseDao.selectRecordByLinkIdAndInvitee(linkId,invitee);
    }
-
 }