From 744f368844d7701a7e5d8d8d5a73bcab3442a3cd Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 20 Jul 2021 09:45:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/SpecialSubjectDTO.java | 4 +++- .../src/main/java/com/epmet/dao/SpecialSubjectDao.java | 2 +- .../main/java/com/epmet/entity/SpecialSubjectEntity.java | 2 +- .../com/epmet/service/impl/SpecialSubjectServiceImpl.java | 6 +++--- .../src/main/resources/mapper/SpecialSubjectDao.xml | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java index 96cb4a1bdf..73e91072f0 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java @@ -103,6 +103,8 @@ public class SpecialSubjectDTO implements Serializable { */ private Date updatedTime; - // 扩展属性 + /** + * 标签名 + */ private String tagName; } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java index 0ada844144..4fcd896952 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java @@ -38,6 +38,6 @@ public interface SpecialSubjectDao extends BaseDao { List queryExistedList(@Param("orgId") String orgId,@Param("notList")List notList); - SpecialSubjectEntity getInfo(@Param("tagId") String tagId); + SpecialSubjectDTO getInfo(@Param("tagId") String tagId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java index 315224b46f..6f0f61ed9a 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java @@ -44,7 +44,7 @@ public class SpecialSubjectEntity extends BaseEpmetEntity { * 标签id */ private String tagId; - private String tagName; + /** * 新增此专题的用户id */ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java index 7228c102f8..785d2cc6a0 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java @@ -282,9 +282,9 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl result = new ArrayList<>(); formDTO.getTagIdList().forEach(tagId -> { PreviewResultDTO previewResultDTO = new PreviewResultDTO(); - SpecialSubjectEntity subjectEntity = baseDao.getInfo(tagId); - previewResultDTO.setSpecialSubjectId(subjectEntity.getId()); - previewResultDTO.setTagName(subjectEntity.getTagName()); + SpecialSubjectDTO subject = baseDao.getInfo(tagId); + previewResultDTO.setSpecialSubjectId(subject.getId()); + previewResultDTO.setTagName(subject.getTagName()); previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize())); result.add(previewResultDTO); }); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml index 4cd83f8b3a..fdc64cb40c 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml @@ -28,7 +28,7 @@ order by ss.CREATED_TIME desc - SELECT ss.id, TAG_NAME From 834d9dddeaf5171a58291b8919888a3ba3d2d15d Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 20 Jul 2021 09:48:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SpecialSubjectServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java index 785d2cc6a0..0ff3c6fe27 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java @@ -280,14 +280,16 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl preview(PreviewFormDTO formDTO) { List result = new ArrayList<>(); - formDTO.getTagIdList().forEach(tagId -> { - PreviewResultDTO previewResultDTO = new PreviewResultDTO(); - SpecialSubjectDTO subject = baseDao.getInfo(tagId); - previewResultDTO.setSpecialSubjectId(subject.getId()); - previewResultDTO.setTagName(subject.getTagName()); - previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize())); - result.add(previewResultDTO); - }); + if (CollectionUtils.isNotEmpty(formDTO.getTagIdList())) { + formDTO.getTagIdList().forEach(tagId -> { + PreviewResultDTO previewResultDTO = new PreviewResultDTO(); + SpecialSubjectDTO subject = baseDao.getInfo(tagId); + previewResultDTO.setSpecialSubjectId(subject.getId()); + previewResultDTO.setTagName(subject.getTagName()); + previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize())); + result.add(previewResultDTO); + }); + } return result; }