/*云深处狗对接进度条显示错误问题解决*/

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

@@ -902,7 +902,9 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
                         algorithmProgress,
                         patrolTaskStatus.getTaskProgress());
                 //patrolTaskStatus.setTaskProgress("100.0");
-                patrolTaskStatus.setTaskState(TaskStatus.DONE.getCode());
+                if("100.0".equals(patrolTaskStatus.getTaskProgress())) {
+                    patrolTaskStatus.setTaskState(TaskStatus.DONE.getCode());
+                }
                 patrolTaskStatusService.updatePatrolTaskStatus(patrolTaskStatus);
             } else {
                 log.info(Color.GREEN + "RUNNING CALC_REMOTE_ALGORITHM_PROGRESS taskPatrolledId: {}, objectId: {}, curNumber: {}, totalNumer: {}, algorithmProgress: {}, status: {}" + Color.END,

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

@@ -1155,8 +1155,8 @@ public class PatrolResultController extends BaseController {
                                 }
 
                                 if (patrolTaskStatusItem.getTaskState() != null &&
-                                        (patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode())
-                                                || patrolTaskStatusItem.getTaskState().equals(TaskStatus.HALTED.getCode())
+                                        (/*patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode()) || */
+                                                patrolTaskStatusItem.getTaskState().equals(TaskStatus.HALTED.getCode())
                                                 || patrolTaskStatusItem.getTaskState().equals(TaskStatus.EXPIRED.getCode()))) {
                                     patrolTaskStatusItem.setTaskState(patrolTaskStatusItem.getTaskState());
                                     patrolTaskStatusItem.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date()));
@@ -1189,11 +1189,12 @@ public class PatrolResultController extends BaseController {
                                                 patrolTaskStatusOfDb.getTaskEstimatedTime());
                                     }
 
+                                    String calProgressInDb = patrolTaskStatusOfDb.getTaskEstimatedTime();
                                     logger.info("patrol_task_status taskPatrolledId: {}, run_progress: {}, db_progress: {}, cal_progress: {}",
                                             patrolTaskStatusItem.getTaskPatrolledId(),
                                             runProgress,
                                             dbProgress,
-                                            patrolTaskStatusOfDb.getTaskEstimatedTime());
+                                            calProgressInDb);
                                     if (runProgress > dbProgress) {
                                         patrolTaskStatusItem.setLineId(patrolTaskStatusOfDb.getLineId());
                                         if (patrolTaskStatusItem.getTaskName().contains("联合") && !patrolTaskStatusItem.getTaskName().startsWith(sendCode)) {
@@ -1211,7 +1212,8 @@ public class PatrolResultController extends BaseController {
                                          *    更新智巡的进度值为100即可
                                          */
                                         if ("100.0".equals(String.valueOf(runProgress))
-                                                && TaskStatus.RUNNING.getCode().equals(patrolTaskStatusItem.getTaskState())) {
+//                                                && TaskStatus.RUNNING.getCode().equals(patrolTaskStatusItem.getTaskState())
+                                        ) {
                                             List<PatrolTaskStatus> statusList = patrolTaskStatusService.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(patrolTaskStatusItem.getTaskPatrolledId()).build());
                                             if (!statusList.isEmpty()) {
                                                 logger.info(Color.CYAN + "updating patrol_task_status 100%, taskPatrolledId: {}, progress: {}, taskState: {}, taskCurCodeInRedis: {}" + Color.END,
@@ -1222,6 +1224,11 @@ public class PatrolResultController extends BaseController {
                                                 PatrolTaskStatus taskStatus = statusList.get(0);
                                                 taskStatus.setTaskProgress(String.valueOf(runProgress));
                                                 iPatrolTaskStatusService.updatePatrolTaskStatusOfTaskProgress(taskStatus);
+                                                if ("100.0".equals(calProgressInDb)) {
+                                                    logger.info("!!!!!!!!!!!!!!!!!! set task_status done!!!");
+                                                    taskStatus.setTaskState(TaskStatus.DONE.getCode());
+                                                    iPatrolTaskStatusService.updatePatrolTaskStatusOfTaskState(taskStatus);
+                                                }
                                                 redisService.deleteObjectOfTask(RedisConst.TASK_CURRENT_CODE, taskStatus.getTaskCode());
                                             }
                                         } else {
@@ -1447,20 +1454,20 @@ public class PatrolResultController extends BaseController {
                         InputStream is = doGetRequestForInputStream(intranetFtpAddress + patrolResult.getFilePath());
 
                         logger.info("feedback from robot image size: {}", (is != null));
-                        if (is != null) {
-                            try {
-                                is = ImageUtil.overlaying(is, patrolResult.getRectangle(), patrolResult.getValue());
-                                strfile = patrolResult.getFilePath();
-                                strfile = strfile.substring(0, strfile.lastIndexOf("/"));
-                                String fileName = "modify_" + strfile.substring(strfile.lastIndexOf("/") + 1);
-                                String file = saveFile(is, fileName, strfile);
-                                patrolResult.setFilePath(file);
-                                logger.info("robot image path: {}", file);
-                            } catch (Exception e) {
-                                //e.printStackTrace();
-                                logger.info("ImageUtil.overlaying error: {}", e.getMessage());
-                            }
-                        }
+//                        if (is != null) {
+//                            try {
+//                                is = ImageUtil.overlaying(is, patrolResult.getRectangle(), patrolResult.getValue());
+//                                strfile = patrolResult.getFilePath();
+//                                strfile = strfile.substring(0, strfile.lastIndexOf("/"));
+//                                String fileName = "modify_" + strfile.substring(strfile.lastIndexOf("/") + 1);
+//                                String file = saveFile(is, fileName, strfile);
+//                                patrolResult.setFilePath(file);
+//                                logger.info("robot image path: {}", file);
+//                            } catch (Exception e) {
+//                                //e.printStackTrace();
+//                                logger.info("ImageUtil.overlaying error: {}", e.getMessage());
+//                            }
+//                        }
                     }
 
                     // 无人机点位id处理
@@ -1620,7 +1627,7 @@ public class PatrolResultController extends BaseController {
                         logger.info("algCount: {}", algCount);
                         jsonRootBean.setTotalNumber(algCount);
                     }
-                    if(!tasks.isEmpty()) {
+                    if (!tasks.isEmpty()) {
                         callRemoteAlgorithm(jsonRootBean.getTotalNumber(), resultList);
                     } else {
                         logger.info(Color.CYAN + "callAlgorithm task: {} not exist!!!" + Color.END, code);

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

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

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

@@ -24,6 +24,8 @@ public interface IPatrolTaskStatusService {
 
     int updatePatrolTaskStatusOfTaskProgress(PatrolTaskStatus patrolTaskStatus);
 
+    int updatePatrolTaskStatusOfTaskState(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

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

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

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