From 2e1b594ca9bbd2af5b4e713746221705591ada52 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 四月 2024 09:42:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcBitInfo.java | 111 +++++++++++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcBitInfo.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcBitInfo.java
index 0c0f241..fe3439d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcBitInfo.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcBitInfo.java
@@ -1,77 +1,76 @@
package com.mes.common;
+public class PlcBitInfo {
-public class PlcBitInfo {
+ public PlcBitInfo(String startAddress) {
+ this.startAddress = startAddress;
+ }
- public PlcBitInfo(String startAddress) {
- this.startAddress = startAddress;
- }
- private String startAddress;
- // 鍙傛暟鏍囪瘑
- private String codeId;
+ private String startAddress;
+ // 鍙傛暟鏍囪瘑
+ private String codeId;
- // 鍙傛暟鍚嶇О
- private String name;
+ // 鍙傛暟鍚嶇О
+ private String name;
- // 璇诲彇 鍙傛暟鍊�
- private Boolean value;
- // 鍙傛暟鍦板潃
- private int addressIndex;
+ // 璇诲彇 鍙傛暟鍊�
+ private Boolean value;
+ // 鍙傛暟鍦板潃
+ private int addressIndex;
- public String getCodeId() {
- return this.codeId;
- }
+ public String getCodeId() {
+ return this.codeId;
+ }
- public void setCodeId(String codeId) {
- this.codeId = codeId;
- }
+ public void setCodeId(String codeId) {
+ this.codeId = codeId;
+ }
- public String getName() {
- return this.name;
- }
+ public String getName() {
+ return this.name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public Boolean getValue() {
- return this.value;
- }
+ public Boolean getValue() {
+ return this.value;
+ }
- public void setValue(Boolean value) {
- this.value = value;
- }
-
+ public void setValue(Boolean value) {
+ this.value = value;
+ }
- public int getAddressIndex() {
- return this.addressIndex;
- }
- /**
+
+ public int getAddressIndex() {
+ return this.addressIndex;
+ }
+
+ /**
* 鑾峰彇鍦板潃
- *
+ *
* @param index 绱㈠紩鍦板潃
*/
- public String getAddress(int index) {
- String[] stringdatas = this.startAddress.trim().split("\\.");
- if (stringdatas.length < 2 )
- return null;
- int dbwindex = 0;
- int bitindex = 0;
- if (stringdatas.length == 3) {
- dbwindex = Integer.parseInt(stringdatas[1]);
- bitindex = Integer.parseInt(stringdatas[2]);
- } else
- return null;
- dbwindex+=index/8;
- bitindex+=index%8;
- return stringdatas[0]+"."+dbwindex+"."+bitindex;
- }
-
-
+ public String getAddress(int index) {
+ String[] stringdatas = this.startAddress.trim().split("\\.");
+ if (stringdatas.length < 2)
+ return null;
+ int dbwindex = 0;
+ int bitindex = 0;
+ if (stringdatas.length == 3) {
+ dbwindex = Integer.parseInt(stringdatas[1]);
+ bitindex = Integer.parseInt(stringdatas[2]);
+ } else
+ return null;
+ dbwindex += index / 8;
+ bitindex += index % 8;
+ return stringdatas[0] + "." + dbwindex + "." + bitindex;
+ }
public void setAddressIndex(int addressindex) {
- this.addressIndex = addressindex;
- }
+ this.addressIndex = addressindex;
}
+}
--
Gitblit v1.8.0