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 | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 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 64d0eee..656a887 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -238,6 +238,28 @@
staProtocol.setPakMk(true);
}
}
+ // 100銆�101銆�122 绔欑偣 StaProtocol 鍏ㄩ噺鐩戞祴鏃ュ織锛�2026-03-25 涔嬪悗涓嶅啀鎵撳嵃锛�
+ if (result.IsSuccess) {
+ try {
+ Calendar cutoff = Calendar.getInstance();
+ cutoff.set(2026, Calendar.MARCH, 25, 0, 0, 0);
+ cutoff.set(Calendar.MILLISECOND, 0);
+ if (System.currentTimeMillis() < cutoff.getTimeInMillis()) {
+ String time = DateUtils.convert(new Date());
+ for (int staNo : new int[]{100, 101, 122}) {
+ StaProtocol p = station.get(staNo);
+ if (p != null) {
+ String msg = String.format("[%s] %s 绔欑偣缂栧彿=%s 宸ヤ綔鍙�=%s 鐩爣绔�=%s 鑷姩=%s 鏈夌墿=%s 鍙叆=%s 鍙嚭=%s 绌烘澘淇″彿=%s 婊℃墭鐩�=%s 楂樺害=%s 閿佸畾鏍囪=%s 鎶ヨ=%s",
+ staNo, time, p.getSiteId(), p.getWorkNo(), p.getStaNo(), p.isAutoing(), p.isLoading(), p.isInEnable(), p.isOutEnable(),
+ p.isEmptyMk(), p.isFullPlt(), p.getLocHeight(), p.isPakMk(), p.getError());
+ log.info("绔欑偣鐩戞祴 {}", msg);
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.warn("绔欑偣鐩戞祴鏃ュ織鎵撳嵃寮傚父", e);
+ }
+ }
}
//浠诲姟淇℃伅鍙嶉
@@ -286,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