Przeglądaj źródła

日志打印的地址不对

xiuwei 3 lat temu
rodzic
commit
f883eef3f3

+ 1 - 1
protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/NoQualityNormalizedIntegerType.java

@@ -166,7 +166,7 @@ public class NoQualityNormalizedIntegerType extends AbstractDataFrameType {
             s.append(addresses.get(0).toString() + "\n");
             int i = 0;
             for (Integer e : datas) {
-                s.append("点位:" + addresses.get(0) + (i++) + ",");
+                s.append("点位:" + (addresses.get(0).getAddress() + (i++)) + ",");
                 s.append("值为 :" + e + "\n");
             }
         } else {

+ 1 - 1
protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/NormalizedIntegerType.java

@@ -195,7 +195,7 @@ public class NormalizedIntegerType extends AbstractDataFrameType {
             s.append(addresses.get(0).toString() + "\n");
             int i = 0;
             for (Map.Entry<IeMeasuredQuality, Integer> e : datas.entrySet()) {
-                s.append("点位:" + addresses.get(0) + (i++) + ",");
+                s.append("点位:" + (addresses.get(0).getAddress() + (i++)) + ",");
                 s.append("值为 :" + e.getValue() + ";" + e.getKey().toString() + "\n");
             }
         } else {

+ 1 - 1
protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/ShortFloatType.java

@@ -196,7 +196,7 @@ public class ShortFloatType extends AbstractDataFrameType {
             s.append(addresses.get(0).toString() + "\n");
             int i = 0;
             for (Map.Entry<IeMeasuredQuality, Float> e : datas.entrySet()) {
-                s.append("点位:" + addresses.get(0) + (i++) + ",");
+                s.append("点位:" + (addresses.get(0).getAddress() + (i++)) + ",");
                 s.append("值为 :" + e.getValue() + ";" + e.getKey().toString() + "\n");
             }
         } else {

+ 1 - 1
protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/ShortIntegerType.java

@@ -195,7 +195,7 @@ public class ShortIntegerType extends AbstractDataFrameType {
             s.append(addresses.get(0).toString() + "\n");
             int i = 0;
             for (Map.Entry<IeMeasuredQuality, Integer> e : datas.entrySet()) {
-                s.append("点位:" + addresses.get(0) + (i++) + ",");
+                s.append("点位:" + (addresses.get(0).getAddress() + (i++)) + ",");
                 s.append("值为 :" + e.getValue() + ";" + e.getKey().toString() + "\n");
             }
         } else {