From b6428016edf3de843020bc95fd1708d3bb1961e5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 07 七月 2025 16:41:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java b/src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java
index 00b5259..e6bcffd 100644
--- a/src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java
+++ b/src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java
@@ -54,7 +54,7 @@
         }
 
         StringBuffer buffer = new StringBuffer();
-        buffer.append("銆愰�氱煡銆戜笁鍑洓鍚戝簱\n");//娑堟伅鏍囬
+        buffer.append("銆愰�氱煡銆戝洓鍚戝簱\n");//娑堟伅鏍囬
 
         boolean hasReport = false;//鏄惁鏈夐渶瑕佹姤鍛婄殑鏁版嵁
         for (ShuttleSlave slave : slaveProperties.getShuttle()) {
@@ -72,6 +72,10 @@
                 continue;//鍏呯數涓紝鏃犻渶閫氱煡
             }
 
+            if (shuttleProtocol.getBatteryPower() == null) {
+                continue;
+            }
+
             if (Integer.parseInt(shuttleProtocol.getBatteryPower()) < shuttlePowerEarlyValue) {
                 buffer.append(shuttleProtocol.getShuttleNo()).append("鍙峰皬杞︼紝鐢甸噺").append(shuttleProtocol.getBatteryPower()).append("锛岃娉ㄦ剰銆俓n");
                 hasReport = true;

--
Gitblit v1.9.1