BattMonitor_FGCD-A059NT_Four/bin/com/dev/fgcd/comm/FGCD_SocketClient_Thread.classBinary files differ
BattMonitor_FGCD-A059NT_Four/bin/com/dev/fgcd/comm/FGCD_SocketClient_Thread_SQL.classBinary files differ
BattMonitor_FGCD-A059NT_Four/bin/com/dev/fgcd/data/FGCD_ComBase.classBinary files differ
BattMonitor_FGCD-A059NT_Four/bin/com/dev/fgcd/data/FGCD_OnlineInfo.classBinary files differ
BattMonitor_FGCD-A059NT_Four/bin/com/version_inf/version_inf.txt
@@ -1,5 +1,10 @@ 充放电一体机通讯程序 V1.116 2022-08-15 1.新增市电状态读取 2.新增强制切换电池组命令 V1.115 2022-07-23 1.修复历史数据记录，设备通信中断重连时，历史数据分成多笔放电记录 Binary files differ
BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
@@ -296,7 +296,27 @@ //设置电池组号 tmp_set_pm = null; }else if(FGCD_ComBase.CMD_StartShowPic == m_StatAndParam.op_cmd) { }else if(FGCD_ComBase.CMD_ForceSetNowBatt == m_StatAndParam.op_cmd) { FGCD_BattTestParam tmp_set_pm = testParam.clone(); FGCD_SocketClient_Thread_SQL.queryFbs9100SetParamBydev_id(m_ConnPool, m_StatAndParam, tmp_set_pm); logger.debug("dev_id:开始强制切换电池组"+m_StatAndParam.dev_id+"\t切换电池组号:" + tmp_set_pm.groupCount); if(FGCD_ComBase.WORK_STATE_STOPPED == sysState.dev_workstate) { SocketComm(FGCD_ComBase.CMD_SETNOWWORKBATT, (tmp_set_pm.groupCount+FGCD_ComBase.CMD_ForceSwitchBatt)); //切换电池组后，立即读取一次组端和单体数据 isOnlineMode = true; readMonData = true; readCharData = true; logger.debug("dev_id:"+m_StatAndParam.dev_id+"\t强制切换电池组号:" + tmp_set_pm.groupCount); }else { logger.debug("dev_id:"+m_StatAndParam.dev_id+"\t 设备正在工作无法强制切换电池组号:" + tmp_set_pm.groupCount); } tmp_set_pm = null; } if(FGCD_ComBase.CMD_StartShowPic == m_StatAndParam.op_cmd) { //开始显示图片 SocketComm(FGCD_ComBase.CMD_STARTSHOWPIC, 1); }else if(FGCD_ComBase.CMD_StopShowPic == m_StatAndParam.op_cmd) { @@ -1047,6 +1067,10 @@ }else if(FGCD_ComBase.CMD_SETNOWWORKBATT == m_FBS_Cmd.CMD) { if(FGCD_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) { m_StatAndParam.op_cmd_ack = FGCD_ComBase.CMD_SetNowBatt_ACK; if(FGCD_ComBase.CMD_ForceSwitchBatt == m_FBS_Cmd.RecState) { m_StatAndParam.op_cmd_ack = FGCD_ComBase.CMD_ForceSetNowBatt_ACK; } FGCD_SocketClient_Thread_SQL.updateFbs9100SetParamCmdAckBydev_id(m_ConnPool,m_StatAndParam); isSuccess = true; logger.debug("dev_id:"+m_StatAndParam.dev_id+"\t 设置电池组号" + testParam.groupCount + "成功"); BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread_SQL.java
@@ -1312,7 +1312,8 @@ + "a059_group_vol2=" + String.format("%1.2f", m_pm.onlineInfo.batt2_vol) + ", " //电池组2组端电压 + "a059_group_curr1=" + String.format("%1.2f", m_pm.sysState.getNowCurr(m_pm.onlineInfo.currBattNum, 1)) + ", " //电池组1组端电流 + "a059_group_curr2=" + String.format("%1.2f", m_pm.sysState.getNowCurr(m_pm.onlineInfo.currBattNum, 2)) + ", " //电池组2组端电流 + "a059_onlineSaveVol=" + String.format("%1.2f", m_pm.onlineInfo.onlineSaveVol); //切换电池组保护电压 + "a059_onlineSaveVol=" + String.format("%1.2f", m_pm.onlineInfo.onlineSaveVol) + "," //切换电池组保护电压 + "a059_acvolLowFlag=" + String.format("%d", m_pm.onlineInfo.acvolLowFlag); //切换电池组保护电压 String sql_str_update = "UPDATE " + sql_str_base + " WHERE dev_id=" + m_pm.dev_id; sql.sqlMysqlExecute(sql_str_update); @@ -1461,6 +1462,7 @@ m_pm.sysState.chargeCurr = res.getFloat("a059_group_curr1"); //电池组1组端电流 } m_pm.onlineInfo.onlineSaveVol = res.getFloat("a059_onlineSaveVol"); //切换电池组保护电压 m_pm.onlineInfo.acvolLowFlag = res.getInt("a059_acvolLowFlag"); //市电中断状态 }
@@ -169,6 +169,8 @@ public static final int CMD_ForceSetNowBatt = 0xC7; //强制切换电池组 public static final int CMD_ForceSetNowBatt_ACK = 0xC8; //强制切换电池组成功 public static final int CMD_ForceSwitchBatt = 0x80; //强制切换电池组标识 //-----------------------------清除告警 public static final int CMD_ClearSysAlarm = 0xB8; //清除告警 public static final int CMD_ClearSysAlarm_ACK = 0xB9; //清除告警成功 BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/data/FGCD_OnlineInfo.java
@@ -15,7 +15,9 @@ public double batt2_vol; //电池组2电压 public int currBattNum; //当前选择的电池组;0:未选择电池组 public int endoscopeState; //内窥镜状态->0停止显示;1:开始显示 public int backup1[] = new int[2]; public int acvolLowFlag; //市电中断状态：0-正常；1-市电中断 public int acvolLowBoxCnt; //市电中断弹框倒计时 public float onlineSaveVol; //切换电池组保护电压 @@ -40,9 +42,13 @@ } currBattNum = FGCD_ComBase.changeByteToInt(bf.get()); endoscopeState = FGCD_ComBase.changeByteToInt(bf.get()); for(int i = 0 ; i < backup1.length ; i++) { backup1[i] = FGCD_ComBase.changeByteToInt(bf.get()); } // for(int i = 0 ; i < backup1.length ; i++) { // backup1[i] = FGCD_ComBase.changeByteToInt(bf.get()); // } acvolLowFlag = FGCD_ComBase.changeByteToInt(bf.get()); //市电中断状态：0-正常；1-市电中断 acvolLowBoxCnt = FGCD_ComBase.changeByteToInt(bf.get()); //市电中断弹框倒计时 onlineSaveVol = bf.getFloat(); //System.out.println("onlineSaveVol："+onlineSaveVol); @@ -71,8 +77,8 @@ @Override public String toString() { return "FGCD_OnlineInfo [BYTE_LEN=" + BYTE_LEN + ", batt1_vol=" + batt1_vol + ", batt2_vol=" + batt2_vol + ", currBattNum=" + currBattNum + ", endoscopeState=" + endoscopeState + ", backup1=" + Arrays.toString(backup1) + ", onlineSaveVol=" + onlineSaveVol + ", backup2=" + ", currBattNum=" + currBattNum + ", endoscopeState=" + endoscopeState + ", acvolLowFlag=" + acvolLowFlag + ",acvolLowBoxCnt=" + acvolLowBoxCnt + ", onlineSaveVol=" + onlineSaveVol + ", backup2=" + Arrays.toString(backup2) + "]"; }
@@ -1,5 +1,10 @@ 充放电一体机通讯程序 V1.116 2022-08-15 1.新增市电状态读取 2.新增强制切换电池组命令 V1.115 2022-07-23 1.修复历史数据记录，设备通信中断重连时，历史数据分成多笔放电记录
@@ -17,7 +17,7 @@ public class main_Monitor_FGCD_A059NT { public final static double m_VersionNum = 1.115; public final static double m_VersionNum = 1.116; public final static String m_Version = "Welcome To Use main_Monitor_FGCD_A059NT PRO 20210714 V" + m_VersionNum ; /**************************************************************************/
