Merge branch 'gaodongdong' into develop

YeeAmosIec104IntfServer/src/main/java/com/yeejoin/amos/iec104/tcp/client/invoke/ApduQueue.java

@@ -126,6 +126,27 @@ public class ApduQueue {
 //			                 }
 			                }
 			                break;
+							// 21 浮点型遥测
+							case 21:
+								InformationObject[] normalizedObjects = asdu.getInformationObjects();
+								numberOfSequenceElements = asdu.getSequenceLength();
+								for (int i = 0; i < numberOfSequenceElements; i++) {
+									InformationObject obj = normalizedObjects[i];
+									InformationElement[][] informationElement = obj.getInformationElements();
+									int informationObjectAddress = obj.getInformationObjectAddress();
+
+									RecData data = new RecData(serverId);
+									data.setCommonAddress(asdu.getCommonAddress());
+									data.setCreatedTime(new Date());
+									data.setDataType(2);
+									data.setInformationAddress(informationObjectAddress);
+									IeShortFloat shortFloat = (IeShortFloat) informationElement[0][0];
+									data.setValue(shortFloat.getValue() + "");
+
+									informationObjectAddress++;
+									RecDataQueue.getInstance().add(data);
+								}
+								break;
 			            // 30 带 CP56Time2a 时标的单点信息
 			            case 30:
 			            	InformationObject[] informationCP56Time2aObjects = asdu.getInformationObjects();

YeeAmosIec104IntfServer/src/main/java/com/yeejoin/amos/iec104/tcp/entity/InformationObject.java

@@ -50,6 +50,14 @@ public class InformationObject {
                     log.debug("13 浮点型遥测2: " + i + "--->" + informationElements[i][1].toString());
                 }
                 break;
+            // 21 浮点型 不带品质描述词的规一化值
+            case 21:
+                informationElements = new InformationElement[numberOfSequenceElements][1];
+                for (int i = 0; i < numberOfSequenceElements; i++) {
+                    informationElements[i][0] = new IeShortFloat(is);
+                    log.debug("21 浮点型遥测, 不带品质描述词的规一化值: " + i + "--->" + informationElements[i][0].toString());
+                }
+                break;
             // 30 带 CP56Time2a 时标的单点信息
             case 30:
                 informationElements = new InformationElement[numberOfSequenceElements][2];