|
@ -987,7 +987,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
result = new SyncScanResult(); |
|
|
result = new SyncScanResult(); |
|
|
if (imgSyncScanResult != null){ |
|
|
if (imgSyncScanResult != null){ |
|
|
SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData(); |
|
|
SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData(); |
|
|
if (imgSyncScanResult.success()&&imgSyncScanResultData.isAllPass()) { |
|
|
if (imgSyncScanResult.success()) { |
|
|
result.setAllPass(imgSyncScanResultData.isAllPass()); |
|
|
result.setAllPass(imgSyncScanResultData.isAllPass()); |
|
|
result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds()); |
|
|
result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds()); |
|
|
result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds()); |
|
|
result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds()); |
|
@ -995,7 +995,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
} |
|
|
} |
|
|
if (textSyncScanResult != null) { |
|
|
if (textSyncScanResult != null) { |
|
|
SyncScanResult textSyncScanResultData = textSyncScanResult.getData(); |
|
|
SyncScanResult textSyncScanResultData = textSyncScanResult.getData(); |
|
|
if (textSyncScanResult.success() && textSyncScanResultData.isAllPass()) { |
|
|
if (textSyncScanResult.success()) { |
|
|
result.setAllPass(result.isAllPass() ? textSyncScanResultData.isAllPass() : false); |
|
|
result.setAllPass(result.isAllPass() ? textSyncScanResultData.isAllPass() : false); |
|
|
result.getSuccessDataIds().addAll(textSyncScanResultData.getSuccessDataIds()); |
|
|
result.getSuccessDataIds().addAll(textSyncScanResultData.getSuccessDataIds()); |
|
|
result.getFailDataIds().addAll(textSyncScanResultData.getFailDataIds()); |
|
|
result.getFailDataIds().addAll(textSyncScanResultData.getFailDataIds()); |
|
@ -1053,6 +1053,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
log.error("updateAuditStatusFailById draftId:{} is not exist in db", draftId); |
|
|
log.error("updateAuditStatusFailById draftId:{} is not exist in db", draftId); |
|
|
throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); |
|
|
throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); |
|
|
} |
|
|
} |
|
|
|
|
|
this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL); |
|
|
boolean coverFail = false,contentFail = false; |
|
|
boolean coverFail = false,contentFail = false; |
|
|
try { |
|
|
try { |
|
|
List<String> failDataIds = syncScanResult.getFailDataIds(); |
|
|
List<String> failDataIds = syncScanResult.getFailDataIds(); |
|
@ -1082,13 +1083,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
}else if (coverFail){ |
|
|
}else if (coverFail){ |
|
|
auditMsg = "封面"; |
|
|
auditMsg = "封面"; |
|
|
} |
|
|
} |
|
|
this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle(),auditMsg)); |
|
|
this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(),auditMsg)); |
|
|
this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL); |
|
|
|
|
|
} |
|
|
} |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
log.error("scanAllPassPublishArticle update db exception", e); |
|
|
log.error("scanAllPassPublishArticle update db exception", e); |
|
|
this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle())); |
|
|
this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle())); |
|
|
this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL); |
|
|
|
|
|
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); |
|
|
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|