审核失败代码调整

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java

@@ -23,19 +23,21 @@ public class ScanContentUtils {
 	 *
 	 * @return
 	 */
-	public static SyncScanResult imgSyncScan(String url, ImgScanParamDTO param) {
-		log.debug("imgSyncScan param:", JSON.toJSONString(param));
+	public static Result<SyncScanResult> imgSyncScan(String url, ImgScanParamDTO param) {
+		log.debug("imgSyncScan param:{}", JSON.toJSONString(param));
 		if (StringUtils.isBlank(url) || param == null) {
 			throw new RenException("参数错误");
 		}
 		try {
 			Result<String> result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(param));
+			log.debug("imgSyncScan result:{}", JSON.toJSONString(param));
 			if (result.success()) {
-				return JSON.parseObject(result.getData(), SyncScanResult.class);
+				return new Result<SyncScanResult>().ok(JSON.parseObject(result.getData(), SyncScanResult.class));
 			}
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), result.getMsg());
+			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), result.getMsg());
 		} catch (Exception e) {
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
+			log.debug("imgSyncScan param:{}", JSON.toJSONString(param));
+			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
 		}
 	}
 
@@ -44,19 +46,21 @@ public class ScanContentUtils {
 	 *
 	 * @return
 	 */
-	public static SyncScanResult textSyncScan(String url, TextScanParamDTO param) {
-		log.debug("textSyncScan param:", JSON.toJSONString(param));
+	public static  Result<SyncScanResult> textSyncScan(String url, TextScanParamDTO param) {
+		log.debug("textSyncScan param:{}", JSON.toJSONString(param));
 		if (StringUtils.isBlank(url) || param == null) {
 			throw new RenException("参数错误");
 		}
 		try {
 			Result<String> result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(param));
+			log.debug("textSyncScan result:{}", JSON.toJSONString(result));
 			if (result.success()) {
-				return JSON.parseObject(result.getData(), SyncScanResult.class);
+				return new Result<SyncScanResult>().ok(JSON.parseObject(result.getData(), SyncScanResult.class));
 			}
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), result.getMsg());
+			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), result.getMsg());
 		} catch (Exception e) {
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
+			log.error("textSyncScan exception:", e);
+			return new Result<SyncScanResult>().error(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage());
 		}
 	}
 }

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

@@ -948,8 +948,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 					}
 				});
 			}
-			SyncScanResult imgSyncScanResult = null;
-			SyncScanResult textSyncScanResult = null;
+			Result<SyncScanResult> imgSyncScanResult = null;
+			Result<SyncScanResult> textSyncScanResult = null;
 
 			if(!CollectionUtils.isEmpty(imgScanParamDTO.getTasks())){
 			log.info("scanContent imgScanParamDTO:{}", JSON.toJSONString(imgScanParamDTO));
@@ -964,22 +964,24 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 
 			result = new SyncScanResult();
-			if (imgSyncScanResult.isAllPass()) {
-				result.setAllPass(imgSyncScanResult.isAllPass());
-				result.getSuccessDataIds().addAll(imgSyncScanResult.getSuccessDataIds());
-				result.getFailDataIds().addAll(imgSyncScanResult.getFailDataIds());
+			SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData();
+			if (imgSyncScanResult.success()&&imgSyncScanResultData.isAllPass()) {
+				result.setAllPass(imgSyncScanResultData.isAllPass());
+				result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds());
+				result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds());
 			}
-			if (textSyncScanResult.isAllPass()) {
-				result.setAllPass(result.isAllPass() ? textSyncScanResult.isAllPass() : false);
-				result.getSuccessDataIds().addAll(textSyncScanResult.getSuccessDataIds());
-				result.getFailDataIds().addAll(textSyncScanResult.getFailDataIds());
+			SyncScanResult textSyncScanResultData = textSyncScanResult.getData();
+			if (textSyncScanResult.success()&&textSyncScanResultData.isAllPass()) {
+				result.setAllPass(result.isAllPass() ? textSyncScanResultData.isAllPass() : false);
+				result.getSuccessDataIds().addAll(textSyncScanResultData.getSuccessDataIds());
+				result.getFailDataIds().addAll(textSyncScanResultData.getFailDataIds());
 			}
 		} catch (Exception e) {
 			log.error("scanContent exception", e);
 			this.sendMsg(draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
 		}
-		log.error("scanContent result", JSON.toJSONString(result));
+		log.debug("scanContent result", JSON.toJSONString(result));
 		return result;
 	}
 	@Override