增加俩个104帧类型

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

@@ -0,0 +1,2 @@
+package wei.yigulu.iec104.asdudataframe;public class BooleanWithTimeType {
+}

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

@@ -0,0 +1,212 @@
+package wei.yigulu.iec104.asdudataframe;
+
+
+import io.netty.buffer.ByteBuf;
+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.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.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 104的归一化值数据帧数据帧
+ *
+ * @author 修唯xiuwei
+ * @version 3.0
+ */
+@NoArgsConstructor
+@Data
+public class NormalizedIntegerType extends AbstractDataFrameType {
+
+    /**
+     * TYPEID
+     */
+    public static final int TYPEID = TechnicalTerm.NORMALIZED_INTEGER_TYPE;
+
+    private List<InformationBodyAddress> addresses = new ArrayList<>();
+
+    private Map<IeMeasuredQuality, Integer> datas = new LinkedHashMap<>();
+
+    /**
+     * Normalized integer type
+     *
+     * @param addresses addresses
+     * @param datas     datas
+     * @throws Iec104Exception iec exception
+     */
+    public NormalizedIntegerType(List<InformationBodyAddress> addresses, Map<IeMeasuredQuality, Integer> datas) throws Iec104Exception {
+        if ((this.datas.size() * (IeMeasuredQuality.OCCUPYBYTES + IeShortInteger.OCCUPYBYTES) + this.addresses.size() * InformationBodyAddress.OCCUPYBYTES) > 240) {
+            throw new Iec104Exception("长度超长，创建对象失败，请切割数据。");
+        }
+        this.addresses = addresses;
+        this.datas = datas;
+    }
+
+
+    @Override
+    public void loadByteBuf(ByteBuf is, Vsq vsq) {
+        Integer f;
+        try {
+            if (vsq.getSq() == 0) {
+                for (int i = 0; i < vsq.getNum(); i++) {
+                    addresses.add(new InformationBodyAddress(is));
+                    f = new IeShortInteger(is).getValue();
+                    datas.put(new IeMeasuredQuality(is), f);
+                }
+            } else {
+                addresses.add(new InformationBodyAddress(is));
+                for (int i = 0; i < vsq.getNum(); i++) {
+                    f = new IeShortInteger(is).getValue();
+                    datas.put(new IeMeasuredQuality(is), f);
+                }
+            }
+        } catch (Iec104Exception e) {
+            if (e.getCode() == 3301) {
+                return;
+            }
+        }
+    }
+
+    /**
+     * 向datas中添加数据，默认的质量描述
+     *
+     * @param f f
+     * @throws Iec104Exception iec exception
+     */
+    public void addData(int f) throws Iec104Exception {
+        addData(f, new IeMeasuredQuality());
+    }
+
+    /**
+     * 向datas中添加数据
+     *
+     * @param f       f
+     * @param quality quality
+     * @throws Iec104Exception iec exception
+     */
+    public void addData(int f, IeMeasuredQuality quality) throws Iec104Exception {
+        validateLen(IeShortInteger.OCCUPYBYTES + IeMeasuredQuality.OCCUPYBYTES);
+        this.datas.put(quality, f);
+    }
+
+
+    /**
+     * 向datas中添加数据和数据地址
+     *
+     * @param address address
+     * @param f       f
+     * @param quality quality
+     * @throws Iec104Exception iec exception
+     */
+    public void addDataAndAdd(InformationBodyAddress address, int f, IeMeasuredQuality quality) throws Iec104Exception {
+        addAddress(address);
+        addData(f, quality);
+    }
+
+    /**
+     * 向datas中添加数据和数据地址
+     *
+     * @param address address
+     * @param f       f
+     * @throws Iec104Exception iec exception
+     */
+    public void addDataAndAdd(InformationBodyAddress address, int f) throws Iec104Exception {
+        addAddress(address);
+        addData(f);
+    }
+
+
+    /**
+     * 向datas中添加数据和数据地址
+     *
+     * @param address address
+     * @throws Iec104Exception iec exception
+     */
+    public void addAddress(InformationBodyAddress address) throws Iec104Exception {
+        validateLen(InformationBodyAddress.OCCUPYBYTES);
+        this.addresses.add(address);
+    }
+
+
+    @Override
+    public void encode(List<Byte> buffer) {
+        if (addresses.size() == 1) {
+            addresses.get(0).encode(buffer);
+            for (Map.Entry<IeMeasuredQuality, Integer> i : datas.entrySet()) {
+                new IeShortInteger(i.getValue()).encode(buffer);
+                buffer.add((byte) i.getKey().encode());
+            }
+        } else {
+            int s = 0;
+            for (Map.Entry<IeMeasuredQuality, Integer> i : datas.entrySet()) {
+                addresses.get(s++).encode(buffer);
+                new IeShortInteger(i.getValue()).encode(buffer);
+                buffer.add((byte) i.getKey().encode());
+            }
+        }
+    }
+
+    @Override
+    public Asdu generateBack() {
+        Asdu asdu = new Asdu();
+        asdu.setTypeId(11);
+        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;
+    }
+
+
+    /**
+     * Validate len *
+     *
+     * @param increase increase
+     * @throws Iec104Exception iec exception
+     */
+    protected void validateLen(int increase) throws Iec104Exception {
+        if (((this.datas.size() * (IeMeasuredQuality.OCCUPYBYTES + IeShortInteger.OCCUPYBYTES) + this.addresses.size() * InformationBodyAddress.OCCUPYBYTES) + increase) > 240) {
+            throw new Iec104Exception("长度超长，不能再向此对象中添加元素");
+        }
+    }
+
+    @Override
+    public byte[][] handleAndAnswer(Apdu apdu) throws Exception {
+        return null;
+    }
+
+
+    @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 (Map.Entry<IeMeasuredQuality, Integer> e : datas.entrySet()) {
+                s.append("点位：" + (addresses.get(0).getAddress() + (i++)) + ",");
+                s.append("值为 ：" + e.getValue() + ";" + e.getKey().toString() + "\n");
+            }
+        } else {
+            s.append("单一寻址\n");
+            int f = 0;
+            for (Map.Entry<IeMeasuredQuality, Integer> i : datas.entrySet()) {
+                s.append(addresses.get(f++).toString());
+                s.append(i.getValue().toString());
+                s.append(i.getKey().toString() + "\n");
+            }
+        }
+        return s.toString();
+    }
+}