From 178a4bc1610e4548c2afe8ad9d162aa47e61d9ea Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 14 九月 2024 16:40:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 61 +++++++++++++-----------------
1 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index ef49d0b..4cc777b 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -5,6 +5,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
+import com.zy.asrs.domain.param.EnergyGatheringRingParam;
import com.zy.asrs.domain.param.RgvOperatorParam;
import com.zy.asrs.domain.param.RingThroughParam;
import com.zy.asrs.domain.vo.*;
@@ -320,58 +321,39 @@
return false;
}
- @PostMapping("/console/rgv/site/data")
- @ManagerAuth(memo = "灏忚溅瀹炴椂浣嶇疆")
- public R scaleLatestData(){
- List<Map> result = new ArrayList<>();
- for (RgvSlave rgv : slaveProperties.getRgv()) {
- // 鑾峰彇RGV淇℃伅
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
- if (rgvThread == null) {
- throw new CoolException("RGV涓嶅湪绾�");
- }
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- if (rgvProtocol == null) {
- throw new CoolException("RGV涓嶅湪绾�");
- }
- Map<String, Object> rgvMap = new HashMap<>();
- rgvMap.put("title", rgvProtocol.getRgvPosI());
- rgvMap.put("id", rgvProtocol.getRgvNo());
- result.add(rgvMap);
- }
- return R.ok().add(result);
- }
@PostMapping("/ring/through/rgv/position/data")
// @ManagerAuth(memo = "鐜┛浣嶇疆淇℃伅")
public R ringThroughRgv(){
List<RingThroughParam> result = new ArrayList<>();
-// for (RgvSlave rgv : slaveProperties.getRgv()) {
- for (int i = 1;i<2;i++) {
+ for (RgvSlave rgv : slaveProperties.getRgv()) {
+// for (int i = 1;i<2;i++) {
// // 鑾峰彇RGV淇℃伅
-// RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
-// if (rgvThread == null) {
-// continue;
-// }
-// RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
-// if (rgvProtocol == null) {
-// continue;
-// }
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
+ if (rgvThread == null) {
+ continue;
+ }
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol == null) {
+ continue;
+ }
RingThroughParam ringThroughParam = new RingThroughParam();
-// ringThroughParam.setIndex(rgv.getId());
- ringThroughParam.setIndex(i);
+ ringThroughParam.setIndex(rgv.getId());
+// ringThroughParam.setIndex(i);
double[] doubles = Utils.RingThroughXY2(183.0, NumUtils.GetRandomIntInRange(183));
// double[] doubles = Utils.RingThroughXY2(183.0, 100*i );
ringThroughParam.setValueX(doubles[0]-2.94);
ringThroughParam.setValueY(doubles[1]-2.94);
+ ringThroughParam.setModeColor(rgvProtocol.modeType.color);
+ ringThroughParam.setStatusColor(rgvProtocol.statusType.color);
result.add(ringThroughParam);
}
return R.ok().add(result);
}
@PostMapping("/ring/through/dev/position/data")
-// @ManagerAuth(memo = "鐜┛浣嶇疆淇℃伅")
+// @ManagerAuth(memo = "绔欑偣淇℃伅")
public R ringThroughDev(){
List<RingThroughParam> result = new ArrayList<>();
// for (RgvSlave rgv : slaveProperties.getRgv()) {
@@ -397,4 +379,15 @@
return R.ok().add(result);
}
+ @PostMapping("/ring/through/track/position/data")
+// @ManagerAuth(memo = "杞ㄩ亾PLC鐘舵�佷俊鎭�")
+ public R wnergyGatheringRingParamTrack(){
+ List<EnergyGatheringRingParam> result = new ArrayList<>();
+ EnergyGatheringRingParam energyGatheringRingParam = new EnergyGatheringRingParam();
+ energyGatheringRingParam.setTrackColor("rgba(0, 230, 118, 0.5)");
+ energyGatheringRingParam.setRadiationColor("rgba(0, 230, 118, 0.5)");
+ result.add(energyGatheringRingParam);
+ return R.ok().add(result);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1