From 4574d451284e3d8d23dfabae97f0804cf292c357 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 19 九月 2024 08:27:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 6 +++---
1 files changed, 3 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 d001b3d..47c7aef 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
@@ -159,15 +159,15 @@
//OP020 鐢佃姱鎸′綅鏍￠獙
if (Constants.OP020.equals(device)){
Integer result = 11;
- Object cellGearObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellGear").getValue();
+ /*Object cellGearObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellGear").getValue();
if (ObjectUtil.isNull(cellGearObjcet)){
- result = 16;//鐢佃姱鎸′綅涓虹┖
+ result = 11;//濡傛灉鐢佃姱鎸′綅涓虹┖锛屼笉杩涜鎸′綅鏍￠獙
}else{
String cellGear = cellGearObjcet.toString();
List<String> cellCodeList = readCellCodeList(thoroughfare, device);
result = checkCellGear(thoroughfare, device,cellCodeList,cellGear);//鏍￠獙鐢佃姱鎸′綅鍜岀粍鍒�
Constants.OLD_CELL_GEAR = cellGear;//鎸′綅璧嬪��
- }
+ }*/
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
}else if (Constants.OP030.equals(device)){
--
Gitblit v1.9.3