From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 14:44:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java |  152 +++++++++++++++++++++++++-------------------------
 1 files changed, 77 insertions(+), 75 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
index f4f3be0..15fa1e7 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
@@ -1,118 +1,120 @@
 package com.mes.device;
-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 +"-" + newIndex;
+            return stringdatas[0] + "." + wordindex + "-" + newIndex;
         }
         return null;
     }

--
Gitblit v1.8.0