1、修改ktr从classpath中以流的方式加载

徐烜
1 parent e1ecfac0
Showing 11 changed files with 190 additions and 40 deletions
src/main/java/com/bsth/service/schedule/datatools/CarConfigInfoDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/CarsDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/EmployeeConfigInfoDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/EmployeeDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/GuideboardInfoDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/ScheduleRule1FlatDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/timetable/strategy/impl/TimetableExcelDataImportStrategyImpl.java
src/main/java/com/bsth/service/schedule/timetable/strategy/impl/TimetableExcelWithPlanInfoExportStrategyImpl.java
src/main/java/com/bsth/service/schedule/timetable/strategy/impl/TimetableExcelWithPlanInfoViewStrategyImpl.java
src/main/java/com/bsth/service/schedule/utils/DataToolsServiceImpl.java
@@ -11,7 +11,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import java.io.File;
@@ -90,8 +89,9 @@ public class CarConfigInfoDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getCarsconfigDatainputktr()).toURI());
-            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            // 通用参数，转换文件路径，转换文件类路径，excel输入文件路径，错误输出文件路径
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getCarsconfigDatainputktr());
             ktrParms.put("filepath", file.getAbsolutePath());
             ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
@@ -120,8 +120,9 @@ public class CarConfigInfoDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getCarsconfigDataoutputktr()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getCarsconfigDataoutputktr());
             ktrParms.put("filename", "车辆配置信息_download-");
             ktrParms.putAll(params);
@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import java.io.File;
@@ -88,8 +87,9 @@ public class CarsDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getCarsDatainputktr()).toURI());
-            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            // 通用参数，转换文件路径，转换文件类路径，excel输入文件路径，错误输出文件路径
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getCarsDatainputktr());
             ktrParms.put("filepath", file.getAbsolutePath());
             ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
@@ -116,8 +116,9 @@ public class CarsDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getCarsDataoutputktr()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getCarsDataoutputktr());
             ktrParms.put("filename", "车辆基础信息_download-");
             ktrParms.putAll(params);
@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import java.io.File;
@@ -88,8 +87,9 @@ public class EmployeeConfigInfoDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getEmployeesconfigDatainputktr()).toURI());
-            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            // 通用参数，转换文件路径，转换文件类路径，excel输入文件路径，错误输出文件路径
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getEmployeesconfigDatainputktr());
             ktrParms.put("filepath", file.getAbsolutePath());
             ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
@@ -118,8 +118,9 @@ public class EmployeeConfigInfoDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getEmployeesconfigDataoutputktr()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getEmployeesconfigDataoutputktr());
             ktrParms.put("filename", "人员配置信息_download-");
             ktrParms.putAll(params);
@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import java.io.File;
@@ -88,8 +87,9 @@ public class EmployeeDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getEmployeesDatainputktr()).toURI());
-            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            // 通用参数，转换文件路径，转换文件类路径，excel输入文件路径，错误输出文件路径
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getEmployeesDatainputktr());
             ktrParms.put("filepath", file.getAbsolutePath());
             ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
@@ -116,8 +116,9 @@ public class EmployeeDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getEmployeesDataoutputktr()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getEmployeesDataoutputktr());
             ktrParms.put("filename", "人员基础信息_download-");
             ktrParms.putAll(params);
@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import java.io.File;
@@ -88,8 +87,9 @@ public class GuideboardInfoDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getGuideboardsDatainputktr()).toURI());
-            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            // 通用参数，转换文件路径，转换文件类路径，excel输入文件路径，错误输出文件路径
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getGuideboardsDatainputktr());
             ktrParms.put("filepath", file.getAbsolutePath());
             ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
@@ -118,8 +118,9 @@ public class GuideboardInfoDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getGuideboardsDataoutputktr()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getGuideboardsDataoutputktr());
             ktrParms.put("filename", "路牌信息_download-");
             ktrParms.putAll(params);
@@ -9,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import java.io.File;
@@ -88,8 +87,9 @@ public class ScheduleRule1FlatDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getScheduleruleDatainputktr()).toURI());
-            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            // 通用参数，转换文件路径，转换文件类路径，excel输入文件路径，错误输出文件路径
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getScheduleruleDatainputktr());
             ktrParms.put("filepath", file.getAbsolutePath());
             ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
@@ -118,8 +118,9 @@ public class ScheduleRule1FlatDataToolsImpl implements DataToolsService {
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getScheduleruleOutput()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getScheduleruleOutput());
             ktrParms.put("filename", "排版规则信息_download-");
             ktrParms.putAll(params);
@@ -24,11 +24,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StreamUtils;
 import java.awt.*;
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.List;
@@ -237,6 +238,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
     @Override
     public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
+        File template_ktr_temp_file = null;
         try {
             LOGGER.info("//---------------- 导出时刻表明细 start... ----------------//");
@@ -247,12 +249,31 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             File ktrFile2 = new File(this.getClass().getResource(
                     dataToolsProperties.getTtinfodetailOutput()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getTtinfodetailMetaoutput());
             ktrParms.put("filename", String.format("时刻表_(id=%s)_download-", String.valueOf(params.get("ttinfoid"))));
+            //---------------------- 计算template ktr（以下）-------------------//
+            /**
+             * trans_class_path 指定的ktr内部使用了 ETL Metadata Injection 步骤，内部的模版ktr必须是一个外部文件路径，无法是流
+             * 所以这里从类路径获取模版ktr流，生成一个临时ktr保存到临时目录，传递给 injectktrfile 变量
+             */
+            InputStream template_ktr_input_stream = this.getClass().getResourceAsStream(
+                    dataToolsProperties.getTtinfodetailOutput());
+            template_ktr_temp_file = Files.createTempFile(
+                    Paths.get(dataToolsProperties.getTransTempdir()),
+                    "ttInfoDetailEditTemplate_ktr_" + new DateTime().toString("yyyyMMddHHmmss"),
+                    ".ktr").toFile();
+            FileOutputStream template_ktr_output_stream = new FileOutputStream(template_ktr_temp_file);
+
+            StreamUtils.copy(template_ktr_input_stream, template_ktr_output_stream);
+
+            //---------------------- 计算template ktr（以上）-------------------//
+
             // 附加参数
-            ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
+//            ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
+            ktrParms.put("injectktrfile", template_ktr_temp_file.getAbsolutePath()); // 注入元数据的ktr文件
             ktrParms.put("ttinfoid", String.valueOf(params.get("ttinfoid")));
             DataToolsFile file = dataToolsService.exportData(ktrParms);
@@ -312,6 +333,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             LOGGER.info(sw.toString());
             throw new ScheduleException(exp.getMessage());
+        } finally {
+            if (template_ktr_temp_file != null && template_ktr_temp_file.exists()) {
+                template_ktr_temp_file.delete();
+            }
         }
     }
@@ -325,8 +350,9 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getTtinfodetailForeditktr()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名，错误输出文件路径
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名，错误输出文件路径
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("trans_class_path", dataToolsProperties.getTtinfodetailForeditktr());
             ktrParms.put("filename", "todo");
             // 附加参数
@@ -11,10 +11,16 @@ import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Sheet;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.StreamUtils;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -145,35 +151,83 @@ public class TimetableExcelDataImportStrategyImpl implements TimetableExcelDataI
         }
         // 3-3、计算ktr路径相关参数
+        File template_ktr_temp_file = null;
         try {
             // 元数据ktr
             File mktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
             ktrParams.put("transpath", mktrFile.getAbsolutePath());
+            ktrParams.put("trans_class_path", dataToolsProperties.getTtinfodetailMetadatainputktr());
             // 实际数据ktr
             if (timetableExcelFormatType == TimetableExcelFormatType.Normal) {
-                File normal_ktrFile = new File(this.getClass().getResource(
-                        dataToolsProperties.getTtinfodetailDatainputktr2version()).toURI());
-                ktrParams.put("injectktrfile", normal_ktrFile.getAbsolutePath());
+//                File normal_ktrFile = new File(this.getClass().getResource(
+//                        dataToolsProperties.getTtinfodetailDatainputktr2version()).toURI());
+//                ktrParams.put("injectktrfile", normal_ktrFile.getAbsolutePath());
+                template_ktr_temp_file = generateTemplateKtrFile(
+                        "ttInfo_input_normal_template_ktr_",
+                        ".ktr",
+                        dataToolsProperties.getTtinfodetailDatainputktr2version(),
+                        dataToolsProperties.getTransTempdir()
+                );
+                ktrParams.put("injectktrfile", template_ktr_temp_file.getAbsolutePath());
             } else if (timetableExcelFormatType == TimetableExcelFormatType.NormalWithGs) {
-                File noramlwithgs_ktrFile = new File(this.getClass().getResource(
-                        dataToolsProperties.getTtinfodetailDatainputktr2normalwithgs()).toURI());
-                ktrParams.put("injectktrfile", noramlwithgs_ktrFile.getAbsolutePath());
+//                File noramlwithgs_ktrFile = new File(this.getClass().getResource(
+//                        dataToolsProperties.getTtinfodetailDatainputktr2normalwithgs()).toURI());
+//                ktrParams.put("injectktrfile", noramlwithgs_ktrFile.getAbsolutePath());
+                template_ktr_temp_file = generateTemplateKtrFile(
+                        "ttInfo_input_noramlwithgs_template_ktr_",
+                        ".ktr",
+                        dataToolsProperties.getTtinfodetailDatainputktr2normalwithgs(),
+                        dataToolsProperties.getTransTempdir()
+                );
+                ktrParams.put("injectktrfile", template_ktr_temp_file.getAbsolutePath());
             } else if (timetableExcelFormatType == TimetableExcelFormatType.Dynamic) {
-                File dynamic_ktrFile = new File(this.getClass().getResource(
-                        dataToolsProperties.getTtinfodetailDatainputktr2version2()).toURI());
-                ktrParams.put("injectktrfile", dynamic_ktrFile.getAbsolutePath());
+//                File dynamic_ktrFile = new File(this.getClass().getResource(
+//                        dataToolsProperties.getTtinfodetailDatainputktr2version2()).toURI());
+//                ktrParams.put("injectktrfile", dynamic_ktrFile.getAbsolutePath());
+                template_ktr_temp_file = generateTemplateKtrFile(
+                        "ttInfo_input_dynamic_template_ktr_",
+                        ".ktr",
+                        dataToolsProperties.getTtinfodetailDatainputktr2version2(),
+                        dataToolsProperties.getTransTempdir()
+                );
+                ktrParams.put("injectktrfile", template_ktr_temp_file.getAbsolutePath());
             } else {
                 throw new ScheduleException("未知的TimetableExcelFormatType格式[" + timetableExcelFormatType + "]");
             }
+            // 3-4、执行ktr
+            dataToolsService.importData(fileCal, ktrParams);
+
         } catch (Exception exp) {
             exp.printStackTrace();
             throw new ScheduleException("导入时刻表异常！");
+        } finally {
+            if (template_ktr_temp_file != null && template_ktr_temp_file.exists()) {
+                template_ktr_temp_file.delete();
+            }
         }
-        // 3-4、执行ktr
-        dataToolsService.importData(fileCal, ktrParams);
+    }
+
+    /**
+     * trans_class_path 指定的ktr内部使用了 ETL Metadata Injection 步骤，内部的模版ktr必须是一个外部文件路径，无法是流
+     * 所以这里从类路径获取模版ktr流，生成一个临时ktr保存到临时目录，传递给 injectktrfile 变量
+     */
+    private File generateTemplateKtrFile(
+            String filePrefix, String fileSuffix,
+            String fileClassPath, String fileDir) throws Exception {
+        InputStream template_ktr_input_stream = this.getClass().getResourceAsStream(fileClassPath);
+        File template_ktr_temp_file = Files.createTempFile(
+                Paths.get(fileDir),
+                filePrefix + new DateTime().toString("yyyyMMddHHmmss"),
+                fileSuffix).toFile();
+        FileOutputStream template_ktr_output_stream = new FileOutputStream(template_ktr_temp_file);
+
+        StreamUtils.copy(template_ktr_input_stream, template_ktr_output_stream);
+
+        return template_ktr_temp_file;
+
     }
 }
@@ -9,10 +9,16 @@ import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.poi.ss.usermodel.Row;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.StreamUtils;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -33,6 +39,8 @@ public class TimetableExcelWithPlanInfoExportStrategyImpl implements TimetableEx
         LOG.info("---------------- 开始导出线路=[{}],日期=[{}]排班时刻信息... --------------", xl.getName(), scheduleDate);
+        File template_ktr_temp_file = null;
+
         try {
             // ---------- 1-1、创建ktr参数 --------- //
             Map<String, Object> ktrParams = new HashMap<>();
@@ -43,12 +51,33 @@ public class TimetableExcelWithPlanInfoExportStrategyImpl implements TimetableEx
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getTtinfodetailPlaninfoOutput()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名
             ktrParams.put("transpath", ktrMetaFile.getAbsolutePath());
+            ktrParams.put("trans_class_path", dataToolsProperties.getTtinfodetailPlaninfoMetaoutput());
             ktrParams.put("filename", "排班时刻表导出数据temp");
+
+            //---------------------- 计算template ktr（以下）-------------------//
+            /**
+             * trans_class_path 指定的ktr内部使用了 ETL Metadata Injection 步骤，内部的模版ktr必须是一个外部文件路径，无法是流
+             * 所以这里从类路径获取模版ktr流，生成一个临时ktr保存到临时目录，传递给 injectktrfile 变量
+             */
+            InputStream template_ktr_input_stream = this.getClass().getResourceAsStream(
+                    dataToolsProperties.getTtinfodetailPlaninfoOutput());
+            template_ktr_temp_file = Files.createTempFile(
+                    Paths.get(dataToolsProperties.getTransTempdir()),
+                    "planInfoOutputTemplate_ktr_" + new DateTime().toString("yyyyMMddHHmmss"),
+                    ".ktr").toFile();
+            FileOutputStream template_ktr_output_stream = new FileOutputStream(template_ktr_temp_file);
+
+            StreamUtils.copy(template_ktr_input_stream, template_ktr_output_stream);
+
+            //---------------------- 计算template ktr（以上）-------------------//
+
+
             // ktr附加命名参数
+//            ktrParams.put("injectktrfile", ktrFile.getAbsolutePath()); // 注入元数据的ktr文件
+            ktrParams.put("injectktrfile", template_ktr_temp_file.getAbsolutePath()); // 注入元数据的ktr文件
             ktrParams.put("xlid", xl.getId()); // 线路Id
-            ktrParams.put("injectktrfile", ktrFile.getAbsolutePath()); // 注入元数据的ktr文件
             ktrParams.put("sdate", scheduleDate.toInstant()
                     .atZone(ZoneId.systemDefault()).toLocalDate()
                     .format(DateTimeFormatter.ISO_DATE)); // 排班日期
@@ -106,6 +135,10 @@ public class TimetableExcelWithPlanInfoExportStrategyImpl implements TimetableEx
         } catch (Exception exp) {
             LOG.error("---------------- 导出线路=[{}],日期=[{}]排班时刻信息失败！ --------------", xl.getName(), scheduleDate);
             throw new ScheduleException(exp);
+        } finally {
+            if (template_ktr_temp_file != null && template_ktr_temp_file.exists()) {
+                template_ktr_temp_file.delete();
+            }
         }
     }
@@ -40,8 +40,9 @@ public class TimetableExcelWithPlanInfoViewStrategyImpl implements TimetableExce
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getTtinfodetailPlaninfoOutputEdit()).toURI());
-            // 通用参数，转换文件路径，excel输出文件名
+            // 通用参数，转换文件路径，转换文件类路径，excel输出文件名
             ktrParams.put("transpath", ktrFile.getAbsolutePath());
+            ktrParams.put("trans_class_path", dataToolsProperties.getTtinfodetailPlaninfoOutputEdit());
             ktrParams.put("filename", "排班时刻表导出edit数据");
             // ktr附加命名参数
             ktrParams.put("xlid", xl.getId()); // 线路Id
@@ -157,6 +157,12 @@ public class DataToolsServiceImpl implements DataToolsService {
                         "没有指定transpath参数值，无法确定ktr转换文件！");
             }
             File ktrFile = new File(transpath);
+
+            String transClassPath = String.valueOf(params.get("trans_class_path"));
+            if ("null".equals(transClassPath)) {
+                throw new Exception("没有指定 trans_class_path 参数值，无法确定ktr转换文件！");
+            }
+
             // 设置文件路径，错误输出文件路径参数
             params.put("filepath", file.getAbsolutePath());
             params.put("erroroutputdir", dataToolsProperties.getTransErrordir());
@@ -164,7 +170,16 @@ public class DataToolsServiceImpl implements DataToolsService {
             // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
             // 2.1、初始化kettle（组件初始化已经做了）
             // 2.2、创建转换元数据，转换
-            TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
+//            TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
+
+            // 使用流方式载入ktr
+            TransMeta transMeta = new TransMeta(
+                    this.getClass().getResourceAsStream(transClassPath),
+                    null,
+                    true,
+                    null,
+                    null);
+
             Trans trans = new Trans(transMeta);
             // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
             for (String key : params.keySet()) {
@@ -225,6 +240,12 @@ public class DataToolsServiceImpl implements DataToolsService {
                         "没有指定transpath参数值，无法确定ktr转换文件！");
             }
             File ktrFile = new File(transpath);
+
+            String transClassPath = String.valueOf(params.get("trans_class_path"));
+            if ("null".equals(transClassPath)) {
+                throw new Exception("没有指定 trans_class_path 参数值，无法确定ktr转换文件！");
+            }
+
             // 设置文件路径参数
             String filepath = dataToolsProperties.getFileoutputDir() +
                     File.separator +
@@ -238,7 +259,16 @@ public class DataToolsServiceImpl implements DataToolsService {
             // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
             // 2.1、初始化kettle（组件初始化已经做了）
             // 2.2、创建转换元数据，转换
-            TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
+//            TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
+
+            // 使用流方式载入ktr
+            TransMeta transMeta = new TransMeta(
+                    this.getClass().getResourceAsStream(transClassPath),
+                    null,
+                    true,
+                    null,
+                    null);
+
             Trans trans = new Trans(transMeta);
             // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
             for (String key : params.keySet()) {