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

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

@@ -1,8 +1,9 @@
 package com.epmet.commons.tools.utils;
-
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
@@ -167,6 +168,19 @@ public class HttpClientManager {
 		}
 		throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 	}
+
+	public static void main(String[] args) {
+		String url = "http://192.168.1.130:8107/epmetscan/api/textSyncScan";
+		TextTaskDTO p = new TextTaskDTO();
+		p.setDataId("1");
+		p.setContent("neirong1");
+		List<TextTaskDTO> list = new ArrayList<>();
+		list.add(p);
+		TextScanParamDTO param = new TextScanParamDTO();
+ 		param.setTasks(list);
+		Result<String> result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(param));
+		System.out.println(JSON.toJSONString(result));
+	}
 }
 
 

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

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -15,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
  * @email liujianjun@yunzongnet.com
  * @date 2020-06-08 8:28
  **/
+@Slf4j
 public class ScanContentUtils {
 	/**
 	 * desc:图片同步扫描
@@ -22,6 +24,7 @@ public class ScanContentUtils {
 	 * @return
 	 */
 	public static SyncScanResult imgSyncScan(String url, ImgScanParamDTO param) {
+		log.debug("imgSyncScan param:",JSON.toJSONString(param));
 		if (StringUtils.isBlank(url) || param == null) {
 			throw new RenException("参数错误");
 		}
@@ -42,6 +45,7 @@ public class ScanContentUtils {
 	 * @return
 	 */
 	public static SyncScanResult textSyncScan(String url, TextScanParamDTO param) {
+		log.debug("textSyncScan param:",JSON.toJSONString(param));
 		if (StringUtils.isBlank(url) || param == null) {
 			throw new RenException("参数错误");
 		}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java

@@ -31,6 +31,11 @@ public interface DraftConstant {
      */
     String AUDITING = "auditing";
 
+    /**
+     * 审核失败：auditfail
+     */
+    String AUDITFAIL = "auditfail";
+
     //是否置顶
     /**
      * 置顶：1

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

@@ -101,4 +101,6 @@ public interface DraftDao extends BaseDao<DraftEntity> {
     List<GovDraftContentDTO> selectDraftContentList(String draftId);
 
     int deleteDraft(String draftId);
+
+	int updateAuditStatusById(@Param("draftId") String draftId, @Param("statusFlag") String statusFlag);
 }

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

@@ -389,7 +389,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		coverEntity.setCustomerId(tokenDto.getCustomerId());
 		coverEntity.setDraftId(fromDTO.getDraftId());
 		coverEntity.setImgUrl(coverImg);
-		coverEntity.setAuditStatus(ModuleConstant.AUDIT_STATUS_PASS);
+		coverEntity.setAuditStatus("");
 		coverEntity.setAuditReason("");
 		coverEntity.setDelFlag(NumConstant.ZERO_STR);
 		return coverEntity;
@@ -456,7 +456,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			entity.setDraftId(fromDTO.getDraftId());
 			entity.setOrderNum(i + 1);
 			//默认通过
-			entity.setAuditStatus(ModuleConstant.AUDIT_STATUS_PASS);
+			entity.setAuditStatus("");
 			newContentList.add(entity);
 		}
 
@@ -938,10 +938,16 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				}
 			});
 		}
-
-		//todo 执行审核
-		SyncScanResult imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiHost.concat(imgSyncScanMethod),imgScanParamDTO);
-		SyncScanResult textSyncScanResult = ScanContentUtils.textSyncScan(scanApiHost.concat(textSyncScanMethod),textScanParamDTO);
+		SyncScanResult imgSyncScanResult = null;
+		SyncScanResult textSyncScanResult = null;
+		try {
+			imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiHost.concat(imgSyncScanMethod),imgScanParamDTO);
+			textSyncScanResult = ScanContentUtils.textSyncScan(scanApiHost.concat(textSyncScanMethod),textScanParamDTO);
+		} 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)
+		}
 		SyncScanResult result = new SyncScanResult();
 		if (imgSyncScanResult.isAllPass()){
 			result.setAllPass(imgSyncScanResult.isAllPass());
@@ -981,6 +987,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
 			this.sendMsg(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());
 		}
 
@@ -998,6 +1005,14 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				draftContentDao.updateAuditStatusById(id,ModuleConstant.AUDIT_STATUS_FAIL);
 			}
 		});
+		List<String> successDataIds = syncScanResult.getSuccessDataIds();
+		successDataIds.forEach(id->{
+			if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX)>=0){
+				draftCoverDao.updateAuditStatusById(id,ModuleConstant.AUDIT_STATUS_PASS);
+			}else{
+				draftContentDao.updateAuditStatusById(id,ModuleConstant.AUDIT_STATUS_PASS);
+			}
+		});
 	}
 
 	@Override
@@ -1014,10 +1029,13 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		formDTO.setTitle(String.format(ModuleConstant.MSG_TITLE,title));
 		formDTO.setMessageContent(content);
 		formDTO.setReadFlag(ReadFlagConstant.UN_READ);
-
 		return epmetMessageOpenFeignClient.saveUserMessage(formDTO);
 	}
 
+	private void updateDraftPublishStatus(String draftId,String statusFlag){
+		draftDao.updateAuditStatusById(draftId,statusFlag);
+	}
+
 	/**
 	 * @Description  更新DB的标签使用次数		政府端
 	 * @param draftId

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

@@ -128,4 +128,7 @@
     <update id="deleteDraft" parameterType="java.lang.String">
         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>
 </mapper>