From 766bcd63a19f7acaff2f5ed2cd1cb016894978ea Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 23 十二月 2024 14:06:12 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java | 13 +++++++++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java index 947a25a..f525f3f 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** * Created by vincent on 11/15/2024 @@ -133,6 +134,18 @@ @GetMapping("/auto/go/patrol") public R autoGoPatrol(@RequestParam(required = false, defaultValue = "5") Integer count) { List<Agv> list = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val)); + + // stop + if (count == 0) { + for (String agvNo : list.stream().map(Agv::getUuid).collect(Collectors.toList())) { + if (patrolService.isPatrolling(agvNo)) { + patrolService.shutdownPatrol(agvNo); + } + } + return R.ok(); + } + + // start Collections.shuffle(list); List<Agv> agvs = list.subList(0, count); int result = 0; diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java index 027a4e7..eec676e 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java @@ -36,7 +36,7 @@ private static final int SCHEDULE_TIME_INTERVAL = 5; - private static final Map<String, ScheduledFuture<?>> AGV_PATROL_MAP = new ConcurrentHashMap<>(); + public static final Map<String, ScheduledFuture<?>> AGV_PATROL_MAP = new ConcurrentHashMap<>(); private final RedisSupport redis = RedisSupport.defaultRedisSupport; -- Gitblit v1.9.1