Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
付智勇
/
koa2_Sequelize_project
转到一个项目
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
付智勇
2017-10-12 13:35:27 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
887366fae9b8ec160856eb0a7a281acb7b885c23
887366fa
1 parent
ef3e4a2a
no message
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
84 行增加
和
4 行删除
controller/recordInfoController.js
routes/RecordInfo.js
services/recordInfoService.js
services/studentMeetingService.js
controller/recordInfoController.js
查看文件 @
887366f
...
...
@@ -77,4 +77,16 @@ recordInfoController.prototype.tencentRecordInfo = async(ctx,next)=>{
throw
error
;
}
}
recordInfoController
.
prototype
.
getRecordFileURL
=
async
(
ctx
,
next
)
=>
{
try
{
const
path
=
ctx
.
request
.
body
.
path
;
let
recordInfo
=
await
recordInfoService
.
getRecordFileURL
(
path
)
return
recordInfo
;
}
catch
(
e
)
{
console
.
log
(
e
)
throw
e
}
}
module
.
exports
=
new
recordInfoController
()
\ No newline at end of file
...
...
routes/RecordInfo.js
查看文件 @
887366f
...
...
@@ -44,7 +44,7 @@ router.put('/updaterecordInfo/:channel', async (ctx, next) => {
}
})
router
.
post
(
'/tencentRecordInfo'
,
async
(
ctx
,
next
)
=>
{
router
.
post
(
'/tencentRecordInfo'
,
async
(
ctx
,
next
)
=>
{
try
{
var
data
=
await
meetingContoller
.
tencentRecordInfo
(
ctx
,
next
);
status
.
successTemp
(
ctx
,
200
,
data
);
...
...
@@ -52,6 +52,15 @@ router.put('/updaterecordInfo/:channel', async (ctx, next) => {
console
.
error
(
e
)
status
.
catchError
(
ctx
,
400
,
e
.
message
);
}
})
})
router
.
post
(
'/getRecordFileURL'
,
async
(
ctx
,
next
)
=>
{
try
{
var
data
=
await
meetingContoller
.
getRecordFileURL
(
ctx
,
next
);
status
.
successTemp
(
ctx
,
200
,
data
);
}
catch
(
e
){
console
.
error
(
e
)
status
.
catchError
(
ctx
,
400
,
e
.
message
);
}
})
module
.
exports
=
router
\ No newline at end of file
...
...
services/recordInfoService.js
查看文件 @
887366f
const
recordInfo
=
require
(
'../model/RecordInfoModel'
)
const
tencentRecordInfoModel
=
require
(
'../model/tencentRecordInfoModel'
)
const
callfile
=
require
(
'child_process'
);
const
fs
=
require
(
'fs'
);
function
recordInfoService
(){
...
...
@@ -40,4 +42,20 @@ recordInfoService.prototype.tencentRecordInfo = async(channelId)=>{
throw
error
;
}
}
recordInfoService
.
prototype
.
getRecordFileURL
=
async
(
URL
)
=>
{
try
{
let
path
=
'/netWorkSchool/Agora_Recording_SDK_for_Linux_FULL/samples'
let
myPath
=
'/Users/fzy/Downloads/Agora_Recording_SDK_for_Linux_FULL/samples/'
+
URL
let
shell
=
`
/
20171011
/
markettest_1227676976_023539
/
`
// let filenames = await callfile.exec(myPath)
let
files
=
fs
.
readdirSync
(
path
);
console
.
log
(
files
)
return
files
}
catch
(
error
)
{
throw
error
;
}
}
module
.
exports
=
new
recordInfoService
();
\ No newline at end of file
...
...
services/studentMeetingService.js
查看文件 @
887366f
...
...
@@ -37,6 +37,7 @@ studentMeetingService.prototype.addStudentMeeting = async(body)=>{
t
.
rollback
();
return
{
code
:
300
,
msg
:
'课堂不存在'
}
}
let
sm
=
await
studentMeeting
.
create
(
body
,{
transaction
:
t
});
// let MeetingBack = await meetingModel.update(
// {reservationNumber:Meeting.reservationNumber+1},
...
...
@@ -83,8 +84,48 @@ studentMeetingService.prototype.queryStudentMeeting = async(teacherName,page=1,p
studentMeetingService.prototype.getStudentMeetingBySite = async(siteId,page=1,pageno=8)=>{
try {
let StudentMeetingBySite = await studentMeeting.findAll({where:{siteId:siteId}});
return StudentMeetingBySite;
let querySql = `SELECT
3u.*, 3meet.meeting_name,
3meet.meeting_status meetingStatus,
3meet.id meetingId,
3meet.create_user teacherName,
3meet.meeting_number meetingNumber,
3meet.begin_time meetingBeginTime,
3meet.end_time meetingEndTime,
3sm. STATUS studentMeetingStatus,
3u2.user_name checkUserName,
3sm.check_time check_time,
3sm.id studentMeetingId,
(SELECT
3m_attachment.path
FROM
3m_user
LEFT JOIN 3m_attachment ON 3m_attachment.business_id = 3m_user.id
WHERE
3m_user.login_name = 3meet.create_user) teacherPhoto,
(
SELECT
path
FROM
3m_attachment
WHERE
3m_attachment.business_id = 3meet.id and 3m_attachment.category = 1
) meetingPhoto
FROM
3m_student_meeting 3sm
LEFT JOIN 3m_user 3u ON 3u.id = 3sm.student_id
LEFT JOIN 3m_user 3u2 ON 3u2.id = 3sm.check_user_id
LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id
WHERE
3sm.site_id = '` +siteId+"
'";;
querySql += '
AND
3
sm
.
status
!=
5
ORDER
BY
3
sm
.
create_time
DESC
LIMIT
'+(page-1)*pageno+'
,
' +pageno
let count = await studentMeeting.count({where:{siteId:siteId,status:{$ne: 5}}})
let sm = await sequelize.query(querySql);
return {studentMeeting:sm[0],count:count,page:page,pageno:pageno};
//return sm[0];
} catch (error) {
throw error;
}
...
...
请
注册
或
登录
后发表评论