cc 2 months ago
parent
commit
df5b595b3b

+ 2 - 2
src/main/java/com/qingjian/module/dm/pre/PreTask.java

@@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.fesod.sheet.ExcelReader;
 import org.apache.fesod.sheet.ExcelReader;
 import org.apache.fesod.sheet.FesodSheet;
 import org.apache.fesod.sheet.FesodSheet;
-import org.apache.fesod.sheet.cache.MapCache;
+import org.apache.fesod.sheet.cache.selector.SimpleReadCacheSelector;
 import org.apache.fesod.sheet.read.metadata.ReadWorkbook;
 import org.apache.fesod.sheet.read.metadata.ReadWorkbook;
 import org.apache.fesod.sheet.read.metadata.holder.ReadWorkbookHolder;
 import org.apache.fesod.sheet.read.metadata.holder.ReadWorkbookHolder;
 import org.apache.fesod.sheet.read.metadata.holder.csv.CsvReadWorkbookHolder;
 import org.apache.fesod.sheet.read.metadata.holder.csv.CsvReadWorkbookHolder;
@@ -133,7 +133,7 @@ public class PreTask {
         // 创建预览数据监听器并开始解析
         // 创建预览数据监听器并开始解析
         PreDataListener preDataListener = new PreDataListener(fileInfoList, fileName, fileId, batchId);
         PreDataListener preDataListener = new PreDataListener(fileInfoList, fileName, fileId, batchId);
         try (ExcelReader reader = FesodSheet.read(Files.newInputStream(filePath), preDataListener)
         try (ExcelReader reader = FesodSheet.read(Files.newInputStream(filePath), preDataListener)
-                .readCache(new MapCache())
+                .readCacheSelector(new SimpleReadCacheSelector(20L, 500))
                 .password(password).headRowNumber(0).excelType(excelTypeEnum)
                 .password(password).headRowNumber(0).excelType(excelTypeEnum)
                 .autoTrim(true).charset(charset).registerConverter(new Str2NullConverter())
                 .autoTrim(true).charset(charset).registerConverter(new Str2NullConverter())
                 .registerConverter(new DateNumberConverter()).build()) {
                 .registerConverter(new DateNumberConverter()).build()) {

+ 1 - 0
src/main/java/com/qingjian/module/person/service/IntimacyService.java

@@ -118,6 +118,7 @@ public class IntimacyService extends ServiceImpl<IntimacyMapper, Intimacy> {
         return results.stream()
         return results.stream()
                 .filter(i -> i.getIntimacy() != 0)
                 .filter(i -> i.getIntimacy() != 0)
                 .sorted(Comparator.comparingInt(IntimacyDTO::getIntimacy).reversed())
                 .sorted(Comparator.comparingInt(IntimacyDTO::getIntimacy).reversed())
+                .limit(100)
                 .toList();
                 .toList();
     }
     }