|
|
@ -304,7 +304,12 @@ public class PatrolTaskResultMainController extends BaseController { |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
CompletableFuture.runAsync(() -> exportExcelWordAndZipShaoxing(reportIds), executor); |
|
|
|
|
|
|
|
|
CompletableFuture.runAsync(() -> exportExcelWordAndZipShaoxing(reportIds), executor) |
|
|
|
|
|
.whenComplete((v, ex) -> { |
|
|
|
|
|
if (ex != null) { |
|
|
|
|
|
logger.error("Async export failed for reportIds: {}", reportIds, ex); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
}, executor).exceptionally(ex -> { |
|
|
}, executor).exceptionally(ex -> { |
|
|
logger.error("Error occurred during saveReport: ", ex); |
|
|
logger.error("Error occurred during saveReport: ", ex); |
|
|
@ -1627,8 +1632,8 @@ public class PatrolTaskResultMainController extends BaseController { |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
logger.error("生成巡视文件异常:{}", e); |
|
|
|
|
|
|
|
|
} catch (Throwable e) { |
|
|
|
|
|
logger.error("生成巡视文件异常", e); |
|
|
closeResources(sxssfWorkbook, wordDocument, tempFiles); |
|
|
closeResources(sxssfWorkbook, wordDocument, tempFiles); |
|
|
} |
|
|
} |
|
|
logMemoryUsage("END exportExcelWordAndZipShaoxing"); |
|
|
logMemoryUsage("END exportExcelWordAndZipShaoxing"); |
|
|
|