From 9d3ef469d5baffdc0f9563d7722a6a2f8fac4ed2 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期六, 27 四月 2024 21:24:06 +0800
Subject: [PATCH] change model5
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 f12e9a5..75637be 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
@@ -226,10 +226,12 @@
if (CollUtil.isNotEmpty(collect1)){
collect3 = collect3.stream().filter(x -> !collect1.contains(x)).collect(Collectors.toList());
}
+ String[] parts = Node.split("[.]");
+ String par = parts[0]+parts[1];
if (CollUtil.isNotEmpty(collect3)){
collect3.forEach(x -> {
ReadWriteEntity readWriteEntity = new ReadWriteEntity();
- readWriteEntity.setIdentifier(x);
+ readWriteEntity.setIdentifier(par+"."+x);
readWriteEntity.setValue(2);
writeList.add(readWriteEntity);
});
@@ -244,7 +246,7 @@
//鏁版嵁搴撴煡璇㈠嚭鐨勫伐浣�
collect4.forEach(x -> {
ReadWriteEntity readWriteEntity = new ReadWriteEntity();
- readWriteEntity.setIdentifier(x);
+ readWriteEntity.setIdentifier(par+"."+x);
readWriteEntity.setValue(1);
writeList.add(readWriteEntity);
});
@@ -268,7 +270,7 @@
// writeList.add(readWriteEntity);
// });
// }
- String[] parts = Node.split("[.]");
+
String a=passingStationCollectionServiceImpl.SelectSN(SNCode,parts[1]);
if (StrUtil.isNotBlank(a)){
int input = Integer.parseInt(a);
--
Gitblit v1.9.3