Browse Source

增加品质描述的数据是否是正常数据的判断

xiuwei 3 năm trước cách đây
mục cha
commit
d43b44a630

+ 3 - 3
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>wei.yigulu</groupId>
     <artifactId>protocol</artifactId>
-    <version>1.2.25</version>
+    <version>1.2.26</version>
     <packaging>pom</packaging>
     <modules>
         <module>protocol-core</module>
@@ -32,8 +32,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <protocol.version>1.2.25</protocol.version>
-        <iec104.version>1.4.30</iec104.version>
+        <protocol.version>1.2.26</protocol.version>
+        <iec104.version>1.4.31</iec104.version>
         <modbus.version>1.2.10</modbus.version>
         <cdt.version>1.0.2</cdt.version>
     </properties>

+ 2 - 2
protocol-all/pom.xml

@@ -6,14 +6,14 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.2.25</version>
+        <version>1.2.26</version>
     </parent>
 
 
 
     <packaging>jar</packaging>
     <artifactId>protocol-all</artifactId>
-    <version>1.2.25</version>
+    <version>1.2.26</version>
 
     <dependencies>
         <dependency>

+ 1 - 1
protocol-cdt/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.2.25</version>
+        <version>1.2.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
protocol-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.2.25</version>
+        <version>1.2.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
protocol-iec104/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.2.25</version>
+        <version>1.2.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 4 - 0
protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/qualitydescription/IeAbstractQuality.java

@@ -86,6 +86,10 @@ public class IeAbstractQuality {
 	}
 
 
+	public boolean isGoodValue(){
+		return !this.isBlocked()&&!isInvalid()&&!isSubstituted()&&!isNotTopical();
+	}
+
 	@Override
 	public String toString() {
 		return "被封锁: " + isBlocked() + ", 被取代: " + isSubstituted() + ", 非当前值: " + isNotTopical()

+ 5 - 0
protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/qualitydescription/IeMeasuredQuality.java

@@ -52,6 +52,11 @@ public class IeMeasuredQuality extends IeAbstractQuality {
 	}
 
 
+	public boolean isGoodValue(){
+		return !this.isOverflow()&&super.isGoodValue();
+	}
+
+
 	@Override
 	public String toString() {
 		return "品质描述 : { 溢出: " + overflow + ", " + super.toString() + "}";

+ 1 - 1
protocol-modbus/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.2.25</version>
+        <version>1.2.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <version>${modbus.version}</version>