From 71b0b84bcae5edbf780313cfc2e6c71847aad826 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Jul 2020 09:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A3=B0=E9=9F=B3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E6=A0=87=E9=A2=98=E5=AE=A1=E6=A0=B8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E8=8D=89=E7=A8=BF=E8=AF=A6=E6=83=85=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/DraftDetailResultDTO.java | 7 +++- .../epmet/controller/ArticleController.java | 2 +- .../src/main/java/com/epmet/dao/DraftDao.java | 15 +++++-- .../java/com/epmet/entity/ArticleEntity.java | 30 ++++++++------ .../java/com/epmet/entity/DraftEntity.java | 30 ++++++++------ .../com/epmet/service/ArticleService.java | 6 ++- .../service/impl/ArticleServiceImpl.java | 40 ++++++++++++++----- .../java/com/epmet/utils/ModuleConstant.java | 17 ++++++-- .../db/migration/V0.0.2__addAutoPublish.sql | 6 ++- .../src/main/resources/mapper/DraftDao.xml | 12 +++++- 10 files changed, 115 insertions(+), 50 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java index 6298a5cfca..d56bb74248 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java @@ -28,6 +28,11 @@ public class DraftDetailResultDTO implements Serializable { */ private String title; + /** + * 标题审核状态 + */ + private String titleAuditStatus; + /** * 发布单位名称 */ @@ -36,7 +41,7 @@ public class DraftDetailResultDTO implements Serializable { /** * 发布日期 */ - @JsonFormat(pattern="yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date publishDate; /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index bf3de1429d..8f9b03861f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -255,7 +255,7 @@ public class ArticleController { articleService.updateAuditStatusFailById(draftId, syncScanResult); } } catch (Exception e) { - articleService.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL); + articleService.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null); log.error("scanContent exception draftId:{} return result null", e); } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java index 4e6c151df4..470ec938b6 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java @@ -75,10 +75,11 @@ public interface DraftDao extends BaseDao { /** * 草稿列表 - * @author zhaoqifeng - * @date 2020/6/3 14:54 + * * @param userId * @return java.util.List + * @author zhaoqifeng + * @date 2020/6/3 14:54 */ List selectDraftList(@Param("userId") String userId); @@ -102,5 +103,13 @@ public interface DraftDao extends BaseDao { int deleteDraft(String draftId); - int updateAuditStatusById(@Param("draftId") String draftId, @Param("statusFlag") String statusFlag); + /** + * desc:修改审核状态（2个状态至少填一个） + * + * @param draftId + * @param statusFlag + * @param titleAuditStatus + * @return + */ + int updateAuditStatusById(@Param("draftId") String draftId, @Param("statusFlag") String statusFlag, @Param("titleAuditStatus") String titleAuditStatus); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleEntity.java index 3b1021a004..13dc5bd83e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleEntity.java @@ -18,7 +18,6 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -43,24 +42,29 @@ public class ArticleEntity extends BaseEpmetEntity { */ private String customerId; - /** - * 草稿ID - */ + /** + * 草稿ID + */ private String draftId; - /** - * 文章标题 - */ + /** + * 文章标题 + */ private String title; - /** - * 文章内容 精简内容 - */ + /** + * 标题审核状态 + */ + private String titleAuditStatus; + + /** + * 文章内容 精简内容 + */ private String previewContent; - /** - * 是否置顶 - */ + /** + * 是否置顶 + */ private Integer isTop; /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftEntity.java index b3c7fd96b6..04e1b22158 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftEntity.java @@ -18,7 +18,6 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -38,24 +37,29 @@ public class DraftEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; - /** - * 客户ID - */ + /** + * 客户ID + */ private String customerId; - /** - * 文章标题 - */ + /** + * 文章标题 + */ private String title; - /** - * 文章内容 精简内容 - */ + /** + * 标题审核状态 + */ + private String titleAuditStatus; + + /** + * 文章内容 精简内容 + */ private String previewContent; - /** - * 是否置顶 - */ + /** + * 是否置顶 + */ private Integer isTop; /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index 6b69368795..634fcfa7f5 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -200,12 +200,14 @@ public interface ArticleService extends BaseService { DraftContentSaveResultDTO saveDraft(TokenDto tokenDto, DraftContentFromDTO fromDTO); /** - * desc:政府端点审核结果处理异常后 修改草稿审核状态 + * desc:政府端点审核结果处理异常后 修改草稿审核状态 2选1 + * * @param draftId * @param statusFlag + * @param titleAuditStatus * @return */ - void updateDraftPublishStatus(String draftId,String statusFlag); + void updateDraftPublishStatus(String draftId, String statusFlag, String titleAuditStatus); /** * desc:人工发布文章 不走审核接口 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 c5c4b74f0f..435f35c656 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 @@ -970,13 +970,19 @@ public class ArticleServiceImpl extends BaseServiceImpl failDataIds = syncScanResult.getFailDataIds(); for (String id : failDataIds) { if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX) >= NumConstant.ZERO) { draftCoverDao.updateAuditStatusById(id.replace(ModuleConstant.SCAN_COVER_PREFIX.concat(StrConstant.UNDER_LINE), ""), ModuleConstant.AUDIT_STATUS_FAIL); coverFail = true; + } else if (id.indexOf(ModuleConstant.SCAN_TITLE_PREFIX) >= NumConstant.ZERO) { + this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, ModuleConstant.AUDIT_STATUS_FAIL); + titleFail = true; } else { draftContentDao.updateAuditStatusById(id, ModuleConstant.AUDIT_STATUS_FAIL); contentFail = true; @@ -1113,18 +1121,28 @@ public class ArticleServiceImpl extends BaseServiceImpl { if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX) >= NumConstant.ZERO) { draftCoverDao.updateAuditStatusById(id.replace(ModuleConstant.SCAN_COVER_PREFIX.concat(StrConstant.UNDER_LINE), ""), ModuleConstant.AUDIT_STATUS_PASS); + } else if (id.indexOf(ModuleConstant.SCAN_TITLE_PREFIX) >= NumConstant.ZERO) { + this.updateDraftPublishStatus(draftId, null, ModuleConstant.AUDIT_STATUS_PASS); } else { draftContentDao.updateAuditStatusById(id, ModuleConstant.AUDIT_STATUS_PASS); } }); - if (coverFail || contentFail) { + if (coverFail || contentFail || titleFail) { String auditMsg = ""; - if (coverFail && contentFail) { + if (titleFail && coverFail && contentFail) { + auditMsg = ModuleConstant.DRAFT_TITLE_CONTENT_AND_COVER; + } else if (coverFail && contentFail) { auditMsg = ModuleConstant.DRAFT_CONTENT_AND_COVER; + } else if (titleFail && coverFail) { + auditMsg = ModuleConstant.DRAFT_TITLE_AND_COVER; + } else if (titleFail && contentFail) { + auditMsg = ModuleConstant.DRAFT_TITLE_AND_CONTENT; } else if (contentFail) { auditMsg = ModuleConstant.DRAFT_CONTENT; } else if (coverFail) { auditMsg = ModuleConstant.DRAFT_COVER; + } else if (titleFail) { + auditMsg = ModuleConstant.DRAFT_TITLE; } this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(), auditMsg)); } @@ -1154,8 +1172,8 @@ public class ArticleServiceImpl extends BaseServiceImpl - update draft set STATUS_FLAG =#{statusFlag,jdbcType=VARCHAR} where id=#{draftId,jdbcType=VARCHAR} + update draft + + + STATUS_FLAG =#{statusFlag,jdbcType=VARCHAR} + + + TITLE_AUDIT_STATUS = #{titleAuditStatus,jdbcType=VARCHAR} + + + where id=#{draftId,jdbcType=VARCHAR} \ No newline at end of file