优化

ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java

@@ -5,6 +5,8 @@ import com.ruoyi.api.domain.agv.agvCallback.AgvCallbackResponse;
 import com.ruoyi.api.service.IApiService;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.queue.agv.domain.AgvQueue;
+import com.ruoyi.queue.agv.service.IAgvQueueService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -22,6 +24,8 @@ public class AgvController extends BaseController {
 
     @Autowired
     private IApiService apiService;
+    @Autowired
+    private IAgvQueueService agvQueueService;
 
     /**
      * agv执行状态返回接口
@@ -50,4 +54,26 @@ public class AgvController extends BaseController {
         return apiService.receiveAgvMoveJob(param);
     }
 
+    @PostMapping("/deleteAgvTray")
+    public AjaxResult deleteAgvTray(@RequestBody Map<String, String> param) {
+        AgvQueue agvQueue = agvQueueService.selectAgvQueueByTaskCode(param.get("taskCode"));
+        if(agvQueue==null){
+            return AjaxResult.error("AGV任务队列不存在！");
+        }else{
+            return apiService.deleteAgvTray(agvQueue);
+        }
+
+    }
+
+    @PostMapping("/continueTask")
+    public AjaxResult continueTask(@RequestBody Map<String, String> param) {
+        AgvQueue agvQueue = agvQueueService.selectAgvQueueByTaskCode(param.get("taskCode"));
+        if(agvQueue==null){
+            return AjaxResult.error("AGV任务队列不存在！");
+        }else{
+            return apiService.continueTask(agvQueue);
+        }
+
+    }
+
 }