浏览代码

分页处理

lvxianyun 3 年之前
父节点
当前提交
8ea03e1259

+ 11 - 1
src/main/java/com/persagy/proxy/adm/request/AdmResponse.java

@@ -49,7 +49,17 @@ public class AdmResponse {
     }
 
     public static AdmResponse success(List<?> content) {
-        return new AdmResponse(SUCCESS, "", CollUtil.isEmpty(content) ? 0L :content.size()*1L,null, 1, 500, CollUtil.isEmpty(content) ? new ArrayList<>(1): content,null,null);
+        return new AdmResponse(SUCCESS, "", CollUtil.isEmpty(content) ? 0L :content.size()*1L,null, 1, 50, CollUtil.isEmpty(content) ? new ArrayList<>(1): content,null,null);
+    }
+    public static AdmResponse success(List<?> content, AdmQueryCriteria request) {
+        int pagesize = 50;
+        if(request!= null && request.getPageNumber() != null && request.getPageNumber() > 0)
+            pagesize = request.getPageSize();
+        int pageNum = 1;
+        if(request!= null && request.getPageSize() != null && request.getPageSize() > 0){
+            pageNum = request.getPageSize();
+        }
+        return new AdmResponse(SUCCESS, "", CollUtil.isEmpty(content) ? 0L :content.size()*1L,CollUtil.isEmpty(content) ? 0L :content.size()*1L, pageNum, pagesize, CollUtil.isEmpty(content) ? new ArrayList<>(1): content,null,null);
     }
     public static AdmResponse success(String message) {
         return new AdmResponse(SUCCESS, message, null,null, null,null,null,null,null);

+ 22 - 40
src/main/java/com/persagy/proxy/object/controller/AdmEquipmentController.java

@@ -1,36 +1,12 @@
 package com.persagy.proxy.object.controller;
 
-import java.awt.Color;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
@@ -66,15 +42,21 @@ import com.persagy.proxy.dictionary.service.IAdmDictService;
 import com.persagy.proxy.object.model.AdmEquipment;
 import com.persagy.proxy.object.service.IAdmEquipmentService;
 import com.persagy.proxy.report.service.IRelationReportService;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.xssf.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.*;
 
 /**
  * Adm 楼层 API
@@ -312,7 +294,7 @@ public class AdmEquipmentController {
 			}else{
 				List<AdmEquipment> admEquipments = JSONUtil.toList(result.getData().toString(), AdmEquipment.class);
 				service.ensureSpecialValues(AdmContextUtil.toDmpContext(), admEquipments);
-				return AdmResponse.success(admEquipments);
+				return AdmResponse.success(admEquipments, request);
 			}
 		}else{
 			return service.query(request);

+ 1 - 1
src/main/java/com/persagy/proxy/object/controller/AdmShaftController.java

@@ -383,7 +383,7 @@ public class AdmShaftController {
         List<ObjectNode> spaceList = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteria);
         if(CollUtil.isNotEmpty(spaceList)){
             List<AdmSpace> vos = JSONUtil.toList(spaceList.toString(), AdmSpace.class);
-            return AdmResponse.success(spaceList);
+            return AdmResponse.success(spaceList, request);
         }else{
             return AdmResponse.success();
         }

+ 13 - 23
src/main/java/com/persagy/proxy/object/controller/AdmSystemController.java

@@ -3,8 +3,6 @@ package com.persagy.proxy.object.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -23,14 +21,13 @@ import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmRelationService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
-import com.persagy.proxy.adm.utils.AdmEntityTransferUtil;
 import com.persagy.proxy.adm.utils.AdmQueryCriteriaHelper;
 import com.persagy.proxy.adm.utils.ObjectNameUtil;
-import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.RelationDTO;
-import com.persagy.proxy.object.model.*;
-import com.persagy.proxy.object.service.IAdmBuildingService;
-import com.persagy.proxy.object.service.IAdmFloorService;
+import com.persagy.proxy.object.model.AdmEquipment;
+import com.persagy.proxy.object.model.AdmShaft;
+import com.persagy.proxy.object.model.AdmSpace;
+import com.persagy.proxy.object.model.AdmSystem;
 import com.persagy.proxy.object.service.IAdmSystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +35,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.QueryParam;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Adm 系统 API
@@ -223,16 +222,7 @@ public class AdmSystemController {
             }
             List<AdmSystem> admSystemList = JSONUtil.toList(result.getData().toString(), AdmSystem.class);
             service.ensureSpecialValues(AdmContextUtil.toDmpContext(), admSystemList);
-            AdmResponse response = AdmResponse.success(admSystemList);
-            Long total = result.getCount() == null ? null : result.getCount().longValue();
-            if(request.isOnlyCount()){
-                response.setTotal(null);
-                response.setCount(total);
-            }else {
-                response.setTotal(total);
-            }
-            response.setPageNumber(request.getPageNumber());
-            response.setPageSize(request.getPageSize());
+            AdmResponse response = AdmResponse.success(admSystemList,request);
             return response;
         }else {
             return service.query(request);
@@ -295,7 +285,7 @@ public class AdmSystemController {
         request.setName(AdmEquipment.OBJ_TYPE);
         QueryCriteria queryCriteriaObj = AdmQueryCriteriaHelper.toDmpCriteria(request);
         List<ObjectNode> obj = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteriaObj);
-        return AdmResponse.success(obj);
+        return AdmResponse.success(obj,request);
     }
 
 
@@ -319,7 +309,7 @@ public class AdmSystemController {
         request.setName(AdmShaft.OBJ_TYPE);
         QueryCriteria queryCriteriaObj = AdmQueryCriteriaHelper.toDmpCriteria(request);
         List<ObjectNode> obj = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteriaObj);
-        return AdmResponse.success(obj);
+        return AdmResponse.success(obj,request);
     }
 
 
@@ -342,7 +332,7 @@ public class AdmSystemController {
         request.setName(AdmSpace.OBJ_TYPE);
         QueryCriteria queryCriteriaObj = AdmQueryCriteriaHelper.toDmpCriteria(request);
         List<ObjectNode> obj = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteriaObj);
-        return AdmResponse.success(obj);
+        return AdmResponse.success(obj,request);
     }
 
 
@@ -354,7 +344,7 @@ public class AdmSystemController {
      * @throws Exception
      */
     @PostMapping("/unspace-sys")
-    public AdmResponse queryUnSpSy(  @QueryParam("type") String type, @QueryParam("spaceId") String spaceId,
+    public AdmResponse queryUnSpSy(@QueryParam("type") String type, @QueryParam("spaceId") String spaceId,
                                      @RequestBody AdmQueryCriteria request) throws Exception {
         if(StrUtil.isNotEmpty(type)){
             if(StrUtil.isBlank(request.getFilters())){
@@ -373,7 +363,7 @@ public class AdmSystemController {
         request.setName(AdmSystem.OBJ_TYPE);
         QueryCriteria queryCriteriaObj = AdmQueryCriteriaHelper.toDmpCriteria(request);
         List<ObjectNode> obj = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteriaObj);
-        return AdmResponse.success(obj);
+        return AdmResponse.success(obj,request);
     }
 
 }

+ 1 - 1
src/main/java/com/persagy/proxy/object/service/impl/AdmSpaceServiceImpl.java

@@ -116,7 +116,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
             //根据classCode floorId 查询查询实际存在的空间
             assembleDefineTypes(context, defineList, request.getFloorId());
             // 设置返回值
-            AdmResponse response = AdmResponse.success(defineList);
+            AdmResponse response = AdmResponse.success(defineList, request);
             Long total = resultDef.getCount() == null ? null : resultDef.getCount().longValue();
             response.setTotal(total);
             return response;

+ 1 - 1
src/main/java/com/persagy/proxy/report/controller/AdmReportEquipController.java

@@ -122,7 +122,7 @@ public class AdmReportEquipController {
         }else{
             equipmentList = new ArrayList<>();
         }
-        return AdmResponse.success(equipmentList);
+        return AdmResponse.success(equipmentList, request);
     }
 
     /**

+ 1 - 2
src/main/java/com/persagy/proxy/report/controller/AdmSpaceInfoController.java

@@ -10,7 +10,6 @@ import com.persagy.proxy.adm.request.AdmDCSQueryRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
-import com.persagy.proxy.adm.utils.GeoToolsUtil;
 import com.persagy.proxy.object.model.AdmEquipment;
 import com.persagy.proxy.object.model.AdmFloor;
 import com.persagy.proxy.object.model.AdmISpace;
@@ -171,7 +170,7 @@ public class AdmSpaceInfoController {
 //					iSpaceList.add(iSpace);
 //				}
 			}
-			AdmResponse admResponse = AdmResponse.success(iSpaceList);
+			AdmResponse admResponse = AdmResponse.success(iSpaceList,request);
 			admResponse.setFloorId(request.getFloorId());
 			admResponse.setZoneType(objectType);
 			return admResponse;