BattMonitor_FGCD-A059NT_Four/bin/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.classBinary files differ
BattMonitor_FGCD-A059NT_Four/bin/com/dev/fgcd/data/FGCD_VCData.classBinary files differ
BattMonitor_FGCD-A059NT_Four/bin/com/version_inf/version_inf.txt
@@ -1,5 +1,8 @@ 充放电一体机通讯程序 V1.117 2022-08-15 1.修复设备通信差重连时设备状态未读取到导致记录多笔充电数据问题 V1.116 2022-08-15 1.新增市电状态读取 2.新增强制切换电池组命令 BattMonitor_FGCD-A059NT_Four/bin/main/main_Monitor_FGCD_A059NT.classBinary files differ
BattMonitor_FGCD-A059NT_Four/src/com/battmonitor/data/BattData_RT.java
@@ -794,6 +794,7 @@ printBattRtDataDebugInf_FBS9100S(3); }else if(BattStatData.BATTSTATE_CHARGE == mTestData.battTestState){ if(mTestData.dev_teststarttime_en.getTime() > mTestData.dev_teststarttime.getTime()) { logger.error("797: 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(2); @@ -821,6 +822,8 @@ 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) ); //设备中断重连时若2次的开始时间不一致则重新记录一笔放电数据 printBattRtDataDebugInf_FBS9100S(8); BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
@@ -190,6 +190,11 @@ sysState.dev_data_flowsum += FGCD_SocketClient_Thread_SQL.getFbs9100DataCommFlowSum_ById(m_ConnPool, m_StatAndParam); /** * 2022-10-11 lijun 添加为了保证设备重连后的测试开始时间与上一次测试开始时间一致,避免网络波动重连后出现多笔充放电数据 */ sysState.test_starttime = m_RTData[0].mTestData.dev_teststarttime; FGCD_SocketClient_Thread_SQL.queryFbs9100StateByDev_Id(m_ConnPool, vc_data, m_StatAndParam); //加载通信之前的活化总次数 BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/comm/FGCD_Task_Thread_SQL.java
@@ -474,7 +474,7 @@ res = sql.sqlMysqlQuery(sql_str_sel); if(res.next()) { //更新设备机房配置信息 System.out.println(sql_str_upd); //System.out.println(sql_str_upd); sql.sqlMysqlExecute(sql_str_upd); }else { //插入机房配置信息 BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/data/FGCD_SysState.java
@@ -121,6 +121,7 @@ //System.out.println(year+":"+month+":"+day+":"+hour+":"+min+":"+sec); String starttime_str = (year+2000)+"-"+month+"-"+day+" "+hour+":"+min+":"+sec; test_starttime = Com.getDateTimeFromStr(starttime_str, Com.DTF_YMDhms); //System.err.println("读取系统状态开始时间:"+Com.getDateTimeFormat(test_starttime, Com.DTF_YMDhms)); //nowDate = Com.getDateTimeFromStr(dt, Com.DTF_YMDhms); int hour1 = FGCD_ComBase.changeByteToInt(bf.get()); int min1 = FGCD_ComBase.changeByteToInt(bf.get()); BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/data/FGCD_VCData.java
@@ -3,7 +3,9 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Arrays; import java.util.Date; import com.battmonitor.base.Com; import com.dev.btse.data.FBS9100_ComBase; import com.dev.btse.data.FBS9100_Crc16; import com.dev.btse.data.FBS9100_TestTime; @@ -106,10 +108,11 @@ //取出8个字节预留数据 FGCD_ComBase.changeShortToInt(tmpbuf.getShort()); } for(int i=0;i<monsum;i++) { vol[i] = FGCD_ComBase.changeShortToDouble(tmpbuf.getShort())/1000; } //System.err.println(monsum+"==="+Arrays.toString(vol)); System.err.println(monsum+"==="+Arrays.toString(vol) + Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms)); return true; } BattMonitor_FGCD-A059NT_Four/src/com/version_inf/version_inf.txt
@@ -1,5 +1,8 @@ 充放电一体机通讯程序 V1.117 2022-08-15 1.修复设备通信差重连时设备状态未读取到导致记录多笔充电数据问题 V1.116 2022-08-15 1.新增市电状态读取 2.新增强制切换电池组命令 BattMonitor_FGCD-A059NT_Four/src/main/main_Monitor_FGCD_A059NT.java
@@ -17,7 +17,7 @@ public class main_Monitor_FGCD_A059NT { public final static double m_VersionNum = 1.116; public final static double m_VersionNum = 1.117; public final static String m_Version = "Welcome To Use main_Monitor_FGCD_A059NT PRO 20210714 V" + m_VersionNum ; /**************************************************************************/