增加36类型帧处理

pom.xml

@@ -59,6 +59,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/ShortFloatWithTimeType.java

@@ -0,0 +1,124 @@
+package wei.yigulu.iec104.asdudataframe;
+
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import wei.yigulu.iec104.apdumodel.Apdu;
+import wei.yigulu.iec104.apdumodel.Asdu;
+import wei.yigulu.iec104.apdumodel.Vsq;
+import wei.yigulu.iec104.asdudataframe.qualitydescription.IeMeasuredQuality;
+import wei.yigulu.iec104.asdudataframe.typemodel.IeProofreadTime;
+import wei.yigulu.iec104.asdudataframe.typemodel.IeShortFloat;
+import wei.yigulu.iec104.asdudataframe.typemodel.IeShortInteger;
+import wei.yigulu.iec104.asdudataframe.typemodel.InformationBodyAddress;
+import wei.yigulu.iec104.exception.Iec104Exception;
+import wei.yigulu.iec104.nettyconfig.TechnicalTerm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 104的浮点值数据帧数据帧带时长
+ *
+ * @author 修唯xiuwei
+ * @version 3.0
+ */
+@NoArgsConstructor
+@Data
+public class ShortFloatWithTimeType extends AbstractDataFrameType {
+
+    /**
+     * TYPEID
+     */
+    public static final int TYPEID = TechnicalTerm.SHORT_FLOAT_TYPE_TIME;
+
+    private List<InformationBodyAddress> addresses = new ArrayList<>();
+
+    private List<ShortFloatAndQualityWithTime> datas = new ArrayList<>();
+
+
+
+    @Override
+    public String toString() {
+        StringBuilder s = new StringBuilder("带时长浮点值");
+        if (addresses.size() == 1) {
+            s.append("连续寻址\n");
+            s.append(addresses.get(0).toString() + "\n");
+            int i = 0;
+            for (ShortFloatAndQualityWithTime e : datas) {
+                s.append("点位：" + (addresses.get(0).getAddress() + (i++)) + ",");
+                s.append("时间为："+e.getTime());
+                s.append("值为 ：" + e.getValue() + ";" + e.getQuality() + "\n");
+            }
+        } else {
+            s.append("单一寻址\n");
+            int f = 0;
+            for (ShortFloatAndQualityWithTime e : datas) {
+                s.append(addresses.get(f++).toString());
+                s.append("时间为："+e.getTime());
+                s.append("值为 ：" + e.getValue() + ";" + e.getQuality() + "\n");
+            }
+        }
+        return s.toString();
+    }
+
+    @Override
+    public void loadByteBuf(ByteBuf is, Vsq vsq) {
+        try {
+            if (vsq.getSq() == 0) {
+                for (int i = 0; i < vsq.getNum(); i++) {
+                    addresses.add(new InformationBodyAddress(is));
+                    datas.add(new ShortFloatAndQualityWithTime(is));
+                }
+            } else {
+                addresses.add(new InformationBodyAddress(is));
+                for (int i = 0; i < vsq.getNum(); i++) {
+                    datas.add(new ShortFloatAndQualityWithTime(is));
+                }
+            }
+        } catch (Iec104Exception e) {
+            if (e.getCode() == 3301) {
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void encode(List<Byte> buffer) {
+
+    }
+
+    @Override
+    public Asdu generateBack() {
+        Asdu asdu = new Asdu();
+        asdu.setTypeId(TYPEID);
+        asdu.setDataFrame(this);
+        asdu.getVsq().setSq(this.addresses.size() == 1 ? 1 : 0);
+        asdu.getVsq().setNum(this.datas.size());
+        asdu.setOriginatorAddress(0);
+        asdu.setCommonAddress(1);
+        return asdu;
+    }
+
+    @Override
+    public byte[][] handleAndAnswer(Apdu apdu) throws Exception {
+        return new byte[0][];
+    }
+
+    @AllArgsConstructor
+    @Data
+    class ShortFloatAndQualityWithTime {
+
+        Float value;
+        IeMeasuredQuality quality;
+        IeProofreadTime time;
+
+        public ShortFloatAndQualityWithTime(ByteBuf is) throws Iec104Exception {
+            this.value=new IeShortFloat(is).getValue();
+            this.quality=new IeMeasuredQuality(is);
+            this.time=new IeProofreadTime(is);
+        }
+    }
+}

protocol-iec104/src/main/java/wei/yigulu/iec104/nettyconfig/TechnicalTerm.java

@@ -108,6 +108,11 @@ public class TechnicalTerm {
 	 */
 	public static final Integer SHORT_FLOAT_TYPE = 13;
 
+	/**
+	 * 测量值，短浮点数 带时标
+	 */
+	public static final Integer SHORT_FLOAT_TYPE_TIME = 36;
+
 
 	/**
 	 * 测量值，无品质位规一化值

protocol-iec104/src/test/java/ClientTest.java

@@ -1,5 +1,4 @@
-import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.util.internal.PlatformDependent;
+
 import wei.yigulu.iec104.nettyconfig.Iec104HSMasterBuilder;
 import wei.yigulu.iec104.util.SendDataFrameHelper;
 
@@ -13,17 +12,19 @@ import wei.yigulu.iec104.util.SendDataFrameHelper;
  **/
 public class ClientTest {
 
+
     public static void main(String[] args) throws Exception {
         Iec104HSMasterBuilder a = new Iec104HSMasterBuilder("127.0.0.1", 2404);
         a.createByUnBlock();
 
         Thread.sleep(5000L);
-        for (;;){
+        /*for (;;){
             Thread.sleep(3000L);
             System.out.println( );
             SendDataFrameHelper.sendTotalSummonFrame(a.getFuture().channel(),1,6,a.getLog());
-        }
+        }*/
 
     }
 
+
 }

protocol-modbus/pom.xml

@@ -30,6 +30,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
                 <version>2.1</version>
                 <configuration>