瀏覽代碼

升版本

xiuwei 2 年之前
父節點
當前提交
ccaac3bdca
共有 7 個文件被更改,包括 18 次插入10 次删除
  1. 3 3
      pom.xml
  2. 2 2
      protocol-all/pom.xml
  3. 1 1
      protocol-cdt/pom.xml
  4. 1 1
      protocol-core/pom.xml
  5. 1 1
      protocol-iec104/pom.xml
  6. 9 1
      protocol-iec104/src/test/java/ClientTest.java
  7. 1 1
      protocol-modbus/pom.xml

+ 3 - 3
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>wei.yigulu</groupId>
     <artifactId>protocol</artifactId>
-    <version>1.2.30</version>
+    <version>1.2.31</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.30</protocol.version>
-        <iec104.version>1.4.34</iec104.version>
+        <protocol.version>1.2.31</protocol.version>
+        <iec104.version>1.4.35</iec104.version>
         <modbus.version>1.2.11</modbus.version>
         <cdt.version>1.0.3</cdt.version>
     </properties>

+ 2 - 2
protocol-all/pom.xml

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

+ 1 - 1
protocol-cdt/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.2.30</version>
+        <version>1.2.31</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.30</version>
+        <version>1.2.31</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.30</version>
+        <version>1.2.31</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 9 - 1
protocol-iec104/src/test/java/ClientTest.java

@@ -1,4 +1,6 @@
 import wei.yigulu.iec104.apdumodel.Apdu;
+import wei.yigulu.iec104.apdumodel.Asdu;
+import wei.yigulu.iec104.asdudataframe.PulseTotalSummonType;
 import wei.yigulu.iec104.nettyconfig.Iec104HSMasterBuilder;
 import wei.yigulu.iec104.util.SendDataFrameHelper;
 
@@ -13,8 +15,14 @@ import wei.yigulu.iec104.util.SendDataFrameHelper;
 public class ClientTest {
 
 	public static void main(String[] args) throws Exception {
-		Iec104HSMasterBuilder iec104HSMasterBuilder = new Iec104HSMasterBuilder("192.168.1.206", 2405);
+		Iec104HSMasterBuilder iec104HSMasterBuilder = new Iec104HSMasterBuilder("127.0.0.1", 2404);
 				iec104HSMasterBuilder.createByUnBlock();
+		Thread.sleep(3000L);
+		PulseTotalSummonType pulseTotalSummonType =new PulseTotalSummonType();
+		Asdu asdu = pulseTotalSummonType.generateBack();
+		Apdu apdu=new Apdu();
+		apdu.setAsdu(asdu);
+		iec104HSMasterBuilder.sendFrameToOpposite(apdu.encode());
 		/*Apdu apdu=new Apdu();
 		iec104HSMasterBuilder.sendFrameToOpposite(apdu.encode());
 		SendDataFrameHelper.sendTotalSummonFrame(iec104HSMasterBuilder.getFuture().channel(),1,6,iec104HSMasterBuilder.getLog());

+ 1 - 1
protocol-modbus/pom.xml

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