dev-新建添主键,分页查询支持排序

api/buildLogApi.js

@@ -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

@@ -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

@@ -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) => {