From 20557421ee1a65db3fbd10cbd36ddcf54e1ca6b0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 16:08:26 +0800
Subject: [PATCH] optimize data

---
 service-job/src/main/java/com/java110/job/export/ExportDataExecutor.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/export/ExportDataExecutor.java b/service-job/src/main/java/com/java110/job/export/ExportDataExecutor.java
index 6dc78f7..c15c0a2 100644
--- a/service-job/src/main/java/com/java110/job/export/ExportDataExecutor.java
+++ b/service-job/src/main/java/com/java110/job/export/ExportDataExecutor.java
@@ -33,8 +33,7 @@
     private boolean isRun = false;
 
     public ExportDataExecutor(boolean isRun) {
-        this.userDownloadFileV1InnerServiceSMOImpl = ApplicationContextFactory.getBean("userDownloadFileV1InnerServiceSMOImpl", IUserDownloadFileV1InnerServiceSMO.class);
-        this.fileUploadTemplate = ApplicationContextFactory.getBean("fileUploadTemplate", FileUploadTemplate.class);
+
         this.isRun = isRun;
     }
 
@@ -48,11 +47,11 @@
             log.debug("瀵煎嚭鏁版嵁绾跨▼寮�濮嬪鐞�");
             try {
                 doExportData();
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 log.error("澶勭悊娑堟伅寮傚父", e);
                 e.printStackTrace();
             }
-            log.debug("瀵煎嚭鏁版嵁绾跨▼寮�濮嬪畬鎴�");
+            log.debug("瀵煎嚭鏁版嵁绾跨▼澶勭悊瀹屾垚");
 
         }
 
@@ -61,6 +60,9 @@
     private void doExportData() throws Exception {
 
         ExportDataDto exportDataDto = ExportDataQueue.getData();
+
+        this.userDownloadFileV1InnerServiceSMOImpl = ApplicationContextFactory.getBean("userDownloadFileV1InnerServiceSMOImpl", IUserDownloadFileV1InnerServiceSMO.class);
+        this.fileUploadTemplate = ApplicationContextFactory.getBean("fileUploadTemplate", FileUploadTemplate.class);
 
         ByteArrayInputStream inputStream = null;
         ByteArrayOutputStream os = null;
@@ -87,9 +89,12 @@
             inputStream = new ByteArrayInputStream(os.toByteArray());
 
             fileName = fileUploadTemplate.saveFile(inputStream, exportDataDto.getFileName());
+
+
             updateUserDownloadFile(exportDataDto, UserDownloadFileDto.STATE_FINISH,fileName, "涓嬭浇瀹屾垚");
 
-        } catch (Exception e) {
+        } catch (Throwable e) {
+            e.printStackTrace();
             updateUserDownloadFile(exportDataDto, UserDownloadFileDto.STATE_FAIL, "","涓嬭浇澶辫触" + ExceptionUtil.getStackTrace(e));
         } finally {
             try {

--
Gitblit v1.8.0