From 940992f0d26959d7ee6a6038c2c9b21cfb74533b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 07 一月 2026 14:32:17 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java | 95 +++++++----------------------------------------
1 files changed, 14 insertions(+), 81 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 afa5160..0ae549d 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
@@ -3,17 +3,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.framework.common.R;
-import com.zy.acs.framework.common.SnowflakeIdWorker;
-import com.zy.acs.manager.core.service.*;
-import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
-import com.zy.acs.manager.core.utils.RouteGenerator;
+import com.zy.acs.manager.core.integrate.conveyor.ConveyorStationService;
+import com.zy.acs.manager.core.service.AvoidWaveCalculator;
+import com.zy.acs.manager.core.service.MapService;
+import com.zy.acs.manager.core.service.PatrolService;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.FuncStaType;
+import com.zy.acs.manager.manager.enums.StaReserveType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -33,100 +33,33 @@
@Autowired
private AgvDetailService agvDetailService;
@Autowired
- private TaskService taskService;
- @Autowired
- private MainService mainService;
- @Autowired
- private MainLockWrapService mainLockWrapService;
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
private CodeService codeService;
- @Autowired
- private JdbcTemplate jdbcTemplate;
- @Autowired
- private LocService locService;
- @Autowired
- private TrafficService trafficService;
- @Autowired
- private ThreadPoolRegulator threadPoolRegulator;
- @Autowired
- private MapDataDispatcher mapDataDispatcher;
@Autowired
private AvoidWaveCalculator avoidWaveCalculator;
@Autowired
private PatrolService patrolService;
@Autowired
- private RouteGenerator routeGenerator;
- @Autowired
private FuncStaService funcStaService;
@Autowired
private AgvModelService agvModelService;
+ @Autowired
+ private StaService staService;
+// @Autowired
+// private ConveyorStationService siemensConveyorStationService;
+ @Autowired
+ private ConveyorStationService siemensConveyorStationService;
@RequestMapping(value = "/system/info", method = {RequestMethod.GET, RequestMethod.POST})
public R systemInfo() {
return R.ok("RCS-FLOW-1.0.0");
}
- // {"msg":"Success","code":200,"data":[[38,2],[38,3],[38,4],[38,5],[38,6],[37,6],[36,6],[35,6],[34,6],[33,6],[32,6],[31,6],[30,6],[29,6],[28,6],[27,6],[26,6],[25,6]]}
- // {"msg":"Success","code":200,"data":[[38,2],[38,3],[38,4],[38,5],[38,6],[37,6],[36,6],[35,6],[34,6],[33,6],[32,6],[31,6],[30,6],[29,6],[28,6],[27,6],[26,6],[25,6]]}
@RequestMapping(value = "/system/demo", method = {RequestMethod.GET, RequestMethod.POST})
public R demo() {
- long startTime = System.currentTimeMillis();
- for (int i = 0; i < 1000; i++) {
- this.demo1();
- }
- System.out.println(System.currentTimeMillis() - startTime);
- return R.ok();
+ Sta sta = staService.selectByStaNo("1006");
+ boolean b = siemensConveyorStationService.allowAgvWork(sta, null, null, StaReserveType.IN);
+ return R.ok().add(b);
}
-
- private R demo1() {
- List<String> path = new ArrayList<>();
- path.add("00000035");
- path.add("00000085");
- path.add("00000135");
- path.add("00000185");
- path.add("00000235");
- path.add("00000234");
- path.add("00000233");
- path.add("00000232");
- path.add("00000231");
- path.add("00000230");
- path.add("00000229");
- path.add("00000228");
- path.add("00000227");
- path.add("00000226");
- path.add("00000225");
- path.add("00000224");
- path.add("00000223");
- path.add("00000222");
-
-// List<int[]> codeMatrixIdxList = new ArrayList<>();
-// for (String pathStr : path) {
-// int[] codeMatrixIdx = mapDataDispatcher.getCodeMatrixIdx(null, pathStr);
-// codeMatrixIdxList.add(codeMatrixIdx);
-// }
-
-// List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(null, path);
-
-// System.out.println(codeMatrixIdxList.toString());
-
-// 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})
-// public R generate() {
-// String[][] codeMatrix = mapDataDispatcher.getCodeMatrix(null);
-// List<String> list = routeGenerator.generateRoutes(codeMatrix);
-// return R.ok(String.valueOf(list.size())).add(list);
-// }
// http://localhost:8088/demo/auto/go/standby
@GetMapping("/auto/go/standby")
--
Gitblit v1.9.1