From f23193da0af90f5cbffb070704c547e42c5ed4ba Mon Sep 17 00:00:00 2001
From: WangGuangYuan <wgy_2020@163.com>
Date: Thu, 20 Mar 2025 09:37:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E7=AB=8B=E5=8D=B3=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=9C=AC=E5=9C=B0=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E5=92=8C=E8=BE=B9=E7=BC=98=E8=8A=82=E7=82=B9=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E4=BD=9C=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatrolTaskStatusController.java           | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 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 7ea7f40..218c25b 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,8 +520,10 @@ public class PatrolTaskStatusController extends BaseController {
             return AjaxResult.error(501, "THERE TASK IS RUNNING!");
         } else {
             PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId());
-            issueToRobot(patrol); //type=41 立即执行任务
-            sendTaskToVideo(patrol);
+            Boolean result = issueToRobot(patrol);//type=41 立即执行任务
+            if (!result) {
+                sendTaskToVideo(patrol);
+            }
             return toAjax(1);
         }
     }
@@ -566,7 +568,8 @@ public class PatrolTaskStatusController extends BaseController {
 
     }
 
-    public void issueToRobot(PatrolTask patrolTask) {
+    public Boolean issueToRobot(PatrolTask patrolTask) {
+        Boolean result = false;
         String receiveCode = "";
         String sendCode = "";
         BasedataEqpBookMoMain basedataEqpBookMoMain = new BasedataEqpBookMoMain();
@@ -585,6 +588,17 @@ public class PatrolTaskStatusController extends BaseController {
                 if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) {
                     receiveCode = eqpBookMoMains.get(0).getMainSystemCode();
                 }
+                if (StringUtils.isNotEmpty(receiveCode) && receiveCode.startsWith("areaPatrolServer")) {
+                    SendTask sendTask = new SendTask();
+                    sendTask.setReceiveCode(receiveCode);
+                    sendTask.setSendCode(sendCode);
+                    sendTask.setCode(patrolTask.getTaskId() + "");
+                    sendTask.setType("41");
+                    sendTask.setCommand("1");
+                    String str = JSONObject.toJSONString(sendTask);
+                    this.feignTaskClient.sendCommand(str);
+                    result = true;
+                }
 //
 //                SendTask sendTaskcontrol = new SendTask();
 //                sendTaskcontrol.setReceiveCode(receiveCode);
@@ -599,18 +613,9 @@ public class PatrolTaskStatusController extends BaseController {
 //                sendTaskcontrol.setItems(sendTaskArrayList);
 //                String jsonString = JSONObject.toJSONString(sendTaskcontrol);
 //                this.feignTaskClient.sendCommand(jsonString);
-
-                SendTask sendTask = new SendTask();
-                sendTask.setReceiveCode(receiveCode);
-                sendTask.setSendCode(sendCode);
-                sendTask.setCode(patrolTask.getTaskId() + "");
-                sendTask.setType("41");
-                sendTask.setCommand("1");
-                String str = JSONObject.toJSONString(sendTask);
-                this.feignTaskClient.sendCommand(str);
             }
         }
-
+        return result;
     }
 
     @GetMapping({"/taskStatusChange"})