From 1c84aef7b3d88ce9f2ac5d3173f892a1cd727800 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 10 五月 2024 18:52:27 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index 9171d45..12af80d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -35,7 +35,7 @@
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鏂拌嚜鍔ㄥ伐绔�
- public List<String> automaticList = Arrays.asList("OP280", "OP300A","OP300B", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
+ public List<String> automaticList = Arrays.asList("OP280","OP310A","OP310B", "OP300A","OP300B", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
//閲囬泦妯＄粍宸ヤ綅 ModuleCode
public List<String> moduleCodeList = Arrays.asList("OP300A","OP300B","OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330");
@@ -126,9 +126,9 @@
// //杩涚珯淇濆瓨鏁版嵁
//// inSaveDate(thoroughfare,device)
// //璁板綍鏁版嵁瀹屾垚
-// String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
//
-// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
//
//
// //璇锋眰宸ュ崟
@@ -176,7 +176,12 @@
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build());
}else {
//鎵嬪姩宸ヤ綅
- WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
+ if(device.contains("OP330")){
+ String str = device.substring(0,5);
+ WebSocketUsers.sendMessageToUserByText(map.get(str), "END");
+ }else {
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
+ }
}
}else {
System.out.println("^");
--
Gitblit v1.9.3