优化窗口业务查询

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

@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
+import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.window.model.WindowHallEntity;
@@ -15,7 +16,7 @@ import com.mortals.xhx.module.window.dao.WindowHallDao;
 * @author zxfei
 * @date 2023-04-25
 */
-public interface WindowHallService extends ICRUDService<WindowHallEntity,Long>{
+public interface WindowHallService extends ICRUDCacheService<WindowHallEntity,Long> {
 
     WindowHallDao getDao();
 

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

@@ -52,9 +52,12 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
 
     @Override
     protected void findAfter(WindowBusinessEntity entity, PageInfo pageInfo, Context context, List<WindowBusinessEntity> list) throws AppException {
-        Map<Long, WindowEntity> collect = windowService.findToMap(new WindowQuery(), context);
 
-        Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.find(new WindowHallQuery(), context).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), Function.identity()));
+        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()));
         Iterator iterator = list.iterator();
         while (iterator.hasNext()) {
             WindowBusinessEntity item = (WindowBusinessEntity) iterator.next();
@@ -67,7 +70,7 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
                 if (!ObjectUtils.isEmpty(windowHallEntity)) {
                     item.setHallId(windowHallEntity.getHallId());
                     item.setHallName(windowHallEntity.getHallName());
-                }else {
+                } else {
                     //log.info("windowhallEntity is null windowId:{}",item.getWindowId());
                 }
             } else {

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

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.window.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.module.window.model.WindowEntity;
 import com.mortals.xhx.module.window.model.WindowQuery;
 import com.mortals.xhx.module.window.service.WindowService;
@@ -27,7 +28,7 @@ import java.util.stream.Collectors;
  * @date 2023-04-25
  */
 @Service("windowHallService")
-public class WindowHallServiceImpl extends AbstractCRUDServiceImpl<WindowHallDao, WindowHallEntity, Long> implements WindowHallService {
+public class WindowHallServiceImpl extends AbstractCRUDCacheServiceImpl<WindowHallDao, WindowHallEntity, Long> implements WindowHallService {
 
     @Autowired
     private WindowService windowService;
@@ -41,8 +42,14 @@ public class WindowHallServiceImpl extends AbstractCRUDServiceImpl<WindowHallDao
      */
     @Override
     protected void findAfter(WindowHallEntity params, PageInfo pageInfo, Context context, List<WindowHallEntity> list) throws AppException {
-        super.findAfter(params, pageInfo, context, list);
-        List<Long> collect = list.stream().map(i -> i.getWindowId()).distinct().collect(Collectors.toList());
+
+        Map<Long, WindowEntity> collectWin = windowService.getCacheList().stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
+        list.forEach(item -> {
+            WindowEntity windowEntity = collectWin.get(item.getWindowId());
+            item.setFromnum(windowEntity == null ? "" : windowEntity.getFromnum());
+        });
+
+     /*   List<Long> collect = list.stream().map(i -> i.getWindowId()).distinct().collect(Collectors.toList());
         if (!ObjectUtils.isEmpty(collect)) {
             WindowQuery windowQuery = new WindowQuery();
             windowQuery.setIdList(collect);
@@ -51,6 +58,6 @@ public class WindowHallServiceImpl extends AbstractCRUDServiceImpl<WindowHallDao
                 WindowEntity windowEntity = collectWin.get(item.getWindowId());
                 item.setFromnum(windowEntity == null ? "" : windowEntity.getFromnum());
             });
-        }
+        }*/
     }
 }
\ No newline at end of file

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

@@ -3,11 +3,7 @@
 POST {{baseUrl}}/window/business/list
 Content-Type: application/json
 
-{
-    "page":1,
-    "size":10
-}
-
+{"windowIdList":["77","78","79","80","81","82","83","84","85","86","87","88","89","90","91","92","93","94","95","96","97","98","99"],"size":-1}
 
 ###窗口业务更新与保存
 POST {{baseUrl}}/window/business/save