From ade2ee628437d38cb7c11dd456a5ea18dff97325 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 三月 2026 15:16:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 554305b..51b7777 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -57,6 +57,10 @@
private RedisUtil redisUtil;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private BasMapService basMapService;
+ @Autowired
+ private StationCycleCapacityService stationCycleCapacityService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -122,6 +126,7 @@
vo.setErrorMsg(stationProtocol.getErrorMsg()); // 鎶ヨ淇℃伅
vo.setBarcode(stationProtocol.getBarcode()); // 鏉＄爜
vo.setWeight(stationProtocol.getWeight());//閲嶉噺
+ vo.setTaskWriteIdx(stationProtocol.getTaskWriteIdx());//浠诲姟鍙啓鍖�
String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-");
if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0 && !stationProtocol.isRunBlock()) {
String taskClass = getStationTaskClass(stationProtocol.getTaskNo(), inTaskRange, outTaskRange);
@@ -264,6 +269,11 @@
return R.ok().add(vos);
}
+ @GetMapping("/latest/data/station/cycle/capacity")
+ public R stationCycleCapacity() {
+ return R.ok().add(stationCycleCapacityService.getLatestSnapshot());
+ }
+
// @PostMapping("/latest/data/barcode")
// @ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
// public R barcodeLatestData(){
@@ -341,10 +351,10 @@
@GetMapping("/map/{lev}/auth")
public R getLocMap(@PathVariable Integer lev) {
Object object = redisUtil.get(RedisKeyType.LOC_MAP_BASE.key);
- if (object == null) {
- return R.error("鍦板浘鏈垵濮嬪寲");
+ List<List<HashMap<String, Object>>> mapNodeList = null;
+ if (object != null) {
+ mapNodeList = (List<List<HashMap<String, Object>>>) object;
}
- List<List<HashMap<String, Object>>> mapNodeList = (List<List<HashMap<String, Object>>>) object;
List<LocMast> locMastList = locMastService.selectLocByLev(lev);
for (LocMast locMast : locMastList) {
String[] locType = locMast.getLocType().split("-");
--
Gitblit v1.9.1