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 | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index a13e3e2..ef49d0b 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -13,6 +13,7 @@
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;
@@ -345,7 +346,7 @@
public R ringThroughRgv(){
List<RingThroughParam> result = new ArrayList<>();
// for (RgvSlave rgv : slaveProperties.getRgv()) {
- for (int i = 1;i<10;i++) {
+ for (int i = 1;i<2;i++) {
// // 鑾峰彇RGV淇℃伅
// RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
// if (rgvThread == null) {
@@ -359,9 +360,11 @@
// ringThroughParam.setIndex(rgv.getId());
ringThroughParam.setIndex(i);
- double[] doubles = Utils.RingThroughXY2(183.0, 100.0*i);
- ringThroughParam.setValueX(doubles[0]);
- ringThroughParam.setValueY(doubles[1]);
+ 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);
@@ -386,9 +389,9 @@
// ringThroughParam.setIndex(rgv.getId());
ringThroughParam.setIndex(i);
- double[] doubles = Utils.RingThroughXY2(183.0, 100.0*i);
- ringThroughParam.setValueX(doubles[0]);
- ringThroughParam.setValueY(doubles[1]);
+ 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