Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center

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

@@ -0,0 +1,38 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/13 3:30 下午
+ */
+@Data
+public class MyShiftIssueTopicsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3943178729586797400L;
+
+    public interface MyShiftIssueTopics{}
+
+    /**
+     * 页码
+     */
+    @NotNull(message = "页码不能为空",groups = {MyShiftIssueTopics.class})
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    @NotNull(message = "每页数量不能为空",groups = {MyShiftIssueTopics.class})
+    private Integer pageSize;
+
+
+    @NotBlank(message = "客户ID不能为空",groups = {MyShiftIssueTopics.class})
+    private String customerId;
+
+    private String userId;
+
+}

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

@@ -0,0 +1,43 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/13 3:31 下午
+ */
+@Data
+public class MyShiftIssueTopicsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -703102629653169023L;
+
+    /**
+     * 话题ID
+     */
+    private String topicId;
+
+    /**
+     * 转议题时间
+     */
+    private Long shiftIssueTime;
+
+    /**
+     * 建议
+     */
+    private String suggestion;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 话题发表网格名称
+     */
+    private String releaseGridName;
+
+    private String gridId;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -8,6 +8,8 @@ import com.epmet.dto.form.MyPubIssuesAuditingFormDTO;
 import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.dto.result.MyPubIssuesAuditingResultDTO;
 import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack;
+import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO;
+import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -53,4 +55,13 @@ public interface GovIssueOpenFeignClient {
      **/
     @PostMapping(value = "/gov/issue/issue/getmypubissues", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<IssueDTO>> getMyPubIssues(@RequestBody MyPubIssuesAuditingFormDTO formDTO);
+
+    /**
+     * @Description  个人中心-我发表的话题列表-已转议题列表
+     * @Param myShiftIssueTopicsFormDTO
+     * @author zxc
+     * @date 2020/11/13 4:58 下午
+     */
+    @PostMapping("/gov/issue/issue/shiftissuetopic")
+    Result<List<MyShiftIssueTopicsResultDTO>> myShiftIssueTopics(@RequestBody MyShiftIssueTopicsFormDTO myShiftIssueTopicsFormDTO);
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -9,6 +9,8 @@ import com.epmet.dto.form.MyPubIssuesAuditingFormDTO;
 import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.dto.result.MyPubIssuesAuditingResultDTO;
 import com.epmet.feign.GovIssueOpenFeignClient;
+import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO;
+import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -35,4 +37,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
     public Result<List<IssueDTO>> getMyPubIssues(MyPubIssuesAuditingFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER,"getMyPubIssues",formDTO);
     }
+
+    @Override
+    public Result<List<MyShiftIssueTopicsResultDTO>> myShiftIssueTopics(MyShiftIssueTopicsFormDTO myShiftIssueTopicsFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER,"myShiftIssueTopics",myShiftIssueTopicsFormDTO);
+    }
 }

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

@@ -167,5 +167,17 @@ public class IssueController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<IssueDTO>>().ok(issueService.getMyPubIssues(formDTO));
     }
+
+    /**
+     * @Description  个人中心-我发表的话题列表-已转议题列表
+     * @Param myShiftIssueTopicsFormDTO
+     * @author zxc
+     * @date 2020/11/13 4:58 下午
+     */
+    @PostMapping("shiftissuetopic")
+    public Result<List<MyShiftIssueTopicsResultDTO>> myShiftIssueTopics(@RequestBody MyShiftIssueTopicsFormDTO myShiftIssueTopicsFormDTO){
+        ValidatorUtils.validateEntity(myShiftIssueTopicsFormDTO, MyShiftIssueTopicsFormDTO.MyShiftIssueTopics.class);
+        return new Result<List<MyShiftIssueTopicsResultDTO>>().ok(issueService.myShiftIssueTopics(myShiftIssueTopicsFormDTO));
+    }
 }
 

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

@@ -167,4 +167,13 @@ public interface IssueDao extends BaseDao<IssueEntity> {
                                      @Param("pageSize") Integer pageSize,
                                      @Param("userId") String userId,
                                      @Param("issueStatus") String issueStatus);
+
+    /**
+     * @Description  个人中心-我发表的话题列表-已转议题列表
+     * @Param tokenDto
+     * @Param myShiftIssueTopicsResultDTO
+     * @author zxc
+     * @date 2020/11/13 3:42 下午
+     */
+    List<MyShiftIssueTopicsResultDTO> myShiftIssueTopics(@Param("topicIds") List<String> topicIds,@Param("customerId") String customerId);
 }

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

@@ -235,4 +235,14 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @Date 2020/11/11 14:57
      **/
     List<IssueDTO> getMyPubIssues(MyPubIssuesAuditingFormDTO formDTO);
+
+    /**
+     * @Description  个人中心-我发表的话题列表-已转议题列表
+     * @Param tokenDto
+     * @Param myShiftIssueTopicsResultDTO
+     * @author zxc
+     * @date 2020/11/13 3:42 下午
+     */
+    List<MyShiftIssueTopicsResultDTO> myShiftIssueTopics(MyShiftIssueTopicsFormDTO myShiftIssueTopicsFormDTO);
+
 }

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

@@ -39,6 +39,7 @@ 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.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
+import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
@@ -864,11 +865,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         PageInfo<MyPubIssuesAuditingResultDTO> result = PageHelper.startPage(form.getPageNo(),form.getPageSize()).doSelectPageInfo(() -> baseDao.myPubIssuesAuditing(form.getUserId()));
         if (!CollectionUtils.isEmpty(result.getList())){
             list = result.getList();
-            Result<List<OrgInfoResultDTO>> gridNameList = govOrgOpenFeignClient.selectOrgInfo(new OrgInfoFormDTO(OrgInfoConstant.GRID, list.stream().map(m -> m.getGridId()).collect(Collectors.toList())));
+            Result<List<AllGridsByUserIdResultDTO>> gridNameList = govOrgOpenFeignClient.getGridListByGridIds(list.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
             if (!gridNameList.success()){
                 throw new RenException("查询议题来源网格名称失败......");
             }
-            list.forEach(l -> gridNameList.getData().stream().filter(o -> l.getGridId().equals(o.getOrgId())).forEach(o -> l.setTopicReleaseGridName(o.getOrgName())));
+            list.forEach(l -> gridNameList.getData().stream().filter(o -> l.getGridId().equals(o.getGridId())).forEach(o -> l.setTopicReleaseGridName(o.getGridName())));
             Result<List<GroupInfoResultDTO>> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(list.stream().map(m -> m.getTopicId()).collect(Collectors.toList())));
             if (!groupNameList.success()){
                 throw new RenException("查询议题来源小组名称失败......");
@@ -893,4 +894,37 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return baseDao.selectMyPubIssues(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getUserId(),formDTO.getIssueStatus());
     }
 
+    /**
+     * @Description  个人中心-我发表的话题列表-已转议题列表
+     * @Param tokenDto
+     * @Param myShiftIssueTopicsResultDTO
+     * @author zxc
+     * @date 2020/11/13 3:42 下午
+     */
+    @Override
+    public List<MyShiftIssueTopicsResultDTO> myShiftIssueTopics(MyShiftIssueTopicsFormDTO form) {
+        TopicIdListFormDTO formDTO = new TopicIdListFormDTO();
+        formDTO.setUserId(form.getUserId());
+        Result<List<String>> listResult = resiGroupOpenFeignClient.selectMyCreateTopic(formDTO);
+        if (!listResult.success()){
+            throw new RenException("查询我创建的话题失败......");
+        }
+        if(CollectionUtils.isEmpty(listResult.getData())){
+            logger.error("查询我创建的话题集合为空");
+            return new ArrayList<>();
+        }
+        List<String> topicIds = listResult.getData();
+        PageInfo<MyShiftIssueTopicsResultDTO> resultPage = PageHelper.startPage(form.getPageNo(), form.getPageSize()).doSelectPageInfo(() -> baseDao.myShiftIssueTopics(topicIds, form.getCustomerId()));
+        if (CollectionUtils.isEmpty(resultPage.getList())){
+            return new ArrayList<>();
+        }
+        List<MyShiftIssueTopicsResultDTO> result = resultPage.getList();
+        Result<List<AllGridsByUserIdResultDTO>> gridListByGridIds = govOrgOpenFeignClient.getGridListByGridIds(result.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
+        if (!gridListByGridIds.success()){
+            throw new RenException("查询话题所属网格名称失败......");
+        }
+        result.forEach(r -> gridListByGridIds.getData().stream().filter(f -> r.getGridId().equals(f.getGridId())).forEach(f -> r.setReleaseGridName(f.getGridName())));
+        return result;
+    }
+
 }

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

@@ -549,14 +549,11 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
             return new ArrayList<>();
         }
         List<String> orgIds = myPartIssuesResult.stream().map(m -> m.getGridId()).collect(Collectors.toList());
-        OrgInfoFormDTO form = new OrgInfoFormDTO();
-        form.setOrgIds(orgIds);
-        form.setOrgType(IssueConstant.GRID);
-        Result<List<OrgInfoResultDTO>> listResult = govOrgOpenFeignClient.selectOrgInfo(form);
+        Result<List<AllGridsByUserIdResultDTO>> listResult = govOrgOpenFeignClient.getGridListByGridIds(orgIds);
         if (!listResult.success()){
             throw new RenException("查询议题来源网格名称失败......");
         }
-        myPartIssuesResult.forEach(m -> listResult.getData().stream().filter(l -> m.getGridId().equals(l.getOrgId())).forEach(l -> m.setTopicReleaseGridName(l.getOrgName())));
+        myPartIssuesResult.forEach(m -> listResult.getData().stream().filter(l -> m.getGridId().equals(l.getGridId())).forEach(l -> m.setTopicReleaseGridName(l.getGridName())));
         return myPartIssuesResult;
     }
 

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

@@ -421,4 +421,23 @@
         </if>
         LIMIT #{pageNo}, #{pageSize}
     </select>
+
+    <!-- 个人中心-我发表的话题列表-已转议题列表 -->
+    <select id="myShiftIssueTopics" resultType="com.epmet.dto.result.MyShiftIssueTopicsResultDTO">
+        SELECT
+            SOURCE_ID AS topicId,
+            UNIX_TIMESTAMP(CREATED_TIME) AS shiftIssueTime,
+            SUGGESTION,
+            ISSUE_TITLE,
+            GRID_ID
+        FROM issue
+        WHERE DEL_FLAG = '0'
+            AND ISSUE_STATUS != 'shift_project'
+            AND CUSTOMER_ID = #{customerId}
+            AND
+            <foreach collection="topicIds" item="topicId" separator=" OR ">
+                SOURCE_ID = #{topicId}
+            </foreach>
+        ORDER BY CREATED_TIME DESC
+    </select>
 </mapper>

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

@@ -0,0 +1,14 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/13 4:27 下午
+ */
+@Data
+public class TopicIdListFormDTO{
+
+    private String userId;
+
+}

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

@@ -6,6 +6,7 @@ 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.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.ParticipatedTopicUnitResultDTO;
@@ -61,4 +62,13 @@ public interface ResiGroupOpenFeignClient {
      */
     @PostMapping("resi/group/topic/my-create-topics")
     Result<List<MyCreateTopicsResultDTO>> listMyCreateTopics(@RequestBody MyCreateTopicsFormDTO formDTO);
+
+    /**
+     * @Description  查询我创建的话题
+     * @Param topicIdListFormDTO
+     * @author zxc
+     * @date 2020/11/13 4:32 下午
+     */
+    @PostMapping("resi/group/topic/select-my-create-topic")
+    Result<List<String>> selectMyCreateTopic(@RequestBody TopicIdListFormDTO topicIdListFormDTO);
 }

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

@@ -7,6 +7,7 @@ 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.TopicIdListFormDTO;
 import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
@@ -43,4 +44,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result listMyCreateTopics(MyCreateTopicsFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listMyTopics", formDTO);
     }
+
+    @Override
+    public Result<List<String>> selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectMyCreateTopic", topicIdListFormDTO);
+    }
 }

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

@@ -285,5 +285,16 @@ public class ResiTopicController {
         return new Result<List<ParticipatedTopicUnitResultDTO>>().ok(topicService.getParticipatedTopics(param));
     }
 
+    /**
+     * @Description  查询我创建的话题
+     * @Param topicIdListFormDTO
+     * @author zxc
+     * @date 2020/11/13 4:32 下午
+     */
+    @PostMapping("select-my-create-topic")
+    public Result<List<String>> selectMyCreateTopic(@RequestBody TopicIdListFormDTO topicIdListFormDTO){
+        return new Result<List<String>>().ok(topicService.selectMyCreateTopic(topicIdListFormDTO));
+    }
+
 
 }

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

@@ -24,6 +24,7 @@ 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.result.*;
 import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -170,4 +171,12 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
      * @date 2020.11.11 23:08
     */
     List<ParticipatedTopicUnitResultDTO> selectParticipatedTopics(@Param("customerId") String customerId,@Param("userId") String userId);
+
+    /**
+     * @Description  查询我创建的话题
+     * @Param topicIdListFormDTO
+     * @author zxc
+     * @date 2020/11/13 4:32 下午
+     */
+    List<String> selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO);
 }

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

@@ -30,7 +30,6 @@ import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
-import org.springframework.web.bind.annotation.RequestBody;
 
 
 import java.util.List;
@@ -280,4 +279,12 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2020.11.11 23:20
     */
     List<ParticipatedTopicUnitResultDTO> getParticipatedTopics(CustomerPageFormDTO param);
+
+    /**
+     * @Description  查询我创建的话题
+     * @Param topicIdListFormDTO
+     * @author zxc
+     * @date 2020/11/13 4:32 下午
+     */
+    List<String> selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO);
 }

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

@@ -1465,6 +1465,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             })).collect(Collectors.toList());
         } return Collections.EMPTY_LIST;
     }
+
+    /**
+     * @Description  查询我创建的话题
+     * @Param topicIdListFormDTO
+     * @author zxc
+     * @date 2020/11/13 4:32 下午
+     */
+    @Override
+    public List<String> selectMyCreateTopic(TopicIdListFormDTO topicIdListFormDTO) {
+        return baseDao.selectMyCreateTopic(topicIdListFormDTO);
+    }
 }
 
 

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

@@ -495,5 +495,17 @@
         AND topic.created_by <![CDATA[ <> ]]> #{userId}
         ORDER BY topic.created_time desc
     </select>
+
+    <!-- 查询我创建的话题 -->
+    <select id="selectMyCreateTopic" resultType="java.lang.String">
+        SELECT
+            id
+        FROM
+            resi_topic
+        WHERE
+            del_flag = '0'
+          AND STATUS = 'discussing'
+          AND created_by = #{userId}
+    </select>
 </mapper>
 

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/MyShiftIssueTopicsFormDTO.java

@@ -0,0 +1,38 @@
+package com.epmet.resi.mine.dto.from;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/13 3:30 下午
+ */
+@Data
+public class MyShiftIssueTopicsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3943178729586797400L;
+
+    public interface MyShiftIssueTopics{}
+
+    /**
+     * 页码
+     */
+    @NotNull(message = "页码不能为空",groups = {MyShiftIssueTopics.class})
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    @NotNull(message = "每页数量不能为空",groups = {MyShiftIssueTopics.class})
+    private Integer pageSize;
+
+
+    @NotBlank(message = "客户ID不能为空",groups = {MyShiftIssueTopics.class})
+    private String customerId;
+
+    private String userId;
+
+}

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyShiftIssueTopicsResultDTO.java

@@ -0,0 +1,41 @@
+package com.epmet.resi.mine.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/13 3:31 下午
+ */
+@Data
+public class MyShiftIssueTopicsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -703102629653169023L;
+
+    /**
+     * 话题ID
+     */
+    private String topicId;
+
+    /**
+     * 转议题时间
+     */
+    private Long shiftIssueTime;
+
+    /**
+     * 建议
+     */
+    private String suggestion;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 话题发表网格名称
+     */
+    private String releaseGridName;
+
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/TopicController.java

@@ -9,8 +9,10 @@ import com.epmet.resi.group.dto.topic.form.CustomerPageFormDTO;
 import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyCreateTopicsFormDTO;
+import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO;
 import com.epmet.resi.mine.dto.from.MyShiftProjectTopicsFormDTO;
 import com.epmet.resi.mine.dto.result.MyCreateTopicsResultDTO;
+import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO;
 import com.epmet.resi.mine.dto.result.MyShiftProjectTopicsResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -76,4 +78,17 @@ public class TopicController {
         return new Result<List<MyCreateTopicsResultDTO>>().ok(topics);
     }
 
+    /**
+     * @Description  个人中心-我发表的话题列表-已转议题列表
+     * @Param tokenDto
+     * @Param myShiftIssueTopicsFormDTO
+     * @author zxc
+     * @date 2020/11/13 3:42 下午
+     */
+    @PostMapping("my-shiftissue-topics")
+    public Result<List<MyShiftIssueTopicsResultDTO>> myShiftIssueTopics(@LoginUser TokenDto tokenDto, @RequestBody MyShiftIssueTopicsFormDTO myShiftIssueTopicsFormDTO){
+        ValidatorUtils.validateEntity(myShiftIssueTopicsFormDTO, MyShiftIssueTopicsFormDTO.MyShiftIssueTopics.class);
+        return new Result<List<MyShiftIssueTopicsResultDTO>>().ok(topicService.myShiftIssueTopics(tokenDto,myShiftIssueTopicsFormDTO));
+    }
+
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/TopicService.java

@@ -1,6 +1,9 @@
 package com.epmet.modules.person.service;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO;
 import com.epmet.resi.mine.dto.result.MyCreateTopicsResultDTO;
+import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO;
 import com.epmet.resi.mine.dto.result.MyShiftProjectTopicsResultDTO;
 
 import java.util.List;
@@ -24,4 +27,13 @@ public interface TopicService {
      * @date 2020.11.13 15:00
     */
     List<MyCreateTopicsResultDTO> listMyCreateTopics(String customerId, String userId, Integer pageNo, Integer pageSize);
+
+    /**
+     * @Description  个人中心-我发表的话题列表-已转议题列表
+     * @Param tokenDto
+     * @Param myShiftIssueTopicsResultDTO
+     * @author zxc
+     * @date 2020/11/13 3:42 下午
+     */
+    List<MyShiftIssueTopicsResultDTO> myShiftIssueTopics(TokenDto tokenDto, MyShiftIssueTopicsFormDTO myShiftIssueTopicsFormDTO);
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java

@@ -1,23 +1,29 @@
 package com.epmet.modules.person.service.impl;
 
 import com.epmet.commons.tools.exception.RenException;
+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.dto.form.ProjectByCreateTopicUserFormDTO;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.ProjectOfCreateTopicUserResultDTO;
+import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.modules.person.service.TopicService;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
+import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO;
 import com.epmet.resi.mine.dto.result.MyCreateTopicsResultDTO;
+import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO;
 import com.epmet.resi.mine.dto.result.MyShiftProjectTopicsResultDTO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -36,6 +42,9 @@ public class TopicServiceImpl implements TopicService {
     @Autowired
     private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
 
+    @Autowired
+    private GovIssueOpenFeignClient govIssueOpenFeignClient;
+
     @Override
     public List<MyShiftProjectTopicsResultDTO> listMyShiftProjectTopics(String userId, String customerId, Integer pageNo, Integer pageSize) {
         ProjectByCreateTopicUserFormDTO form = new ProjectByCreateTopicUserFormDTO();
@@ -80,4 +89,24 @@ public class TopicServiceImpl implements TopicService {
         List<com.epmet.resi.group.dto.topic.result.MyCreateTopicsResultDTO > topics = result.getData();
         return ConvertUtils.sourceToTarget(topics, MyCreateTopicsResultDTO.class);
     }
+
+    /**
+     * @Description  个人中心-我发表的话题列表-已转议题列表
+     * @Param tokenDto
+     * @Param myShiftIssueTopicsResultDTO
+     * @author zxc
+     * @date 2020/11/13 3:42 下午
+     */
+    @Override
+    public List<MyShiftIssueTopicsResultDTO> myShiftIssueTopics(TokenDto tokenDto, MyShiftIssueTopicsFormDTO myShiftIssueTopicsFormDTO) {
+        myShiftIssueTopicsFormDTO.setUserId(tokenDto.getUserId());
+        Result<List<MyShiftIssueTopicsResultDTO>> listResult = govIssueOpenFeignClient.myShiftIssueTopics(myShiftIssueTopicsFormDTO);
+        if (!listResult.success()){
+            throw new RenException("查询我发表的话题列表-已转议题列表失败......");
+        }
+        if (CollectionUtils.isEmpty(listResult.getData())){
+            return new ArrayList<>();
+        }
+        return listResult.getData();
+    }
 }