11

whyclxw

2021-09-02 5c3e9ca324155efb5461ee48ad591a1070d6ae5e

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

@@ -10,10 +10,13 @@
import java.util.ArrayList;

import java.util.Arrays;



import com.battmonitor.base.ComBase;

import com.battmonitor.sql.MysqlConnPool;

import com.dev.fgcd.comm.FGCD_Task_Thread_SQL;

import com.dev.fgcd.comm.FGCD_TestDataDownLoad;

import com.dev.fgcd.data.FGCD_ComBase;

import com.dev.fgcd.data.FGCD_TestFBOFile;

import com.dev.fgcd.data.FGCD_TestFBOFile.FBOFile;





public class FboData {

@@ -154,7 +157,7 @@
   public static void checkFboFileByOneSql(MysqlConnPool m_ConnPool,File file,FGCD_TestFBOFile fbofile,int file_downloadNum)

   {

      File f = file;

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

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

      int file_block=0;  //当前文件导入数据的字节

      int download_flag=0; //文件下载状态

      int download_state=0;

@@ -164,6 +167,7 @@
       boolean sucess=true;

       try {

         fis = new FileInputStream(f);

         file_sum=fis.available();

         byte[] buf = new byte[256];

           if(fis.read(buf, 0, buf.length) == 256)

           {

@@ -173,6 +177,11 @@
              boolean flag=FGCD_Task_Thread_SQL.insertFBOInfIntoTable(m_ConnPool, data_inf, fbofile.battgroupid,max_test_record_count);

              while(true&&flag)

              {   

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

                 if(nowFbo_download_state==FGCD_ComBase.CMD_DownLoadFBDFile_Over) {

                    sucess=false;

                    break;

                 }

                 FboDataType mType = new FboDataType();

                 int tag = mType.checkDataHead(fis);

                 if((0xFD == tag) || (0xFC == tag))

@@ -189,7 +198,7 @@
                        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);//插入文件的进度

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

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

                         record_num++;

                    }

                 }