Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
5
51business
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
方斌
51business
Commits
7e5c28fe
Commit
7e5c28fe
authored
Apr 15, 2020
by
任国军
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add getArticleByCategory
parent
163baa3b
Pipeline
#21690
passed with stage
in 3 seconds
Changes
5
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
125 additions
and
0 deletions
+125
-0
institution.js
app/controller/course/v5/institution.js
+13
-0
courseV5Article.js
app/model/class/v5/courseV5Article.js
+43
-0
courseV5ArticleQA.js
app/model/class/v5/courseV5ArticleQA.js
+44
-0
course_v5.js
app/router/course_v5.js
+2
-0
institution.js
app/service/course/v5/institution.js
+23
-0
No files found.
app/controller/course/v5/institution.js
View file @
7e5c28fe
...
@@ -56,6 +56,19 @@ class InstitutionController extends Controller {
...
@@ -56,6 +56,19 @@ class InstitutionController extends Controller {
ctx
.
success
(
ret
);
ctx
.
success
(
ret
);
}
}
// 获取科普文章
async
getArticleByCategory
()
{
const
{
ctx
,
service
}
=
this
;
const
queryParams
=
ctx
.
request
.
query
;
if
(
ctx
.
isEmpty
(
queryParams
)
||
ctx
.
isEmpty
(
queryParams
.
cat_id
))
{
ctx
.
failed
(
'cat_id is empty'
);
}
const
ret
=
await
service
.
course
.
v5
.
institution
.
getArticleByCategory
(
queryParams
.
cat_id
);
ctx
.
success
(
ret
);
}
}
}
module
.
exports
=
InstitutionController
;
module
.
exports
=
InstitutionController
;
app/model/class/v5/courseV5Article.js
0 → 100644
View file @
7e5c28fe
'use strict'
;
const
moment
=
require
(
'moment'
);
module
.
exports
=
app
=>
{
const
{
STRING
,
INTEGER
,
DATE
}
=
app
.
Sequelize
;
const
CourseV5Article
=
app
.
classModel
.
define
(
'course_v5_article'
,
{
id
:
{
type
:
INTEGER
,
primaryKey
:
true
,
autoIncrement
:
true
,
},
cat_id
:
INTEGER
,
image
:
STRING
,
content
:
STRING
,
status
:
INTEGER
,
is_deleted
:
INTEGER
,
created_time
:
{
type
:
DATE
,
allowNull
:
true
,
get
()
{
const
date
=
this
.
getDataValue
(
'created_time'
);
return
date
?
moment
(
date
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
undefined
;
},
},
updated_time
:
{
type
:
DATE
,
allowNull
:
true
,
get
()
{
const
date
=
this
.
getDataValue
(
'updated_time'
);
return
date
?
moment
(
date
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
undefined
;
},
},
},
{
timestamps
:
false
,
tableName
:
'course_v5_article'
,
});
return
CourseV5Article
;
};
app/model/class/v5/courseV5ArticleQA.js
0 → 100644
View file @
7e5c28fe
'use strict'
;
const
moment
=
require
(
'moment'
);
module
.
exports
=
app
=>
{
const
{
STRING
,
INTEGER
,
DATE
}
=
app
.
Sequelize
;
const
CourseV5ArticleQA
=
app
.
classModel
.
define
(
'course_v5_article_qa'
,
{
id
:
{
type
:
INTEGER
,
primaryKey
:
true
,
autoIncrement
:
true
,
},
article_id
:
INTEGER
,
question
:
STRING
,
answer
:
STRING
,
sort
:
INTEGER
,
status
:
INTEGER
,
is_deleted
:
INTEGER
,
created_time
:
{
type
:
DATE
,
allowNull
:
true
,
get
()
{
const
date
=
this
.
getDataValue
(
'created_time'
);
return
date
?
moment
(
date
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
undefined
;
},
},
updated_time
:
{
type
:
DATE
,
allowNull
:
true
,
get
()
{
const
date
=
this
.
getDataValue
(
'updated_time'
);
return
date
?
moment
(
date
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
undefined
;
},
},
},
{
timestamps
:
false
,
tableName
:
'course_v5_article_qa'
,
});
return
CourseV5ArticleQA
;
};
app/router/course_v5.js
View file @
7e5c28fe
...
@@ -23,4 +23,6 @@ module.exports = app => {
...
@@ -23,4 +23,6 @@ module.exports = app => {
router
.
get
(
'/third'
,
'/collection/class/all'
,
auth
,
'course.v5.institution.getCollectionClassList'
);
// 获取收藏课程列表
router
.
get
(
'/third'
,
'/collection/class/all'
,
auth
,
'course.v5.institution.getCollectionClassList'
);
// 获取收藏课程列表
router
.
post
(
'/third'
,
'/collection/class/:class_id'
,
auth
,
'course.v5.institution.collectClass'
);
// 收藏课程
router
.
post
(
'/third'
,
'/collection/class/:class_id'
,
auth
,
'course.v5.institution.collectClass'
);
// 收藏课程
router
.
delete
(
'third'
,
'/collection/class/:class_id'
,
auth
,
'course.v5.institution.delCollectClass'
);
// 取消收藏课程
router
.
delete
(
'third'
,
'/collection/class/:class_id'
,
auth
,
'course.v5.institution.delCollectClass'
);
// 取消收藏课程
router
.
get
(
'/third'
,
'/article'
,
'course.v5.institution.getArticleByCategory'
);
// 获取科普文章
};
};
app/service/course/v5/institution.js
View file @
7e5c28fe
...
@@ -199,6 +199,29 @@ class InstitutionSubService extends Service {
...
@@ -199,6 +199,29 @@ class InstitutionSubService extends Service {
return
{
result
:
true
};
return
{
result
:
true
};
}
}
// 获取科普文章
async
getArticleByCategory
(
catId
)
{
const
{
ctx
}
=
this
;
const
article
=
await
ctx
.
classModel
.
V5
.
CourseV5Article
.
findOne
({
where
:
{
cat_id
:
catId
,
status
:
1
,
is_deleted
:
0
}
});
if
(
ctx
.
isEmpty
(
article
))
{
return
{};
}
// 问答
const
qa
=
await
ctx
.
classModel
.
V5
.
CourseV5ArticleQA
.
findAll
({
where
:
{
article_id
:
article
.
id
,
status
:
1
,
is_deleted
:
0
},
order
:
[[
'sort'
,
'asc'
]],
attributes
:
[
'id'
,
'question'
,
'answer'
]
});
const
ret
=
{
id
:
article
.
id
,
cat_id
:
article
.
cat_id
,
image
:
article
.
image
,
content
:
article
.
content
,
qa
,
};
return
ret
;
}
}
}
module
.
exports
=
InstitutionSubService
;
module
.
exports
=
InstitutionSubService
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment