From 8392e1416aba29b9446ea82e1ae170f4d3394a8b Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 8 Jun 2020 12:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9api=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=EF=BC=9B=E6=B7=BB=E5=8A=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=8D=89=E7=A8=BF=E5=86=85=E5=AE=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/DraftContentDao.java    |  2 ++
 .../src/main/java/com/epmet/dao/DraftCoverDao.java  |  2 +-
 .../com/epmet/service/impl/ArticleServiceImpl.java  | 13 +++++++------
 .../src/main/resources/bootstrap.yml                |  5 ++++-
 .../src/main/resources/mapper/DraftContentDao.xml   |  3 +++
 .../src/main/resources/mapper/DraftCoverDao.xml     |  2 +-
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftContentDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftContentDao.java
index a1c220aaff..1abca178e0 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftContentDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftContentDao.java
@@ -49,4 +49,6 @@ public interface DraftContentDao extends BaseDao<DraftContentEntity> {
      * @return
      */
     List<DraftContentEntity> selectScanContentByDraftId(String draftId);
+
+    int updateAuditStatusById(@Param("id")String id, @Param("auditStatus")String auditStatus);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftCoverDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftCoverDao.java
index 45eab3d1dc..d9bec5bd34 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftCoverDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftCoverDao.java
@@ -51,5 +51,5 @@ public interface DraftCoverDao extends BaseDao<DraftCoverEntity> {
      **/
     DraftCoverDTO selectCoverIdAndUrlByDraftId(@Param("draftId")String draftId);
 
-    int updateAuditStatusById(@Param("draftId")String id, @Param("auditStatus")String auditStatus);
+    int updateAuditStatusById(@Param("id")String id, @Param("auditStatus")String auditStatus);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index dc89051e29..af4d96dde5 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -122,6 +122,10 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 	@Value("${openapi.scan.server.host}")
 	private String scanApiHost;
+	@Value("${openapi.scan.method.imgSyncScan}")
+	private String imgSyncScanMethod;
+	@Value("${openapi.scan.method.textSyncScan}")
+	private String textSyncScanMethod;
 
 	private static final String AGENCY = "agency";
 	private static final String GRID = "grid";
@@ -932,10 +936,9 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 
 		//todo 执行审核
-		SyncScanResult imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiHost,imgScanParamDTO);
-		SyncScanResult textSyncScanResult = ScanContentUtils.textSyncScan(scanApiHost,textScanParamDTO);
+		SyncScanResult imgSyncScanResult = ScanContentUtils.imgSyncScan(scanApiHost.concat(imgSyncScanMethod),imgScanParamDTO);
+		SyncScanResult textSyncScanResult = ScanContentUtils.textSyncScan(scanApiHost.concat(textSyncScanMethod),textScanParamDTO);
 		SyncScanResult result = new SyncScanResult();
-
 		if (imgSyncScanResult.isAllPass()){
 			result.setAllPass(imgSyncScanResult.isAllPass());
 			result.getSuccessDataIds().addAll(imgSyncScanResult.getSuccessDataIds());
@@ -987,11 +990,9 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX)>=0){
 				draftCoverDao.updateAuditStatusById(id,ModuleConstant.AUDIT_STATUS_FAIL);
 			}else{
-				//TODO 修改内容 审核状态
+				draftContentDao.updateAuditStatusById(id,ModuleConstant.AUDIT_STATUS_FAIL);
 			}
-
 		});
-
 	}
 
 	public Result sendMsg(String title,String content) {
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
index 23c588c59d..cf9123df0f 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
@@ -97,4 +97,7 @@ ribbon:
 openapi:
   scan:
     server:
-      host: http://localhost:8107/epmetscan
+      host: http://localhost:8107/epmetscan/api
+    mehod:
+      imgSyncScan: /imgSyncScan
+      textSyncScan: /textSyncScan
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftContentDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftContentDao.xml
index 799d6fba71..6f13de52b5 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftContentDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftContentDao.xml
@@ -34,5 +34,8 @@
         WHERE
             DEL_FLAG = 0 AND DRAFT_ID = #{draftId,jdbcType=VARCHAR}
     </select>
+    <update id="updateAuditStatusById">
+        UPDATE DRAFT_CONTENT SET AUDIT_STATUS = #{auditStatus,jdbcType=VARCHAR} WHERE ID = #{id,jdbcType=VARCHAR}
+    </update>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml
index a35c5343fc..740bde510d 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml
@@ -25,7 +25,7 @@
          SELECT ID,IMG_URL FROM DRAFT_COVER WHERE DEL_FLAG = 0 AND DRAFT_ID = #{draftId,jdbcType=VARCHAR}
     </select>
     <update id="updateAuditStatusById">
-        UPDATE DRAFT_COVER SET AUDIT_STATUS = #{auditStatus,jdbcType=VARCHAR}
+        UPDATE DRAFT_COVER SET AUDIT_STATUS = #{auditStatus,jdbcType=VARCHAR} WHERE ID = #{id,jdbcType=VARCHAR}
     </update>
 
 </mapper>
\ No newline at end of file