修复bug

Administrator

2021-09-03 f615ba8a90438b91ddb7f2df8bd94fd9b7020d0a

修复bug

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

@@ -276,17 +276,21 @@
                Thread.sleep(200);

                /************************    文件下载      *****************************************************/

                {

					
                    FGCD_SocketClient_Thread_SQL.queryTb_Fgcd_Filedownload_Table(m_ConnPool, fboFile);

                    if(FGCD_ComBase.CMD_ReadFBDFile == fboFile.op_cmd) {

                        System.out.println("读取FBO文件");

                        fboFile.clearState();

                        //System.err.println(fboFile);

                        //读取文件列表

                        SocketComm(fboFile.createCmd(FGCD_ComBase.CMD_GETFILELIST), ByteBuffer.allocate(0));                        

                    }else if(FGCD_ComBase.CMD_DownLoadFBDFile == fboFile.op_cmd) {

                        //开始下载文件

                        //开始下载文件						
                        FGCD_TestDataDownLoad download = new FGCD_TestDataDownLoad(fboFile, socket,m_ConnPool);

                        FGCD_SocketClient_Thread_SQL.updateFgcd_Filedownload_TableCmdByDevId(m_ConnPool, fboFile);

                        download.downLoadTestData();

                    }					
                        fboFile.clearState();

                    }	
                }

                if(DevReadCount %10 == 0 || readMonData) {

                    //logger.info("获取单体数据");

@@ -927,7 +931,6 @@
                    //读取文件列表成功

                    fboFile.op_cmd = FGCD_ComBase.CMD_ReadFBDFile_ACK;

                    System.out.println("读取文件列表成功");

                    fboFile.cleatState();

                    FGCD_SocketClient_Thread_SQL.updateTb_Fgcd_Filedownload_Table(m_ConnPool, fboFile);

                    isSuccess = true;

                }


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

@@ -171,7 +171,7 @@
                " SET op_cmd = "+fbo.op_cmd + 

                " ,file_count = " + fbo.file_count +

                " ,file_total = " + fbo.file_total;

        if(fbo.file_count > 0) {

        if(fbo.files.length > 0) {

            //当前文件数大于0

            for(int i=0;i<fbo.files.length;i++) {

                FBOFile file = fbo.files[i];


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

@@ -85,13 +85,13 @@
            //当前下载文件

            nowFbo = fbofile.files[i];

            int file_downloadNum=i;//设置当前下载文件的索引

            if(nowFbo.download_flag != DownloadFlag_Start) {

                continue;

            }

            if(now_download_state == DownLoadState_DownLoadCancel) {

                fbofile.files[i].setDownload_state(DownLoadState_DownLoadCancel);

                fbofile.files[i].setDownload_flag(DownloadFlag_Fail);

                FGCD_Task_Thread_SQL.updateFgcd_Filedownload_TableCmdByDevId(pool,fbofile,file_downloadNum);

                continue;

            }

            if(nowFbo.download_flag != DownloadFlag_Start) {

                continue;

            }

            ReadTestData = true;

@@ -100,14 +100,15 @@
                try {

                    queryDownLoadState(pool, fbofile);

                    if(fbofile.op_cmd == FGCD_ComBase.CMD_DownLoadFBDFile_Over) {

                        now_download_state = FGCD_ComBase.CMD_DownLoadFBDFile_Over;

						
                        fbofile.setStop_reason(FialReason_UserCancel);

                        now_download_state = DownLoadState_DownLoadCancel;

                        /*//手动终止下载命令

                        fbofile.files[file_downloadNum].setDownload_flag(DownloadFlag_Fail);

                        fbofile.files[file_downloadNum].setDownload_state(DownLoadState_DownLoadCancel);*/

                        //fbofile.op_cmd = FGCD_ComBase.CMD_DownLoadFBDFile_Over_ACK;

                        FGCD_Task_Thread_SQL.updateFgcd_Filedownload_TableCmdByDevId(pool, fbofile,file_downloadNum);

                        continue;

                        break;

                    }                    

                    if(nowFbo.getDownload_state() == DownLoadState_ReadData) {    

                        //System.out.println("读取测试文件中"+file);


 BattMonitor_FGCD-A059NT/src/com/dev/fgcd/data/FGCD_TestFBOFile.java

@@ -387,6 +387,18 @@
            }

            filename += ".FBO";

        }



        @Override

        public String toString() {

            return "FBOFile [file_count=" + file_count + ", file_index=" + file_index + ", year=" + year + ", month="

                    + month + ", day=" + day + ", hour=" + hour + ", minte=" + minte + ", second=" + second

                    + ", filename=" + filename + ", test_timelong=" + test_timelong + ", data_type=" + data_type

                    + ", test_curr=" + test_curr + ", test_cap=" + test_cap + ", cap_std=" + cap_std + ", monvol_low="

                    + monvol_low + ", groupvol_low=" + groupvol_low + ", mon_count=" + mon_count + ", testgroup_count="

                    + testgroup_count + ", teststop_reason=" + teststop_reason + ", monvol_type=" + monvol_type

                    + ", download_flag=" + download_flag + ", download_state=" + download_state + ", now_data_block="

                    + now_data_block + ", total_data_block=" + total_data_block + "]";

        }

        

    }



@@ -404,16 +416,22 @@
    }





    public void cleatState() {

    public void clearState() {

        for(int i=0;i<files.length;i++) {

            FBOFile f = files[i];

            f.download_flag = 0;

            f.download_state = 0;

            f.now_data_block = 0;

            f.total_data_block = 0;

            this.files[i].download_flag = 0;

            this.files[i].download_state = 0;

            this.files[i].now_data_block = 0;

            this.files[i].total_data_block = 0;

        }    

    }





    @Override

    public String toString() {

        return "FGCD_TestFBOFile [dev_id=" + dev_id + ", op_cmd=" + op_cmd + ", battgroupid=" + battgroupid

                + ", file_index=" + file_index + ", file_count=" + file_count + ", file_total=" + file_total + "]";

    }



    

    

}