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
付智勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
a4d50ad4fa167f2aafc4958b07a45b94faa7a873
a4d50ad4
1 parent
923c7ab1
master
...
20171113
nows
revert-2a1f6481
删除课堂
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
72 行增加
和
8 行删除
controller/meetingController.js
controller/userController.js
model/meetingModel.js
routes/meeting.js
services/meetingService.js
services/userService.js
controller/meetingController.js
查看文件 @
a4d50ad
...
...
@@ -19,6 +19,7 @@ meetingController.prototype.createMeeting = async(ctx,next)=>{
}
let
num
=
JSON
.
stringify
(
Math
.
floor
(
Math
.
random
()
*
99999
)
+
1000
)
let
meeting
=
{
id
:
uuid
.
db32
(),
meetingNumber
:
num
,
//课堂序号
meetingName
:
meetingbody
.
meetingName
,
//课堂名字
meetingContent
:
meetingbody
.
meetingContent
,
//课堂描述
...
...
@@ -55,4 +56,26 @@ meetingController.prototype.createMeeting = async(ctx,next)=>{
}
}
meetingController
.
prototype
.
getMeeting
=
async
(
ctx
,
next
)
=>
{
try
{
let
meetingbody
=
ctx
.
request
.
body
;
let
page
=
ctx
.
header
.
page
?
Number
(
ctx
.
header
.
page
):
ctx
.
header
.
page
;
let
pageno
=
ctx
.
header
.
pageno
;
let
meetingData
=
await
meetingService
.
getMeeting
(
meetingbody
,
page
,
pageno
);
return
meetingData
;
}
catch
(
error
)
{
throw
error
;
}
}
meetingController
.
prototype
.
delMeeting
=
async
(
ctx
,
next
)
=>
{
try
{
const
meetingId
=
ctx
.
params
.
meetingId
;
let
delMeetingData
=
await
meetingService
.
delMeeting
(
meetingId
);
return
delMeetingData
}
catch
(
error
)
{
}
}
module
.
exports
=
new
meetingController
()
\ No newline at end of file
...
...
controller/userController.js
查看文件 @
a4d50ad
...
...
@@ -84,15 +84,15 @@ userController.prototype.login = async(ctx, next) =>{
}
userController
.
prototype
.
getStu
=
async
(
ctx
,
next
)
=>
{
try
{
const
stuType
=
ctx
.
params
.
type
;
if
(
!
stuType
){
return
status
.
paramError
(
'type'
);
}
let
stu
=
await
userService
.
getStu
(
stuType
);
return
stu
let
page
=
ctx
.
header
.
page
?
Number
(
ctx
.
header
.
page
):
ctx
.
header
.
page
;
let
pageno
=
ctx
.
header
.
pageno
;
let
stu
=
await
userService
.
getStu
(
stuType
,
page
,
pageno
);
return
stu
}
catch
(
error
)
{
throw
new
Error
(
error
)
}
...
...
model/meetingModel.js
查看文件 @
a4d50ad
...
...
@@ -26,7 +26,7 @@ var user = sequelize.define('3m_meeting', {
},
create_user
:{
type
:
Sequelize
.
STRING
(
128
),
field
:
"
user_name
"
field
:
"
create_user
"
},
createTime
:{
type
:
Sequelize
.
DATE
,
...
...
routes/meeting.js
查看文件 @
a4d50ad
...
...
@@ -11,6 +11,24 @@ router.post('/createMeeting', async (ctx, next) => {
var
data
=
await
meetingContoller
.
createMeeting
(
ctx
,
next
);
status
.
successTemp
(
ctx
,
200
,
data
);
}
catch
(
e
){
console
.
error
(
e
)
status
.
catchError
(
ctx
,
400
,
e
.
message
);
}
})
router
.
put
(
'/getMeeting'
,
async
(
ctx
,
next
)
=>
{
try
{
var
data
=
await
meetingContoller
.
getMeeting
(
ctx
,
next
);
status
.
successTemp
(
ctx
,
200
,
data
);
}
catch
(
e
){
status
.
catchError
(
ctx
,
400
,
e
.
message
);
}
});
router
.
delete
(
'/delMeeting/:meetingId'
,
async
(
ctx
,
next
)
=>
{
try
{
var
data
=
await
meetingContoller
.
delMeeting
(
ctx
,
next
);
status
.
successTemp
(
ctx
,
200
,
data
);
}
catch
(
e
){
status
.
catchError
(
ctx
,
400
,
e
.
message
);
}
})
...
...
services/meetingService.js
查看文件 @
a4d50ad
...
...
@@ -10,12 +10,34 @@ function meetingService(){
meetingService
.
prototype
.
createMeeting
=
async
(
meetingInfo
)
=>
{
try
{
let
backMeeting
=
meetingModel
.
create
(
meetingInfo
);
let
backMeeting
=
await
meetingModel
.
create
(
meetingInfo
);
return
backMeeting
}
catch
(
error
)
{
throw
error
}
}
meetingService
.
prototype
.
getMeeting
=
async
(
queryData
,
page
=
1
,
pageno
=
10
)
=>
{
try
{
let
backMeeting
=
await
meetingModel
.
findAll
({
where
:
queryData
,
offset
:
(
page
-
1
)
*
pageno
,
limit
:
pageno
});
let
count
=
await
meetingModel
.
count
({
where
:
queryData
})
return
{
meetingInfo
:
backMeeting
,
count
:
count
,
page
:
page
,
pageno
:
pageno
};
}
catch
(
error
)
{
throw
error
;
}
}
meetingService
.
prototype
.
delMeeting
=
async
(
meetingId
)
=>
{
try
{
let
Meeting
=
await
meetingModel
.
findOne
({
where
:{
id
:
meetingId
}});
if
(
!
Meeting
){
return
{
code
:
11
,
msg
:
'课堂不存在'
}
}
let
backMeeting
=
await
meetingModel
.
destroy
({
where
:{
id
:
meetingId
}});
return
backMeeting
}
catch
(
error
)
{
throw
error
;
}
}
...
...
services/userService.js
查看文件 @
a4d50ad
...
...
@@ -43,13 +43,14 @@ userService.prototype.login = async(name,pw) => {
userService
.
prototype
.
getStu
=
async
(
type
)
=>
{
userService
.
prototype
.
getStu
=
async
(
type
,
page
=
1
,
pageno
=
10
)
=>
{
try
{
let
sql
=
`
SELECT
u
.
*
,
ug
.
name
groupName
FROM
3
m_user
u
LEFT
JOIN
3
m_user_group
ug
ON
ug
.
id
=
u
.
group_id
`
LEFT
JOIN
3
m_user_group
ug
ON
ug
.
id
=
u
.
group_id
`
;
let
User
=
await
sequelize
.
query
(
sql
);
return
User
}
catch
(
error
)
{
...
...
请
注册
或
登录
后发表评论