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 +++++---
src/main/java/com/zy/asrs/utils/Utils.java | 6 +-
src/main/webapp/views/index.html | 17 +++-----
src/main/java/com/zy/asrs/utils/NumUtils.java | 61 ++++++++++++++++++++++++++++++
4 files changed, 81 insertions(+), 20 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);
diff --git a/src/main/java/com/zy/asrs/utils/NumUtils.java b/src/main/java/com/zy/asrs/utils/NumUtils.java
new file mode 100644
index 0000000..68acf28
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/NumUtils.java
@@ -0,0 +1,61 @@
+package com.zy.asrs.utils;
+
+import java.util.Random;
+
+public class NumUtils {
+// public static void main(String[] args) {
+//
+//
+//
+// int randomInt = ;
+// System.out.println("闅忔満鏁存暟: " + randomInt);
+//
+//
+// int randomIntInRange = ; // 0 鍒� 99
+// System.out.println("0 鍒� 99 涔嬮棿鐨勯殢鏈烘暣鏁�: " + randomIntInRange);
+//
+//
+// double randomDouble = random.nextDouble();
+// System.out.println("0 鍒� 1 涔嬮棿鐨勯殢鏈烘诞鐐规暟: " + randomDouble);
+// }
+
+ public static void main(String[] args) {
+ // 鑾峰彇涓�涓� 0 鍒� 1 涔嬮棿鐨勯殢鏈烘诞鐐规暟
+ double randomDouble = Math.random();
+ System.out.println("0 鍒� 1 涔嬮棿鐨勯殢鏈烘诞鐐规暟: " + randomDouble);
+
+ // 鑾峰彇涓�涓寚瀹氳寖鍥村唴鐨勯殢鏈烘暣鏁帮紝渚嬪 [0, 100) 鐨勯殢鏈烘暟
+ int randomIntInRange = (int) (Math.random() * 100); // 0 鍒� 99
+ System.out.println("0 鍒� 99 涔嬮棿鐨勯殢鏈烘暣鏁�: " + randomIntInRange);
+ }
+
+ public static double GetRandomDouble(){
+ // 鑾峰彇涓�涓� 0 鍒� 1 涔嬮棿鐨勯殢鏈烘诞鐐规暟
+ return Math.random();
+ }
+
+ public static double GetRandomIntInRange(){
+ // 鑾峰彇涓�涓寚瀹氳寖鍥村唴鐨勯殢鏈烘暣鏁帮紝渚嬪 [0, 100) 鐨勯殢鏈烘暟
+ return (int) (Math.random() * 100);
+ }
+
+ public static double GetRandomInt(){
+ Random random = new Random();
+ // 鑾峰彇涓�涓殢鏈烘暣鏁�
+ return random.nextInt();
+ }
+
+ public static double GetRandomIntInRange(Integer integer){
+ Random random = new Random();
+ // 鑾峰彇涓�涓寚瀹氳寖鍥村唴鐨勯殢鏈烘暣鏁帮紝渚嬪 [0, 100) 鐨勯殢鏈烘暟
+ return random.nextInt(integer);
+ }
+//
+// public static double GetRandomDouble(){
+// Random random = new Random();
+// // 鑾峰彇涓�涓� 0 鍒� 1 涔嬮棿鐨勯殢鏈烘诞鐐规暟
+// return random.nextDouble();
+// }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 36c8ef3..f0955c7 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -91,13 +91,13 @@
double l = b / a;
// 鍦嗙殑宸茬煡鍙傛暟
- double radius = 48; // 鍗婂緞涓�48
+ double radius = 47.52; // 鍗婂緞涓�48
// double circumference = ; // 璁＄畻鍦嗗懆闀�
double arcLength = 2 * Math.PI * radius * l; // 缁欏嚭鐨勫姬闀�
// 鍦嗗績鍧愭爣
- double centerX = 52.5;
- double centerY = 47.5;
+ double centerX = 50;
+ double centerY = 50;
// 姹傚姬搴�
double theta = arcLength / radius;
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 777671e..c72cb50 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -63,8 +63,13 @@
line-height: 24px;
font-weight: bold;
transition: transform 0.3s ease;
+ background-color: #FF5722;
+ transform: scale(1.2);
}
.bus {
+ background-color: #2196F3;
+ border: 20px solid;
+ border-color: #2196F3;
position: absolute;
width: 24px;
height: 24px;
@@ -73,14 +78,6 @@
line-height: 24px;
font-weight: bold;
transition: transform 0.3s ease;
- }
- .station {
- background-color: #FF5722;
- transform: scale(1.2);
- }
- .bus {
- background-color: #2196F3;
- border: 20px solid #ffffff;
}
.station:hover, .bus:hover {
transform: scale(1.4);
@@ -104,13 +101,13 @@
<!-- <div class="station" style="top: 30%; left: 0;">6</div>-->
<!-- Stations on inner ring -->
-<!-- <div class="station" style="top: 5%; left: 50%;">7</div>-->
+ <div class="station" style="top: 0%; left: 0%;">500</div>
<!-- <div class="station" style="top: 25%; left: 80%;">8</div>-->
<!-- <div class="station" style="top: 75%; left: 80%;">9</div>-->
<!-- <div class="station" style="top: 95%; left: 50%;">10</div>-->
<!-- <div class="station" style="top: 75%; left: 20%;">11</div>-->
<!-- <div class="station" style="top: 25%; left: 20%;">12</div>-->
- <div v-for="station in tableDataDev" class="station" :style="{ top: station.valueX + '%', left: station.valueY + '%' }">{{ station.index }}</div>
+<!-- <div v-for="station in tableDataDev" class="station" :style="{ top: station.valueX + '%', left: station.valueY + '%' }">{{ station.index }}</div>-->
<!-- Buses -->
--
Gitblit v1.9.1