From 3b64c807f60e5d6b71deca3f79c9be4be19abfaa Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 23 二月 2024 10:47:58 +0800
Subject: [PATCH] #显示器更新
---
src/main/java/com/zy/asrs/utils/Utils.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 8747c14..a98297a 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -28,6 +28,7 @@
import java.text.DecimalFormat;
import java.util.*;
+import java.util.regex.Pattern;
/**
* Created by vincent on 2020/8/27
@@ -453,12 +454,22 @@
NavigateMapData mapData = new NavigateMapData(z);//鑾峰彇鍦板浘鏁版嵁
int[][] data = mapData.getData(-1, null, currentShuttleId == null ? null : Utils.getShuttlePoints(0, z));//杞藉叆鍏ㄩ儴杞﹁締
+ int moveBay = 23;//閬胯璧峰鍒�
+ int bay = Utils.getBay(shuttleProtocol.getCurrentLocNo());//灏忚溅褰撳墠鍒�
+ if (bay > 1 && bay <= 30) {
+ moveBay = 23;
+ } else if (bay > 30 && bay <= 45) {
+ moveBay = 39;
+ } else if (bay > 45) {
+ moveBay = 50;
+ }
+
int distY = -1;
int distX = -1;
int distZ = -1;
//鑾峰彇閬胯搴撲綅
String distLocNo = null;
- for (int y = 20; y <= 56; y++) {
+ for (int y = moveBay; y <= 56; y++) {
boolean searchFlag = true;
for (int x = 10; x <= 11; x++) {
if (data[x][y] < 0 || data[x][y] == 66) {
@@ -684,5 +695,13 @@
}
return null;
}
-
+ /**
+ * 鍒ゆ柇瀛楃涓叉槸鍚︿负JSON鏍煎紡
+ */
+ public static boolean isJson(String jsonString) {
+ // JSON鏍煎紡鐨勬鍒欒〃杈惧紡
+ String pattern = "^\\{.*\\}$";
+ // 浣跨敤Pattern绫昏繘琛屾鍒欏尮閰�
+ return Pattern.matches(pattern, jsonString);
+ }
}
--
Gitblit v1.9.1