From 3eee2147f220634b620b7ed84c97fbd8257205d5 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期二, 13 一月 2026 13:21:44 +0800
Subject: [PATCH] 修改了AGV的接口以及mas获取的数据
---
src/main/java/com/zy/asrs/controller/DigitalTwinController.java | 100 ++++++++-----------------------------------------
1 files changed, 17 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DigitalTwinController.java b/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
index 5bfbd16..628091d 100644
--- a/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
+++ b/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
@@ -89,19 +89,6 @@
@RequestParam(required = false) String endDate){
List<DtLocVo> locVoList = digitalTwinService.recentLoc(areaId, startDate, endDate);
-
-// DtLocVo dtLocVo = DtLocVo.builder()
-// .locDate("2025-10-22")
-// .idleNum(208)
-// .build();
-// DtLocVo dtLocVo2 = DtLocVo.builder()
-// .locDate("2025-10-23")
-// .idleNum(177)
-// .build();
-// List<DtLocVo> locVoList = new ArrayList<>();
-// locVoList.add(dtLocVo);
-// locVoList.add(dtLocVo2);
-
return R.ok().add(locVoList);
}
@@ -120,8 +107,7 @@
@RequestParam(required = false) String endDate){
List<DtInAndOutBoundVo> inAndOutBoundVoList = digitalTwinService.inAndOutBound(areaId, startDate, endDate);
-
-
+//
// DtInAndOutBoundVo dtInAndOutBoundVo = DtInAndOutBoundVo.builder()
// .boundDate("2025-10-22")
// .inBoundNum(237)
@@ -154,31 +140,6 @@
@RequestParam(required = false) Integer pageSize){
List<DtDetainMatVo> detainMatVoList = digitalTwinService.recentDetainMat(areaId, overDayNum, pageIndex, pageSize);
-
-// DtDetainMatVo dtDetainMatVo = DtDetainMatVo.builder()
-// .belongAreaId("A1")
-// .belongAreaName("鍒�鍏峰簱")
-// .matId("mat10001")
-// .matName("閬撳叿鎶�")
-// .lokId("loc1001")
-// .lokName("搴撲綅10001")
-// .detainTime(765)
-// .inBoundTime("2025-10-11T11:15:16")
-// .build();
-// DtDetainMatVo dtDetainMatVo2 = DtDetainMatVo.builder()
-// .belongAreaId("A1")
-// .belongAreaName("鍒�鍏峰簱")
-// .matId("mat10002")
-// .matName("閬撳叿鎶�")
-// .lokId("loc1002")
-// .lokName("搴撲綅10002")
-// .detainTime(665)
-// .inBoundTime("2025-10-10T11:15:16")
-// .build();
-// List<DtDetainMatVo> detainMatVoList = new ArrayList<>();
-// detainMatVoList.add(dtDetainMatVo);
-// detainMatVoList.add(dtDetainMatVo2);
-
return R.ok().add(detainMatVoList);
}
@@ -192,35 +153,7 @@
// @ManagerAuth
public R equipment(@RequestParam(required = false) String areaId){
- DtEquipmentVo dtDetainMatVo = DtEquipmentVo.builder()
- .equipmentId("eq1001")
- .equipmentName("鍫嗗灈鏈�1")
- .equipmentType(1)
- .belongAreaId("A1")
- .belongAreaName("鍒�鍏峰簱")
- .verticalSpeed(288)
- .horizontalSpeed(203)
- .voltage(48)
- .status(1)
- .operateMethod(1)
- .build();
- DtEquipmentVo dtDetainMatVo2 = DtEquipmentVo.builder()
- .equipmentId("eq1002")
- .equipmentName("鍫嗗灈鏈�2")
- .equipmentType(1)
- .belongAreaId("A1")
- .belongAreaName("鍒�鍏峰簱")
- .verticalSpeed(208)
- .horizontalSpeed(253)
- .voltage(48)
- .status(1)
- .operateMethod(1)
- .build();
- List<DtEquipmentVo> dtEquipmentVoList = new ArrayList<>();
- dtEquipmentVoList.add(dtDetainMatVo);
- dtEquipmentVoList.add(dtDetainMatVo2);
-
- return R.ok().add(dtEquipmentVoList);
+ return R.ok(digitalTwinService.equipment(areaId));
}
/**
@@ -232,10 +165,8 @@
@RequestMapping(value = "/warehouseDetail")
// @ManagerAuth
public R warehouseDetail(@RequestParam(required = false) String areaId){
- List<DtLocDetailVo> dtLocDetailVoList = digitalTwinService.warehouseDetail(areaId);
- return R.ok().add(dtLocDetailVoList);
- }
+ return R.ok(digitalTwinService.warehouseDetail(areaId));
// List<DtLocDetailVo> dtLocDetailVoList = new ArrayList<>();
// DtLocDetailVo dtLocDetailVo = new DtLocDetailVo();
// dtLocDetailVo.setLocNo("CA0100202");
@@ -289,17 +220,20 @@
// locDetl2.setMaktx("鍒�鎶�");
// dtLocDetailVo2.setLocDetl(locDetl2);
// dtLocDetailVoList.add(dtLocDetailVo2);
+
+
+// LocDetl locDetl2 = new LocDetl();
+// locDetl2.setLocNo("1001");
+// locDetl2.setAreaId(10010L);
+// locDetl2.setAreaName("鍒�鍏峰簱");
+// locDetl2.setMatnr("mat10001");
+// locDetl2.setMaktx("鍒�鎶�");
//
-//
-//// LocDetl locDetl2 = new LocDetl();
-//// locDetl2.setLocNo("1001");
-//// locDetl2.setAreaId(10010L);
-//// locDetl2.setAreaName("鍒�鍏峰簱");
-//// locDetl2.setMatnr("mat10001");
-//// locDetl2.setMaktx("鍒�鎶�");
-////
-////// List<LocDetl> locDetlList = new ArrayList<>();
-////// locDetlList.add(locDetl);
-////// locDetlList.add(locDetl2);
+//// List<LocDetl> locDetlList = new ArrayList<>();
+//// locDetlList.add(locDetl);
+//// locDetlList.add(locDetl2);
+
+// return R.ok().add(dtLocDetailVoList);
+ }
}
--
Gitblit v1.9.1