From 13fbd2d9fdc7146cc5709b30b3f04e81c829f86f Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 24 三月 2026 16:53:21 +0800
Subject: [PATCH] 大屏接口

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d702696..656a887 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -308,19 +308,23 @@
         }
 
         if (System.currentTimeMillis() - deviceDataLogTime > 1000 * 1) {
-            //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
-            //淇濆瓨鏁版嵁璁板綍
-            DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
-            DeviceDataLog deviceDataLog = new DeviceDataLog();
-            deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
-            deviceDataLog.setWcsData(JSON.toJSONString(station));
-            deviceDataLog.setType("devp");
-            deviceDataLog.setDeviceNo(slave.getId());
-            deviceDataLog.setCreateTime(new Date());
-            deviceDataLogService.insert(deviceDataLog);
-
-            //鏇存柊閲囬泦鏃堕棿
-            deviceDataLogTime = System.currentTimeMillis();
+            try {
+                //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
+                //淇濆瓨鏁版嵁璁板綍
+                if (result != null && result.IsSuccess && result.Content != null) {
+                    DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
+                    DeviceDataLog deviceDataLog = new DeviceDataLog();
+                    deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
+                    deviceDataLog.setWcsData(JSON.toJSONString(station));
+                    deviceDataLog.setType("devp");
+                    deviceDataLog.setDeviceNo(slave.getId());
+                    deviceDataLog.setCreateTime(new Date());
+                    deviceDataLogService.insert(deviceDataLog);
+                }
+            } finally {
+                //鏇存柊閲囬泦鏃堕棿
+                deviceDataLogTime = System.currentTimeMillis();
+            }
         }
 
         if (result.IsSuccess && result2.IsSuccess && result3.IsSuccess && result4.IsSuccess) {

--
Gitblit v1.9.1