Merge branches 'dev' and 'dev_pyscreen' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreen

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDetailResultDTO.java

@@ -2,7 +2,6 @@ package com.epmet.project.dto.result;
 
 import com.epmet.evaluationindex.screen.dto.result.DepartmentNameListResultDTO;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -51,11 +50,17 @@ public class ProjectDetailResultDTO implements Serializable {
      */
     private List<DepartmentNameListResultDTO> departmentList;
 
+    /**
+     * 话题内容add at 21.03.01
+     */
+    private String topicContent;
+
     public ProjectDetailResultDTO() {
         this.eventTitle = "";
         this.eventContent = "";
         this.eventSource = "";
         this.imgUrlList = new ArrayList<>();
         this.processList = new ArrayList<>();
+        this.topicContent="";
     }
 }

epmet-module/data-report/data-report-server/pom.xml

@@ -88,6 +88,12 @@
             <artifactId>epmet-commons-dynamic-datasource</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>resi-group-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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;
@@ -26,8 +27,11 @@ import com.epmet.project.dto.form.DifficultyRankFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
 import com.epmet.project.dto.result.ProjectDetailResultDTO;
 import com.epmet.project.dto.result.*;
+import com.epmet.resi.group.dto.topic.ResiTopicDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,7 +62,8 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
-
+    @Autowired
+    private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
     /**
      * @Author sun
      * @Description 数据-项目-获取汇总数据
@@ -223,6 +228,14 @@ public class ProjectServiceImpl implements ProjectService {
         List<DepartmentNameListResultDTO> departmentNameListResultDTOS = ConvertUtils.sourceToTarget(data.getDepartmentList(), DepartmentNameListResultDTO.class);
         projectDetailResultDTO.setDepartmentList(departmentNameListResultDTOS);
         projectDetailResultDTO.setDepartmentNameList(data.getDepartmentNameList());
+        //返回话题内容
+        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());
+            }
+        }
         return projectDetailResultDTO;
     }
 

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

@@ -10,20 +10,20 @@ 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.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
+import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 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.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 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;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.HashMap;
 import java.util.List;
-import org.springframework.http.MediaType;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -32,7 +32,7 @@ import org.springframework.http.MediaType;
  * @date 2020/6/4 13:16
  */
 @FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class)
-//@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class,url = "localhost:8095")
+// @FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class,url = "localhost:8095")
 public interface ResiGroupOpenFeignClient {
 
     @PostMapping("/resi/group/group/gov-edit-auditing-list")
@@ -195,4 +195,7 @@ public interface ResiGroupOpenFeignClient {
      */
     @PostMapping("resi/group/topic/sendevent")
     Result sendEvent(@RequestBody TopicEventFormDTO param);
+
+    @GetMapping("resi/group/topic/querytopicinfobyissueid/{issueId}")
+    Result<ResiTopicDTO> queryTopicInfoByIssueId(@PathVariable("issueId")String issueId);
 }

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

@@ -1,7 +1,6 @@
 package com.epmet.resi.group.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
@@ -11,6 +10,7 @@ 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.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
+import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 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;
@@ -134,4 +134,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result sendEvent(TopicEventFormDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendEvent",param);
     }
+
+    @Override
+    public Result<ResiTopicDTO> queryTopicInfoByIssueId(String issueId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryTopicInfoByIssueId", issueId);
+    }
 }

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

@@ -1,6 +1,5 @@
 package com.epmet.modules.topic.controller;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.epmet.commons.tools.annotation.LoginUser;
@@ -16,6 +15,7 @@ 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 lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -429,4 +429,11 @@ public class ResiTopicController {
         return new Result();
     }
 
+    @GetMapping("querytopicinfobyissueid/{issueId}")
+    public Result<ResiTopicDTO> queryTopicInfoByIssueId(@PathVariable("issueId") String issueId) {
+        if (StringUtils.isNotBlank(issueId)) {
+            return new Result<ResiTopicDTO>().ok(topicService.queryTopicInfoByIssueId(issueId));
+        }
+        return new Result<>();
+    }
 }

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

@@ -210,4 +210,6 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
      * @date 2020/12/23 下午2:25
      */
     String selectCustomerIdByTopicId(@Param("topicId")String topicId);
+
+    ResiTopicDTO selectByIssueId(@Param("issueId") String issueId);
 }

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

@@ -350,4 +350,6 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2021.01.04 16:41
     */
     void sendTopicPointEventByEventType(TopicEventFormDTO param);
+
+    ResiTopicDTO queryTopicInfoByIssueId(String issueId);
 }

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

@@ -2145,6 +2145,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 		}
 	}
 
+    @Override
+    public ResiTopicDTO queryTopicInfoByIssueId(String issueId) {
+        return baseDao.selectByIssueId(issueId);
+    }
+
 }
 
 

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

@@ -565,5 +565,10 @@
           AND t.ID = #{topicId}
     </select>
 
+    <select id="selectByIssueId" parameterType="map" resultType="com.epmet.resi.group.dto.topic.ResiTopicDTO">
+        select * from resi_topic rt
+        where rt.DEL_FLAG='0'
+        and rt.ISSUE_ID=#{issueId}
+    </select>
 </mapper>