议题分享id获取

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

@@ -0,0 +1,15 @@
+package com.epmet.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/18 下午1:59
+ */
+public interface IssueShareConstant {
+
+    String NOT_EXIST_ISSUE_INFO = "未查询到此议题相关信息";
+
+    String TOPIC_BELONG_GROUP_FAILURE = "查询话题所属小组失败......";
+
+    String TOPIC_BELONG_GROUP_NULL = "查询话题所属小组为空......";
+
+}

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

@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/18 下午1:23
+ */
+@Data
+public class IssueCreateUrlFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7269328640568283013L;
+
+    public interface IssueCreateUrlForm{}
+
+    @NotBlank(message = "议题ID不能为空",groups = {IssueCreateUrlForm.class})
+    private String issueId;
+}

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

@@ -0,0 +1,22 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/18 下午1:30
+ */
+@Data
+@AllArgsConstructor
+public class IssueCreateUrlResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 552194128388715353L;
+
+    /**
+     * 议题分享链接ID
+     */
+    private String shareLinkId;
+}

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

@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -25,6 +27,8 @@ 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.dto.IssueShareLinkRecordDTO;
+import com.epmet.dto.form.IssueCreateUrlFormDTO;
+import com.epmet.dto.result.IssueCreateUrlResultDTO;
 import com.epmet.service.IssueShareLinkRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -39,7 +43,7 @@ import java.util.Map;
  * @since v1.0.0 2020-12-18
  */
 @RestController
-@RequestMapping("issuesharelinkrecord")
+@RequestMapping("issuesharelink")
 public class IssueShareLinkRecordController {
     
     @Autowired
@@ -81,4 +85,17 @@ public class IssueShareLinkRecordController {
         return new Result();
     }
 
+    /**
+     * @Description  议题分享链接ID
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/12/18 下午1:36
+     */
+    @PostMapping("createurl")
+    public Result<IssueCreateUrlResultDTO> getIssueShareLinkId(@RequestBody IssueCreateUrlFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, IssueCreateUrlFormDTO.IssueCreateUrlForm.class);
+        return new Result<IssueCreateUrlResultDTO>().ok(issueShareLinkRecordService.getIssueShareLinkId(formDTO,tokenDto));
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueShareLinkRecordDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.IssueShareLinkRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 议题分享链接表
@@ -30,4 +31,21 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IssueShareLinkRecordDao extends BaseDao<IssueShareLinkRecordEntity> {
 
+    /**
+     * @Description  校验此人此议题是否存在分享记录
+     * @Param issueId
+     * @Param userId
+     * @author zxc
+     * @date 2020/12/18 下午1:47
+     */
+    String checkIssueRecord(@Param("issueId") String issueId, @Param("userId") String userId);
+
+    /**
+     * @Description  根据issueId查询议题信息
+     * @Param issueId
+     * @author zxc
+     * @date 2020/12/18 下午1:55
+     */
+    IssueShareLinkRecordEntity selectIssueInfoById(@Param("issueId") String issueId);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueShareLinkRecordEntity.java

@@ -17,6 +17,7 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -60,4 +61,10 @@ public class IssueShareLinkRecordEntity extends BaseEpmetEntity {
      */
 	private String inviteContent;
 
+	/**
+	 * 话题ID
+	 */
+	@TableField(exist = false)
+	private String topicId;
+
 }

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

@@ -19,7 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 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.result.IssueCreateUrlResultDTO;
 import com.epmet.entity.IssueShareLinkRecordEntity;
 
 import java.util.List;
@@ -92,4 +95,13 @@ public interface IssueShareLinkRecordService extends BaseService<IssueShareLinkR
      * @date 2020-12-18
      */
     void delete(String[] ids);
+
+    /**
+     * @Description  议题分享链接ID
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/12/18 下午1:36
+     */
+    IssueCreateUrlResultDTO getIssueShareLinkId(IssueCreateUrlFormDTO formDTO, TokenDto tokenDto);
 }

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

@@ -4,13 +4,23 @@ 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.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.commons.tools.utils.Result;
+import com.epmet.constant.IssueShareConstant;
 import com.epmet.dao.IssueShareLinkRecordDao;
 import com.epmet.dto.IssueShareLinkRecordDTO;
+import com.epmet.dto.form.IssueCreateUrlFormDTO;
+import com.epmet.dto.result.IssueCreateUrlResultDTO;
 import com.epmet.entity.IssueShareLinkRecordEntity;
+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;
 import com.epmet.service.IssueShareLinkRecordService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,6 +37,9 @@ import java.util.Map;
 @Service
 public class IssueShareLinkRecordServiceImpl extends BaseServiceImpl<IssueShareLinkRecordDao, IssueShareLinkRecordEntity> implements IssueShareLinkRecordService {
 
+    @Autowired
+    private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
+
     @Override
     public PageData<IssueShareLinkRecordDTO> page(Map<String, Object> params) {
         IPage<IssueShareLinkRecordEntity> page = baseDao.selectPage(
@@ -79,4 +92,41 @@ public class IssueShareLinkRecordServiceImpl extends BaseServiceImpl<IssueShareL
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description  议题分享链接ID
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/12/18 下午1:36
+     */
+    @Override
+    public IssueCreateUrlResultDTO getIssueShareLinkId(IssueCreateUrlFormDTO formDTO, TokenDto tokenDto) {
+        // 校验此人此议题是否存在分享记录
+        String shareLinkId = baseDao.checkIssueRecord(formDTO.getIssueId(), tokenDto.getUserId());
+        if (StringUtils.isNotBlank(shareLinkId)){
+            return new IssueCreateUrlResultDTO(shareLinkId);
+        }
+        IssueShareLinkRecordEntity issueInfo = baseDao.selectIssueInfoById(formDTO.getIssueId());
+        if (null == issueInfo){
+            throw new RenException(IssueShareConstant.NOT_EXIST_ISSUE_INFO);
+        }
+        TopicBelongGroupFormDTO topicBelongGroupFormDTO = new TopicBelongGroupFormDTO();
+        topicBelongGroupFormDTO.setTopicId(issueInfo.getTopicId());
+        Result<TopicBelongGroupResultDTO> topicInfo = resiGroupOpenFeignClient.selectTopicBelongGroup(topicBelongGroupFormDTO);
+        if (!topicInfo.success()){
+            throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_FAILURE);
+        }
+        IssueShareLinkRecordEntity entity = new IssueShareLinkRecordEntity();
+        entity.setCustomerId(issueInfo.getCustomerId());
+        if (StringUtils.isBlank(topicInfo.getData().getGroupId())){
+            throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_NULL);
+        }
+        entity.setGridId(topicInfo.getData().getGroupId());
+        entity.setIssueId(formDTO.getIssueId());
+        entity.setShareUserId(tokenDto.getUserId());
+        entity.setInviteContent(null);
+        baseDao.insert(entity);
+        return new IssueCreateUrlResultDTO(entity.getId());
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueShareLinkRecordDao.xml

@@ -3,5 +3,23 @@
 
 <mapper namespace="com.epmet.dao.IssueShareLinkRecordDao">
 
+    <!-- 校验此人此议题是否存在分享记录 -->
+    <select id="checkIssueRecord" resultType="java.lang.String">
+        SELECT
+            ID
+        FROM issue_share_link_record
+        WHERE DEL_FLAG = 0
+          AND SHARE_USER_ID = #{userId}
+          AND ISSUE_ID = #{issueId}
+    </select>
 
+    <!-- 根据issueId查询议题信息 -->
+    <select id="selectIssueInfoById" resultType="com.epmet.entity.IssueShareLinkRecordEntity">
+        SELECT
+            CUSTOMER_ID,
+            SOURCE_ID AS topicId
+        FROM issue
+        WHERE DEL_FLAG = 0
+          AND ID = #{issueId}
+    </select>
 </mapper>

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicShareConstant.java

@@ -8,4 +8,6 @@ public interface TopicShareConstant {
 
     String NOT_EXIST_TOPIC_INFO = "未查到该话题信息......";
 
+    String NOT_EXIST_TOPIC_BELONG_GROUP = "未查询到话题所属小组......";
+
 }

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

@@ -0,0 +1,17 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/18 下午2:06
+ */
+@Data
+public class TopicBelongGroupFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1257699096393262959L;
+
+    private String topicId;
+}

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

@@ -0,0 +1,19 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/18 下午2:12
+ */
+@Data
+@AllArgsConstructor
+public class TopicBelongGroupResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8180287697221964032L;
+
+    private String groupId;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -11,24 +11,16 @@ import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.form.*;
-import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
-import com.epmet.resi.group.dto.topic.result.MyCreateTopicsResultDTO;
-import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
-import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
+import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.HashMap;
 import java.util.List;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -148,4 +140,13 @@ public interface ResiGroupOpenFeignClient {
      */
     @PostMapping("resi/group/topic/fetchtopicinfowhenauditissue")
     Result<IssueShiftedFromTopicFormDTO> fetchTopicInfoWhenAuditIssue(@RequestBody ResiTopicTurnIssueFromDTO param);
+
+    /**
+     * @Description  查询话题所属小组
+     * @Param formDTO
+     * @author zxc
+     * @date 2020/12/18 下午2:08
+     */
+    @PostMapping("resi/group/topicsharelink/topicbelonggroup")
+    Result<TopicBelongGroupResultDTO> selectTopicBelongGroup(@RequestBody TopicBelongGroupFormDTO formDTO);
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -8,19 +8,13 @@ import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
-import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
-import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
-import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
 import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
+import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.stereotype.Component;
@@ -106,4 +100,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<IssueShiftedFromTopicFormDTO> fetchTopicInfoWhenAuditIssue(ResiTopicTurnIssueFromDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "fetchTopicInfoWhenAuditIssue",param);
     }
+
+    @Override
+    public Result<TopicBelongGroupResultDTO> selectTopicBelongGroup(TopicBelongGroupFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectTopicBelongGroup",formDTO);
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java

@@ -12,7 +12,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.topic.service.TopicShareLinkRecordService;
 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.TopicBelongGroupFormDTO;
 import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO;
+import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -80,4 +82,15 @@ public class TopicShareLinkRecordController {
         return new Result<CreateUrlResultDTO>().ok(topicShareLinkRecordService.getCreateUrlId(createUrlFormDTO,tokenDto));
     }
 
+    /**
+     * @Description  查询话题所属小组
+     * @Param formDTO
+     * @author zxc
+     * @date 2020/12/18 下午2:08
+     */
+    @PostMapping("topicbelonggroup")
+    public Result<TopicBelongGroupResultDTO> selectTopicBelongGroup(@RequestBody TopicBelongGroupFormDTO formDTO){
+        return new Result<TopicBelongGroupResultDTO>().ok(topicShareLinkRecordService.selectTopicBelongGroup(formDTO));
+    }
+
 }

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

@@ -6,7 +6,9 @@ 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.TopicBelongGroupFormDTO;
 import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO;
+import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -86,4 +88,12 @@ public interface TopicShareLinkRecordService extends BaseService<TopicShareLinkR
      * @date 2020/12/18 上午10:14
      */
     CreateUrlResultDTO getCreateUrlId(CreateUrlFormDTO createUrlFormDTO, TokenDto tokenDto);
+
+    /**
+     * @Description  查询话题所属小组
+     * @Param formDTO
+     * @author zxc
+     * @date 2020/12/18 下午2:08
+     */
+    TopicBelongGroupResultDTO selectTopicBelongGroup(TopicBelongGroupFormDTO formDTO);
 }

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

@@ -14,7 +14,9 @@ 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.TopicBelongGroupFormDTO;
 import com.epmet.resi.group.dto.topic.result.CreateUrlResultDTO;
+import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -113,4 +115,19 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
         return new CreateUrlResultDTO(entity.getId());
     }
 
+    /**
+     * @Description  查询话题所属小组
+     * @Param formDTO
+     * @author zxc
+     * @date 2020/12/18 下午2:08
+     */
+    @Override
+    public TopicBelongGroupResultDTO selectTopicBelongGroup(TopicBelongGroupFormDTO formDTO) {
+        TopicShareLinkRecordEntity entity = baseDao.selectTopicInfoById(formDTO.getTopicId());
+        if (null == entity){
+            throw new RenException(TopicShareConstant.NOT_EXIST_TOPIC_BELONG_GROUP);
+        }
+        return new TopicBelongGroupResultDTO(entity.getGroupId());
+    }
+
 }