From 69effdb00de80feed4b7810ec009d5f95a65dcca Mon Sep 17 00:00:00 2001
From: WangGuangYuan <wgy_2020@163.com>
Date: Wed, 26 Mar 2025 09:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E6=B1=89=E7=8E=B0=E5=9C=BA=E5=A4=9A?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PatrolTaskStatusController.java       | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java
index 82e2544..32cfc13 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java
@@ -520,10 +520,7 @@ public class PatrolTaskStatusController extends BaseController {
             return AjaxResult.error(501, "THERE TASK IS RUNNING!");
         } else {
             PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId());
-            Boolean result = issueToRobot(patrol);//type=41 立即执行任务
-            if (!result) {
-                sendTaskToVideo(patrol);
-            }
+            issueToRobot(patrol);//type=41 立即执行任务
             return toAjax(1);
         }
     }
@@ -568,8 +565,7 @@ public class PatrolTaskStatusController extends BaseController {
 
     }
 
-    public Boolean issueToRobot(PatrolTask patrolTask) {
-        Boolean result = false;
+    public void issueToRobot(PatrolTask patrolTask) {
         String receiveCode = "";
         String sendCode = "";
         BasedataEqpBookMoMain basedataEqpBookMoMain = new BasedataEqpBookMoMain();
@@ -597,7 +593,8 @@ public class PatrolTaskStatusController extends BaseController {
                     sendTask.setCommand("1");
                     String str = JSONObject.toJSONString(sendTask);
                     this.feignTaskClient.sendCommand(str);
-                    result = true;
+                } else {
+                    sendTaskToVideo(patrolTask);
                 }
 //
 //                SendTask sendTaskcontrol = new SendTask();
@@ -615,7 +612,6 @@ public class PatrolTaskStatusController extends BaseController {
 //                this.feignTaskClient.sendCommand(jsonString);
             }
         }
-        return result;
     }
 
     @GetMapping({"/taskStatusChange"})