From 1dacf2305187f5c2fb44f03b6b754c46cb73ba25 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 19 三月 2026 08:53:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 81e6b8c..cf6679d 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -348,22 +348,31 @@
if (rgvProtocol == null) {
continue;
}
- RingThroughParam ringThroughParam = new RingThroughParam();
+ try {
+ if (rgvProtocol.getRgvPos() == null || rgvProtocol.getModeType() == null || rgvProtocol.getStatusType() == null) {
+ log.warn("鐜┛浣嶇疆淇℃伅瀛樺湪绌哄瓧娈碉紝璺宠繃璇GV: rgvNo={}", rgv.getId());
+ continue;
+ }
+ RingThroughParam ringThroughParam = new RingThroughParam();
- ringThroughParam.setIndex(rgv.getId());
+ ringThroughParam.setIndex(rgv.getId());
// ringThroughParam.setIndex(i);
// 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.getRgvPosNew(perimeter, rgvProtocol.getRgvPos().doubleValue());
- 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);
+ ringThroughParam.setValueX(doubles[0]);
+ ringThroughParam.setValueY(doubles[1]);
+ ringThroughParam.setModeColor(rgvProtocol.getModeType().color);
+ ringThroughParam.setStatusColor(rgvProtocol.getStatusType().color);
+ if (rgvProtocol.getModeType() == RgvModeType.AUTO){
+ ringThroughParam.setAnimation(2);
+ }
+ result.add(ringThroughParam);
+ } catch (Exception e) {
+ // 鍗曞彴RGV鏁版嵁寮傚父涓嶅奖鍝嶅叾瀹僐GV缁樺埗
+ log.error("鐜┛浣嶇疆淇℃伅澶勭悊寮傚父锛岃烦杩囪RGV: rgvNo={}", rgv.getId(), e);
}
- result.add(ringThroughParam);
}
return R.ok().add(result);
}
@@ -593,4 +602,4 @@
return R.error("鍒濆鍖栧け璐ワ紒锛侊紒");
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1