reloaded 4 years ago
parent
commit
d87638ede8
3 changed files with 7 additions and 7 deletions
  1. 3 3
      app/controller/lookuser.js
  2. 0 1
      app/router.js
  3. 4 3
      app/service/lookuser.js

+ 3 - 3
app/controller/lookuser.js

@@ -13,9 +13,9 @@ class LookuserController extends Controller {
     this.service = this.ctx.service.lookuser;
   }
 
-  async looknumber() {
-    const data = await this.service.looknumber(this.ctx.query);
-    this.ctx.ok({ data });
+  async index() {
+    const data = await this.service.query(this.ctx.query);
+    this.ctx.ok({ ...data });
   }
 }
 

+ 0 - 1
app/router.js

@@ -32,7 +32,6 @@ module.exports = app => {
   router.post('roomuser', '/api/onlive/roomuser/update/:id', controller.roomuser.update);
 
   // 观看用户表设置路由
-  router.get('/api/onlive/lookuser/looknumber', controller.lookuser.looknumber);
   router.resources('lookuser', '/api/onlive/lookuser', controller.lookuser); // index、create、show、destroy
   router.post('lookuser', '/api/onlive/lookuser/update/:id', controller.lookuser.update);
 

+ 4 - 3
app/service/lookuser.js

@@ -22,8 +22,9 @@ class LookuserService extends CrudService {
     }
   }
 
-  async looknumber() {
-    const rooms = await this.rmodel.find();
+  async query({ skip, limit, ...info }) {
+    const total = await this.rmodel.count(info);
+    const rooms = await this.rmodel.find(info).skip(Number(skip)).limit(Number(limit));
     const data = [];
     for (const _room of rooms) {
       const room = _.cloneDeep(JSON.parse(JSON.stringify(_room)));
@@ -31,7 +32,7 @@ class LookuserService extends CrudService {
       room.number = number;
       data.push(room);
     }
-    return data;
+    return { data, total };
   }
 
 }