修复清除告警bug

Administrator

2021-08-11 138d0c2a4e42d7c1a03c19536436a59aa37c2ba6

 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/comm/FGCD_SocketClient_Thread.java

@@ -170,8 +170,9 @@
          sysState.dev_data_flowsum += FGCD_SocketClient_Thread_SQL.getFbs9100DataCommFlowSum_ById(m_ConnPool, m_StatAndParam);

          

          

          FGCD_SocketClient_Thread_SQL.insertFbs9100SetParamBydev_id(m_ConnPool,m_StatAndParam.dev_id);

          FGCD_SocketClient_Thread_SQL.insertOrUpdateFbs9100SetParamBydev_id(m_ConnPool,m_StatAndParam.dev_id);

          FGCD_SocketClient_Thread_SQL.insertFBS9100StateTableOnRam(m_ConnPool, m_StatAndParam.dev_id);

          FGCD_SocketClient_Thread_SQL.insertFBS9100_SysParamDefaultData(m_ConnPool, m_StatAndParam);

          

          BattData_RT_SQL.checkTbFbs9100StateIntegrity(m_ConnPool, m_StatAndParam.dev_id);

          

@@ -205,7 +206,7 @@
               }

               

               if(FGCD_ComBase.CMD_StartDischarge == m_StatAndParam.op_cmd) {

                  logger.info("检测启动放电测试");

                  //logger.info("检测启动放电测试");

                  //同步进入放电参数界面

                  SocketComm(FGCD_ComBase.CMD_RETURNMAIN,FGCD_ComBase.CMD_InterFace_Disc);

                  //启动放电测试

@@ -238,15 +239,16 @@
               }else if(FGCD_ComBase.CMD_StopHUOHUATest == m_StatAndParam.op_cmd){

                  //停止活化测试

                  SocketComm(FGCD_ComBase.CMD_STOPHHTEST, ByteBuffer.allocate(0));                 

               }else if(FGCD_ComBase.CMD_PauseHUOHUATest== m_StatAndParam.op_cmd){

               }else if(FGCD_ComBase.CMD_PauseHUOHUATest == m_StatAndParam.op_cmd){

                  //暂停活化测试

                  SocketComm(FGCD_ComBase.CMD_PAUSEHHTEST, ByteBuffer.allocate(0));

               }

               

               if(FGCD_ComBase.CMD_ClearSysAlarm == m_StatAndParam.op_cmd) {

                  //清除设备告警

                  SocketComm(FGCD_ComBase.CMD_CLEARALARM, ByteBuffer.allocate(0));

               }

            }

            int op_cmd = FGCD_SocketClient_Thread_SQL.queryClearAlarmState(m_ConnPool, m_StatAndParam);

            if(FGCD_ComBase.CMD_ClearSysAlarm == op_cmd) {

               //清除设备告警

               SocketComm(FGCD_ComBase.CMD_CLEARALARM, ByteBuffer.allocate(0));

            }

            Thread.sleep(200);

            

@@ -430,11 +432,6 @@


                bytebuffer_for_socket_RX.flip();



                Date d2 = new Date();

                long comm_tms = (d2.getTime() - d1.getTime());

                if(comm_tms < 200) {

                    Thread.sleep(200 - comm_tms);

                }

              /*

              System.out.println(this.getName()

                             + "  dev_id: " + m_StatAndParam.dev_id

@@ -692,10 +689,11 @@
            //---------------------  清除告警    ----------------------------------

            else if(FGCD_ComBase.CMD_CLEARALARM == m_FBS_Cmd.CMD) {

                if(FGCD_ComBase.RETURN_SUCCESS == m_FBS_Cmd.RecState) {

                   m_StatAndParam.op_cmd_ack = FGCD_ComBase.CMD_ClearSysAlarm_ACK;

                   FGCD_SocketClient_Thread_SQL.updateFbs9100SetParamCmdAckBydev_id(m_ConnPool,m_StatAndParam);

                    isSuccess = true;

                    //System.out.println("清除告警成功");

                   //m_StatAndParam.op_cmd_ack = FGCD_ComBase.CMD_ClearSysAlarm_ACK;

                   //FGCD_SocketClient_Thread_SQL.updateFbs9100SetParamCmdAckBydev_id(m_ConnPool,m_StatAndParam);

                   FGCD_SocketClient_Thread_SQL.updateClearAlarmState(m_ConnPool, m_StatAndParam, FGCD_ComBase.CMD_ClearSysAlarm_ACK);

                   isSuccess = true;

                    System.out.println("清除告警成功");

                }

            }

            //---------------------  进入 Android控制   ----------------------------------