Merge remote-tracking branch 'remotes/origin/dev_voice' into dev

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

@@ -1,6 +1,7 @@
 package com.epmet.commons.tools.utils;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
@@ -36,7 +37,7 @@ public class ScanContentUtils {
 			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(),Result.class);
+				return JSON.parseObject(result.getData(),new TypeReference<Result<SyncScanResult>>(){});
 			}
 			Result<SyncScanResult> resultResult = new Result<>();
 			resultResult.error(result.getCode(),result.getMsg());
@@ -62,7 +63,8 @@ public class ScanContentUtils {
 			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(),Result.class);
+				//return JSON.parseObject(result.getData(),Result.class);
+				return JSON.parseObject(result.getData(),new TypeReference<Result<SyncScanResult>>(){});
 			}
 			Result<SyncScanResult> resultResult = new Result<>();
 			resultResult.error(result.getCode(),result.getMsg());
@@ -83,7 +85,17 @@ public class ScanContentUtils {
 		list.add(p);
 		TextScanParamDTO param = new TextScanParamDTO();
 		param.setTasks(list);
-		Result<SyncScanResult> result = ScanContentUtils.textSyncScan(url, param);
+		Result<SyncScanResult> imgSyncScanResult = ScanContentUtils.textSyncScan(url, param);
-		System.out.println(JSON.toJSONString(result));
+		System.out.println(JSON.toJSONString(imgSyncScanResult));
-	}
+		SyncScanResult result = new SyncScanResult();
+		if (imgSyncScanResult != null){
+			SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData();
+			if (imgSyncScanResult.success()&&imgSyncScanResultData.isAllPass()) {
+				result.setAllPass(imgSyncScanResultData.isAllPass());
+				result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds());
+				result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds());
+				System.out.println("================"+JSON.toJSONString(result));
+			}
+			}
+		}
 }

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

@@ -264,7 +264,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		if (!CollectionUtils.isEmpty(fromDTO.getTagNameList())) {
 			List<String> tagNameList = fromDTO.getTagNameList();
 			tagNameList = tagNameList.stream().distinct().collect(Collectors.toList());
-			String tagNamesStr = StringUtils.join(tagNameList, "\\|");
+			String tagNamesStr = StringUtils.join(tagNameList, "|");
 			draftEntity.setTags(tagNamesStr);
 		}
 		draftEntity.setIsTop(fromDTO.getIsTop());