Merge remote-tracking branch 'origin/master'

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java

@@ -108,6 +108,9 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
                 return;
             }
             //redisService.setCacheObject(keyId, "123456789");
+        } else {
+            log.info("ANALYSE_REQUEST_ID: DEL {} FROM REDIS!", keyId);
+            //redisService.deleteObject(keyId);
         }
 
         String patrolTaskIdObj = redisService.getCacheObject(keyId);
@@ -165,7 +168,8 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
                     || AlgConstants.INFRA_YU3.equals(algType)
                     || AlgConstants.INFRA_CAMERA.equals(algType)
                     || AlgConstants.INFRA_CAMERA_REVERSE.equals(algType)
-                    || AlgConstants.INFRARED2.equals(algType))
+                    || AlgConstants.INFRARED2.equals(algType)
+                    || "isolator".equals(algType))
             ) {
                 /*
                  * 先检查结果有缺无缺陷，如果有缺陷不用判断算法直接调用大模型；*

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -1162,6 +1162,15 @@ public class PatrolResultController extends BaseController {
                                                 || patrolTaskStatusItem.getTaskState().equals(TaskStatus.EXPIRED.getCode()))) {
                                     patrolTaskStatusItem.setTaskState(patrolTaskStatusItem.getTaskState());
                                     patrolTaskStatusItem.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date()));
+
+                                    List<PatrolTaskStatus> statusList = patrolTaskStatusService.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(patrolTaskStatusItem.getTaskPatrolledId()).build());
+                                    if (!statusList.isEmpty()) {
+                                        PatrolTaskStatus taskStatus = statusList.get(0);
+                                        taskStatus.setTaskState(patrolTaskStatusItem.getTaskState());
+                                        taskStatus.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date()));
+                                        logger.info("GET_INFO_41 UPDATE TASK_STATE TO HALTED taskStatus: {}", taskStatus);
+                                        iPatrolTaskStatusService.updatePatrolTaskStatusOfTaskStateAndEndTime(taskStatus);
+                                    }
                                 }
                                 List<PatrolTaskStatus> patrolTaskStatusList = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus);
                                 logger.info("GET_INFO_41 ROBOT_TASK_STATUS patrolTaskStatusList: {}", patrolTaskStatusList);

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java

@@ -88,6 +88,11 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService {
             analyseReq.setObjectList(Collections.singletonList(analyseReqItem));
             if (checkOldInfraredType(typeList)) {
                 log.info("ANALYSIS_FILTER_URL_OLD_INFRARED requestId: {}, analyseReq: {}", requestId, analyseReq);
+                if (testMode) {
+                    delayQueueService.submitRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseReq.getRequestId(), (3L), TimeUnit.MINUTES);
+                } else {
+                    delayQueueService.submitRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseReq.getRequestId(), requestTimeout, TimeUnit.DAYS);
+                }
                 sendCompensateRequest(analyseReq);
                 return;
             }

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java

@@ -28,6 +28,8 @@ public interface PatrolTaskStatusMapper {
 
     int updatePatrolTaskStatusOfTaskState(PatrolTaskStatus patrolTaskStatus);
 
+    int updatePatrolTaskStatusOfTaskStateAndEndTime(PatrolTaskStatus patrolTaskStatus);
+
     int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus);
 
     int deletePatrolTaskStatusByLineId(Long lineId);

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java

@@ -26,6 +26,8 @@ public interface IPatrolTaskStatusService {
 
     int updatePatrolTaskStatusOfTaskState(PatrolTaskStatus patrolTaskStatus);
 
+    int updatePatrolTaskStatusOfTaskStateAndEndTime(PatrolTaskStatus patrolTaskStatus);
+
     int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus);
 
     int deletePatrolTaskStatusByLineIds(Long[] lineIds);

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java

@@ -67,6 +67,10 @@ public class PatrolTaskStatusServiceImpl implements IPatrolTaskStatusService {
       return this.patrolTaskStatusMapper.updatePatrolTaskStatusOfTaskState(patrolTaskStatus);
    }
 
+   public int updatePatrolTaskStatusOfTaskStateAndEndTime(PatrolTaskStatus patrolTaskStatus) {
+      return this.patrolTaskStatusMapper.updatePatrolTaskStatusOfTaskStateAndEndTime(patrolTaskStatus);
+   }
+
    public int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus) {
       return this.patrolTaskStatusMapper.updatePatrolTaskStatusRunning(patrolTaskStatus);
    }

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml

@@ -280,6 +280,15 @@
         where line_id = #{lineId}
     </update>
 
+    <update id="updatePatrolTaskStatusOfTaskStateAndEndTime" parameterType="PatrolTaskStatus">
+        update patrol_task_status
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="taskState != null">task_state = #{taskState},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+        </trim>
+        where line_id = #{lineId}
+    </update>
+
     <delete id="deletePatrolTaskStatusByLineId" parameterType="Long">
         delete
         from patrol_task_status