From e9b531edd2917b01a80dfa14e917ec21ddad8882 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 三月 2026 20:26:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index e8bdf35..13029ed 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -13,8 +13,10 @@
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.CrnDetailVo;
import com.zy.asrs.domain.vo.CrnLatestDataVo;
+import com.zy.asrs.domain.vo.FakeTaskTraceVo;
import com.zy.asrs.domain.vo.StationLatestDataVo;
import com.zy.asrs.domain.vo.RgvLatestDataVo;
+import com.zy.asrs.domain.vo.StationTaskTraceVo;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -30,6 +32,8 @@
import com.zy.core.thread.StationThread;
import com.zy.core.thread.RgvThread;
import com.zy.core.model.protocol.RgvProtocol;
+import com.zy.core.network.fake.FakeTaskTraceRegistry;
+import com.zy.core.trace.StationTaskTraceRegistry;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +65,10 @@
private BasMapService basMapService;
@Autowired
private StationCycleCapacityService stationCycleCapacityService;
+ @Autowired
+ private FakeTaskTraceRegistry fakeTaskTraceRegistry;
+ @Autowired
+ private StationTaskTraceRegistry stationTaskTraceRegistry;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -156,10 +164,10 @@
}
private boolean isInRange(Integer taskNo, WrkLastno taskRange) {
- if (taskRange == null || taskRange.getSNo() == null || taskRange.getENo() == null) {
+ if (taskRange == null || taskRange.getsNo() == null || taskRange.geteNo() == null) {
return false;
}
- return taskNo >= taskRange.getSNo() && taskNo <= taskRange.getENo();
+ return taskNo >= taskRange.getsNo() && taskNo <= taskRange.geteNo();
}
@PostMapping("/latest/data/crn")
@@ -274,6 +282,20 @@
return R.ok().add(stationCycleCapacityService.getLatestSnapshot());
}
+ @PostMapping("/latest/data/fake/trace")
+ @ManagerAuth(memo = "浠跨湡浠诲姟杞ㄨ抗瀹炴椂鏁版嵁")
+ public R fakeTaskTraceLatestData() {
+ List<FakeTaskTraceVo> traceList = fakeTaskTraceRegistry.listActiveTraces();
+ return R.ok().add(traceList);
+ }
+
+ @PostMapping("/latest/data/station/trace")
+ @ManagerAuth(memo = "杈撻�佷换鍔¤建杩瑰疄鏃舵暟鎹�")
+ public R stationTaskTraceLatestData() {
+ List<StationTaskTraceVo> traceList = stationTaskTraceRegistry.listLatestTraces();
+ return R.ok().add(traceList);
+ }
+
// @PostMapping("/latest/data/barcode")
// @ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
// public R barcodeLatestData(){
--
Gitblit v1.9.1