diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/RedisConst.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/RedisConst.java index 4ea986e..a022eb2 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/RedisConst.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/RedisConst.java @@ -12,4 +12,5 @@ public class RedisConst { public static final String TASK_REPEAT_CODE = "TASK_REPEAT_CODE@"; public static final String TASK_TIMER_CLOCK = "TASK_TIMER_CLOCK"; public static final String IMMEDIATELY_EXEC_TASK_TIME = "IMMEDIATELY_EXEC_TASK_TIME"; + public static final String REQUEST_UUID = "REQUEST_UUID@"; } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java index 7f8056d..be05d65 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java @@ -7,6 +7,7 @@ import com.inspect.analysis.domain.*; import com.inspect.analysis.service.IAnalysisService; import com.inspect.analysis.service.IResultAnalysisService; import com.inspect.base.core.constant.Color; +import com.inspect.base.core.constant.RedisConst; import com.inspect.base.core.domain.Response; import com.inspect.base.core.utils.DateUtils; import com.inspect.base.core.utils.StringUtils; @@ -114,7 +115,7 @@ public class AnalysisController extends BaseController { int size = 0; String taskId = ""; String requestId = analyseResult.getRequestId(); - String taskPatrolId = redisService.getCacheObject(requestId); + String taskPatrolId = redisService.getCacheObject(RedisConst.REQUEST_UUID + requestId); logger.info("[ANALYSIS] requestId: {}, taskPatrolId: {}", requestId, taskPatrolId); Map deviceIdLineIdMap = new HashMap<>(); PatrolTaskResultMain taskResultMain = new PatrolTaskResultMain(); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java index ca87892..96309f9 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java @@ -10,6 +10,7 @@ import com.inspect.analysis.service.IAnalysisLogService; import com.inspect.analysis.service.IAnalysisService; import com.inspect.analysis.service.IResultAnalysisService; import com.inspect.base.core.constant.Color; +import com.inspect.base.core.constant.RedisConst; import com.inspect.base.core.constant.Tags; import com.inspect.base.core.utils.DateUtils; import com.inspect.base.core.utils.StringUtils; @@ -104,7 +105,7 @@ public class AnalysisServiceImpl implements IAnalysisService { int size = 0; String taskId = ""; String requestId = analyseResult.getRequestId(); - String taskPatrolId = redisService.getCacheObject(requestId); + String taskPatrolId = redisService.getCacheObject(RedisConst.REQUEST_UUID + requestId); log.info("[ANALYSIS] requestId: {}, taskPatrolId: {}", requestId, taskPatrolId); Map deviceIdLineIdMap = new HashMap<>(); PatrolTaskResultMain taskResultMain = new PatrolTaskResultMain(); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index aaa746d..f63e80a 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -7,6 +7,7 @@ import com.inspect.analysis.domain.ResultAnalysis; import com.inspect.analysis.domain.resultList; import com.inspect.analysis.service.IResultAnalysisService; import com.inspect.base.core.constant.Color; +import com.inspect.base.core.constant.RedisConst; import com.inspect.base.core.domain.DataMsg; import com.inspect.base.core.enums.StaEnum; import com.inspect.base.core.enums.TaskStatus; @@ -386,8 +387,7 @@ public class PatrolResultController extends BaseController { PatrolTaskFtp patrolTaskFtp = patrolTaskFtpService.selectPatrolTaskFtpByLineId(2L); String uuid = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); - redisService.setCacheObject(uuid, patrolResultList.get(0).getTaskPatrolledId()); - redisService.expire(uuid, 1L, TimeUnit.DAYS); + redisService.setCacheObject(RedisConst.REQUEST_UUID + uuid, patrolResultList.get(0).getTaskPatrolledId(), 1L, TimeUnit.DAYS); String ANALYSIS_URL = patrolTaskService.selectConfigByKey("ANALYSIS_URL"); String BIG_ANALYSIS_URL = patrolTaskService.selectConfigByKey("BIG_ANALYSIS_URL"); String MAJOR_URL = patrolTaskService.selectConfigByKey("MAJOR_URL"); @@ -841,7 +841,7 @@ public class PatrolResultController extends BaseController { logger.info("callRemoteAlgorithm firList.isEmpty(): {}", firList.isEmpty()); if (!firList.isEmpty() && "true".equals(pictureFrame)) { String uuid = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); - redisService.setCacheObject(uuid, patrolResultList.get(0).getTaskPatrolledId(), 1L, TimeUnit.DAYS); + redisService.setCacheObject(RedisConst.REQUEST_UUID + uuid, patrolResultList.get(0).getTaskPatrolledId(), 1L, TimeUnit.DAYS); AnalyseRequest sendData = new AnalyseRequest(); sendData.setObjectList(firList); sendData.setRequestHostIp(MAJOR_URL); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java index 3d6f771..e5c5cd1 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java @@ -9,6 +9,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import com.inspect.base.core.constant.Color; +import com.inspect.base.core.constant.RedisConst; import com.inspect.base.core.utils.HttpClientUtils; import com.inspect.base.core.utils.StringUtils; import com.inspect.base.redis.service.RedisService; @@ -37,6 +38,8 @@ public class AnalyseRemoteService { public void sendRequest(AnalyseRequest analyseReq, boolean isFilter) { String requestId = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); String taskPatrolId = analyseReq.getTaskPatrolId(); + redisService.setCacheObject(RedisConst.REQUEST_UUID + requestId, taskPatrolId, 1L, TimeUnit.DAYS); + log.info("[CALL REMOTE ANALYZE] requestId: {}, taskPatrolId: {}", requestId, taskPatrolId); analyseReq.setRequestId(requestId); String taskSetKey = "ANALYSE_TASK_REQUEST:" + taskPatrolId; String requestSetKey = "ANALYSE_REQUEST_ALG:" + requestId;