799967501@qq.com

1.修改跨夜录制,视频生成文件夹问题

2.添加课堂号尾号筛选录制功能
1 { 1 {
2 "GETCLASSURL": "http://139.196.126.156:8081/getLogs/recordClassList", 2 "GETCLASSURL": "http://139.196.126.156:8081/getLogs/recordClassList",
3 "GETCLASSURLPARAMETER": { 3 "GETCLASSURLPARAMETER": {
4 - "siteId": ["quanpinzy"], 4 + "siteId": ["beidatest","talk915"],
5 "key": "xdymp4record20191225", 5 "key": "xdymp4record20191225",
6 "page": 1, 6 "page": 1,
7 "maxMedia": 1 7 "maxMedia": 1
@@ -25,5 +25,6 @@ @@ -25,5 +25,6 @@
25 "k": 0, 25 "k": 0,
26 "w": 1280, 26 "w": 1280,
27 "h": 720 27 "h": 720
28 - } 28 + },
  29 + "classLastNumber":["0","1","2"]
29 } 30 }
@@ -49,7 +49,6 @@ const methods = { @@ -49,7 +49,6 @@ const methods = {
49 }, 49 },
50 async getRequestClassIds(url, siteId, key, startTime, endTime, page) { 50 async getRequestClassIds(url, siteId, key, startTime, endTime, page) {
51 let axiosUrl = `${url}?siteId=${siteId}&key=${key}&from=${startTime}&to=${endTime}&page=${page}` 51 let axiosUrl = `${url}?siteId=${siteId}&key=${key}&from=${startTime}&to=${endTime}&page=${page}`
52 - console.log('axiosUrl', axiosUrl)  
53 let result = await axios.get(axiosUrl) 52 let result = await axios.get(axiosUrl)
54 return result 53 return result
55 }, 54 },
@@ -18,6 +18,7 @@ let classidPost = [] @@ -18,6 +18,7 @@ let classidPost = []
18 let parentData = {} 18 let parentData = {}
19 var classobj = {}; 19 var classobj = {};
20 let className = "" 20 let className = ""
  21 +let yesterday = "" // get写入课堂的时间
21 22
22 // spawn("export DISPLAY=:7", { shell: true}) 23 // spawn("export DISPLAY=:7", { shell: true})
23 24
@@ -35,24 +36,36 @@ class MediaCreat { @@ -35,24 +36,36 @@ class MediaCreat {
35 let fileConfig = new MediaCreat().getConfigFileJson() 36 let fileConfig = new MediaCreat().getConfigFileJson()
36 if (!fileConfig) return false 37 if (!fileConfig) return false
37 className = siteIds.shift() 38 className = siteIds.shift()
38 - const { GETCLASSURL, GETCLASSURLPARAMETER } = JSON.parse(fileConfig) 39 + const { GETCLASSURL, GETCLASSURLPARAMETER, classLastNumber } = JSON.parse(fileConfig)
39 let page = 1 40 let page = 1
40 if (className) { 41 if (className) {
41 let result = await getRequestClassIds(GETCLASSURL, className, GETCLASSURLPARAMETER.key, startTime, endTime, page) 42 let result = await getRequestClassIds(GETCLASSURL, className, GETCLASSURLPARAMETER.key, startTime, endTime, page)
42 - parentData[result.data.data.siteId] = new Set()  
43 - for (let j = 0; j < result.data.data.list.length; j++) {  
44 - classid.push(result.data.data.list[j])  
45 - parentData[result.data.data.siteId].add(result.data.data.list[j]['classId']) 43 + // parentData[result.data.data.siteId] = new Set()
  44 + let resultList = result.data.data.list
  45 + for (let j = 0; j < resultList.length; j++) {
  46 + let item = resultList[j]
  47 + let classId = item['classId']
  48 + let number = classId.substr(classId.length - 1, 1)
  49 + if (classLastNumber.includes(number)){
  50 + classid.push(item)
  51 + // parentData[result.data.data.siteId].add(classId)
  52 + }
46 } 53 }
47 const { siteId, list, totalPage } = result.data.data 54 const { siteId, list, totalPage } = result.data.data
48 for (let i = page += 1; i <= totalPage; i++) { 55 for (let i = page += 1; i <= totalPage; i++) {
49 let result = await getRequestClassIds(GETCLASSURL, className, GETCLASSURLPARAMETER.key, startTime, endTime, i) 56 let result = await getRequestClassIds(GETCLASSURL, className, GETCLASSURLPARAMETER.key, startTime, endTime, i)
50 - for (let j = 0; j < result.data.data.list.length; j++) {  
51 - classid.push(result.data.data.list[j])  
52 - parentData[result.data.data.siteId].add(result.data.data.list[j]['classId']) 57 + let resultList = result.data.data.list
  58 + for (let j = 0; j < resultList.length; j++) {
  59 + let item = resultList[j]
  60 + let classId = item['classId']
  61 + let number = classId.substr(classId.length - 1, 1)
  62 + if (classLastNumber.includes(number)) {
  63 + classid.push(item)
  64 + // parentData[result.data.data.siteId].add(classId)
  65 + }
53 } 66 }
54 } 67 }
55 - parentData[result.data.data.siteId] = Array.from(parentData[result.data.data.siteId]) 68 + // parentData[result.data.data.siteId] = Array.from(parentData[result.data.data.siteId])
56 if (siteIds.length) { 69 if (siteIds.length) {
57 return await new MediaCreat().allData() 70 return await new MediaCreat().allData()
58 } 71 }
@@ -82,7 +95,7 @@ class MediaCreat { @@ -82,7 +95,7 @@ class MediaCreat {
82 ymdDir = PROJECTCATALOG + "/media/" + siteId + "/" + dayTimeYMD().ymd 95 ymdDir = PROJECTCATALOG + "/media/" + siteId + "/" + dayTimeYMD().ymd
83 } else { 96 } else {
84 // get 的目录创建为上一天日期 97 // get 的目录创建为上一天日期
85 - ymdDir = PROJECTCATALOG + "/media/" + siteId + "/" + YesterdayTime().ymd 98 + ymdDir = PROJECTCATALOG + "/media/" + siteId + "/" + yesterday
86 } 99 }
87 100
88 if (!fs.existsSync(mediaDir)) { 101 if (!fs.existsSync(mediaDir)) {
@@ -201,6 +214,7 @@ router.get('/recording', async function (req, res, next) { @@ -201,6 +214,7 @@ router.get('/recording', async function (req, res, next) {
201 for (let i = 0; i < GETCLASSURLPARAMETER.maxMedia; i++) { 214 for (let i = 0; i < GETCLASSURLPARAMETER.maxMedia; i++) {
202 let shiftData = classid.shift() 215 let shiftData = classid.shift()
203 if (shiftData) { 216 if (shiftData) {
  217 + yesterday = YesterdayTime().ymd
204 new MediaCreat().recordingCreat(shiftData['classId'], shiftData['siteId'], 'get') 218 new MediaCreat().recordingCreat(shiftData['classId'], shiftData['siteId'], 'get')
205 } else { 219 } else {
206 return false 220 return false