From 2234cee8e872fd7633b95eef5b0c760cbbb8eabf Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期五, 02 九月 2022 17:00:00 +0800
Subject: [PATCH] 20220902林平凡离职交接(新增北理工大气数据获取)

---
 src/main/java/api/controller/SinglelampDataController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/api/controller/SinglelampDataController.java b/src/main/java/api/controller/SinglelampDataController.java
index 48e689b..2afe3c3 100644
--- a/src/main/java/api/controller/SinglelampDataController.java
+++ b/src/main/java/api/controller/SinglelampDataController.java
@@ -1,11 +1,9 @@
 package api.controller;
 
-import api.bean.LampEntity;
 import api.bean.ReqParams;
 import api.bean.SinglelampDataEntity;
 import api.result.Msg;
 import api.service.AccessService;
-import api.service.LampService;
 import api.service.SinglelampDataServer;
 import com.github.pagehelper.PageInfo;
 import com.google.common.util.concurrent.RateLimiter;
@@ -38,13 +36,13 @@
     @RequestMapping(value = "/list",method = RequestMethod.POST)
     public Msg list(@RequestBody ReqParams reqParams){
         rateLimiter.acquire(1);
-        if (reqParams.getLimit()>50){
+        if (reqParams.getLimit()>200){
             return Msg.error("limit exception!!!");
         }
         Long userId = accessService.getUserId(reqParams.getAccessToken());
 
         if(userId == null){
-            return Msg.error("server exception!!!");
+            return Msg.error("accessToken exception!!!");
         }
         reqParams.toString();
 
@@ -52,7 +50,9 @@
 
         Map data = new HashMap();
 
-        data.put("total",info.getTotal());
+        data.put("dataSize",info.getStartRow());
+        data.put("lampSize",info.getEndRow());
+        data.put("totalPage",Math.ceil(info.getStartRow()*1.0/reqParams.getLimit()));
         data.put("list",info.getList());
 
         return Msg.ok().put("data",data);
@@ -67,7 +67,7 @@
         Long userId = accessService.getUserId(reqParams.getAccessToken());
 
         if(userId == null){
-            return Msg.error("server exception!!!");
+            return Msg.error("accessToken exception!!!");
         }
 
         PageInfo<SinglelampDataEntity> info = singlelampDataServer.selectByStreetlightId(reqParams);

--
Gitblit v1.9.3