From c9c1560eeffdc73c38ab8ef6e1492b164b2360f5 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 16 六月 2024 09:32:56 +0800
Subject: [PATCH] 临时表功能上传
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 dca43ce..99ba9d3 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
@@ -527,13 +527,22 @@
try {
value = Float.parseFloat(part); // 灏濊瘯灏嗗瓧绗︿覆杞崲涓烘诞鐐规暟
String replacement;
- if (value == 1f) {
+ if(i<2){
+ replacement = part;
+ }else{
+ if (value == 1f) {
+ replacement = "OK";
+ } else{
+ replacement = "NG";
+ }
+ }
+ /* if (value == 1f) {
replacement = "OK";
} else if (value == 2f) {
replacement = "NG";
} else {
replacement = part; // 濡傛灉涓嶆槸1鎴�2锛屽垯淇濇寔涓嶅彉
- }
+ }*/
sb.append(replacement);
if (i < parts.length - 1) {
sb.append(','); // 娣诲姞閫楀彿锛堥櫎浜嗘渶鍚庝竴涓厓绱狅級
@@ -604,6 +613,8 @@
}
daPassingStationCollectionService.saveBeachDaPassingStationCollection(passingStationCollections);
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
+ logger.info("宸ヤ綅{}鍥炲21",device);
+
return "21";
}else {
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(22).build());
--
Gitblit v1.9.3