From 5f4bcf85cedd59a28b57b3cc7d3e219130217db4 Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期一, 09 五月 2022 13:46:57 +0800
Subject: [PATCH] U 李军修改数据解析
---
src/main/java/testElectronJ/FboDataHeadStart.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/testElectronJ/FboDataHeadStart.java b/src/main/java/testElectronJ/FboDataHeadStart.java
index 511d424..5f9f423 100644
--- a/src/main/java/testElectronJ/FboDataHeadStart.java
+++ b/src/main/java/testElectronJ/FboDataHeadStart.java
@@ -118,11 +118,12 @@
bf.get(batt_date); //瀹夎鏃ユ湡 2000-01-01 10
checkBattDate();
batt_std_cap = ComBase.changeShortToInt(bf.getShort()); //鏍囩О瀹归噺 2
- batt_std_res = ComBase.changeShortToInt(bf.getShort())/10; //鏍囩О鍐呴樆 2
- batt_std_cte = ComBase.changeShortToInt(bf.getShort())/10; //鏍囩О鐢靛 2
+ batt_std_res = (float)ComBase.changeShortToInt(bf.getShort())/10; //鏍囩О鍐呴樆 2
+ batt_std_cte = (float)ComBase.changeShortToInt(bf.getShort())/10; //鏍囩О鐢靛 2
batt_mon_num = ComBase.changeShortToInt(bf.getShort()); //鍗曚綋鏁伴噺 1
- batt_mon_vol = ComBase.changeShortToInt(bf.getShort())/10; //鍗曚綋鐢靛帇 0.1 2 =100
- TestStartTime.setDateTime(bf);; //鏀剧數寮�濮嬬殑鏃堕棿 6
+ batt_mon_vol = (float)ComBase.changeShortToInt(bf.getShort())/10; //鍗曚綋鐢靛帇 0.1 2 =100
+ //System.out.println("鍗曚綋鐢靛帇锛�"+batt_mon_vol);
+ TestStartTime.setDateTime(bf);; //鏀剧數寮�濮嬬殑鏃堕棿 6
testStartTime = TestStartTime.getFBODateTime();
Device = ComBase.changeShortToInt(bf.getShort()); //浠〃绫诲瀷 鏈娇鐢� 1
//System.out.println("浠〃绫诲瀷锛�"+getDeviceType(Device));
@@ -137,16 +138,16 @@
module_mon_num[i] = ComBase.changeShortToInt(bf.getShort()); //姣忎釜缁勫帇妯″潡鍗曚綋鑺傛暟 鐩墠鍙敤5涓� 20
//System.out.println((i+1)+":鍗曚綋鏁扮洰锛�"+module_mon_num[i]);
}
- GrpVol_H_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //缁勭鐢靛帇涓婇檺 2
- GrpVol_L_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //缁勭鐢靛帇涓嬮檺 2
- Module_Vol_H_Limit = ComBase.changeShortToFloat(bf.getShort())/1000; //鍗曚綋鐢靛帇涓婇檺 2
- Module_Vol_L_Limit = ComBase.changeShortToFloat(bf.getShort())/1000; //鍗曚綋鐢靛帇涓嬮檺 2
- ENV_Temp_H_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //鍗曚綋娓╁害涓婇檺 2
- ENV_Temp_L_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //鍗曚綋娓╁害涓嬮檺 2
- ENV_Humi_H_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //鍗曚綋婀垮害涓婇檺 2
- ENV_Humi_L_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //鍗曚綋婀垮害涓嬮檺 2
- ChargeCurr_H_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //鍏呯數鐢垫祦涓婇檺 2
- DischCurr_H_Limit = ComBase.changeShortToFloat(bf.getShort())/10; //鏀剧數鐢垫祦涓婇檺 2
+ GrpVol_H_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/10; //缁勭鐢靛帇涓婇檺 2
+ GrpVol_L_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/10; //缁勭鐢靛帇涓嬮檺 2
+ Module_Vol_H_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/1000; //鍗曚綋鐢靛帇涓婇檺 2
+ Module_Vol_L_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/1000; //鍗曚綋鐢靛帇涓嬮檺 2
+ ENV_Temp_H_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/10; //鍗曚綋娓╁害涓婇檺 2
+ ENV_Temp_L_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/10; //鍗曚綋娓╁害涓嬮檺 2
+ ENV_Humi_H_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/10; //鍗曚綋婀垮害涓婇檺 2
+ ENV_Humi_L_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/10; //鍗曚綋婀垮害涓嬮檺 2
+ ChargeCurr_H_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/10; //鍏呯數鐢垫祦涓婇檺 2
+ DischCurr_H_Limit = (float)ComBase.changeShortToFloat(bf.getShort())/10; //鏀剧數鐢垫祦涓婇檺 2
Cap_L_Limit = ComBase.changeShortToFloat(bf.getShort()); //瀹归噺涓嬮檺 2
for(int i =0;i<StandBy.length;i++) {
--
Gitblit v1.9.1