去掉停止时的ACK

whyclxw

2021-09-03 fd38ca665f1139baa74206c6e08b49f06db4e441

 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/fbo/FboData.java

@@ -154,7 +154,7 @@
   }

   

    //按照每读取一笔数据插入数据库的方式

   public static void checkFboFileByOneSql(MysqlConnPool m_ConnPool,File file,FGCD_TestFBOFile fbofile,int file_downloadNum)

   public static void checkFboFileByOneSql(MysqlConnPool m_ConnPool,File file,int battgroupid,int file_downloadNum)

   {

      File f = file;

      int file_sum=0; //需要导入文件的文件大小字节(导入数据库进度)

@@ -172,12 +172,12 @@
           if(fis.read(buf, 0, buf.length) == 256)

           {

              data_inf.setDataInf(buf);

              int max_test_record_count =FGCD_Task_Thread_SQL.quereyBattMaxTestRecordCount(m_ConnPool, fbofile.battgroupid);

              int max_test_record_count =FGCD_Task_Thread_SQL.quereyBattMaxTestRecordCount(m_ConnPool, battgroupid);

              //添加inf表记录

              boolean flag=FGCD_Task_Thread_SQL.insertFBOInfIntoTable(m_ConnPool, data_inf, fbofile.battgroupid,max_test_record_count);

              boolean flag=FGCD_Task_Thread_SQL.insertFBOInfIntoTable(m_ConnPool, data_inf, battgroupid,max_test_record_count);

              while(true&&flag)

              {   

                 int nowFbo_download_state=FGCD_Task_Thread_SQL.quereyDownLoadState_UserCancel(m_ConnPool,fbofile.battgroupid);

                 int nowFbo_download_state=FGCD_Task_Thread_SQL.quereyDownLoadState_UserCancel(m_ConnPool,battgroupid);

                 if(nowFbo_download_state==FGCD_ComBase.CMD_DownLoadFBDFile_Over) {

                    sucess=false;

                    break;

@@ -194,10 +194,10 @@
                       m_FboData.setData(databuf);

                       //al_fbo_data.add(m_FboData);

                       //System.err.println(m_FboData.toString());

                       boolean bl=FGCD_Task_Thread_SQL.insertFBODataIntoTableByOneSql(m_ConnPool,data_inf,m_FboData,fbofile.battgroupid,record_num,max_test_record_count);

                       boolean bl=FGCD_Task_Thread_SQL.insertFBODataIntoTableByOneSql(m_ConnPool,data_inf,m_FboData,battgroupid,record_num,max_test_record_count);

                        sucess=sucess&bl;

                        file_block=record_num*(data_inf.BattSum*2 + 32)+256;

                         FGCD_Task_Thread_SQL.updateFBOGressByOneSql(m_ConnPool,file_sum,file_block,fbofile,file_downloadNum);//插入文件的进度

                         FGCD_Task_Thread_SQL.updateFBOGressByOneSql(m_ConnPool,file_sum,file_block,battgroupid,file_downloadNum);//插入文件的进度

                         System.err.println("总数："+file_sum+"  导入数据："+file_block);

                         record_num++;

                    }

@@ -212,7 +212,7 @@
               download_flag=FGCD_TestDataDownLoad.DownloadFlag_Fail;

               download_state=FGCD_TestDataDownLoad.DownLoadState_ExportFail;

            }

              FGCD_Task_Thread_SQL.updateFBOStateByOneSql(m_ConnPool,download_flag,download_state,fbofile,file_downloadNum);

              FGCD_Task_Thread_SQL.updateFBOStateByOneSql(m_ConnPool,download_flag,download_state,battgroupid,file_downloadNum);

           }

              

      } catch (IOException e) {