Merge remote-tracking branch 'origin/dev_longwanscreen' into dev_temp

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

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.datareport.service.project.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
@@ -230,6 +231,7 @@ public class ProjectServiceImpl implements ProjectService {
         //返回话题内容
         if(result.success()&&null!=result.getData()){
             Result<ResiTopicDTO> topicResult = resiGroupOpenFeignClient.queryTopicInfoByIssueId(result.getData().getIssueId());
+            log.info(String.format("根据issueId:%s查询话题详情返参:%s", result.getData().getIssueId(), JSON.toJSONString(topicResult)));
             if (topicResult.success() && null != topicResult.getData() && StringUtils.isNotBlank(topicResult.getData().getTopicContent())) {
                 projectDetailResultDTO.setTopicContent(topicResult.getData().getTopicContent());
             }

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

@@ -17,6 +17,7 @@ import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -196,6 +197,6 @@ public interface ResiGroupOpenFeignClient {
     Result sendEvent(@RequestBody TopicEventFormDTO param);
 
 
-    @PostMapping("resi/group/topic/querytopicinfobyissue/{issueId}")
+    @GetMapping("resi/group/topic/querytopicinfobyissueid/{issueId}")
     Result<ResiTopicDTO> queryTopicInfoByIssueId(@PathVariable("issueId")String issueId);
 }

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

@@ -434,7 +434,7 @@ public class ResiTopicController {
         return new Result();
     }
 
-    @PostMapping("querytopicinfobyissueid/{issueId}")
+    @GetMapping("querytopicinfobyissueid/{issueId}")
     public Result<ResiTopicDTO> queryTopicInfoByIssueId(@PathVariable("issueId") String issueId) {
         if (StringUtils.isNotBlank(issueId)) {
             return new Result<ResiTopicDTO>().ok(topicService.queryTopicInfoByIssueId(issueId));