From 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f Mon Sep 17 00:00:00 2001 From: vincentlu <t1341870251@gmail.com> Date: 星期一, 13 一月 2025 09:38:29 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/fake/AgvSimulatorTask.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/AgvSimulatorTask.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/AgvSimulatorTask.java index 0cb4de9..874926c 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/AgvSimulatorTask.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/AgvSimulatorTask.java @@ -6,6 +6,7 @@ import com.zy.acs.common.enums.AgvCompleteType; import com.zy.acs.common.utils.RedisSupport; import com.zy.acs.manager.core.scheduler.MapDataWsScheduler; +import com.zy.acs.manager.core.service.MainService; import com.zy.acs.manager.core.service.MapService; import com.zy.acs.manager.manager.entity.Action; import com.zy.acs.manager.manager.entity.Agv; @@ -34,6 +35,7 @@ private final CodeService codeService; private final MapService mapService; private final JamService jamService; + private final MainService mainService; private final List<Action> actionList; private final RedisSupport redis; @@ -48,6 +50,7 @@ , CodeService codeService , MapService mapService , JamService jamService + , MainService mainService , List<Action> actionList ) { this.agv = agv; @@ -57,6 +60,7 @@ this.codeService = codeService; this.mapService = mapService; this.jamService = jamService; + this.mainService = mainService; this.actionList = actionList; this.groupId = actionList.get(0).getGroupId(); @@ -104,7 +108,7 @@ private void simulateWalking(Agv agv, Action action) throws InterruptedException { - Code code = codeService.selectByData(action.getCode()); + Code code = codeService.getCacheByData(action.getCode()); // agvDetail.setPos(1); // agvDetail.setCode(code.getId()); // 妯℃嫙鐢甸噺娑堣�� @@ -149,6 +153,7 @@ agv_11_up.setQrCode(qrCode); AgvProtocol agvProtocol = AgvProtocol.build(this.agv.getUuid()).setMessageBody(agv_11_up); - redis.push(RedisConstant.AGV_COMPLETE_FLAG, agvProtocol); + mainService.upDataSubscribe(agvProtocol); +// redis.push(RedisConstant.AGV_COMPLETE_FLAG, agvProtocol); } } -- Gitblit v1.9.1