122

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java

@@ -326,7 +326,7 @@ public class WalletTransactionServiceImpl extends ServiceImpl<WalletTransactionM
 
     @Override
     public void exportByTemplate(HttpServletResponse response, WalletTransactionDto dto, Long total, String fileName, DataScope dataScope) {
-        ExecutorService executor = Executors.newFixedThreadPool(10);
+        ExecutorService executor = Executors.newFixedThreadPool(5);
         try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(ResourceUtil.getStream(fileName)).build()) {
             WriteSheet writeSheet = EasyExcel.writerSheet().build();
             FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
@@ -364,6 +364,9 @@ public class WalletTransactionServiceImpl extends ServiceImpl<WalletTransactionM
                             }
                         }
                         return list;
+                    } catch (Exception e) {
+                        log.error("|{}|分页查询异常, currentPage:{}", TAG, currentPage, e);
+                        throw e;
                     } finally {
                         RequestContextHolder.resetRequestAttributes();
                     }
@@ -385,7 +388,9 @@ public class WalletTransactionServiceImpl extends ServiceImpl<WalletTransactionM
                     }
                     excelWriter.fill(list, fillConfig, writeSheet);
                 } catch (Exception e) {
-                    log.error("|{}|多线程导出获取数据异常", TAG, e);
+                    log.error("|{}|多线程导出获取数据异常，任务中断", TAG, e);
+                    // 抛出异常以终止导出，避免数据不完整
+                    throw new RuntimeException("导出数据异常，请重试", e);
                 }
             }
             map.put("computeTotalPayPrice", priceTotal.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString());