From 78489da7e2185f53faaec9356fa1a8997cedab70 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 28 五月 2025 08:46:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index d2b5ed7..2e31d9a 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -105,7 +105,16 @@
         for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
             SiteLatestDataVo vo = new SiteLatestDataVo();
             StaProtocol staProtocol = entry.getValue();
-            vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
+            if (entry.getKey() < 100){
+                if (entry.getKey() < 10){
+                    vo.setSiteId("00" + entry.getKey());  //濡傛灉绔欑偣缂栧彿鏄�1锛�2锛�3锛�4  鏀逛负 001锛�002 锛�003
+                }else {
+                    vo.setSiteId("0" + entry.getKey()); //濡傛灉绔欑偣缂栧彿鏄�23锛�59锛�67锛�81  鏀逛负 023锛� 059锛� 067锛� 081
+                }
+            }else {
+                vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
+
+            }
             vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
             vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 鐘舵��
             vo.setNearbySta(staProtocol.getNearbySta());
@@ -134,7 +143,7 @@
 //            Short totalBay = locMastMapper.selectTotalBay();
 
             vo.setOffset((double) new Random().nextInt(560));     //  鍫嗗灈鏈哄亸绉婚噺
-            vo.setBay((short) (crnProtocol.getBay() - crn.getOffset()));    //  褰撳墠鍒�
+            vo.setBay((short) (crnProtocol.getBay()));    //  褰撳墠鍒�
             /**
              * 鍫嗗灈鏈虹姸鎬佸垽鏂�
              */

--
Gitblit v1.9.1