From fd6d26f8ffe6a37533e741337f3eca9134d934c7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 一月 2025 10:42:59 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 2369fee..3fc2bfb 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
@@ -108,11 +108,18 @@
// codeMatrixIdxList.add(codeMatrixIdx);
// }
- List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(null, path);
+// List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(null, path);
// System.out.println(codeMatrixIdxList.toString());
- return R.ok().add(codeMatrixIdxList);
+// return R.ok().add(codeMatrixIdxList);
+
+ for (String codeData : path) {
+ Code code = codeService.getCacheByData(codeData);
+ Code byId = codeService.getCacheById(code.getId());
+ }
+
+ return R.ok();
}
// @RequestMapping(value = "/system/route/generate", method = {RequestMethod.GET, RequestMethod.POST})
@@ -136,7 +143,7 @@
for (int i = 0; i < standbyFunStaList.size(); i++) {
FuncSta funcSta = standbyFunStaList.get(i);
- Code code = codeService.getById(funcSta.getCode());
+ Code code = codeService.getCacheById(funcSta.getCode());
Agv agv = agvList.get(i);
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
@@ -153,25 +160,25 @@
avoidWaveCalculator.calcDynamicNodeWhenBoot();
// AgvDetail agvDetail11 = agvDetailService.selectByAgvNo("11");
-// agvDetail11.setCode(codeService.selectByData("00000251").getId());
+// agvDetail11.setCode(codeService.getCacheByData("00000251").getId());
// agvDetailService.updateById(agvDetail11);
//
// AgvDetail agvDetail12 = agvDetailService.selectByAgvNo("12");
-// agvDetail12.setCode(codeService.selectByData("00000204").getId());
+// agvDetail12.setCode(codeService.getCacheByData("00000204").getId());
// agvDetailService.updateById(agvDetail12);
//
// AgvDetail agvDetail14 = agvDetailService.selectByAgvNo("14");
-// agvDetail14.setCode(codeService.selectByData("00000101").getId());
+// agvDetail14.setCode(codeService.getCacheByData("00000101").getId());
// agvDetailService.updateById(agvDetail14);
//
// avoidWaveCalculator.calcDynamicNodeWhenBoot();
//
// mainLockWrapService.buildMinorTask(agvService.getById(agvDetail14.getAgvId()), TaskTypeType.MOVE,
-// codeService.selectByData("00000303").getData(), null);
+// codeService.getCacheByData("00000303").getData(), null);
// mainLockWrapService.buildMinorTask(agvService.getById(agvDetail11.getAgvId()), TaskTypeType.MOVE,
-// codeService.selectByData("00000411").getData(), null);
+// codeService.getCacheByData("00000411").getData(), null);
// mainLockWrapService.buildMinorTask(agvService.getById(agvDetail12.getAgvId()), TaskTypeType.MOVE,
-// codeService.selectByData("00000403").getData(), null);
+// codeService.getCacheByData("00000403").getData(), null);
return R.ok();
}
@@ -212,8 +219,8 @@
public R astarDemo() {
long startTime = System.currentTimeMillis();
List<String> path = mapService.checkoutPath("18"
- , codeService.selectByData("00001318")
- , codeService.selectByData("00003447")
+ , codeService.getCacheByData("00001318")
+ , codeService.getCacheByData("00003447")
, true
, new ArrayList<>()
, segmentService.getById(1390));
--
Gitblit v1.9.1