From bbff6bec147ff7e57f73a8bd5242e50ef6bf6f70 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 18 Dec 2020 17:12:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E8=AF=9D=E9=A2=98id=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/topic/form/TopicVisitFormDTO.java     | 11 ++-----
 .../TopicShareLinkRecordController.java       |  1 +
 .../impl/TopicShareLinkRecordServiceImpl.java | 30 ++++++++-----------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicVisitFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicVisitFormDTO.java
index 2c54362c83..359d4be674 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicVisitFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicVisitFormDTO.java
@@ -2,6 +2,7 @@ package com.epmet.resi.group.dto.topic.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -13,17 +14,11 @@ public class TopicVisitFormDTO implements Serializable {
 
     private static final long serialVersionUID = -7231684507046042401L;
 
-    /**
-     * 当点击右上角三个点分享时，传参为topicId；点击页面内的分享时，传参为inviteId
-     */
+    public interface TopicVisitForm{}
 
     /**
      * 分享ID
      */
+    @NotBlank(message = "分享ID不能为空",groups = {TopicVisitForm.class})
     private String shareLinkId;
-
-    /**
-     * 话题ID
-     */
-    private String topicId;
 }
diff --git 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
index 64ce18e876..d8e9614ff2 100644
--- 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
@@ -104,6 +104,7 @@ public class TopicShareLinkRecordController {
      */
     @PostMapping("visit")
     public Result<TopicVisitResultDTO> topicVisit(@RequestBody TopicVisitFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, TopicVisitFormDTO.TopicVisitForm.class);
         return new Result<TopicVisitResultDTO>().ok(topicShareLinkRecordService.topicVisit(formDTO,tokenDto));
     }
 
diff --git 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
index db1cf064cd..4303b06b86 100644
--- 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
@@ -155,23 +155,19 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
     @Override
     @Transactional(rollbackFor = Exception.class)
     public TopicVisitResultDTO topicVisit(TopicVisitFormDTO formDTO, TokenDto tokenDto) {
-        String topicId = null;
-        if (StringUtils.isNotBlank(formDTO.getShareLinkId())){
-            // 点击页面上的分享时
-            TopicShareLinkRecordEntity linkRecord = baseDao.selectById(formDTO.getShareLinkId());
-            if (null == linkRecord){
-                throw new RenException(TopicShareConstant.NOT_EXIST_INVITE_RECORD);
-            }
-            TopicShareLinkVisitRecordEntity entity = new TopicShareLinkVisitRecordEntity();
-            entity.setCustomerId(linkRecord.getCustomerId());
-            entity.setShareUserId(linkRecord.getShareUserId());
-            entity.setInviteeUserId(tokenDto.getUserId());
-            entity.setShareLinkRecId(formDTO.getShareLinkId());
-            entity.setIsInviteRegister(NumConstant.ONE);
-            visitRecordDao.insert(entity);
-            topicId = linkRecord.getTopicId();
-        }else topicId = formDTO.getTopicId();
-        TopicVisitResultDTO result = baseDao.selectTopicInfoById(topicId);
+        // 点击页面上的分享时
+        TopicShareLinkRecordEntity linkRecord = baseDao.selectById(formDTO.getShareLinkId());
+        if (null == linkRecord){
+            throw new RenException(TopicShareConstant.NOT_EXIST_INVITE_RECORD);
+        }
+        TopicShareLinkVisitRecordEntity entity = new TopicShareLinkVisitRecordEntity();
+        entity.setCustomerId(linkRecord.getCustomerId());
+        entity.setShareUserId(linkRecord.getShareUserId());
+        entity.setInviteeUserId(tokenDto.getUserId());
+        entity.setShareLinkRecId(formDTO.getShareLinkId());
+        entity.setIsInviteRegister(NumConstant.ONE);
+        visitRecordDao.insert(entity);
+        TopicVisitResultDTO result = baseDao.selectTopicInfoById(linkRecord.getTopicId());
         if (null == result){
             throw new RenException(TopicShareConstant.NOT_EXIST_TOPIC_INFO);
         }