From 204d411e545412dc65545b1b9149479a6d07672a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 14 九月 2024 14:46:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 72 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index b6abe70..ef49d0b 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -6,12 +6,15 @@
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
import com.zy.asrs.domain.param.RgvOperatorParam;
+import com.zy.asrs.domain.param.RingThroughParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.asrs.utils.NumUtils;
+import com.zy.asrs.utils.Utils;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -30,6 +33,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.rmi.CORBA.Util;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -338,23 +342,57 @@
return R.ok().add(result);
}
@PostMapping("/ring/through/rgv/position/data")
- @ManagerAuth(memo = "鐜┛浣嶇疆淇℃伅")
- public R ringThrough(){
- 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);
+// @ManagerAuth(memo = "鐜┛浣嶇疆淇℃伅")
+ public R ringThroughRgv(){
+ List<RingThroughParam> result = new ArrayList<>();
+// 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;
+// }
+ RingThroughParam ringThroughParam = new RingThroughParam();
+
+// 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);
+ result.add(ringThroughParam);
+ }
+ return R.ok().add(result);
+ }
+
+ @PostMapping("/ring/through/dev/position/data")
+// @ManagerAuth(memo = "鐜┛浣嶇疆淇℃伅")
+ public R ringThroughDev(){
+ List<RingThroughParam> result = new ArrayList<>();
+// for (RgvSlave rgv : slaveProperties.getRgv()) {
+ for (int i = 1;i<10;i++) {
+// // 鑾峰彇RGV淇℃伅
+// 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);
+ double[] doubles = Utils.RingThroughXY2(183.0, 100*i );
+ ringThroughParam.setValueX(doubles[0]+2.94);
+ ringThroughParam.setValueY(doubles[1]+2.94);
+ result.add(ringThroughParam);
}
return R.ok().add(result);
}
--
Gitblit v1.9.1