From 8169d6b4f9b6bae9e4e5a7cdacddec76f8da36df Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Jun 2020 17:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/utils/HttpClientManager.java | 16 ++++++++++++++- .../commons/tools/utils/ScanContentUtils.java | 4 ++++ .../com/epmet/constant/DraftConstant.java | 5 +++++ .../src/main/java/com/epmet/dao/DraftDao.java | 2 ++ .../service/impl/ArticleServiceImpl.java | 20 ++++++++++++++----- .../src/main/resources/mapper/DraftDao.xml | 3 +++ 6 files changed, 44 insertions(+), 6 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java index 5422ce563f..82f50cf042 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java +++ b/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 list = new ArrayList<>(); + list.add(p); + TextScanParamDTO param = new TextScanParamDTO(); + param.setTasks(list); + Result result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(param)); + System.out.println(JSON.toJSONString(result)); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java index cfab55c859..057b4b7e23 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java +++ b/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("参数错误"); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java index 25dbb4b000..b4d0f0f12f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java +++ b/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 diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java index 57d555b5d2..4e6c151df4 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java @@ -101,4 +101,6 @@ public interface DraftDao extends BaseDao { List selectDraftContentList(String draftId); int deleteDraft(String draftId); + + int updateAuditStatusById(@Param("draftId") String draftId, @Param("statusFlag") String statusFlag); } \ 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 4482f98178..44e9794186 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 @@ -938,10 +938,16 @@ public class ArticleServiceImpl extends BaseServiceImpl update draft set DEL_FLAG='1' where id=#{draftId} + + update draft set STATUS_FLAG =#{statusFlag,jdbcType=VARCHAR} where id=#{draftId,jdbcType=VARCHAR} + \ No newline at end of file