党建声音添加 标题审核字段，草稿详情返回审核状态

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;
 
     /**

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);
 		}
 	}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java

@@ -75,10 +75,11 @@ public interface DraftDao extends BaseDao<DraftEntity> {
 
     /**
      * 草稿列表
-     * @author zhaoqifeng
-     * @date 2020/6/3 14:54
+     *
      * @param userId
      * @return java.util.List<com.epmet.dto.result.DraftListResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/6/3 14:54
      */
     List<DraftListResultDTO> selectDraftList(@Param("userId") String userId);
 
@@ -102,5 +103,13 @@ public interface DraftDao extends BaseDao<DraftEntity> {
 
     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);
 }

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;
@@ -53,6 +52,11 @@ public class ArticleEntity extends BaseEpmetEntity {
 	 */
 	private String title;
 
+	/**
+	 * 标题审核状态
+	 */
+	private String titleAuditStatus;
+
 	/**
 	 * 文章内容 精简内容
 	 */

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;
@@ -48,6 +47,11 @@ public class DraftEntity extends BaseEpmetEntity {
 	 */
 	private String title;
 
+	/**
+	 * 标题审核状态
+	 */
+	private String titleAuditStatus;
+
 	/**
 	 * 文章内容 精简内容
 	 */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java

@@ -200,12 +200,14 @@ public interface ArticleService extends BaseService<ArticleEntity> {
 	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:人工发布文章 不走审核接口

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<ArticleDao, ArticleEntit
 
 		if (!isOk) {
 			this.sendMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
-			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
+			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 			return null;
 		}
 		SyncScanResult result = null;
 		try {
 			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
 			ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+
+			TextTaskDTO titleTextTask = new TextTaskDTO();
+			titleTextTask.setDataId(ModuleConstant.SCAN_TITLE_PREFIX.concat(StrConstant.UNDER_LINE).concat(draftEntity.getId()));
+			titleTextTask.setContent(draftEntity.getTitle());
+			textScanParamDTO.getTasks().add(titleTextTask);
+
 			DraftCoverDTO draftCoverDTO = draftCoverDao.selectCoverIdAndUrlByDraftId(draftId);
 			if (draftCoverDTO != null) {
 				ImgTaskDTO taskDTO = new ImgTaskDTO();
@@ -1021,7 +1027,6 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				}
 			}
 
-
 			result = new SyncScanResult();
 			if (imgSyncScanResult != null) {
 				SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData();
@@ -1042,7 +1047,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		} catch (Exception e) {
 			log.error("scanContent exception", e);
 			this.sendMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
-			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
+			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 		}
 		log.debug("scanContent result:{}", JSON.toJSONString(result));
 		return result;
@@ -1092,18 +1097,21 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
 		}
 		if (syncScanResult.isAllPass()) {
-			this.updateDraftPublishStatus(draftId, DraftConstant.PUBLISHED);
+			this.updateDraftPublishStatus(draftId, DraftConstant.PUBLISHED, null);
 		} else {
-			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
+			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 		}
 
-		boolean coverFail = false, contentFail = false;
+		boolean coverFail = false, contentFail = false, titleFail = false;
 		try {
 			List<String> 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<ArticleDao, ArticleEntit
 			successDataIds.forEach(id -> {
 				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<ArticleDao, ArticleEntit
 	}
 
 	@Override
-	public void updateDraftPublishStatus(String draftId, String statusFlag) {
-		draftDao.updateAuditStatusById(draftId, statusFlag);
+	public void updateDraftPublishStatus(String draftId, String statusFlag, String titleAuditStatus) {
+		draftDao.updateAuditStatusById(draftId, statusFlag, titleAuditStatus);
 	}
 
 	@Override
@@ -1164,7 +1182,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		try {
 			//校验草稿状态 并更新为已发布
 			DraftEntity draftEntity = checkDraftStatus(draftId);
-			this.updateDraftPublishStatus(draftId, DraftConstant.PUBLISHED);
+			this.updateDraftPublishStatus(draftId, DraftConstant.PUBLISHED, null);
 			//复制 草稿到文章（草稿内容，封面，属性）
 			ArticleEntity articleEntity = this.publishDraftToArticle(draftEntity, ArticleConstant.PUBLISH_WAY_MANUAL);
 			UpdateCustomerTagCacheDTO updateCustomerTagCacheDTO = this.updateCustomerTag(tokenDto, draftId);

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/utils/ModuleConstant.java

@@ -66,22 +66,27 @@ public interface ModuleConstant {
 
     /**
      * 草稿未找到异常模板
-     * */
+     */
     String SPECIFIED_DRAFT_NOT_FOUNT_EXCEPTION_TEMPLATE = "未找到指定草稿，草稿Id：【%s】";
 
     /**
      * 内容审核 封面图片前缀，用于标识这个Id是封面图片
-     * */
+     */
     String SCAN_COVER_PREFIX = "cover_";
 
+    /**
+     * 内容审核 标题前缀，用于标识这个Id是标题
+     */
+    String SCAN_TITLE_PREFIX = "title_";
+
     /**
      * 文章站内消息标题
-     * */
+     */
     String MSG_TITLE = "您有一条文章【%s】的消息";
 
     /**
      * 文章未审核通过 消息内容模版
-     * */
+     */
     String MSG_AUDIT_CONTENT = "您好，您发布的【%s】文章%s审核未通过，请重新编辑后发布，谢谢。";
 
     /**
@@ -116,11 +121,15 @@ public interface ModuleConstant {
 
     String DRAFT_ID_IS_NULL = "草稿ID不能为空";
 
+    String DRAFT_TITLE_CONTENT_AND_COVER = "标题、内容和封面";
+    String DRAFT_TITLE_AND_COVER = "标题和封面";
+    String DRAFT_TITLE_AND_CONTENT = "标题和内容";
     String DRAFT_CONTENT_AND_COVER = "内容和封面";
 
     String DRAFT_CONTENT = "内容";
 
     String DRAFT_COVER = "封面";
+    String DRAFT_TITLE = "标题";
 
     String DRAFT_CONTENT_IS_NULL = "文章封面不能为空";
 

epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql

@@ -1,2 +1,6 @@
 ALTER TABLE `epmet_gov_voice`.`article`
 ADD COLUMN `PUBLISH_WAY` varchar(16) NOT NULL DEFAULT 'autoAudit' COMMENT '发布方式 自动审核后发布：autoAudit;人工确认无误发布(不审核)：manualNoAudit' AFTER `TAGS`;
+ALTER TABLE `epmet_gov_voice`.`draft`
+ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`;
+ALTER TABLE `epmet_gov_voice`.`article`
+ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`;

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml

@@ -155,6 +155,7 @@
         SELECT
             d.id AS draft_id,
             d.TITLE,
+            d.TITLE_AUDIT_STATUS,
             d.PUBLISHER_NAME,
             d.PUBLISH_DATE,
             0 AS visit_record_count,
@@ -185,6 +186,15 @@
         update draft set DEL_FLAG='1' where id=#{draftId}
     </update>
     <update id="updateAuditStatusById">
-         update draft set STATUS_FLAG =#{statusFlag,jdbcType=VARCHAR} where id=#{draftId,jdbcType=VARCHAR}
+        update draft
+        <set>
+            <if test="titleAuditStatus != null and titleAuditStatus!= ''">
+                STATUS_FLAG =#{statusFlag,jdbcType=VARCHAR}
+            </if>
+            <if test="titleAuditStatus != null and titleAuditStatus!= ''">
+                TITLE_AUDIT_STATUS = #{titleAuditStatus,jdbcType=VARCHAR}
+            </if>
+        </set>
+        where id=#{draftId,jdbcType=VARCHAR}
     </update>
 </mapper>