潘钊 / bsth_control · Commits

Commit 875889e8fe7cb64245de7ff01922d0dde8907eab

Authored by 徐烜
1 parent 424d2ba5

Update

Inline Side-by-side
Showing 4 changed files with 20 additions and 3 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 4 of 7 files are displayed.

src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
  View file @875889e
@@ -169,8 +169,10 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im @@ -169,8 +169,10 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im
169 Map<String, Object> ktrParms = new HashMap<>(); 169 Map<String, Object> ktrParms = new HashMap<>();
170 File ktrFile = new File(this.getClass().getResource( 170 File ktrFile = new File(this.getClass().getResource(
171 dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI()); 171 dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
  172 +// File ktrFile2 = new File(this.getClass().getResource(
  173 +// dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
172 File ktrFile2 = new File(this.getClass().getResource( 174 File ktrFile2 = new File(this.getClass().getResource(
173 - dataToolsProperties.getTtinfodetailDatainputktr()).toURI()); 175 + dataToolsProperties.getTtinfodetailDatainputktr2()).toURI());
174 176
175 // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径 177 // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
176 ktrParms.put("transpath", ktrFile.getAbsolutePath()); 178 ktrParms.put("transpath", ktrFile.getAbsolutePath());
src/main/java/com/bsth/service/schedule/utils/DataToolsProperties.java
  View file @875889e
@@ -72,6 +72,9 @@ public class DataToolsProperties { @@ -72,6 +72,9 @@ public class DataToolsProperties {
72 /** 时刻表明细信息导入 */ 72 /** 时刻表明细信息导入 */
73 @NotNull 73 @NotNull
74 private String ttinfodetailDatainputktr; 74 private String ttinfodetailDatainputktr;
  75 + /** 时刻表明细信息导入 */
  76 + @NotNull
  77 + private String ttinfodetailDatainputktr2;
75 /** 排班规则信息导入 */ 78 /** 排班规则信息导入 */
76 @NotNull 79 @NotNull
77 private String scheduleruleDatainputktr; 80 private String scheduleruleDatainputktr;
@@ -320,4 +323,12 @@ public class DataToolsProperties { @@ -320,4 +323,12 @@ public class DataToolsProperties {
320 public void setGuideboardsDataoutputktr(String guideboardsDataoutputktr) { 323 public void setGuideboardsDataoutputktr(String guideboardsDataoutputktr) {
321 this.guideboardsDataoutputktr = guideboardsDataoutputktr; 324 this.guideboardsDataoutputktr = guideboardsDataoutputktr;
322 } 325 }
  326 +
  327 + public String getTtinfodetailDatainputktr2() {
  328 + return ttinfodetailDatainputktr2;
  329 + }
  330 +
  331 + public void setTtinfodetailDatainputktr2(String ttinfodetailDatainputktr2) {
  332 + this.ttinfodetailDatainputktr2 = ttinfodetailDatainputktr2;
  333 + }
323 } 334 }
src/main/resources/datatools/config-dev.properties
  View file @875889e
@@ -30,11 +30,13 @@ datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr @@ -30,11 +30,13 @@ datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr
30 # 时刻表基础信息导入 30 # 时刻表基础信息导入
31 datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr 31 datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr
32 # 时刻表明细信息导入（元数据） 32 # 时刻表明细信息导入（元数据）
33 -datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailMetaData.ktr 33 +datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
34 # 时刻表明细编辑用数据 34 # 时刻表明细编辑用数据
35 datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr 35 datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
36 # 时刻表明细信息导入 36 # 时刻表明细信息导入
37 datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr 37 datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
  38 +# 时刻表明细信息导入2
  39 +datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
38 40
39 # 车辆配置信息导入 41 # 车辆配置信息导入
40 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr 42 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr
src/main/resources/datatools/config-prod.properties
  View file @875889e
@@ -31,11 +31,13 @@ datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr @@ -31,11 +31,13 @@ datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr
31 # 时刻表基础信息导入 31 # 时刻表基础信息导入
32 datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr 32 datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr
33 # 时刻表明细信息导入（元数据） 33 # 时刻表明细信息导入（元数据）
34 -datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailMetaData.ktr 34 +datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
35 # 时刻表明细编辑用数据 35 # 时刻表明细编辑用数据
36 datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr 36 datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
37 # 时刻表明细信息导入 37 # 时刻表明细信息导入
38 datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr 38 datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
  39 +# 时刻表明细信息导入2
  40 +datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
39 41
40 # 车辆配置信息导入 42 # 车辆配置信息导入
41 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr 43 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr