From f2f19526ed5ba89a8e3a195d3559a2d74471b0c9 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 16 五月 2024 10:19:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 23 +++++++++++++++++++++++
src/main/resources/application-prod.yml | 2 ++
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index c0e75cd..40c5b1c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -381,7 +381,30 @@
}
public synchronized void DevpTaskAndPut() throws InterruptedException {
+ try {
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+// if (){ //杈撻�佺嚎鐘舵��
+//
+// }
+ System.out.println(JSON.toJSONString(staProtocol));
+ }
+
+ }
+
+ } catch (Exception e) {
+ log.error("鐢熸垚灏忚溅鎼繍浠诲姟 ===>> 澶辫触", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 8ddd7e9..8d06613 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -24,6 +24,8 @@
rack: 0
port: 102
slot: 0
+ inSta[0]: #
+ staNo: 100
scale[0]: #纾呯Г
port: 5005
ip: 10.10.10.201
--
Gitblit v1.9.1