我参与的议题

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

@@ -82,4 +82,6 @@ public interface IssueVoteDetailDao extends BaseDao<IssueVoteDetailEntity> {
      * @date 2020/11/10 10:01 上午
      */
     List<MyPartIssuesResultDTO> myPartIssues(@Param("userId")String userId);
+
+    List<MyPartIssuesResultDTO> myPartIssuesByTopicId(@Param("topicIds")List<String> topicIds);
 }

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

@@ -44,6 +44,9 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.redis.IssueVoteStatisticalRedis;
+import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO;
+import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.IssueVoteDetailService;
 import com.epmet.service.IssueVoteStatisticalService;
 import com.epmet.utils.ModuleConstants;
@@ -90,6 +93,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     private IssueVoteDetailService issueVoteDetailService;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
 
     @Override
     public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
@@ -545,6 +550,16 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     @Override
     public List<MyPartIssuesResultDTO> myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO) {
         List<MyPartIssuesResultDTO> myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId());
+        MyPartIssueFormDTO formDTO = new MyPartIssueFormDTO();
+        formDTO.setUserId(myPartIssuesFormDTO.getUserId());
+        Result<MyPartIssueResultDTO> myPartIssueResult = resiGroupOpenFeignClient.selectMyPartTopic(formDTO);
+        if (!myPartIssueResult.success()){
+            throw new RenException("查询我评论过的话题失败......");
+        }
+        if (!CollectionUtils.isEmpty(myPartIssueResult.getData().getTopicIds())){
+            List<MyPartIssuesResultDTO> myPartIssuesResultDTOS = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds());
+            myPartIssuesResult.addAll(myPartIssuesResultDTOS);
+        }
         if (CollectionUtils.isEmpty(myPartIssuesResult)){
             return new ArrayList<>();
         }

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

@@ -87,4 +87,20 @@
               AND vd.CREATED_BY = #{userId}
               ORDER BY i.CREATED_TIME DESC
     </select>
+
+    <select id="myPartIssuesByTopicId" resultType="com.epmet.dto.result.MyPartIssuesResultDTO">
+        SELECT
+            i.ID AS issueId,
+            i.SUGGESTION,
+            i.ISSUE_TITLE,
+            i.GRID_ID AS gridId,
+            UNIX_TIMESTAMP(i.CREATED_TIME) AS shiftIssueTime
+        FROM issue i
+        WHERE i.DEL_FLAG = '0'
+              AND
+              <foreach collection="topicIds" item="topicId" separator=" OR ">
+                  i.SOURCE_ID = #{topicId}
+              </foreach>
+        ORDER BY i.CREATED_TIME DESC
+    </select>
 </mapper>

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

@@ -0,0 +1,17 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 3:29 下午
+ */
+@Data
+public class MyPartIssueFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -632199437101523924L;
+
+    private String userId;
+}

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

@@ -0,0 +1,23 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 3:30 下午
+ */
+@Data
+public class MyPartIssueResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7726879551303168135L;
+
+    private List<String> topicIds;
+
+    public MyPartIssueResultDTO() {
+        this.topicIds = new ArrayList<>();
+    }
+}

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

@@ -6,9 +6,11 @@ import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
 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.CustomerPageFormDTO;
+import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO;
 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.feign.fallback.ResiGroupOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
@@ -71,4 +73,13 @@ public interface ResiGroupOpenFeignClient {
      */
     @PostMapping("resi/group/topic/select-my-create-topic")
     Result<List<String>> selectMyCreateTopic(@RequestBody TopicIdListFormDTO topicIdListFormDTO);
+
+    /**
+     * @Description  查询我评论过的话题
+     * @Param myPartIssueFormDTO
+     * @author zxc
+     * @date 2020/11/17 3:34 下午
+     */
+    @PostMapping("resi/group/topic/myparttopic")
+    Result<MyPartIssueResultDTO> selectMyPartTopic(@RequestBody MyPartIssueFormDTO myPartIssueFormDTO);
 }

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

@@ -7,8 +7,10 @@ import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
 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.CustomerPageFormDTO;
+import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO;
 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.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
@@ -49,4 +51,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<List<String>> selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectMyCreateTopic", topicIdListFormDTO);
     }
+
+    @Override
+    public Result<MyPartIssueResultDTO> selectMyPartTopic(MyPartIssueFormDTO myPartIssueFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectMyPartTopic", myPartIssueFormDTO);
+    }
 }

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

@@ -296,5 +296,16 @@ public class ResiTopicController {
         return new Result<List<String>>().ok(topicService.selectMyCreateTopic(topicIdListFormDTO));
     }
 
+    /**
+     * @Description  查询我评论过的话题
+     * @Param myPartIssueFormDTO
+     * @author zxc
+     * @date 2020/11/17 3:34 下午
+     */
+    @PostMapping("myparttopic")
+    public Result<MyPartIssueResultDTO> selectMyPartTopic(@RequestBody MyPartIssueFormDTO myPartIssueFormDTO){
+        return new Result<MyPartIssueResultDTO>().ok(topicService.selectMyPartTopic(myPartIssueFormDTO));
+    }
+
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java

@@ -22,11 +22,8 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.topic.entity.ResiTopicEntity;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.TopicInfoDTO;
-import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO;
-import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
-import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO;
+import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
-import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -179,4 +176,12 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
      * @date 2020/11/13 4:32 下午
      */
     List<String> selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO);
+
+    /**
+     * @Description  查询我评论过的话题
+     * @Param myPartIssueFormDTO
+     * @author zxc
+     * @date 2020/11/17 3:34 下午
+     */
+    List<String> selectMyPartTopic(MyPartIssueFormDTO myPartIssueFormDTO);
 }

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

@@ -287,4 +287,12 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2020/11/13 4:32 下午
      */
     List<String> selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO);
+
+    /**
+     * @Description  查询我评论过的话题
+     * @Param myPartIssueFormDTO
+     * @author zxc
+     * @date 2020/11/17 3:34 下午
+     */
+    MyPartIssueResultDTO selectMyPartTopic(MyPartIssueFormDTO myPartIssueFormDTO);
 }

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

@@ -1487,6 +1487,23 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     public List<String> selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO) {
         return baseDao.selectMyCreateTopic(topicIdListFormDTO);
     }
+
+    /**
+     * @Description  查询我评论过的话题
+     * @Param myPartIssueFormDTO
+     * @author zxc
+     * @date 2020/11/17 3:34 下午
+     */
+    @Override
+    public MyPartIssueResultDTO selectMyPartTopic(MyPartIssueFormDTO myPartIssueFormDTO) {
+        List<String> topicIds = baseDao.selectMyPartTopic(myPartIssueFormDTO);
+        if (CollectionUtils.isEmpty(topicIds)){
+            return new MyPartIssueResultDTO();
+        }
+        MyPartIssueResultDTO myPartIssueResultDTO = new MyPartIssueResultDTO();
+        myPartIssueResultDTO.setTopicIds(topicIds);
+        return myPartIssueResultDTO;
+    }
 }
 
 

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

@@ -508,5 +508,17 @@
           AND STATUS = 'discussing'
           AND created_by = #{userId}
     </select>
+
+    <!-- 查询我评论过的话题 -->
+    <select id="selectMyPartTopic" resultType="java.lang.String">
+        SELECT
+            DISTINCT(rt.ID) AS topicIds
+        FROM resi_topic rt
+        LEFT JOIN resi_topic_comment rtc ON rtc.TOPIC_ID = rt.ID
+        WHERE rt.DEL_FLAG = '0'
+              AND rtc.DEL_FLAG = '0'
+              AND rt.CREATED_BY != #{userId}
+              AND rtc.CREATED_BY = #{userId}
+    </select>
 </mapper>