Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
张艾宸
/
webScreen
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
799967501@qq.com
2021-04-14 21:46:42 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ca2df2c0a3fce43c1d42d5703c0b3af5155fc18e
ca2df2c0
1 parent
48d8cdf6
1.修改跨夜录制,视频生成文件夹问题
2.添加课堂号尾号筛选录制功能
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
27 行增加
和
13 行删除
config/config.json
config/method.js
routes/index.js
config/config.json
查看文件 @
ca2df2c
{
"GETCLASSURL"
:
"http://139.196.126.156:8081/getLogs/recordClassList"
,
"GETCLASSURLPARAMETER"
:
{
"siteId"
:
[
"
quanpinzy
"
],
"siteId"
:
[
"
beidatest"
,
"talk915
"
],
"key"
:
"xdymp4record20191225"
,
"page"
:
1
,
"maxMedia"
:
1
...
...
@@ -25,5 +25,6 @@
"k"
:
0
,
"w"
:
1280
,
"h"
:
720
}
},
"classLastNumber"
:[
"0"
,
"1"
,
"2"
]
}
...
...
config/method.js
查看文件 @
ca2df2c
...
...
@@ -49,7 +49,6 @@ const methods = {
},
async
getRequestClassIds
(
url
,
siteId
,
key
,
startTime
,
endTime
,
page
)
{
let
axiosUrl
=
`
$
{
url
}?
siteId
=
$
{
siteId
}
&
key
=
$
{
key
}
&
from
=
$
{
startTime
}
&
to
=
$
{
endTime
}
&
page
=
$
{
page
}
`
console
.
log
(
'axiosUrl'
,
axiosUrl
)
let
result
=
await
axios
.
get
(
axiosUrl
)
return
result
},
...
...
routes/index.js
查看文件 @
ca2df2c
...
...
@@ -18,6 +18,7 @@ let classidPost = []
let
parentData
=
{}
var
classobj
=
{};
let
className
=
""
let
yesterday
=
""
// get写入课堂的时间
// spawn("export DISPLAY=:7", { shell: true})
...
...
@@ -35,24 +36,36 @@ class MediaCreat {
let
fileConfig
=
new
MediaCreat
().
getConfigFileJson
()
if
(
!
fileConfig
)
return
false
className
=
siteIds
.
shift
()
const
{
GETCLASSURL
,
GETCLASSURLPARAMETER
}
=
JSON
.
parse
(
fileConfig
)
const
{
GETCLASSURL
,
GETCLASSURLPARAMETER
,
classLastNumber
}
=
JSON
.
parse
(
fileConfig
)
let
page
=
1
if
(
className
)
{
let
result
=
await
getRequestClassIds
(
GETCLASSURL
,
className
,
GETCLASSURLPARAMETER
.
key
,
startTime
,
endTime
,
page
)
parentData
[
result
.
data
.
data
.
siteId
]
=
new
Set
()
for
(
let
j
=
0
;
j
<
result
.
data
.
data
.
list
.
length
;
j
++
)
{
classid
.
push
(
result
.
data
.
data
.
list
[
j
])
parentData
[
result
.
data
.
data
.
siteId
].
add
(
result
.
data
.
data
.
list
[
j
][
'classId'
])
// parentData[result.data.data.siteId] = new Set()
let
resultList
=
result
.
data
.
data
.
list
for
(
let
j
=
0
;
j
<
resultList
.
length
;
j
++
)
{
let
item
=
resultList
[
j
]
let
classId
=
item
[
'classId'
]
let
number
=
classId
.
substr
(
classId
.
length
-
1
,
1
)
if
(
classLastNumber
.
includes
(
number
)){
classid
.
push
(
item
)
// parentData[result.data.data.siteId].add(classId)
}
}
const
{
siteId
,
list
,
totalPage
}
=
result
.
data
.
data
for
(
let
i
=
page
+=
1
;
i
<=
totalPage
;
i
++
)
{
let
result
=
await
getRequestClassIds
(
GETCLASSURL
,
className
,
GETCLASSURLPARAMETER
.
key
,
startTime
,
endTime
,
i
)
for
(
let
j
=
0
;
j
<
result
.
data
.
data
.
list
.
length
;
j
++
)
{
classid
.
push
(
result
.
data
.
data
.
list
[
j
])
parentData
[
result
.
data
.
data
.
siteId
].
add
(
result
.
data
.
data
.
list
[
j
][
'classId'
])
let
resultList
=
result
.
data
.
data
.
list
for
(
let
j
=
0
;
j
<
resultList
.
length
;
j
++
)
{
let
item
=
resultList
[
j
]
let
classId
=
item
[
'classId'
]
let
number
=
classId
.
substr
(
classId
.
length
-
1
,
1
)
if
(
classLastNumber
.
includes
(
number
))
{
classid
.
push
(
item
)
// parentData[result.data.data.siteId].add(classId)
}
}
}
parentData
[
result
.
data
.
data
.
siteId
]
=
Array
.
from
(
parentData
[
result
.
data
.
data
.
siteId
])
//
parentData[result.data.data.siteId] = Array.from(parentData[result.data.data.siteId])
if
(
siteIds
.
length
)
{
return
await
new
MediaCreat
().
allData
()
}
...
...
@@ -82,7 +95,7 @@ class MediaCreat {
ymdDir
=
PROJECTCATALOG
+
"/media/"
+
siteId
+
"/"
+
dayTimeYMD
().
ymd
}
else
{
// get 的目录创建为上一天日期
ymdDir
=
PROJECTCATALOG
+
"/media/"
+
siteId
+
"/"
+
YesterdayTime
().
ymd
ymdDir
=
PROJECTCATALOG
+
"/media/"
+
siteId
+
"/"
+
yesterday
}
if
(
!
fs
.
existsSync
(
mediaDir
))
{
...
...
@@ -201,6 +214,7 @@ router.get('/recording', async function (req, res, next) {
for
(
let
i
=
0
;
i
<
GETCLASSURLPARAMETER
.
maxMedia
;
i
++
)
{
let
shiftData
=
classid
.
shift
()
if
(
shiftData
)
{
yesterday
=
YesterdayTime
().
ymd
new
MediaCreat
().
recordingCreat
(
shiftData
[
'classId'
],
shiftData
[
'siteId'
],
'get'
)
}
else
{
return
false
...
...
请
注册
或
登录
后发表评论