V1.102 1.为兼容老版本fuguang.war平台和fg.war平台的控制功能

Administrator

2021-08-16 8c29d7514b6bc5c5c29e77a59726a51248744a0c

 BattMonitor_FBS9600S/src/com/dev/fbs9600s/FBS9600S_SocketClient_Thread.java

@@ -127,31 +127,36 @@
                  monCount = 0;

               }

            }

            FBS9600S_SystemState devState = FBS9600S_SocketClient_Thread_SQL.queryFBS9600SSysCmd(pool, systemState.dev_id);

            FBS9600S_SystemState devState = FBS9600S_SocketClient_Thread_SQL.queryFBS9100SSysCmd(pool, systemState.dev_id);

            if(devState.op_cmd >0) {

               if(devState.op_cmd == FBS9600S_ComBase.CMD_StartResTest) {

                  //启动内阻测试

                  m_cmd = new FBS9600S_Cmd(FBS9600S_ComBase.CMD_SINGL_WRITE_MODBUS, FBS9600S_ComBase.CMD_StartResTest_Addr, FBS9600S_ComBase.CMD_ControlRegCount);

                  if(SocketComm(m_cmd, m_cmd.createByteBuffer(m_cmd.reg_count))) {

                     devState.op_cmd = FBS9600S_ComBase.CMD_StartResTestAck;

                  }else {

                     devState.op_cmd = FBS9600S_ComBase.DataType_Null;

                  }

                  devState.op_cmd = FBS9600S_ComBase.DataType_Null;

               }

               if(devState.op_cmd == FBS9600S_ComBase.CMD_ResetSystem) {

                  //重启系统

                  m_cmd = new FBS9600S_Cmd(FBS9600S_ComBase.CMD_SINGL_WRITE_MODBUS, FBS9600S_ComBase.CMD_SystemReStart_Addr, FBS9600S_ComBase.CMD_ControlRegCount);

                  if(SocketComm(m_cmd, m_cmd.createByteBuffer(m_cmd.reg_count))) {

                     devState.op_cmd = FBS9600S_ComBase.CMD_ResetSystemAck;

                  }else {

                     devState.op_cmd = FBS9600S_ComBase.DataType_Null;

                  }

                  devState.op_cmd = FBS9600S_ComBase.DataType_Null;

               }

                              

               FBS9600S_SocketClient_Thread_SQL.updateFbs9100StateCmdBydev_id(pool, devState);

            }

            

            

            FBS9600S_SystemState param = FBS9600S_SocketClient_Thread_SQL.queryFBS9600SSetParam(pool, systemState.dev_id);

            if(param.op_cmd == FBS9600S_ComBase.CMD_GetJunHeng || param.op_cmd == FBS9600S_ComBase.CMD_SetJunHeng) {

            FBS9600S_SystemState param = FBS9600S_SocketClient_Thread_SQL.queryFBS9100SSetParam(pool, systemState.dev_id);

            if(param.op_cmd == FBS9600S_ComBase.CMD_GetJunHeng 
                  || param.op_cmd == FBS9600S_ComBase.CMD_SetJunHeng

                  || param.op_cmd == FBS9600S_ComBase.CMD_ResetSystem

            ) {

               //设置均衡功能

               //System.out.println("读取均衡");

               if(param.op_cmd == FBS9600S_ComBase.CMD_GetJunHeng) {

@@ -170,9 +175,34 @@
                     param.op_cmd = FBS9600S_ComBase.CMD_SetJunHengAck;

                  }

               }

               //2021-08-16 lijun 新增兼容新版本平台，重启功能，但是发送命令后设备没返回,默认设置重启成功

               if(param.op_cmd == FBS9600S_ComBase.CMD_ResetSystem) {

                  //重启系统

                  m_cmd = new FBS9600S_Cmd(FBS9600S_ComBase.CMD_SINGL_WRITE_MODBUS, FBS9600S_ComBase.CMD_SystemReStart_Addr, FBS9600S_ComBase.CMD_ControlRegCount);

                  if(SocketComm(m_cmd, m_cmd.createByteBuffer(m_cmd.reg_count))) {

                     param.op_cmd = FBS9600S_ComBase.CMD_ResetSystemAck;

                     //System.out.println("重启FBS成功");

                  }

                  param.op_cmd = FBS9600S_ComBase.CMD_ResetSystemAck;

               }					
               FBS9600S_SocketClient_Thread_SQL.updateFbs9100SetParamCmdBydev_id(pool, param);            

            }

            

            FBS9600S_SystemState temp = FBS9600S_SocketClient_Thread_SQL.queryFbs9600StateCmdBydev_id(pool, systemState.dev_id);

            if(temp.op_cmd == FBS9600S_ComBase.CMD_StartResTestNew) {

               //启动内阻测试

               m_cmd = new FBS9600S_Cmd(FBS9600S_ComBase.CMD_SINGL_WRITE_MODBUS, FBS9600S_ComBase.CMD_StartResTest_Addr, FBS9600S_ComBase.CMD_ControlRegCount);

               if(SocketComm(m_cmd, m_cmd.createByteBuffer(m_cmd.reg_count))) {

                  temp.op_cmd = FBS9600S_ComBase.CMD_StartResTestNewAck;

						
                  System.out.println("启动内阻测试成功");

               }else {						
                  temp.op_cmd = FBS9600S_ComBase.DataType_Null;

               }

					
               FBS9600S_SocketClient_Thread_SQL.updateFbs9600StateCmdBydev_id(pool, temp);

					
            }

            //System.out.println("$$$$$$$$$$$$$$$");

            FBS9600S_SocketClient_Thread_SQL.UpdateFBS9600StateByDev_id(pool, systemState);

            

@@ -234,7 +264,7 @@
              byte[] cipher_tx_t = makeCommBuf(data, bf, false);

            //=====================================================================//

              Date d1 = new Date();

              System.out.println("发送数据:"+ComFn.bytesToHexString(cipher_tx_t, cipher_tx_t.length)+Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms));

              //System.out.println("发送数据:"+ComFn.bytesToHexString(cipher_tx_t, cipher_tx_t.length)+Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms));

              int rx_read_time_out = 0; 

              out.write(cipher_tx_t);

             out.flush();