|
@@ -183,19 +183,18 @@ public class CalculateServer {
|
|
|
byte[] groupData = bitMapGroup.getData();
|
|
|
|
|
|
//按照数据类型写入data
|
|
|
+// INT32
|
|
|
+// FLOAT
|
|
|
+// UINT32
|
|
|
+// UINT
|
|
|
+// CHAR
|
|
|
+// FLOAT64
|
|
|
+// FLOAT32
|
|
|
+// INT16
|
|
|
+// UINT16
|
|
|
+// INT
|
|
|
String dataType = tpd.getTagPoint().getDataType();
|
|
|
switch (dataType) {
|
|
|
- case "FLOAT32":
|
|
|
- //golden数据类型标记为FLOAT32,实际取值确实Double
|
|
|
-// Float valuef = (Float)tpd.getRtdbData().getValue();
|
|
|
-// System.arraycopy(BytesUtil.float2byte(valuef),0, groupData, dataOffset, 4);
|
|
|
-// dataOffset += 4;
|
|
|
-// break;
|
|
|
- case "FLOAT64":
|
|
|
- Double valued = (Double)tpd.getRtdbData().getValue();
|
|
|
- System.arraycopy(BytesUtil.double2Byte(valued), 0, groupData, dataOffset, 8);
|
|
|
- dataOffset += 8;
|
|
|
- break;
|
|
|
case "BOOL":
|
|
|
Object valueo = tpd.getRtdbData().getValue();
|
|
|
if (valueo instanceof Double) {
|
|
@@ -214,17 +213,34 @@ public class CalculateServer {
|
|
|
|
|
|
dataOffset += 1;
|
|
|
break;
|
|
|
+ case "UINT16":
|
|
|
+ case "INT16":
|
|
|
+ case "CHAR":
|
|
|
+ break;
|
|
|
case "INT":
|
|
|
case "INT32":
|
|
|
+ case "UINT32":
|
|
|
+ case "UINT":
|
|
|
//golden取值只有Long和Double两种类型,无32位整数型
|
|
|
-// Integer valuei = (Integer)tpd.getRtdbData().getValue();
|
|
|
-// System.arraycopy(BytesUtil.int2Bytes(valuei),0, groupData, dataOffset, 4);
|
|
|
+ Long valuell = (Long)tpd.getRtdbData().getValue();
|
|
|
+ System.arraycopy(BytesUtil.long2Bytes(valuell),0, groupData, dataOffset, 8);
|
|
|
+ dataOffset += 8;
|
|
|
+ break;
|
|
|
+ case "FLOAT32":
|
|
|
+ //golden数据类型标记为FLOAT32,实际取值确实Double
|
|
|
+// Float valuef = (Float)tpd.getRtdbData().getValue();
|
|
|
+// System.arraycopy(BytesUtil.float2byte(valuef),0, groupData, dataOffset, 4);
|
|
|
// dataOffset += 4;
|
|
|
// break;
|
|
|
+ case "FLOAT64":
|
|
|
+// Double valued = (Double)tpd.getRtdbData().getValue();
|
|
|
+// System.arraycopy(BytesUtil.double2Byte(valued), 0, groupData, dataOffset, 8);
|
|
|
+// dataOffset += 8;
|
|
|
+// break;
|
|
|
default:
|
|
|
- Long valuell = (Long)tpd.getRtdbData().getValue();
|
|
|
+ Double valueld = (Double) tpd.getRtdbData().getValue();
|
|
|
//todo: 时间是否需要代入
|
|
|
- System.arraycopy(BytesUtil.long2Bytes(valuell),0, groupData, dataOffset, 8);
|
|
|
+ System.arraycopy(BytesUtil.double2Byte(valueld),0, groupData, dataOffset, 8);
|
|
|
dataOffset += 8;
|
|
|
}
|
|
|
}
|