From 5667eaea71c3c0ae4c1d42205d42d1b1a9cdac51 Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Mon, 21 Sep 2026 17:00:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=8C=E7=BB=93=E5=AD=97=E6=AE=B5completed?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=95=B0=E6=8D=AE=E4=B8=8A=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/analysis/domain/AnalyseResult.java | 1 + .../service/impl/AnalyseResponseServiceImpl.java | 12 +++++------- .../service/impl/BasedataDeviceServiceImpl.java | 3 --- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResult.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResult.java index 5fe91c6..beecd22 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResult.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResult.java @@ -25,6 +25,7 @@ public class AnalyseResult implements Serializable { private boolean isTest = false; private int totalNumber; private boolean isCompensate = false; // false-normal; true-compensate + private boolean completed = false; // 分析流程是否结束 public void setResultsList(List resultsList) { this.resultsList = resultsList; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java index ec1fea3..a3e3855 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java @@ -260,6 +260,7 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { requestId, objectId, StringUtils.EMPTY)); + analyseResult.setCompleted(bBigModelExecFlag ? false : true); repositAnalyseAlgorithmResult(analyseResult); } catch (Exception e) { log.error("error", e); @@ -856,7 +857,7 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { } // ws - uploadResultWS(resultAnalysis); + uploadResultWS(resultAnalysis, analyseResult.isCompleted()); } patrolResult.setValue(valueJoiner.toString()); @@ -899,12 +900,9 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { //this.senWebsocket(websocketDataList); } - private void uploadResultWS(ResultAnalysis resultAnalysis) { - String requestId = resultAnalysis.getRequestId(); - String redisKey = AnalyseConstants.ANALYSE_AI_REQUEST.concat(requestId); - boolean hasKey = redisService.hasKey(redisKey); - log.info("uploadResultWS requestId:{}, hasKey:{}", redisKey, hasKey); - if (AnalysisType.LargeModel.getCode().equals(resultAnalysis.getFilter())) { + private void uploadResultWS(ResultAnalysis resultAnalysis, boolean completed) { + log.info("uploadResultWS patrolTaskId:{}, objectId:{}, algType:{}, isCompleted:{}", resultAnalysis.getTaskPatrolId(), resultAnalysis.getObjectId(), resultAnalysis.getAlgType(), completed); + if (completed) { PatrolData patrolData = patrolResultService.selectPatrolData(resultAnalysis); if (patrolData != null) { if (AlgConstants.ALG_INFRARED_LIST.contains(resultAnalysis.getAlgType())) { diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java index 8cc7269..2c4f459 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java @@ -1,7 +1,5 @@ package com.inspect.metadata.prodevmnt.service.impl; -import com.inspect.base.core.enums.AlgTypeEnum; -import com.inspect.base.core.enums.DevTypeEnum; import com.inspect.metadata.alg.domain.BasedataAlgSubtype; import com.inspect.metadata.alg.mapper.BasedataAlgSubtypeMapper; import com.inspect.metadata.area.domain.BaseDataArea; @@ -11,7 +9,6 @@ import com.inspect.metadata.patrolpointmnt.domain.BasedataPatrolPoint; import com.inspect.metadata.patrolpointmnt.domain.BasedataPatrolPointPreset; import com.inspect.metadata.patrolpointmnt.mapper.BasedataPatrolPointMapper; import com.inspect.metadata.patrolpointmnt.mapper.BasedataPatrolPointPresetMapper; -import com.inspect.metadata.patrolpointmnt.service.IBasedataPatrolPointService; import com.inspect.metadata.prodevmnt.domain.BasedataDevice; import com.inspect.metadata.prodevmnt.domain.BasedataDeviceType; import com.inspect.metadata.prodevmnt.domain.BasedataModelDevice;