Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
node-devlop-rest-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
zhouzihao
node-devlop-rest-api
Commits
39c8506b
Commit
39c8506b
authored
Mar 26, 2020
by
zhouzihao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dev-新建添主键,分页查询支持排序
parent
81c4b8e8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
api/buildLogApi.js
api/buildLogApi.js
+1
-1
tools/databaseHelper.js
tools/databaseHelper.js
+11
-5
tools/helper.js
tools/helper.js
+2
-2
No files found.
api/buildLogApi.js
View file @
39c8506b
...
...
@@ -2,7 +2,7 @@ var helper = require('../tools/helper')
module
.
exports
=
{
//分页查询构建日志
pageBuildLog
:
helper
.
pagedBuilder
(
'
build_log
'
,
'
log_id
'
,
{}),
pageBuildLog
:
helper
.
pagedBuilder
(
'
build_log
'
,
'
log_id
'
,
{}
,
'
create_time desc
'
),
// 成功失败回调使用的修改接口
// fixme 阻止新添加新的数据
backCallSuccess
:
helper
.
saveBuilder
(
'
build_log
'
,
'
log_id
'
),
...
...
tools/databaseHelper.js
View file @
39c8506b
...
...
@@ -31,7 +31,9 @@ var saveJsonToDb = (json, table, key) => {
}
db
.
query
(
sql
.
sql
,
sql
.
values
)
.
then
((
rows
)
=>
{
resovle
({
ok
:
1
});
// console.log(JSON.stringify(rows));
json
[
key
]
=
rows
.
insertId
;
resovle
(
json
);
}).
catch
((
err
)
=>
{
reject
(
JSON
.
stringify
(
err
));
});
...
...
@@ -112,15 +114,19 @@ var countByJson = (json, table, key) => {
* @param {*} page
* @param {*} pageSize
*/
var
pagedDbByJson
=
(
json
,
table
,
items
,
key
,
page
=
1
,
pageSize
=
10
)
=>
{
var
pagedDbByJson
=
(
json
,
table
,
items
,
key
,
page
=
1
,
pageSize
=
10
,
orderby
=
""
)
=>
{
return
new
Promise
((
resovle
,
reject
)
=>
{
countByJson
(
json
,
table
,
key
)
.
then
((
len
)
=>
{
if
(
len
>
0
)
{
return
listDbByJson
(
json
,
table
,
items
,
{
let
extra
=
{
$limit
:
pageSize
,
$offset
:
(
page
-
1
)
*
pageSize
}).
then
((
data
)
=>
{
$offset
:
(
page
-
1
)
*
pageSize
,
}
if
(
!
_
.
isEmpty
){
extra
[
'
$orderby
'
]
=
orderby
;
}
return
listDbByJson
(
json
,
table
,
items
,
extra
).
then
((
data
)
=>
{
resovle
({
data
,
paged
:
{
...
...
tools/helper.js
View file @
39c8506b
...
...
@@ -48,13 +48,13 @@ var listAllBuilder = (table, items, condition, translate = (x) => { return x })
* @param {*} key
* @param {*} items
*/
var
pagedBuilder
=
(
table
,
key
,
items
)
=>
{
var
pagedBuilder
=
(
table
,
key
,
items
,
orderby
=
""
)
=>
{
return
(
req
,
res
)
=>
{
var
page
=
_
.
toInteger
(
_
.
get
(
req
.
query
,
'
page
'
,
1
));
var
pageSize
=
_
.
toInteger
(
_
.
get
(
req
.
query
,
'
pageSize
'
,
10
));
_
.
unset
(
req
.
query
,
'
page
'
);
_
.
unset
(
req
.
query
,
'
pageSize
'
);
databaseHelper
.
pagedDbByJson
(
req
.
query
,
table
,
items
,
key
,
page
,
pageSize
)
databaseHelper
.
pagedDbByJson
(
req
.
query
,
table
,
items
,
key
,
page
,
pageSize
,
orderby
)
.
then
((
data
)
=>
{
res
.
end
(
JSON
.
stringify
(
data
));
}).
catch
((
err
)
=>
{
...
...
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