From 4334e0e00e23a4ed28e9b58465b775b10c820aa2 Mon Sep 17 00:00:00 2001 From: 付智勇 <fuzhiyong@efangtec.com> Date: Sat, 21 Oct 2017 13:42:49 +0800 Subject: [PATCH] no message --- services/recordInfoService.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/services/recordInfoService.js b/services/recordInfoService.js index c30e1f1..3e529fe 100644 --- a/services/recordInfoService.js +++ b/services/recordInfoService.js @@ -47,25 +47,29 @@ recordInfoService.prototype.tencentRecordInfo = async(channelId)=>{ recordInfoService.prototype.getRecordFileURL = async(path,time)=>{ try { - let onlinePath = '/netWorkSchool/Agora_Recording_SDK_for_Linux_FULL/samples/' - //let onlinePath = '/Users/fzy/Downloads/Agora_Recording_SDK_for_Linux_FULL/samples/' + //let onlinePath = '/netWorkSchool/Agora_Recording_SDK_for_Linux_FULL/samples/' + let onlinePath = '/Users/fzy/Downloads/Agora_Recording_SDK_for_Linux_FULL/samples/' var backFile=[]; var fileU let addrecord = await recordInfo.findAll({where:{channel:path}}); console.log('录制文件',addrecord) let noFile = []; var allFile = []; + var channefiles = []; addrecord.forEach(function(record,top){ let date1 = moment(Number( record.createTime)).format('YYYYMMDD') let date2 = moment(Number(record.createTime)-8*60*60*1000).format('YYYYMMDDhhmmss') let channeFile = onlinePath+date1; var fschannefiles=fs.readdirSync(channeFile); + if(top == 1){ + channefiles=fschannefiles; + } fschannefiles.forEach(function(cfile,index){ if(record.channel == cfile.split('_')[0]+'_'+cfile.split("_")[1]){ let pathURL = onlinePath+date1+"/"+cfile; let files=fs.readdirSync(pathURL); if(top == 1){ - allFile.push(files); + allFile=files; } files.forEach(function(file){ let type = file.split('.'); @@ -74,11 +78,11 @@ recordInfoService.prototype.getRecordFileURL = async(path,time)=>{ }else{ let noFile = []; let fileN = type[0].split('_'); - console.log('++++++++=========',fileN[1]) - console.log(moment(fileN[1], "YYYYMMDDhhmmss").format("X"),record.createTime) - console.log(date2,record.status) - console.log(record.id); - console.log(fileN[1].slice(0,fileN[1].length-3),date2==fileN[1].slice(0,fileN[1].length-3)) + // console.log('++++++++=========',fileN[1]) + // console.log(moment(fileN[1], "YYYYMMDDhhmmss").format("X"),record.createTime) + // console.log(date2,record.status) + // console.log(record.id); + // console.log(fileN[1].slice(0,fileN[1].length-3),date2==fileN[1].slice(0,fileN[1].length-3)) if(date2==fileN[1].slice(0,fileN[1].length-3)){ backFile.push({ channel:record.channel, @@ -117,7 +121,7 @@ recordInfoService.prototype.getRecordFileURL = async(path,time)=>{ // createTime:record.createTime, // fileUrl:applacation.recordPath+date1+'/'+cfile+'/'+minFile // }) - return {backFile:backFile,fschannefiles:allFile} + return {backFile:backFile,fschannefiles:allFile,channefiles:channefiles} } catch (error) { throw error; } -- libgit2 0.24.0