From 1b7bf3002bf005a6bf62ad1613d08c689db995c3 Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期一, 13 二月 2023 16:07:20 +0800
Subject: [PATCH] 修改数据的保留位数
---
FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$FBSData.class | 0
FBS9600ForFBO_Parse/src/com/fgkj/mcp/TestDataInfo.java | 21 +++++++++++++++------
FBS9600ForFBO_Parse/src/com/fgkj/bres/RESData.java | 6 +++---
FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorParam.class | 0
FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MVolData.class | 0
FBS9600ForFBO_Parse/bin/com/fgkj/bres/RESData.class | 0
FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorState.class | 0
FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$DateTime.class | 0
FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MonitorDataInfo.class | 0
FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo.class | 0
FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$BattParam.class | 0
11 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/FBS9600ForFBO_Parse/bin/com/fgkj/bres/RESData.class b/FBS9600ForFBO_Parse/bin/com/fgkj/bres/RESData.class
index 856412d..1d074d0 100644
--- a/FBS9600ForFBO_Parse/bin/com/fgkj/bres/RESData.class
+++ b/FBS9600ForFBO_Parse/bin/com/fgkj/bres/RESData.class
Binary files differ
diff --git a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$BattParam.class b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$BattParam.class
index bd3fe22..0569bba 100644
--- a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$BattParam.class
+++ b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$BattParam.class
Binary files differ
diff --git a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$DateTime.class b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$DateTime.class
index 7e3b21e..d73efed 100644
--- a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$DateTime.class
+++ b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$DateTime.class
Binary files differ
diff --git a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$FBSData.class b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$FBSData.class
index a5d3347..7c81f63 100644
--- a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$FBSData.class
+++ b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$FBSData.class
Binary files differ
diff --git a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MVolData.class b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MVolData.class
index 8f6c391..d5040ce 100644
--- a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MVolData.class
+++ b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MVolData.class
Binary files differ
diff --git a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MonitorDataInfo.class b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MonitorDataInfo.class
index 9757a03..a81bd45 100644
--- a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MonitorDataInfo.class
+++ b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$MonitorDataInfo.class
Binary files differ
diff --git a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorParam.class b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorParam.class
index 02b328d..da76b32 100644
--- a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorParam.class
+++ b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorParam.class
Binary files differ
diff --git a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorState.class b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorState.class
index d3521e5..fb02aeb 100644
--- a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorState.class
+++ b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo$SYSMonitorState.class
Binary files differ
diff --git a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo.class b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo.class
index b4ba7ed..d9d8044 100644
--- a/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo.class
+++ b/FBS9600ForFBO_Parse/bin/com/fgkj/mcp/TestDataInfo.class
Binary files differ
diff --git a/FBS9600ForFBO_Parse/src/com/fgkj/bres/RESData.java b/FBS9600ForFBO_Parse/src/com/fgkj/bres/RESData.java
index e7929df..59e67c8 100644
--- a/FBS9600ForFBO_Parse/src/com/fgkj/bres/RESData.java
+++ b/FBS9600ForFBO_Parse/src/com/fgkj/bres/RESData.java
@@ -61,13 +61,13 @@
battSum = ComBase.changeShortToInt(bf.getShort()); //鍥哄畾鍊�300
for(int i=0;i<MonomerVol.length;i++) {
- MonomerVol[i] = ComBase.changeShortToFloat(bf.getShort())*0.001f; //鍗曚綋鐢靛帇锛屽垎杈ㄧ巼0.001V
+ MonomerVol[i] = (float)(ComBase.changeShortToFloat(bf.getShort())*0.001); //鍗曚綋鐢靛帇锛屽垎杈ㄧ巼0.001V
}
for(int i=0;i<MonomerTemp.length;i++) {
- MonomerTemp[i] = ComBase.changeShortToFloat(bf.getShort())*0.1f - 10; //娓╁害锛屽亸绉�100锛屽垎杈ㄧ巼0.1鈩�
+ MonomerTemp[i] = (float)(ComBase.changeShortToFloat(bf.getShort())*0.1 - 10); //娓╁害锛屽亸绉�100锛屽垎杈ㄧ巼0.1鈩�
}
for(int i=0;i<MonomerRes.length;i++) {
- MonomerRes[i] = ComBase.changeShortToFloat(bf.getShort())*0.001f; //鍐呴樆锛屽垎杈ㄧ巼0.001m惟
+ MonomerRes[i] = (float)(ComBase.changeShortToFloat(bf.getShort())*0.001); //鍐呴樆锛屽垎杈ㄧ巼0.001m惟
}
return true;
}
diff --git a/FBS9600ForFBO_Parse/src/com/fgkj/mcp/TestDataInfo.java b/FBS9600ForFBO_Parse/src/com/fgkj/mcp/TestDataInfo.java
index e3140f6..7636eb3 100644
--- a/FBS9600ForFBO_Parse/src/com/fgkj/mcp/TestDataInfo.java
+++ b/FBS9600ForFBO_Parse/src/com/fgkj/mcp/TestDataInfo.java
@@ -69,7 +69,7 @@
{
FBSData fbsData = new FBSData(testDataInfo.monitorstate.testType);
if(fbsData.setData(databuf)) {
- //System.out.println(resData);
+ System.out.println(fbsData);
FBSDatas.add(fbsData);
}
}
@@ -203,8 +203,8 @@
return false;
}
for(int i=0;i<vol.length;i++) {
- //System.out.println(ComBase.changeShortToFloat(bf.getShort()));
- vol[i] = ComBase.changeShortToFloat(bf.getShort())*0.001f;//鍗曚綋鐢靛帇 鍋忕Щ20000 鍒嗚鲸鐜�0.001V
+ //System.out.println(ComBase.changeShortToFloat(bf.getShort())*0.001);
+ vol[i] = (float)(ComBase.changeShortToFloat(bf.getShort())*0.001);//鍗曚綋鐢靛帇 鍋忕Щ20000 鍒嗚鲸鐜�0.001V
}
bf.compact();
//System.out.println(this);
@@ -236,7 +236,7 @@
}
public boolean setData(byte[] databuf) {
- boolean flag = false;
+ boolean flag = true;
//System.out.println(databuf.length + "===" + BYTE_LEN);
//System.out.println(ComFn.bytesToHexString(databuf, databuf.length));
ByteBuffer bf = ByteBuffer.allocate(databuf.length + dataType.length);
@@ -274,6 +274,15 @@
return flag;
}
+
+ @Override
+ public String toString() {
+ return "FBSData [dataType=" + Arrays.toString(dataType) + ", CRC16=" + CRC16 + ", testTime=" + testTime
+ + ", battGroup=" + battGroup + ", battSum=" + battSum + ", vcData=" + vcData + ", mVol=" + mVol
+ + "]";
+ }
+
+
}
public class BattParam{
@@ -629,9 +638,9 @@
public static void main(String[] args) {
TestDataInfo info = new TestDataInfo();
- //info.readFileData("D:\\妗岄潰鏂囦欢澶囦唤\\鍏徃鍚勭璁惧璧勬枡\\FBS瀛樺偍鏂囦欢瑙ｆ瀽/M2021-06-22 13.08.40.MCP");
+ info.readFileData("D:\\妗岄潰鏂囦欢澶囦唤\\鍏徃鍚勭璁惧璧勬枡\\FBS瀛樺偍鏂囦欢瑙ｆ瀽/M2021-06-22 13.08.40.MCP");
//info.readFileData("D:\\妗岄潰鏂囦欢澶囦唤\\鍏徃鍚勭璁惧璧勬枡\\FBS瀛樺偍鏂囦欢瑙ｆ瀽/M2021-06-22 13.12.45.MCH");
- info.readFileData("D:\\妗岄潰鏂囦欢澶囦唤\\鍏徃鍚勭璁惧璧勬枡\\FBS瀛樺偍鏂囦欢瑙ｆ瀽/M2021-08-13 09.40.06.MCP");
+ //info.readFileData("D:\\妗岄潰鏂囦欢澶囦唤\\鍏徃鍚勭璁惧璧勬枡\\FBS瀛樺偍鏂囦欢瑙ｆ瀽/M2021-08-13 09.40.06.MCP");
}
}
--
Gitblit v1.9.1