BattMonitor_FBO_4831NT/bin/com/battmonitor/data/BattData_RT.classBinary files differ
BattMonitor_FBO_4831NT/bin/com/battmonitor/data/BattStatData.classBinary files differ
BattMonitor_FBO_4831NT/bin/com/batttest/BattDataTestPro_Thread$MyBattTestTask.classBinary files differ
BattMonitor_FBO_4831NT/bin/com/dev/fgcd/comm/FGCD_SocketClient_Thread.classBinary files differ
BattMonitor_FBO_4831NT/bin/com/dev/fgcd/data/FGCD_BattInfo.classBinary files differ
BattMonitor_FBO_4831NT/bin/com/version_inf/version_inf.txt
@@ -2,7 +2,15 @@ 通信端口： 4831 设备ID: 48310000X V1.103 需求修改 1.设备静置状态不记录数据 2.设备暂停状态时不记录放电数据,暂停结束后继续记录 V1.104 2023-05-16 1.设备静置状态不记录数据 2.设备暂停状态时不记录放电数据,暂停结束后继续记录 V1.103 1.修复暂停状态时历史数据新记录一笔数据问题 Binary files differ
BattMonitor_FBO_4831NT/src/com/battmonitor/data/BattData_RT.java
@@ -825,7 +825,7 @@ printBattRtDataDebugInf_FBS9100S(5); }else if(BattStatData.BATTSTATE_DISCHARGE == mTestData.battTestState) { if(mTestData.dev_teststarttime_en.getTime() > mTestData.dev_teststarttime.getTime()) { logger.error("825: BattData_RT:开始时间不一致：en:" + Com.getDateTimeFormat(mTestData.dev_teststarttime_en, Com.DTF_YMDhms) + "\t new:" + Com.getDateTimeFormat(mTestData.dev_teststarttime, Com.DTF_YMDhms) ); logger.error("BattData_RT:828: BattData_RT:开始时间不一致：en:" + Com.getDateTimeFormat(mTestData.dev_teststarttime_en, Com.DTF_YMDhms) + "\t new:" + Com.getDateTimeFormat(mTestData.dev_teststarttime, Com.DTF_YMDhms) ); //设备中断重连时若2次的开始时间不一致则重新记录一笔放电数据 printBattRtDataDebugInf_FBS9100S(8); @@ -858,6 +858,7 @@ || (BattStatData.BATTSTATE_CHARGE == mTestData.battTestState)) { mTestData.calTestCap(1); calBattRestCap(mTestData.testCurr, mTestData.testCap);
@@ -351,6 +351,16 @@ upDateCurrRT(curr); } /** * 从FBS设备更新测试时长 * @param curr */ public void updateTestTimeLong_FBSDev(int timelong) { testTimeLong = timelong; recordTime.setTime(new Date().getTime()); } public void updateNewDataRCTime(Date d_t) { newDataRecordTime.setTime(d_t.getTime()); } @@ -361,8 +371,11 @@ old_rec_t.setTime(recordTime.getTime()); recordTime.setTime(new Date().getTime()); testTimeLong = (int) ((recordTime.getTime() - startTestTime.getTime())/1000); /** * 2023-05-17 测试时长根据设备上的测试时长设置 */ //testTimeLong = (int) ((recordTime.getTime() - startTestTime.getTime())/1000); double t_interval = recordTime.getTime(); t_interval = (t_interval-old_rec_t.getTime()) / 1000; BattMonitor_FBO_4831NT/src/com/batttest/BattDataTestPro_Thread.java
@@ -157,6 +157,15 @@ batt_is_testing = true; } /** * @author LiJun 2023-05-17 设备处于暂停放电或者充电时不记录数据 */ if((FGCD_ComBase.WORK_STATE_STOPDIS == rt_data.mTestData.dev_FBS9100S_WorkState) || (FGCD_ComBase.WORK_STATE_STOPCHAR == rt_data.mTestData.dev_FBS9100S_WorkState)) { //暂停放电或者充电时不记录数据 continue; } if(true == m_BattTestState.putBattTesttingState(n, batt_is_testing)) { BattMonitor_FBO_4831NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
@@ -86,6 +86,8 @@ private FGCD_Station_inf station_inf; //一体机机房信息. boolean isNewRead = true; private int m_Read_Rate = 1; //数据读取速率 @@ -367,7 +369,7 @@ SocketComm(FGCD_ComBase.CMD_CLEARALARM, ByteBuffer.allocate(0)); } } Thread.sleep(200); Thread.sleep(100); /************************ 文件下载 *****************************************************/ { @@ -405,14 +407,15 @@ // readMonData = false; // } if(DevReadCount %10 == 0) { if(DevReadCount %(2*m_Read_Rate) == 0) { //System.err.println(Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms)+"\tReadRate:"+m_Read_Rate); FGCD_Cmd tmp_cmd = new FGCD_Cmd(FGCD_ComBase.CMD_ReadSysInfo); SocketComm(tmp_cmd, ByteBuffer.allocate(0)); Thread.sleep(50); if(SocketComm(tmp_cmd, ByteBuffer.allocate(0))) Thread.sleep(50); } if(DevReadCount % 50 == 0) { if(DevReadCount % 70 == 0) { //15s读取一次版本信息 //logger.info("获取设备版本号"); FGCD_Cmd tmp_cmd = new FGCD_Cmd(FGCD_ComBase.CMD_READDEVICEVERSION); @@ -439,9 +442,15 @@ FGCD_Thread_Mark = false; } if(sysState.dev_workstate > FGCD_ComBase.WORK_STATE_STOPPED) { m_Read_Rate = 1; }else { m_Read_Rate = 12; } DevReadCount++; if(DevReadCount >= 2400) { if(DevReadCount >= 240000) { DevReadCount = 0; } } catch (Exception e) { @@ -1293,7 +1302,16 @@ } //now_dev_workstate = sysState.dev_workstate; now_dev_workstate = battInfo.sysWorkState; if(FGCD_ComBase.DeviceTestType_HuoHua == battInfo.DeviceTestType && FGCD_ComBase.WORK_STATE_STOPPED != battInfo.sysWorkState) { if(FGCD_ComBase.DeviceTestType_HuoHua == battInfo.DeviceTestType && FGCD_ComBase.WORK_STATE_STOPPED != battInfo.sysWorkState /** * 屏蔽静置时的历史数据存储 */ && FGCD_ComBase.WORK_STATE_WAITCHAR != battInfo.sysWorkState && FGCD_ComBase.WORK_STATE_WAITDIS != battInfo.sysWorkState ) { //非停止状态活化有效,否则活化无效 now_dev_workstate = FGCD_ComBase.WORK_STATE_HUOHUA; } @@ -1317,6 +1335,7 @@ m_RTData[n].mTestData.updateOnlineVolFrom_FBSDev(battInfo.onlineVol); m_RTData[n].mTestData.updateGroupVolFrom_FBSDev(battInfo.groupVol); //更新电池组组端电压 m_RTData[n].mTestData.updateCurrFrom_FBSDev(battInfo.groupCurrent); m_RTData[n].mTestData.updateTestTimeLong_FBSDev(battInfo.getTestTimeLong()); //---------------------------------------------------------------------------// //--------------------- 接着更新当前时间 -----------------------------------------// BattMonitor_FBO_4831NT/src/com/dev/fgcd/data/FGCD_BattInfo.java
@@ -79,6 +79,15 @@ } return mon_count; } public int getTestTimeLong() { int testTimeLong = 0; String[] t = testedTime.split(":"); if(t.length >= 3) { testTimeLong = Integer.parseInt(t[0])*60*60 + Integer.parseInt(t[1])*60 + Integer.parseInt(t[2]); } return testTimeLong; } public String getCurrentBatteryName() { return currentBatteryName; @@ -334,7 +343,10 @@ //System.out.println(list.toJSONString()); //System.out.println(data.toJSONString()); String tmsg = "01:00:00"; String[] t = tmsg.split(":"); int timelong = Integer.parseInt(t[0])*60*60 + Integer.parseInt(t[1])*60 + Integer.parseInt(t[2]); System.out.println(timelong); } } BattMonitor_FBO_4831NT/src/com/version_inf/version_inf.txt
@@ -2,7 +2,15 @@ 通信端口： 4831 设备ID: 48310000X V1.103 需求修改 1.设备静置状态不记录数据 2.设备暂停状态时不记录放电数据,暂停结束后继续记录 V1.104 2023-05-16 1.设备静置状态不记录数据 2.设备暂停状态时不记录放电数据,暂停结束后继续记录 V1.103 1.修复暂停状态时历史数据新记录一笔数据问题
@@ -18,7 +18,7 @@ public class main_Monitor_FBO_4831 { public final static double m_VersionNum = 1.117; public final static double m_VersionNum = 1.104; public final static String m_Version = "Welcome To Use main_Monitor_FBO_4830 PRO 20210714 V" + m_VersionNum ; /**************************************************************************/
