修改大厅查询

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java

@@ -93,7 +93,6 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
                 this.findAfter(entity, pageInfo, context, result.getList());
                 if (!ObjectUtils.isEmpty(result.getList())) {
                     cacheService.set(KEY_SEARCH_SITEBUSINESSID_CACHE + siteBusinessId, JSON.toJSONString(result), KEY_SEARCH_TIMEOUTT_CACHE);
-
                 }
             }
         } else if (!ObjectUtils.isEmpty(query.getWindowId())) {
@@ -136,12 +135,13 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
     protected void findAfter(WindowBusinessEntity entity, PageInfo pageInfo, Context context, List<WindowBusinessEntity> list) throws AppException {
         Map<Long, WindowEntity> collect = windowService.getCacheList().stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
         //Map<Long, WindowEntity> collect = windowService.findToMap(new WindowQuery(), context);
-        Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.getCacheList().stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
-        //Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.find(new WindowHallQuery(), context).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), Function.identity()));
+        Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.getCacheList().stream().collect(Collectors.toMap(x -> x.getWindowId(), y -> y, (o, n) -> n));
+       // Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.find(new WindowHallQuery(), context).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), Function.identity()));
         Iterator iterator = list.iterator();
         while (iterator.hasNext()) {
             WindowBusinessEntity item = (WindowBusinessEntity) iterator.next();
             WindowEntity windowEntity = collect.get(item.getWindowId());
+           // WindowEntity windowEntity = windowService.getCache(item.getWindowId().toString());
             if (!ObjectUtils.isEmpty(item.getWindowId()) && !ObjectUtils.isEmpty(windowEntity)) {
                 item.setDeptId(windowEntity.getDeptId());
                 item.setDeptName(windowEntity.getDeptName());

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

@@ -11,7 +11,7 @@ Content-Type: application/json
 POST {{baseUrl}}/window/business/interlist
 Content-Type: application/json
 
-{"siteBusinessId":2,"size":-1,"searchCache": 1}
+{"siteBusinessId":212,"searchCache": 1}
 
 ###窗口业务列表缓存2
 POST {{baseUrl}}/window/business/interlist