V1.106 2022-01-18 1. 新增设备版本号读取以及存取 2. 新增设备电池组切换功能 3. 新增内窥镜自动拍照功能

Administrator

2022-01-18 d00561cf482b443a1cec9d8bbbe40750b2edfc45

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

@@ -1225,6 +1225,15 @@
               

               + "dev_last_captest_stop_type=" + m_pm.sysState.dev_captest_stop_type + ", "

               + "dev_captest_cap=" + m_pm.sysState.testCap + ", "

				
               /***

                * 2022-01-17新增在线模块信息

                */

               + "dev_conresist=" + m_pm.onlineInfo.batt1_vol + ", "            //电池组1电压

               + "dev_conresist1=" + m_pm.onlineInfo.batt2_vol + ", "            //电池组2电压

               + "dev_onlinevollow=" + m_pm.onlineInfo.currBattNum + ", "         //当前电池组号   0->未设置;1->电池组1;2->电池组2

               + "dev_station_poff_cnt=" + m_pm.onlineInfo.endoscopeState + ", "   //内窥镜状态  0->停止显示  1->开始显示

					
               + "dev_data_flowsum=" + m_pm.sysState.dev_data_flowsum+ ", "

               + "dev_commcount=" + m_pm.sysState.dev_commcount+ ", "

               + "dev_errcommcount=" + m_pm.sysState.dev_errcommcount;

@@ -1793,12 +1802,16 @@
   public static void insertOrUpdateFbs9100SetParamBydev_id(MysqlConnPool con_pool, int dev_id) {

      String sql_str_sel = " Select * from "+Sql_Mysql.FBS9100SetParam_Table+" where dev_id= "+dev_id ;

      String sql_str_ins = " insert into "+Sql_Mysql.FBS9100SetParam_Table+"(dev_id) values("+dev_id+")";

      String sql_str_upd = " update "+Sql_Mysql.FBS9100SetParam_Table+" set op_cmd = 0";

      Sql_Mysql sql = new Sql_Mysql(con_pool.getConn());

      ResultSet res = null;

      try {

         res = sql.sqlMysqlQuery(sql_str_sel);

         if(!res.next()) {

            sql.sqlMysqlExecute(sql_str_ins);

         }else {

            //清空通信之前的控制命令

            sql.sqlMysqlExecute(sql_str_upd);

         }

      } catch (SQLException e) {

         sql.logger.error("FGCD_SocketClient_Thread_SQL.insertOrUpdateFbs9100SetParamBydev_id():" + e.toString(), e);

@@ -2740,6 +2753,7 @@
   public static void insertFBS9100_SysParamDefaultData(MysqlConnPool conn_pool,FGCD_StateAndParam param) {

      String sql_str_sel = " Select * from "+Sql_Mysql.FBS9100SysParam_Table +" Where dev_id = "+param.dev_id;

      String sql_str_ins = " insert into " + Sql_Mysql.FBS9100SysParam_Table+"(dev_id) values("+param.dev_id+")";

      String sql_str_upd = " update " + Sql_Mysql.FBS9100SysParam_Table+" set op_cmd = 0";

      ResultSet res = null;

      Sql_Mysql sql = null;

      try {

@@ -2747,6 +2761,9 @@
         res = sql.sqlMysqlQuery(sql_str_sel);

         if(!res.next()) {

            sql.sqlMysqlExecute(sql_str_ins);

         }else {

            //清空通信之前的控制命令

            sql.sqlMysqlExecute(sql_str_upd);				
         }

      } catch (SQLException e) {

         e.printStackTrace();