Merge branch 'yanyuan' of http://git.ht-atia.cn/qinyanlei/inspect into yanyuan

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<AnalyseResItem> resultsList) {
         this.resultsList = resultsList;

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())) {

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;