党建园地-最新议题接口修改(话题内容改为议题建议)

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

@@ -22,9 +22,9 @@ public class LatestIssueListResultDTO implements Serializable {
      */
     private String issueTitle = "";
     /**
-     * 话题内容
+     * 话题转议题组长输入的建议
      */
-    private String topicContent = "";
+    private String suggestion = "";
     /**
      * 用户头像
      */

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java

@@ -66,7 +66,6 @@ public interface IssueConstant {
     String REDIS_KEY = "epmet:issue:";
 
     String SELECT_ISSUEPROJECTRELATION_EXCEPTION = "获取议题项目关系数据失败";
-    String SELECT_RESI_GROUP_EXCEPTION = "获取话题数据失败";
 
     /**
      * 议题表决缓存属性值 supportAmount

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@@ -62,14 +62,6 @@ public interface ResiGroupFeignClient {
     @PostMapping("/resi/group/topic/checktopicpublisher")
     Result<CheckTopicPublisherResultDTO> checkTopicPublisher(@RequestBody CheckTopicPublisherFormDTO formDTO);
 
-    /**
-     * @param topicIdList
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    @PostMapping("/resi/group/topic/gettopiclist/{topicIdList}")
-    Result<List<ResiTopicDTO>> getTopicList(@PathVariable("topicIdList") List<String> topicIdList);
-
     /**
      * @Description 得到一个网格下的应表数
      * @param gridIdFormDTO

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java

@@ -45,11 +45,6 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "checkTopicPublisher", formDTO);
     }
 
-    @Override
-    public Result<List<ResiTopicDTO>> getTopicList(List<String> topicIdList) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicList", topicIdList);
-    }
-
     @Override
     public Result<Integer> votableCount(CommonGridIdFormDTO gridIdFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "votableCount", gridIdFormDTO);

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

@@ -659,19 +659,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         List<UserResiInfoResultDTO> userInfoList = listResult.getData();
 
-        //3:调用resi-group服务，批量查询话题内容
-        List<String> topicIdList = entityList.stream().map(IssueEntity::getSourceId).collect(Collectors.toList());
-        Result<List<ResiTopicDTO>> resultTopicList = resiGroupFeignClient.getTopicList(topicIdList);
-        if (!resultTopicList.success() || null == resultTopicList.getData()) {
-            throw new RenException(IssueConstant.SELECT_RESI_GROUP_EXCEPTION);
-        }
-        List<ResiTopicDTO> topicList = resultTopicList.getData();
-
-        //4:遍历组装对象
+        //3:遍历组装对象
         entityList.forEach(issue -> {
             LatestIssueListResultDTO resultDTO = new LatestIssueListResultDTO();
             resultDTO.setIssueId(issue.getId());
             resultDTO.setIssueTitle(issue.getIssueTitle());
+            resultDTO.setSuggestion(issue.getSuggestion());
             resultDTO.setCreateIssueTime(issue.getCreatedTime().getTime()/1000);
             userInfoList.forEach(user -> {
                 if (issue.getCreatedBy().equals(user.getUserId())) {
@@ -680,12 +673,6 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     resultDTO.setIssuePublisherName(user.getShowName());
                 }
             });
-            topicList.forEach(topic -> {
-                if (issue.getSourceId().equals(topic.getId())) {
-                    //话题内容
-                    resultDTO.setTopicContent(topic.getTopicContent());
-                }
-            });
             returnList.add(resultDTO);
         });
 

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

@@ -259,15 +259,4 @@ public class ResiTopicController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<CheckTopicPublisherResultDTO>().ok(topicService.checkTopicPublisher(formDTO));
     }
-
-    /**
-     * @param topicIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    @PostMapping(value = "gettopiclist/{topicIdList}")
-    public Result<List<ResiTopicDTO>> getTopicList(@PathVariable("topicIdList") List<String> topicIdList){
-        return new Result<List<ResiTopicDTO>>().ok(topicService.getTopicList(topicIdList));
-    }
 }

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

@@ -153,11 +153,4 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
      */
     CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO);
 
-    /**
-     * @param topicIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    List<ResiTopicDTO> selectTopicListById(@Param("topicIdList") List<String> topicIdList);
 }

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

@@ -264,11 +264,4 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      */
     CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO);
 
-    /**
-     * @param topicIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    List<ResiTopicDTO> getTopicList(List<String> topicIdList);
 }

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

@@ -1167,17 +1167,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         return resiTopicDao.checkTopicPublisher(formDTO);
     }
 
-    /**
-     * @param topicIdList
-     * @return
-     * @Author sun
-     * @Description 批量查询话题信息
-     **/
-    @Override
-    public List<ResiTopicDTO> getTopicList(List<String> topicIdList) {
-        return baseDao.selectTopicListById(topicIdList);
-    }
-
 }
 
 

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

@@ -446,17 +446,5 @@
             AND created_by = #{createdBy}
             AND id = #{topicId}
     </select>
-
-    <select id="selectTopicListById" resultType="com.epmet.resi.group.dto.topic.ResiTopicDTO">
-        SELECT
-            *
-        FROM
-            resi_topic
-        WHERE
-            del_flag = '0'
-        <foreach item="topicId" collection="topicIdList" separator="OR" open="AND (" close=")" index="">
-            id = #{topicId}
-        </foreach>
-    </select>
 </mapper>