From 2621b20f67dd0c76e1cbc450a0fd44e702f8d094 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 29 四月 2025 16:09:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/StationStatusParam.java | 14 ++++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 28 ++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ba53d6f..234a20c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -68,6 +68,8 @@
private CommonService commonService;
@Autowired
private NotifyUtils notifyUtils;
+ @Autowired
+ private BasDevpService basDevpService;
private static final boolean auth = true;
@@ -369,6 +371,32 @@
return R.ok(crnStatusParams);
}
+ //杈撻�佺珯鐐圭姸鎬佹煡璇㈡帴鍙�
+ @GetMapping("/stationStatus")
+ @Transactional
+ public R stationStatus() {
+ List<StationStatusParam> data = new ArrayList<>();
+ List<BasDevp> list = basDevpService.selectList(new EntityWrapper<BasDevp>()
+ .in("dev_no", 102, 104, 106, 108, 203, 206, 209, 212));
+ for (BasDevp basDevp : list) {
+ String taskNo = "";
+ if (basDevp.getWrkNo() > 0) {
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(basDevp.getWrkNo());
+ if (taskWrk != null) {
+ taskNo = taskWrk.getTaskNo();
+ }
+ }
+
+ StationStatusParam param = new StationStatusParam();
+ param.setStaNo(basDevp.getDevNo());
+ param.setTaskNo(taskNo);
+ param.setLoading(basDevp.getLoading());
+
+ data.add(param);
+ }
+ return R.ok(data);
+ }
+
//妯℃嫙杈撻�佺嚎鍏ュ簱
@PostMapping("/simulationDevpIn")
@Transactional
diff --git a/src/main/java/com/zy/asrs/entity/param/StationStatusParam.java b/src/main/java/com/zy/asrs/entity/param/StationStatusParam.java
new file mode 100644
index 0000000..77139f7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/StationStatusParam.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class StationStatusParam {
+
+ private String taskNo;
+
+ private Integer staNo;
+
+ private String loading;
+
+}
--
Gitblit v1.9.1