From d8f66b834134f6b755fd3fb93bb91b56f9d31f6f Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期四, 29 十二月 2022 15:46:53 +0800
Subject: [PATCH] 放假备份。对接光伏对外接口,单灯,灯杆调整。

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

diff --git a/src/main/java/api/controller/SinglelampDataController.java b/src/main/java/api/controller/SinglelampDataController.java
index 48e689b..726d2c6 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;
@@ -37,14 +35,15 @@
 
     @RequestMapping(value = "/list",method = RequestMethod.POST)
     public Msg list(@RequestBody ReqParams reqParams){
+        System.out.println(reqParams.toString());
         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 +51,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 +68,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