From b12eee29357a3470ee5fe4d0fea05fd361f8f3a0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 6 Jul 2020 15:05:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StatsPublicityController.java | 6 +-- .../epmet/service/StatsPublicityService.java | 42 +++++++++---------- .../impl/StatsPublicityServiceImpl.java | 23 +++++----- .../service/StatsPublicityTaskService.java | 8 ++-- .../PublicityTagUsedMonthlyStatsTask.java | 2 +- ...ityTagUsedQuarterlyAndYearlyStatsTask.java | 2 +- .../PublicityTagViewedMonthlyStatsTask.java | 2 +- 7 files changed, 43 insertions(+), 42 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java index c544d2d3b2..91fea2b2db 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java @@ -40,7 +40,7 @@ public class StatsPublicityController { } /** - * desc:【日】 统计发表文章最多的分类 包含 机关 部门 网格 + * desc:【日】 统计标签被使用次数 包含 机关 部门 网格 * * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据 * @return @@ -52,7 +52,7 @@ public class StatsPublicityController { } /** - * desc:【月,季，年】 统计发表文章最多的分类 包含 机关 部门 网格 + * desc:【月,季，年】 统计标签被使用次数 包含 机关 部门 网格 * * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据 * @return @@ -64,7 +64,7 @@ public class StatsPublicityController { } /** - * desc:【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 + * desc:【季，年】 统计标签被使用次数 包含 机关 部门 网格 * * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据 * @return diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java index 14a165b830..36e4428b42 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java @@ -4,74 +4,74 @@ package com.epmet.service; import com.epmet.dto.StatsFormDTO; public interface StatsPublicityService { - /** - * desc: 统计宣传能力的汇总信息 - * - * @return: Boolean - * @date: 2020/6/17 16:11 - * @author: jianjun liu - * @param statsDate - */ - Boolean articleSummaryDailyStatsjob(StatsFormDTO statsDate); + /** + * desc: 统计宣传能力的汇总信息 + * + * @param formDTO + * @return: Boolean + * @date: 2020/6/17 16:11 + * @author: jianjun liu + */ + Boolean articleSummaryDailyStatsjob(StatsFormDTO formDTO); /** * desc: 按日 统计每个标签被引用的使用文章数 * + * @param formDTO * @return: Boolean * @date: 2020/6/17 16:11 * @author: jianjun liu - * @param statsDate */ - Boolean tagUsedDailyStatsjob(StatsFormDTO statsDate); + Boolean tagUsedDailyStatsjob(StatsFormDTO formDTO); /** * desc: 按月 统计每个标签被引用的使用文章数 * * @param - * @param statsDate + * @param formDTO * @return: * @date: 2020/6/19 18:44 * @author: jianjun liu */ - Boolean tagUsedMonthlyStatsjob(StatsFormDTO statsDate); + Boolean tagUsedMonthlyStatsjob(StatsFormDTO formDTO); /** * desc: 按季年统计标签被使用次数 * - * @param statsDate + * @param formDTO * @return: * @date: 2020/6/20 10:44 * @author: jianjun liu */ - Boolean tagUsedQuarterlyStatsjob(StatsFormDTO statsDate); + Boolean tagUsedQuarterlyStatsjob(StatsFormDTO formDTO); /** * desc: 按日 统计每个标签的阅读数 * - * @param statsDate + * @param formDTO * @return: Boolean * @date: 2020/6/20 8:40 * @author: jianjun liu */ - Boolean tagViewedDailyStatsjob(StatsFormDTO statsDate); + Boolean tagViewedDailyStatsjob(StatsFormDTO formDTO); /** * desc: 按月统计标签被查看次数 * - * @param statsDate + * @param formDTO * @return: * @date: 2020/6/20 10:44 * @author: jianjun liu */ - Boolean tagViewedMonthlyStatsjob(StatsFormDTO statsDate); + Boolean tagViewedMonthlyStatsjob(StatsFormDTO formDTO); /** * desc: 按季年统计标签被查看次数 * - * @param statsDate + * @param formDTO * @return: * @date: 2020/6/20 10:44 * @author: jianjun liu */ - Boolean tagViewedQuarterlyStatsjob(StatsFormDTO statsDate); + Boolean tagViewedQuarterlyStatsjob(StatsFormDTO formDTO); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java index 23b75b1cbf..c0f4b194a9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java @@ -198,6 +198,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { try { + log.info("tagUsedMonthlyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); statsTagUsedMonthly(dimIdBean.getMonthId(), formDTO.getCustomerId()); } catch (Exception e) { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedMonthlyStatsjob", formDTO.getCustomerId(), dimIdBean.getMonthId()), e); @@ -206,6 +207,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; + log.info("tagUsedMonthlyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId()); do { customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); if (!CollectionUtils.isEmpty(customerIdList)) { @@ -228,6 +230,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { try { + log.info("tagViewedDailyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); statsTagViewedDaily(statsDate, dimIdBean, formDTO.getCustomerId()); } catch (Exception e) { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedDailyStatsjob", formDTO.getCustomerId(), dimIdBean.getMonthId()), e); @@ -236,6 +239,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; + log.info("tagViewedDailyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId()); do { customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); if (!CollectionUtils.isEmpty(customerIdList)) { @@ -259,6 +263,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { try { + log.info("tagViewedMonthlyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); statsTagViewedMonthly(dimIdBean.getMonthId(), formDTO.getCustomerId()); } catch (Exception e) { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedMonthlyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e); @@ -267,6 +272,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; + log.info("tagViewedMonthlyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId()); do { customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); if (!CollectionUtils.isEmpty(customerIdList)) { @@ -289,6 +295,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { try { + log.info("tagUsedQuarterlyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); try { log.debug("start === statsTagUsedQuarterly "); statsTagUsedQuarterly(dimIdBean.getQuarterId(), formDTO.getCustomerId()); @@ -305,6 +312,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedMonthlyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e); } } else { + log.info("tagUsedQuarterlyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; @@ -336,6 +344,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { Date statsDate = getStatsDateFromParam(formDTO); DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { + log.info("tagViewedQuarterlyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); try { log.debug("start === statsTagViewedQuarterly "); statsTagViewedQuarterly(dimIdBean.getQuarterId(), formDTO.getCustomerId()); @@ -349,6 +358,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagViewedQuarterly", formDTO.getCustomerId(), dimIdBean.getYearId()), e); } } else { + log.info("tagViewedQuarterlyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; @@ -474,7 +484,6 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { } boolean b = factArticlePublishedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), gridDailyEntityMap.values()); } catch (Exception e) { - e.printStackTrace(); log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsPublishedGridDaily", customerId, statsDate), e); } } @@ -560,14 +569,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { * * @param statsDate * @param dimIdBean - * @param customerId + * @param customerId remark:获取当天发布的文章数据，然后根据文章标签 进行统计，加上默认标签的数量 没有则为0 */ private void statsTagUsedDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId) { - //1.业务数据来源 发布时间为统计时间的 - // 因为一个客户的发布文章数在同一天不会特别的多，所以以客户为单位查询今天发布的所有带有标签的文章 根据发布单位类型进行拆分 - // 1.1查出今天所有的文章标签 根据网格Id - // 1.2 //获取所有网格 List agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId); if (CollectionUtils.isEmpty(agencyDTOList)) { @@ -715,14 +720,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { * * @param statsDate * @param dimIdBean - * @param customerId + * @param customerId remark:根据统计时间的阅读文章记录，然后根据文章Id获取到对应的标签 然后 进行统计 */ private void statsTagViewedDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId) { - //1.业务数据来源 发布时间为统计时间的 - // 因为一个客户的发布文章数在同一天不会特别的多，所以以客户为单位查询今天发布的所有带有标签的文章 根据发布单位类型进行拆分 - // 1.1查出今天所有的文章标签 根据网格Id - // 1.2 //获取所有机关 用于后面想上级添加数据 List agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId); if (CollectionUtils.isEmpty(agencyDTOList)) { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java index 2b1c2df325..40107e4f80 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java @@ -22,7 +22,7 @@ public interface StatsPublicityTaskService { Result articleSummaryDailyStatsjob(StatsFormDTO formDTO); /** - * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 + * desc: 定时任务 【日】统计标签被使用次数 包含 机关 部门 网格 * * @return: * @date: 2020/6/22 9:09 @@ -31,7 +31,7 @@ public interface StatsPublicityTaskService { Result tagUsedDailyStatsjob(StatsFormDTO formDTO); /** - * desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 + * desc: 【月】 统计标签被使用次数包含 机关 部门 网格 * * @date: 2020/6/22 9:09 * @author: jianjun liu @@ -39,7 +39,7 @@ public interface StatsPublicityTaskService { Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO); /** - * desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 + * desc: 【季，年】 统计标签被使用次数 包含 机关 部门 网格 * * @date: 2020/6/22 9:09 * @author: jianjun liu @@ -55,7 +55,7 @@ public interface StatsPublicityTaskService { Result tagViewedDailyStatsjob(StatsFormDTO formDTO); /** - * desc: 【月，季，年】 统计阅读最多的标签 包含 机关 网格 + * desc: 【月】 统计阅读最多的标签 包含 机关 网格 * * @date: 2020/6/22 9:09 * @author: jianjun liu diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java index a09f97c854..e21f058b4a 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** - * desc:标签被使用次数 【月、季、年】统计定时任务 + * desc:标签被使用次数 【月】统计定时任务 */ @Component("publicityTagUsedMonthlyStatsTask") public class PublicityTagUsedMonthlyStatsTask implements ITask { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java index e6ce88d6a5..af82f6038a 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** - * desc:标签被使用次数 【月、季、年】统计定时任务 + * desc:标签被使用次数 【季、年】统计定时任务 */ @Component("publicityTagUsedQuarterlyAndYearlyStatsTask") public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java index ed3badd326..7b61aa5c7f 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** - * desc:标签被阅读次数 【月、季、年】统计定时任务 + * desc:标签被阅读次数 【月】统计定时任务 */ @Component("publicityTagViewedMonthlyStatsTask") public class PublicityTagViewedMonthlyStatsTask implements ITask { From 857c7ec592b94dcd1410522dc30840d0f7ec42c3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Jul 2020 10:55:34 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8api?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scan/common/enu/SuggestionEnum.java | 4 +- .../scan/common/enu/SysResponseEnum.java | 1 - .../scan/service/impl/ScanServiceImpl.java | 104 +++++------------- 3 files changed, 31 insertions(+), 78 deletions(-) diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SuggestionEnum.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SuggestionEnum.java index 455b2975f4..3881508341 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SuggestionEnum.java +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SuggestionEnum.java @@ -4,14 +4,14 @@ import java.util.ArrayList; import java.util.List; /** - * desc:文本检测建议 + * desc:检测建议 * @author jianjun liu * @date 2020-06-04 21:39 **/ public enum SuggestionEnum { PASS("pass", "正常"), REVIEW("review", "需要人工审核"), - BLOCK("block", "文本违规"); + BLOCK("block", "内容违规"); private String code; private String desc; diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SysResponseEnum.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SysResponseEnum.java index 330cdb87e8..67ee3cc9d2 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SysResponseEnum.java +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/enu/SysResponseEnum.java @@ -2,7 +2,6 @@ package com.epmet.openapi.scan.common.enu; /** * @author jianjun liu - * @email liujianjun@yunzongnet.com * @date 2020-06-04 21:39 **/ public enum SysResponseEnum { diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java index 709fc7aef4..58fd107bc0 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java @@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.aliyuncs.AcsRequest; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.exceptions.ServerException; import com.aliyuncs.green.model.v20180509.ImageAsyncScanRequest; import com.aliyuncs.green.model.v20180509.ImageSyncScanRequest; import com.aliyuncs.green.model.v20180509.TextScanRequest; @@ -162,7 +160,7 @@ public class ScanServiceImpl implements ScanService { imageAsyncScanRequest.setReadTimeout(6000); try { - ImgAsyncScanResult scanResult = executeAsyncImg(imageAsyncScanRequest); + ImgAsyncScanResult scanResult = null;//executeAsyncImg(imageAsyncScanRequest); return new Result().ok(scanResult); } catch (Exception e) { log.error("sendImgScan execute Exception", e); @@ -177,98 +175,52 @@ public class ScanServiceImpl implements ScanService { if (httpResponse.isSuccess()) { JSONObject scrResponse = JSON.parseObject(new String(httpResponse.getHttpContent(), SysConstant.UTF8)); - //System.out.println(JSON.toJSONString(scrResponse, true)); if (HttpStatus.SC_OK == scrResponse.getInteger(SysConstant.CODE)) { //任务 列表 List scanTaskResults = scrResponse.getJSONArray(SysConstant.DATA).toJavaList(ScanTaskResult.class); for (ScanTaskResult taskResult : scanTaskResults) { result.getDetails().add(taskResult); //又根据场景不同 - if (HttpStatus.SC_OK == taskResult.getCode()) { - //如果是多个场景 则为对个 BaseScanResult - List sceneResults = taskResult.getResults(); - //是文本检测 目前就一种场景 - boolean isSuccess = true; - for (SceneDetailResult sceneResult : sceneResults) { - String suggestion = sceneResult.getSuggestion(); - if (SuggestionEnum.PASS.getCode().equals(suggestion)) { - isSuccess = false; - break; - } - } - if (isSuccess){ + if (HttpStatus.SC_OK != taskResult.getCode()) { + if (!result.getFailDataIds().contains(taskResult.getDataId())) { result.getFailDataIds().add(taskResult.getDataId()); - } else { - result.getSuccessDataIds().add(taskResult.getDataId()); + log.warn("executeSyncText task process fail:code:{},result:{}", taskResult.getCode(), JSON.toJSONString(taskResult)); } + continue; + } + //如果是多个场景 则为对个 BaseScanResult + List sceneResults = taskResult.getResults(); + //是文本检测 目前就一种场景 + boolean isSuccess = true; + for (SceneDetailResult sceneResult : sceneResults) { + String suggestion = sceneResult.getSuggestion(); + if (SuggestionEnum.BLOCK.getCode().equals(suggestion)) { + isSuccess = false; + break; + } + } + if (isSuccess) { + result.getSuccessDataIds().add(taskResult.getDataId()); } else { + log.warn("executeSyncText dataId:{} block:{}", taskResult.getDataId(), JSON.toJSONString(taskResult.getResults())); result.getFailDataIds().add(taskResult.getDataId()); - log.warn("executeSyncText task process fail:code:{},msg:{}", taskResult.getCode(), taskResult.getMsg()); - throw new ExeCuteHttpException(" executeSyncTexttask process fail:code:" + taskResult.getCode() + ",msg:" + taskResult.getMsg()); } } return result; } else { + log.warn("executeSyncText response not success. code:{}", scrResponse.getInteger(SysConstant.CODE)); throw new ExeCuteHttpException("executeSyncText detect not success. code:" + scrResponse.getInteger(SysConstant.CODE)); } } else { - log.warn("executeSyncText response not success. status:" + httpResponse.getStatus()); + log.warn("executeSyncText response not success. status:{}", httpResponse.getStatus()); throw new ExeCuteHttpException("response not success. status:" + httpResponse.getStatus()); } - } catch (Exception e) { - log.warn("executeSyncImg exception", e); + log.warn("executeSyncText exception", e); throw new ExeCuteHttpException(SysResponseEnum.EXCEPTION.getCode(), SysResponseEnum.EXCEPTION.getMsg()); } } - - /** - * desc:异步 检查图片 TODO 结果处理 - * - * @param request - * @return - */ - private ImgAsyncScanResult executeAsyncImg(AcsRequest request) { - ImgAsyncScanResult result = new ImgAsyncScanResult(); - try { - HttpResponse httpResponse = IAcsClientUtil.getIAcsClient().doAction(request); - if (httpResponse.isSuccess()) { - JSONObject scrResponse = JSON.parseObject(new String(httpResponse.getHttpContent(), SysConstant.UTF8)); - //System.out.println(JSON.toJSONString(scrResponse, true)); - if (HttpStatus.SC_OK == scrResponse.getInteger(SysConstant.CODE)) { - JSONArray taskResults = scrResponse.getJSONArray(SysConstant.DATA); - for (Object taskResult : taskResults) { - if (HttpStatus.SC_OK == ((JSONObject) taskResult).getInteger(SysConstant.CODE)) { - String taskId = ((JSONObject) taskResult).getString("taskId"); - // 将taskId 保存下来，间隔一段时间来轮询结果, 参照ImageAsyncScanResultsRequest - result.getSuccessTaskIds().add(taskId); - } else { - String taskId = ((JSONObject) taskResult).getString("taskId"); - result.getFailTaskIds().add(taskId); - log.warn("task process fail:{}", ((JSONObject) taskResult).getInteger(SysConstant.CODE)); - continue; - } - } - return result; - } else { - System.out.println("detect not success. code:" + scrResponse.getInteger(SysConstant.CODE)); - throw new ExeCuteHttpException("detect not success. code:" + scrResponse.getInteger(SysConstant.CODE)); - } - } else { - System.out.println("response not success. status:" + httpResponse.getStatus()); - throw new ExeCuteHttpException("response not success. status:" + httpResponse.getStatus()); - } - } catch (ServerException e) { - e.printStackTrace(); - } catch (ClientException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - } - return result; - } - private SyncScanResult executeSyncImg(AcsRequest request) { SyncScanResult result = new SyncScanResult(); try { @@ -283,6 +235,7 @@ public class ScanServiceImpl implements ScanService { if (HttpStatus.SC_OK != taskResult.getCode()) { if (!result.getFailDataIds().contains(taskResult.getDataId())) { result.getFailDataIds().add(taskResult.getDataId()); + log.warn("executeSyncImg detect not success. code:{},result:{}", taskResult.getCode(), JSON.toJSONString(taskResult)); } continue; } @@ -297,19 +250,20 @@ public class ScanServiceImpl implements ScanService { break; } } - if (isSuccess){ + if (isSuccess) { result.getSuccessDataIds().add(taskResult.getDataId()); - }else{ + } else { + log.warn("executeSyncImg dataId:{} block:{}", taskResult.getDataId(), JSON.toJSONString(taskResult.getResults())); result.getFailDataIds().add(taskResult.getDataId()); } } return result; } else { - log.warn("executeSyncImg detect not success. code:", scrResponse.getInteger(SysConstant.CODE)); + log.warn("executeSyncImg detect not success. code:{}", scrResponse.getInteger(SysConstant.CODE)); throw new ExeCuteHttpException("detect not success. code:" + scrResponse.getInteger(SysConstant.CODE)); } } else { - log.warn("executeSyncImg response not success. status:" + httpResponse.getStatus()); + log.warn("executeSyncImg response not success. status:{}", httpResponse.getStatus()); throw new ExeCuteHttpException("response not success. status:" + httpResponse.getStatus()); } } catch (Exception e) { From e97a2d95b830facc90820197c98192bcf1751c57 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Jul 2020 11:07:24 +0800 Subject: [PATCH 3/6] =?UTF-8?q?gov=20voice=E4=BF=AE=E6=94=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8api=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-voice/gov-voice-server/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 41174b5606..63313523a3 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -134,7 +134,7 @@ false - https://epmet-dev.elinkservice.cn/epmetscan/api + https://epmet-dev.elinkservice.cn/api/epmetscan/api @@ -167,7 +167,7 @@ true - https://epmet-dev.elinkservice.cn/epmetscan/api + https://epmet-dev.elinkservice.cn/api/epmetscan/api @@ -197,7 +197,7 @@ true - https://epmet-open.elinkservice.cn:7040/epmetscan/api + https://epmet-open.elinkservice.cn/api/epmetscan/api From f6c07b565d0f5f8994abe5d58f98a9253a1fe501 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Jul 2020 11:10:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=83=A8=E7=BD=B2gov=20voice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index 9a098dd8c9..315b948a99 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.59 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.60 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index a3f5a780b5..8076291c2a 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.59 + 0.3.60 gov-voice com.epmet From c51f48004de0896db21ef2c2b1eeeb0ffcb1d5df Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Jul 2020 12:28:36 +0800 Subject: [PATCH 5/6] =?UTF-8?q?gov-issue,gov-project,resi-group=E4=BF=AE?= =?UTF-8?q?=E6=94=B9scanapi=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-issue/gov-issue-server/pom.xml | 6 +++--- epmet-module/gov-project/gov-project-server/pom.xml | 6 +++--- epmet-module/resi-group/resi-group-server/pom.xml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index c62f715bb6..7d4f211888 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -147,7 +147,7 @@ false - https://epmet-dev.elinkservice.cn/epmetscan/api + https://epmet-dev.elinkservice.cn/api/epmetscan/api https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c @@ -184,7 +184,7 @@ true - https://epmet-dev.elinkservice.cn/epmetscan/api + https://epmet-dev.elinkservice.cn/api/epmetscan/api https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c @@ -218,7 +218,7 @@ true - https://epmet-open.elinkservice.cn:7040/epmetscan/api + https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 72a2d4b2b0..fb0c8b5f6c 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -147,7 +147,7 @@ false - https://epmet-dev.elinkservice.cn/epmetscan/api + https://epmet-dev.elinkservice.cn/api/epmetscan/api @@ -180,7 +180,7 @@ true - https://epmet-dev.elinkservice.cn/epmetscan/api + https://epmet-dev.elinkservice.cn/api/epmetscan/api @@ -210,7 +210,7 @@ true - https://epmet-open.elinkservice.cn:7040/epmetscan/api + https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index ca1ef02f6c..93c64a2540 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -150,7 +150,7 @@ false - https://epmet-dev.elinkservice.cn/epmetscan/api + https://epmet-dev.elinkservice.cn/api/epmetscan/api @@ -182,7 +182,7 @@ false true - https://epmet-dev.elinkservice.cn/epmetscan/api + https://epmet-dev.elinkservice.cn/api/epmetscan/api @@ -211,7 +211,7 @@ false true - https://epmet-open.elinkservice.cn:7040/epmetscan/api + https://epmet-open.elinkservice.cn/api/epmetscan/api From c231246702b0c8fb7bcfec412dc9d5136997a988 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 7 Jul 2020 12:31:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?gov-issue,gov-project,resi-group=E9=83=A8?= =?UTF-8?q?=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-test.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- .../gov-project-server/deploy/docker-compose-test.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index d4627e55db..4b27e8212c 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.50 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.51 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index 4ead2072a6..ccc53b97d9 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.50 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.51 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml index a18c32a917..6d12039b0a 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.50 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.51 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 7d4f211888..6eeb2a35c3 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.50 + 0.3.51 gov-issue com.epmet diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 9e943276d9..f5f033e08c 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.37 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.38 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index d2443e2430..f3f7157861 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.37 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.38 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml index d5b4d6936d..be230acf39 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.37 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.38 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index fb0c8b5f6c..ab5057b85d 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.37 + 0.3.38 gov-project com.epmet diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 6371e3b3fe..281ea59d07 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.60 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.61 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index bcd8e5754a..5a39890745 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.60 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.61 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml index 03b8267679..6d5b2048fa 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.60 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.61 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index b897855fb3..0b734ec6b3 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.60 + 0.3.61 com.epmet resi-group