From 59b47441175f1ba367ef56fe4a4eca94c3c9d850 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 09:04:10 +0800
Subject: [PATCH] 测试合并
---
springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
index e1d7e6e..51d6ddf 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
@@ -1,4 +1,7 @@
package com.example.springboot.entity.device;
+
+import com.example.springboot.component.S7control;
+
public class PlcParameterInfo {
public PlcParameterInfo(String startAddress) {
this.startAddress = startAddress;
@@ -91,6 +94,7 @@
public void setRatio(int ratio) {
this.ratio = ratio;
}
+
/**
* 鑾峰彇鍦板潃
@@ -111,8 +115,8 @@
}
if (addressLength == 14 ) {
int wordindex = index;
- int newIndex = wordindex + 13;
- return stringdatas[0] + "." + wordindex +"-" + newIndex;
+ //int newIndex = wordindex + 13;
+ return stringdatas[0] + "." + wordindex ;
}
return null;
}
@@ -121,4 +125,10 @@
return addressIndex;
}
+ public String getValueString() {
+ return S7control.getinstance().readStrings(getAddress());
+ }
+ public String getAddress() {
+ return getAddress(this.addressIndex);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0