From e8d3676793d4194485afec7940aaf355af594901 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 18 四月 2024 14:24:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcParameterInfo.java | 157 ++++++++++++++++++++++++++-------------------------
1 files changed, 80 insertions(+), 77 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcParameterInfo.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcParameterInfo.java
index 2ae2998..c4d17af 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcParameterInfo.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcParameterInfo.java
@@ -1,119 +1,121 @@
package com.mes.common;
-public class PlcParameterInfo {
- public PlcParameterInfo(String startAddress) {
+
+public class PlcParameterInfo {
+ public PlcParameterInfo(String startAddress) {
this.startAddress = startAddress;
- }
- private String startAddress;
- // 鍙傛暟鏍囪瘑
- private String codeId;
+ }
- // 鍙傛暟鍚嶇О
- private String name;
+ private String startAddress;
+ // 鍙傛暟鏍囪瘑
+ private String codeId;
- // 璇诲彇 鍙傛暟鍊�
- private String value;
+ // 鍙傛暟鍚嶇О
+ private String name;
- // // 鍐欏叆 鍙傛暟鍊�
- // private String writeValue;
+ // 璇诲彇 鍙傛暟鍊�
+ private String value;
- // 鍙傛暟鍗曚綅
- private String unit;
+ // // 鍐欏叆 鍙傛暟鍊�
+ // private String writeValue;
- // 鍙傛暟鍊艰浆鎹㈢郴鏁�
- private int ratio;
+ // 鍙傛暟鍗曚綅
+ private String unit;
- // 鍙傛暟鍦板潃
- private int addressIndex;
+ // 鍙傛暟鍊艰浆鎹㈢郴鏁�
+ private int ratio;
- // 鍙傛暟鍦板潃浣嶉暱搴�
- private int addressLength;
+ // 鍙傛暟鍦板潃
+ private int addressIndex;
- public String getCodeId() {
- return this.codeId;
- }
+ // 鍙傛暟鍦板潃浣嶉暱搴�
+ private int addressLength;
- public void setCodeId(String codeId) {
- this.codeId = codeId;
- }
+ public String getCodeId() {
+ return this.codeId;
+ }
- public String getName() {
- return this.name;
- }
+ public void setCodeId(String codeId) {
+ this.codeId = codeId;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public String getName() {
+ return this.name;
+ }
- public String getValue() {
- return this.value;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setValue(String value) {
- this.value = value;
- }
+ public String getValue() {
+ return this.value;
+ }
- // public String getWriteValue() {
- // return this.writeValue;
- // }
+ public void setValue(String value) {
+ this.value = value;
+ }
- // public void setWriteValue(String writeValue) {
- // this.writeValue = writeValue;
- // }
+ // public String getWriteValue() {
+ // return this.writeValue;
+ // }
- public String getUnit() {
- return this.unit;
- }
+ // public void setWriteValue(String writeValue) {
+ // this.writeValue = writeValue;
+ // }
- public void setUnit(String unit) {
- this.unit = unit;
- }
+ public String getUnit() {
+ return this.unit;
+ }
- public int getAddressIndex() {
- return this.addressIndex;
- }
+ public void setUnit(String unit) {
+ this.unit = unit;
+ }
- public void setAddressIndex(int addressindex) {
- this.addressIndex = addressindex;
- }
+ public int getAddressIndex() {
+ return this.addressIndex;
+ }
- public int getAddressLength() {
- return this.addressLength;
- }
+ public void setAddressIndex(int addressindex) {
+ this.addressIndex = addressindex;
+ }
- public void setAddressLength(int addresslength) {
- this.addressLength = addresslength;
- }
+ public int getAddressLength() {
+ return this.addressLength;
+ }
- public int getRatio() {
- return this.ratio;
- }
+ public void setAddressLength(int addresslength) {
+ this.addressLength = addresslength;
+ }
- public void setRatio(int ratio) {
- this.ratio = ratio;
- }
-
+ public int getRatio() {
+ return this.ratio;
+ }
- /**
+ public void setRatio(int ratio) {
+ this.ratio = ratio;
+ }
+
+
+ /**
* 鑾峰彇鍦板潃
- *
+ *
* @param index 绱㈠紩鍦板潃
*/
public String getAddress(int index) {
String[] stringdatas = this.startAddress.trim().split("\\.");
- int addressLength=this.addressLength;
- if (addressLength < 2 ){
+ int addressLength = this.addressLength;
+ if (addressLength < 2) {
return null;
}
- if (addressLength == 2 ) {
+ if (addressLength == 2) {
int wordindex = index;
return stringdatas[0] + "." + wordindex;
}
- if (addressLength == 14 ) {
+ if (addressLength == 14) {
int wordindex = index;
//int newIndex = wordindex + 13;
- return stringdatas[0] + "." + wordindex ;
+ return stringdatas[0] + "." + wordindex;
}
return null;
}
@@ -122,7 +124,8 @@
return addressIndex;
}
+
public String getAddress() {
- return getAddress(this.addressIndex);
+ return getAddress(this.addressIndex);
}
}
\ No newline at end of file
--
Gitblit v1.8.0