添加大厅与窗口关联

base-manager/src/main/java/com/mortals/xhx/common/utils/MemoryPagination.java

 package com.mortals.xhx.common.utils;
 
+import com.alibaba.fastjson.JSON;
 import org.apache.commons.collections4.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -9,6 +11,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.LongStream;
 
 /**
  * @author: zxfei
@@ -31,6 +34,7 @@ public class MemoryPagination {
         int totalCount = records.size();
         int remainder = totalCount % pageSize;
         int pageCount = (remainder > 0) ? totalCount / pageSize + 1 : totalCount / pageSize;
+        System.out.println("remainder:"+remainder);
         if (remainder == 0) {
             return records.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
         } else {
@@ -59,4 +63,18 @@ public class MemoryPagination {
         Set<Object> seen = ConcurrentHashMap.newKeySet();
         return t -> seen.add(keyExtractor.apply(t));
     }
+
+
+    public static void main(String[] args) {
+        ArrayList<Integer> integers = new ArrayList<>();
+        for(int i=0;i<10;i++){
+            integers.add(i);
+        }
+
+        List<Integer> pagination = MemoryPagination.pagination(integers, 1, 10);
+
+        System.out.println(JSON.toJSONString(pagination));
+
+
+    }
 }

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteBusinessServiceImpl.java

@@ -56,8 +56,8 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
     @Override
     protected SiteBusinessEntity findBefore(SiteBusinessEntity params, PageInfo pageInfo, Context context) throws AppException {
         //查询所有
-    //    pageInfo.setCurrPage(1);
-      //  pageInfo.setPrePageResult(-1);
+        pageInfo.setCurrPage(1);
+        pageInfo.setPrePageResult(-1);
 
         if (!ObjectUtils.isEmpty(params.getIdNotList())) {
             Set<Long> notIdSet = params.getIdNotList().stream().collect(Collectors.toSet());
@@ -92,10 +92,9 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
     @Override
     protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException {
         //重新内存分页
-       // params.getPage();
-       // params.getSize();
-
-      //  list = MemoryPagination.pagination(list, params.getSize(), params.getPage());
+        params.getPage();
+        params.getSize();
+        list = MemoryPagination.pagination(list, params.getSize(), params.getPage());
         if (!ObjectUtils.isEmpty(params.getIdNotList())) {
             //排除掉已经存在的ids
             log.info("idNotList:{}", JSON.toJSONString(params.getIdNotList()));

base-manager/src/test/java/com/mortals/httpclient/site/SiteHallController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###站点大厅信息列表
 POST {{baseUrl}}/site/hall/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -24,6 +23,15 @@ Content-Type: application/json
 }
 
 
+###站点大厅信息列表
+POST {{baseUrl}}/site/hall/getBusinessByHall
+Content-Type: application/json
+
+{
+  "id":1
+}
+
+
 ###站点大厅信息更新与保存
 POST {{baseUrl}}/site/hall/save
 Authorization: {{authToken}}

base-manager/src/test/java/com/mortals/httpclient/window/WindowHallController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###大厅窗口列表
 POST {{baseUrl}}/window/hall/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {