分享议题id获取信息

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/constant/IssueShareConstant.java

@@ -12,4 +12,6 @@ public interface IssueShareConstant {
 
     String TOPIC_BELONG_GROUP_NULL = "查询话题所属小组为空......";
 
+    String NOT_EXIST_INVITE_ISSUE_RECORD = "未查询到该邀请记录【议题】......";
+
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueVisitFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/18 下午3:12
+ */
+@Data
+public class IssueVisitFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7901684507046042401L;
+
+    public interface IssueVisitForm{}
+
+    /**
+     * 分享ID
+     */
+    @NotBlank(message = "分享ID不能为空",groups = {IssueVisitForm.class})
+    private String shareLinkId;
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueVisitResultDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/18 下午5:13
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IssueVisitResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5079228371448105954L;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueShareLinkRecordController.java

@@ -28,7 +28,9 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueShareLinkRecordDTO;
 import com.epmet.dto.form.IssueCreateUrlFormDTO;
+import com.epmet.dto.form.IssueVisitFormDTO;
 import com.epmet.dto.result.IssueCreateUrlResultDTO;
+import com.epmet.dto.result.IssueVisitResultDTO;
 import com.epmet.service.IssueShareLinkRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -98,4 +100,17 @@ public class IssueShareLinkRecordController {
         return new Result<IssueCreateUrlResultDTO>().ok(issueShareLinkRecordService.getIssueShareLinkId(formDTO,tokenDto));
     }
 
+    /**
+     * @Description  分享议题id获取信息
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/12/18 下午5:22
+     */
+    @PostMapping("visit")
+    public Result<IssueVisitResultDTO> issueVisit(@RequestBody IssueVisitFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, IssueVisitFormDTO.IssueVisitForm.class);
+        return new Result<IssueVisitResultDTO>().ok(issueShareLinkRecordService.issueVisit(formDTO,tokenDto));
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueShareLinkRecordService.java

@@ -22,7 +22,9 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IssueShareLinkRecordDTO;
 import com.epmet.dto.form.IssueCreateUrlFormDTO;
+import com.epmet.dto.form.IssueVisitFormDTO;
 import com.epmet.dto.result.IssueCreateUrlResultDTO;
+import com.epmet.dto.result.IssueVisitResultDTO;
 import com.epmet.entity.IssueShareLinkRecordEntity;
 
 import java.util.List;
@@ -104,4 +106,13 @@ public interface IssueShareLinkRecordService extends BaseService<IssueShareLinkR
      * @date 2020/12/18 下午1:36
      */
     IssueCreateUrlResultDTO getIssueShareLinkId(IssueCreateUrlFormDTO formDTO, TokenDto tokenDto);
+
+    /**
+     * @Description  分享议题id获取信息
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/12/18 下午5:22
+     */
+    IssueVisitResultDTO issueVisit( IssueVisitFormDTO formDTO, TokenDto tokenDto);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -11,10 +12,14 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IssueShareConstant;
 import com.epmet.dao.IssueShareLinkRecordDao;
+import com.epmet.dao.IssueShareLinkVisitRecordDao;
 import com.epmet.dto.IssueShareLinkRecordDTO;
 import com.epmet.dto.form.IssueCreateUrlFormDTO;
+import com.epmet.dto.form.IssueVisitFormDTO;
 import com.epmet.dto.result.IssueCreateUrlResultDTO;
+import com.epmet.dto.result.IssueVisitResultDTO;
 import com.epmet.entity.IssueShareLinkRecordEntity;
+import com.epmet.entity.IssueShareLinkVisitRecordEntity;
 import com.epmet.resi.group.dto.topic.form.TopicBelongGroupFormDTO;
 import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
@@ -39,6 +44,8 @@ public class IssueShareLinkRecordServiceImpl extends BaseServiceImpl<IssueShareL
 
     @Autowired
     private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
+    @Autowired
+    private IssueShareLinkVisitRecordDao visitRecordDao;
 
     @Override
     public PageData<IssueShareLinkRecordDTO> page(Map<String, Object> params) {
@@ -129,4 +136,27 @@ public class IssueShareLinkRecordServiceImpl extends BaseServiceImpl<IssueShareL
         return new IssueCreateUrlResultDTO(entity.getId());
     }
 
+    /**
+     * @Description  分享议题id获取信息
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/12/18 下午5:22
+     */
+    @Override
+    public IssueVisitResultDTO issueVisit(IssueVisitFormDTO formDTO, TokenDto tokenDto) {
+        IssueShareLinkRecordEntity linkRecord = baseDao.selectById(formDTO.getShareLinkId());
+        if (null == linkRecord){
+            throw new RenException(IssueShareConstant.NOT_EXIST_INVITE_ISSUE_RECORD);
+        }
+        IssueShareLinkVisitRecordEntity entity = new IssueShareLinkVisitRecordEntity();
+        entity.setCustomerId(linkRecord.getCustomerId());
+        entity.setShareUserId(linkRecord.getShareUserId());
+        entity.setInviteeUserId(tokenDto.getUserId());
+        entity.setShareLinkRecId(formDTO.getShareLinkId());
+        entity.setIsInviteRegister(NumConstant.ONE);
+        visitRecordDao.insert(entity);
+        return new IssueVisitResultDTO(linkRecord.getIssueId(),linkRecord.getGridId(),linkRecord.getCustomerId());
+    }
+
 }

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

@@ -155,7 +155,6 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
     @Override
     @Transactional(rollbackFor = Exception.class)
     public TopicVisitResultDTO topicVisit(TopicVisitFormDTO formDTO, TokenDto tokenDto) {
-        // 点击页面上的分享时
         TopicShareLinkRecordEntity linkRecord = baseDao.selectById(formDTO.getShareLinkId());
         if (null == linkRecord){
             throw new RenException(TopicShareConstant.NOT_EXIST_INVITE_RECORD);