From 6c784c4ab70e4e5583d1b88f8be6ff90a405c47f Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期一, 15 八月 2022 17:15:11 +0800
Subject: [PATCH] V1.116 2022-08-15 1.新增市电状态读取 2.新增强制切换电池组命令
---
BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java b/BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
index c728933..0f07538 100644
--- a/BattMonitor_FGCD-A059NT_Four/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java
+++ b/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 + "成功");
--
Gitblit v1.9.1