From 64e14e3f383b3a212cbd15edc32d16c9c20f7abc Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 13 Apr 2023 10:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E8=A1=97=E9=81=93?= =?UTF-8?q?=E3=80=911.=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF+PC=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E6=96=87=E7=AB=A0=E5=92=8C=E8=8D=89=E7=A8=BF=E7=9A=84?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E5=88=97=E8=A1=A8=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=8F?= =?UTF-8?q?=E7=9B=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/DraftAttrFromDTO.java | 5 +++++ .../main/java/com/epmet/dto/form/DraftContentFromDTO.java | 5 +++++ .../main/java/com/epmet/dto/result/DraftListResultDTO.java | 4 ++++ .../com/epmet/dto/result/GovArticleDetailResultDTO.java | 5 ++++- .../java/com/epmet/dto/result/OfflineListResultDTO.java | 5 +++++ .../main/java/com/epmet/controller/DraftController.java | 2 +- .../java/com/epmet/service/impl/ArticleServiceImpl.java | 7 +++++-- .../src/main/resources/mapper/ArticleDao.xml | 3 +++ .../src/main/resources/mapper/DraftDao.xml | 1 + 9 files changed, 33 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftAttrFromDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftAttrFromDTO.java index 6d4b81cc2a..fb472b3096 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftAttrFromDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftAttrFromDTO.java @@ -42,6 +42,11 @@ public class DraftAttrFromDTO implements Serializable { @NotBlank(message = "草稿ID不能为空") private String draftId; + /** + * 栏目 + */ + private String category; + /** * 封面图片地址 */ diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java index 09c6818ac2..717930c62e 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java @@ -43,6 +43,11 @@ public class DraftContentFromDTO implements Serializable { */ private String draftId; + /** + * 栏目 + */ + private String category; + /** * 文章标题 */ diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftListResultDTO.java index e3f62d12d5..f3c5e77a86 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftListResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftListResultDTO.java @@ -19,6 +19,10 @@ public class DraftListResultDTO implements Serializable { * 文章ID */ private String draftId; + /** + * 栏目 + */ + private String category; /** * 文章标题 */ diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovArticleDetailResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovArticleDetailResultDTO.java index 5ca995d10e..9e30604875 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovArticleDetailResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovArticleDetailResultDTO.java @@ -21,7 +21,10 @@ public class GovArticleDetailResultDTO implements Serializable { * 文章id */ private String articleId; - + /** + * 栏目 + */ + private String category; /** * 标题 */ diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/OfflineListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/OfflineListResultDTO.java index e277f6cd7a..c7e86d113f 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/OfflineListResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/OfflineListResultDTO.java @@ -19,6 +19,11 @@ public class OfflineListResultDTO implements Serializable { * 文章ID */ private String articleId; + + /** + * 栏目 + */ + private String category; /** * 文章标题 */ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java index 6cf5a28000..39e70e953e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java @@ -68,7 +68,7 @@ public class DraftController { } @PostMapping("draftlist") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_LIST) + // @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_LIST) public Result> draftList(@LoginUser TokenDto tokenDto, @RequestBody DraftListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return new Result>().ok(draftService.draftList(tokenDto, formDTO).getList()); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 14e3054801..c8146140d2 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -187,6 +187,7 @@ public class ArticleServiceImpl extends BaseServiceImpl draftContentList = null; if (StringUtils.isNotBlank(fromDTO.getDraftId())) { draftEntity = this.checkDraftStatus(fromDTO.getDraftId()); + draftEntity.setCategory(fromDTO.getCategory()); draftEntity.setTitle(StringUtils.isBlank(fromDTO.getTitle()) ? "" : fromDTO.getTitle()); buildPreviewContent(fromDTO, draftEntity); draftDao.updateById(draftEntity); @@ -212,6 +213,7 @@ public class ArticleServiceImpl extends BaseServiceImpl publishRangeEntityList = buildDraftPublishRange(draftEntity, tokenDto, fromDTO); - - + // 栏目 + draftEntity.setCategory(fromDTO.getCategory()); executeSaveDraftAttr(draftEntity, coverEntity, publishRangeEntityList); return true; } @@ -933,6 +935,7 @@ public class ArticleServiceImpl extends BaseServiceImpl SELECT a.ID AS "articleId", + a.CATEGORY AS "category", a.TITLE AS "title", IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent", a.PUBLISHER_NAME AS "publisherName", @@ -135,6 +137,7 @@ SELECT DISTINCT a.ID AS "articleId", a.TITLE AS "title", + a.CATEGORY AS "category", IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent", a.PUBLISHER_NAME AS "publisherName", a.OFF_LINE_TIME AS "publishDate" diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml index 8d8e396aac..28b4aa5e0b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml @@ -135,6 +135,7 @@ SELECT ID AS "draftId", TITLE AS "title", + CATEGORY AS "category", IFNULL(PREVIEW_CONTENT, "") AS "content", UNIX_TIMESTAMP(CREATED_TIME) AS "createdTime", STATUS_FLAG AS auditStatus