diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java index 8f6aa53..9586b18 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java @@ -103,6 +103,9 @@ public class JobMainTask { @Value("${jobtask.keepAliveTime:100}") private int keepAliveTime; + @Value("${task.scheduler.batch-size:100}") + private int taskBatchSize; + private ExecutorService threadPool; final ShaoXinBigModel shaoXinBigModel; @@ -711,7 +714,7 @@ public class JobMainTask { } taskExecRecord.setCursorNumber(cursor); - if (bOk) { + //if (bOk) { success++; log.info("execute point success, cursor: {}, success: {}, total: {}", cursor, success, total); taskExecRecord.setFinishNumber(success); @@ -728,9 +731,10 @@ public class JobMainTask { totalProgress, TaskStatus.RUNNING.getCode()/*运行中百分比上报*/ ); - } else { - log.info("execute point fail, cursor: {}, success: {}, total: {}", cursor, success, total); - } +// } +// else { +// log.info("execute point fail, cursor: {}, success: {}, total: {}", cursor, success, total); +// } taskExecClient.updatePatrolTaskExecRecord(taskExecRecord); return cursor; } @@ -1087,8 +1091,9 @@ public class JobMainTask { // } private void prePointExecImmediate(final PatrolTaskExecRecord patrolTaskExecRecord, List patrolTaskInfoList) { - int batchSize = 100; + int batchSize = taskBatchSize; int total = patrolTaskInfoList.size(); + log.info(Color.CYAN + "batchSize: {}, total: {}" + Color.END, batchSize, total); int index = 1; for (int i = 0; i < total; i += batchSize) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmRequestProcessConsumer.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmRequestProcessConsumer.java index f89a8bd..e5fe523 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmRequestProcessConsumer.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmRequestProcessConsumer.java @@ -2,11 +2,13 @@ package com.inspect.analysis.service.impl; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.inspect.analysis.constant.AnalyseConstants; +import com.inspect.base.core.constant.Color; import com.inspect.base.redis.service.RedisService; import com.inspect.partrolresult.domain.AnalyseRequest; import com.inspect.partrolresult.service.AnalyseRemoteService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -23,13 +25,15 @@ public class AlgorithmRequestProcessConsumer { @Resource private AnalyseRemoteService analyseRemoteService; - @Scheduled(fixedDelay = 1000) + //@Scheduled(fixedDelay = 1000) + @Scheduled(fixedDelayString = "${task.scheduler.request.delay-ms:1000}") public void pollAndProcess() { + //logger.info(Color.YELLOW + "AlgorithmRequestProcessConsumerTracer" + Color.END); String requestDataInRedis; RedisTemplate redisTemplate = redisService.redisTemplate; while ((requestDataInRedis = redisTemplate.opsForList().leftPop(AnalyseConstants.ALGORITHM_REQUEST_QUEUE)) != null) { try { - logger.info("AlgorithmProcessConsumer pollAndProcess queueSize: {}, requestData:{}", getQueueSize(), requestDataInRedis); + logger.info(Color.CYAN + "AlgorithmRequestProcessConsumerTracer queueSize: {}, requestData: {}" + Color.END, getQueueSize(), requestDataInRedis); AnalyseRequest analyseRequest = new Gson().fromJson(requestDataInRedis, AnalyseRequest.class); analyseRemoteService.sendRequest(analyseRequest, analyseRequest.getTypeList(), analyseRequest.isFilter()); } catch (Exception e) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmResponseProcessConsumer.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmResponseProcessConsumer.java index 1cb40e7..b419fd6 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmResponseProcessConsumer.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AlgorithmResponseProcessConsumer.java @@ -3,6 +3,7 @@ package com.inspect.analysis.service.impl; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.inspect.analysis.constant.AnalyseConstants; import com.inspect.analysis.service.IAnalysisService; +import com.inspect.base.core.constant.Color; import com.inspect.base.redis.service.RedisService; import com.inspect.partrolresult.domain.AnalyseRequest; import com.inspect.partrolresult.service.AnalyseRemoteService; @@ -24,13 +25,15 @@ public class AlgorithmResponseProcessConsumer { @Resource private IAnalysisService analysisService; - @Scheduled(fixedDelay = 1000) + //@Scheduled(fixedDelay = 1000) + @Scheduled(fixedDelayString = "${task.scheduler.response.delay-ms:1000}") public void pollAndProcess() { + //logger.info(Color.CYAN + "AlgorithmResponseProcessConsumerTracer" + Color.END); String responseDataInRedis; RedisTemplate redisTemplate = redisService.redisTemplate; while ((responseDataInRedis = redisTemplate.opsForList().leftPop(AnalyseConstants.ALGORITHM_RESPONSE_QUEUE)) != null) { try { - logger.info("AlgorithmResponseProcessConsumer pollAndProcess queueSize: {}, responseData:{}", getQueueSize(), responseDataInRedis); + logger.info(Color.CYAN + "AlgorithmResponseProcessConsumerTracer queueSize: {}, responseData: {}" + Color.END, getQueueSize(), responseDataInRedis); // AnalyseRequest analyseRequest = new Gson().fromJson(responseDataInRedis, AnalyseRequest.class); // analyseRemoteService.sendRequest(analyseRequest, analyseRequest.getTypeList(), analyseRequest.isFilter()); analysisService.handleAlgorithmResult(responseDataInRedis); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 22e4a4c..ba004f4 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -225,7 +225,7 @@ public class PatrolTaskController extends BaseController { logger.info("---------------[TASK] query resultAnalysis {}", resultAnalysis); // 初筛数据 List filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); - logger.info("---------------[TASK] query filterList {}", filterList); + logger.debug("---------------[TASK] query filterList {}", filterList); List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); resultAnalysis.setFilter("0"); long t2 = System.currentTimeMillis();