From 5d1df2b22fd4e0b31f80385664393cd3d73a21ed Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 19 八月 2025 09:58:39 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 6bcaa10..62e85d8 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -355,12 +355,14 @@
// double[] doubles = Utils.RingThroughXY2(perimeter, NumUtils.GetRandomIntInRange(183));
// double[] doubles = Utils.RingThroughXYRgv(perimeter, perimeter-rgvProtocol.RgvPos.doubleValue());
double[] doubles = Utils.getRgvPosNew(perimeter, rgvProtocol.RgvPos.doubleValue());
-// double[] doubles = Utils.RingThroughXY2(183.0, 100*i );
ringThroughParam.setValueX(doubles[0]);
ringThroughParam.setValueY(doubles[1]);
ringThroughParam.setModeColor(rgvProtocol.modeType.color);
ringThroughParam.setStatusColor(rgvProtocol.statusType.color);
+ if (rgvProtocol.getModeType() == RgvModeType.AUTO){
+ ringThroughParam.setAnimation(2);
+ }
result.add(ringThroughParam);
}
return R.ok().add(result);
@@ -373,6 +375,9 @@
List<RingThroughParam> result = new ArrayList<>();
List<BasDevpPosition> basDevpPositions = basDevpPositionService.selectList(new EntityWrapper<>());
for (BasDevpPosition basDevpPosition : basDevpPositions){
+ if (basDevpPosition.getDevRegion() == 0){
+ continue;
+ }
RingThroughParam ringThroughParam = new RingThroughParam();
ringThroughParam.setModeColor("#FFFFFF");
--
Gitblit v1.9.1