From a5e331b9ed8ace8d6b5a35547ecb0a35409ab70c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 30 Sep 2022 16:28:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/IssueResultDTO.java | 13 +++++- .../epmet/service/impl/IssueServiceImpl.java | 7 +++- .../src/main/resources/mapper/IssueDao.xml | 41 ++++++++++++++----- .../dto/result/IssueDetailResultDTO.java | 11 +++++ .../com/epmet/dto/result/IssueResultDTO.java | 10 +++++ 5 files changed, 68 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java index f63ea2d492..a08efd39b4 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Author zxc @@ -15,7 +16,7 @@ import java.util.Date; public class IssueResultDTO implements Serializable { private static final long serialVersionUID = -1L; - + private String issueId; /** * 议题标题 */ @@ -53,4 +54,14 @@ public class IssueResultDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date shiftIssueTime; + + /** + * 来源类型 话题：resi_topic；直接立议题：issue； + */ + private String sourceType; + + /** + * 发布议题的图片 + */ + private List issueImgs; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 8ca9185566..dca54d5ab8 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.AchievementTypeEnum; @@ -213,13 +214,15 @@ public class IssueServiceImpl extends BaseServiceImpl imp //议题信息 IssueResultDTO issueResult = issueDao.issueDetail(issueDetail); if (null != issueResult && StringUtils.isNotBlank(issueResult.getGridId())) { - BelongGridNameFormDTO formDTO = new BelongGridNameFormDTO(); + /*BelongGridNameFormDTO formDTO = new BelongGridNameFormDTO(); formDTO.setGridId(issueResult.getGridId()); Result result = govOrgOpenFeignClient.getGridNameByGridId(formDTO); logger.info("根据网格id查询网格名称接口返参：" + JSON.toJSONString(result)); if (result.success() && null != result.getData()) { issueResult.setGridName(result.getData().getBelongsGridName()); - } + }*/ + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(issueResult.getGridId()); + issueResult.setGridName(null != gridInfoCache ? gridInfoCache.getGridNamePath() : StrConstant.EPMETY_STR); } return issueResult; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index a1e3a4acd1..080f01afe6 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -28,21 +28,40 @@ + + + + + + + + + + + + + + - SELECT - source_id AS topicId, - issue_title AS issueTitle, - issue_status AS issueStatus, - suggestion AS issueSuggestion, - grid_id AS gridId, - created_by AS userId, - CREATED_TIME as shiftIssueTime + i.id as issueId, + i.source_id AS topicId, + i.issue_title AS issueTitle, + i.issue_status AS issueStatus, + i.suggestion AS issueSuggestion, + i.grid_id AS gridId, + i.created_by AS userId, + i.CREATED_TIME as shiftIssueTime, + i.SOURCE_TYPE, + ia.URL FROM - issue + issue i + left join issue_attachment ia + on(i.id=ia.BUSINESS_ID and ia.del_flag='0') WHERE - id = #{issueId} - AND del_flag = 0 + i.id = #{issueId} + AND i.del_flag = 0