From 9a07fed7b55d37d5e15df449b54b8c4b7e9a8e68 Mon Sep 17 00:00:00 2001 From: 1 <1@123> Date: 星期日, 11 五月 2025 17:25:18 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/RgvController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java index 9ea4f5c..83e6cd1 100644 --- a/src/main/java/com/zy/asrs/controller/RgvController.java +++ b/src/main/java/com/zy/asrs/controller/RgvController.java @@ -51,6 +51,53 @@ return R.ok().add(res); } + @PostMapping("/task/cache/all") + @ManagerAuth(memo = "鍏ㄩ儴淇℃伅") + public R allTaskCache(@RequestParam(defaultValue = "0") Integer rgvNo){ + List<Map<String, Object>> res = new ArrayList<>(); + try{ + RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNo); + TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache(); + ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol(); + for (TaskProtocol taskProtocol : allTaskProtocol.values()){ + Map<String, Object> map2 = new HashMap<>(); + map2.put("rgvNo", rgvNo); + map2.put("taskNo", taskProtocol.getTaskNo()); + map2.put("targetPosition", taskProtocol.getTargetPosition()); + map2.put("isRunning", taskProtocol.getIsRunning()); + map2.put("taskStatus", taskProtocol.getTaskStatus()); + map2.put("direction", taskProtocol.isDirection()); + res.add(map2); + } + } catch (Exception e){ +// return R.error("寮傚父"+e.getMessage()); + } + return R.ok().add(res); + } + + @PostMapping("/run/del")//Take Put Walk + @ManagerAuth(memo = "灏忚溅琛岃蛋") + public R rgvRunDel(@RequestParam(defaultValue = "0") Integer rgvNo + ) { + if (rgvNo==null || rgvNo==0){ + return R.error("璇烽�夋嫨灏忚溅"); + } + RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNo); + TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache(); + + try { + ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol(); + for (TaskProtocol taskProtocol : allTaskProtocol.values()){ + taskProtocolCache.removeTaskProtocol(taskProtocol.getTaskNoDirection()); + } + + } catch (Exception e) { + return R.error("浠诲姟鍒犻櫎澶辫触"+e.getMessage()); + } + + return R.ok("浠诲姟娓呯┖鎴愬姛"); + } + @PostMapping("/run/walk")//Take Put Walk @ManagerAuth(memo = "灏忚溅琛岃蛋") public R rgvRunWalk(@RequestParam(defaultValue = "0") Integer rgvNo, -- Gitblit v1.9.1