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

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

@@ -27,4 +27,9 @@ public interface IssueOpenConstant {
      * 议题解决类型-未解决
      */
     String ISSUE_UNRESOLVED = "unresolved";
+
+    /**
+     * 议题来源类型 eg:resi_topic
+     */
+    String SOURCE_TYPE_RT="resi_topic";
 }

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

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -143,4 +144,14 @@ public class IssueDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 转项目日期 （服务间调用日期一致性） 戳
+     */
+    private Long shiftedTimeStamp;
+
+    /**
+     * 关闭日期 戳
+     */
+    private Long closedTimeStamp;
+
 }

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

@@ -396,7 +396,9 @@
     <!-- 查询我发起的议题（可根据状态查询）-->
     <select id="selectMyPubIssues" parameterType="map" resultType="com.epmet.dto.IssueDTO">
         SELECT
-            *
+            i.*,
+            UNIX_TIMESTAMP(i.CLOSED_TIME) AS closedTimeStamp,
+            UNIX_TIMESTAMP(i.SHIFTED_TIME) AS shiftedTimeStamp
         FROM
             issue i
         WHERE

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

@@ -5,18 +5,23 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IssueOpenConstant;
+import com.epmet.constant.OrgInfoConstant;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.form.MyPartIssuesFormDTO;
 import com.epmet.dto.form.MyPubIssuesAuditingFormDTO;
+import com.epmet.dto.form.OrgInfoFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.modules.person.service.IssueService;
+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.result.IssueGridResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -169,7 +174,34 @@ public class IssueServiceImpl implements IssueService {
         if(null==issueResult||CollectionUtils.isEmpty(issueResult.getData())){
             return new ArrayList<>();
         }
-        //todo
-        return null;
+        //议题来源话题id集合
+        List<String> topicIds=new ArrayList<>();
+        issueResult.getData().forEach(issueDTO ->{
+            if(IssueOpenConstant.SOURCE_TYPE_RT.equals(issueDTO.getSourceType())&& StringUtils.isNotBlank(issueDTO.getSourceId())){
+                topicIds.add(issueDTO.getSourceId());
+            }
+        } );
+        //查询网格名称
+        Result<List<OrgInfoResultDTO>> gridNameList = govOrgOpenFeignClient.selectOrgInfo(new OrgInfoFormDTO(OrgInfoConstant.GRID, issueResult.getData().stream().map(m -> m.getGridId()).collect(Collectors.toList())));
+        if (!gridNameList.success()){
+            logger.error("查询议题来源网格名称失败......");
+        }
+        //查询话题来源小组名称
+        Result<List<GroupInfoResultDTO>> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(topicIds));
+        if (!groupNameList.success()){
+            logger.error("查询议题来源小组名称失败......");
+        }
+        List<MyPubIssuesClosedResultDTO> resultDTOList=new ArrayList<>();
+        for(IssueDTO issueDTO:issueResult.getData()){
+            MyPubIssuesClosedResultDTO resultDTO=new MyPubIssuesClosedResultDTO();
+            resultDTO.setIssueId(issueDTO.getId());
+            resultDTO.setIssueTitle(issueDTO.getIssueTitle());
+            resultDTO.setSuggestion(issueDTO.getSuggestion());
+            resultDTO.setClosedTime(issueDTO.getClosedTimeStamp());
+            gridNameList.getData().stream().filter(o -> issueDTO.getGridId().equals(o.getOrgId())).forEach(o -> resultDTO.setTopicReleaseGridName(o.getOrgName()));
+            groupNameList.getData().stream().filter(g -> issueDTO.getSourceId().equals(g.getTopicId())).forEach(g -> resultDTO.setTopicReleaseGroupName(g.getTopicGroupName()));
+            resultDTOList.add(resultDTO);
+        }
+        return resultDTOList;
     }
 }