Update

徐烜
1 parent c81af188
Showing 8 changed files with 298 additions and 283 deletions
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/service/schedule/TTInfoDetailService.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailForEdit.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/utils/DataToolsServiceImpl.java
src/main/resources/application-dev.properties
src/test/resources/testdata/problem.properties
@@ -4,6 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -73,9 +74,13 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
     @RequestMapping(value = "/edit/{xlid}/{ttid}", method = RequestMethod.GET)
     public Map<String, Object> getEditInfo(@PathVariable("xlid") Integer xlid,
                                            @PathVariable("ttid") Long ttid) {
+
+        // 获取最大的发车数，用于输出数据的数量
+        Long maxfcno = ttInfoDetailService.findMaxFcno(xlid, ttid);
+
         Map<String, Object> rtn = new HashMap<>();
         try {
-            TTInfoDetailService.EditInfo editInfo = ttInfoDetailService.getEditInfo(xlid, ttid);
+            TTInfoDetailForEdit.EditInfo editInfo = ttInfoDetailService.getEditInfo(xlid, ttid, maxfcno);
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("data", editInfo);
         } catch (Exception exp) {
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.exception.ScheduleException;
-import org.apache.commons.lang3.StringUtils;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -14,157 +13,21 @@ import java.util.Map;
 public interface TTInfoDetailService extends BService<TTInfoDetail, Long> {
     /**
-     * 发车信息内部类。
-     */
-    public static class FcInfo {
-        /** 时刻明细id */
-        private Long ttdid;
-        /** 发车时间 */
-        private String fcsj;
-        /** 班次类型 */
-        private String bc_type;
-        /** 线路上下行 */
-        private String xldir;
-        /** 是偶分班 */
-        private Boolean isfb;
-
-        /** 起点站code */
-        private String qdzCode;
-        /** 终点站code */
-        private String zdzCode;
-
-        public FcInfo() {
-        }
-
-        public FcInfo(
-                String ttdid_str,
-                String bc_type,
-                String fcsj,
-                String xldir,
-                String isfb,
-                String qdzCode,
-                String zdzCode) {
-            this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
-            this.bc_type = bc_type;
-            this.fcsj = fcsj;
-            this.xldir = xldir;
-            if ("N".equals(isfb))
-                this.isfb = false;
-            else if ("Y".equals(isfb) || "true".equals(isfb))
-                this.isfb = true;
-            else
-                this.isfb = false;
-
-            if (StringUtils.isNotEmpty(qdzCode) && !"null".equals(qdzCode)) {
-                this.qdzCode = qdzCode;
-            }
-            if (StringUtils.isNotEmpty(zdzCode) && !"null".equals(zdzCode)) {
-                this.zdzCode = zdzCode;
-            }
-
-        }
-
-        public Long getTtdid() {
-            return ttdid;
-        }
-
-        public void setTtdid(Long ttdid) {
-            this.ttdid = ttdid;
-        }
-
-        public String getFcsj() {
-            return fcsj;
-        }
-
-        public void setFcsj(String fcsj) {
-            this.fcsj = fcsj;
-        }
-
-        public String getBc_type() {
-            return bc_type;
-        }
-
-        public void setBc_type(String bc_type) {
-            this.bc_type = bc_type;
-        }
-
-        public String getXldir() {
-            return xldir;
-        }
-
-        public void setXldir(String xldir) {
-            this.xldir = xldir;
-        }
-
-        public Boolean getIsfb() {
-            return isfb;
-        }
-
-        public void setIsfb(Boolean isfb) {
-            this.isfb = isfb;
-        }
-
-        public String getQdzCode() {
-            return qdzCode;
-        }
-
-        public void setQdzCode(String qdzCode) {
-            this.qdzCode = qdzCode;
-        }
-
-        public String getZdzCode() {
-            return zdzCode;
-        }
-
-        public void setZdzCode(String zdzCode) {
-            this.zdzCode = zdzCode;
-        }
-    }
-
-    /**
-     * 时刻表编辑用的返回数据。
+     * 获取待编辑的数据。
+     * @param xlid 线路id
+     * @param ttid 时刻表id
+     * @param maxfcno 最大发车顺序号
+     * @return
      */
-    public static class EditInfo {
-        /** 标题数据 */
-        private List<String> header = new ArrayList<>();
-        /** 内容数据 */
-        private List<List<FcInfo>> contents = new ArrayList<>();
-
-        /** 营运描述 */
-        private String yy_desc;
-
-        public List<String> getHeader() {
-            return header;
-        }
-
-        public void setHeader(List<String> header) {
-            this.header = header;
-        }
-
-        public List<List<FcInfo>> getContents() {
-            return contents;
-        }
-
-        public void setContents(List<List<FcInfo>> contents) {
-            this.contents = contents;
-        }
-
-        public String getYy_desc() {
-            return yy_desc;
-        }
-
-        public void setYy_desc(String yy_desc) {
-            this.yy_desc = yy_desc;
-        }
-    }
+    TTInfoDetailForEdit.EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException;
     /**
-     * 获取待编辑的数据。
+     * 获取时刻表最大发车顺序号
      * @param xlid 线路id
-     * @param ttid 时刻表id
+     * @param ttinfoid 时刻表id
      * @return
      */
-    EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException;
+    Long findMaxFcno(Integer xlid, Long ttinfoid);
     /**
      * 验证sheet（以后放到规则引擎里去做）。
@@ -21,10 +21,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * Created by xu on 17/5/16.
@@ -206,8 +203,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
     }
     @Override
-    public File exportDataForEdit(Integer xlid, Long ttid) throws ScheduleException {
+    public EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException {
         try {
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 start... ----------------//");
+
             // 创建ktr转换所需参数
             Map<String, Object> ktrParms = new HashMap<>();
             File ktrFile = new File(this.getClass().getResource(
@@ -225,9 +224,115 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             ktrParms.put("xlid", String.valueOf(xlid));
             ktrParms.put("ttid", String.valueOf(ttid));
-            return dataToolsService.exportData(ktrParms);
+            dataToolsService.exportData(ktrParms);
+
+            EditInfo editInfo = new EditInfo(); // 输出数据
+
+
+            // 1.6、获取最大的发车数，用于输出数据的数量
+            LOGGER.info("最大发车顺序号={}", maxfcno);
+            if (maxfcno != null) {
+                // 2、读取ktr生成的excel数据，组织编辑用数据返回
+                // 2-1、读取Excel文件
+                Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
+                        File.separator + outputFilePath + ".xls"));
+                Sheet sheet = book.getSheet(0);
+
+                // 2-2、处理数据
+                int all_bc_ks = 0; // 总空驶班次
+                int all_bc_yy = 0; // 总营运班次
+                double all_lc_ks = 0; // 总空驶里程
+                double all_lc_yy = 0; // 总营运里程
+
+                String[] headarrays = new String[maxfcno.intValue() + 3];
+                headarrays[0] = "路牌";
+                headarrays[maxfcno.intValue() + 1] = "空驶班次/空驶里程";
+                headarrays[maxfcno.intValue() + 2] = "运营班次/运营里程";
+
+                for (int r = 1; r < sheet.getRows(); r++) {
+                    List<FcInfo> fcInfos = new ArrayList<>();
+                    // 每行第一列都是路牌
+                    fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null)); // 用fcsj放置路牌显示
+
+                    int bc_ks = 0; // 空驶班次
+                    int bc_yy = 0; // 营运班次
+                    double lc_ks = 0; // 空驶里程
+                    double lc_yy = 0; // 营运里程
+
+                    for (int c = 1; c <= maxfcno; c++) {
+                        String content_str = sheet.getCell(c, r).getContents();
+                        try {
+                            String[] content = StringUtils.isEmpty(content_str) ? null : content_str.split(","); // 总的内容
+
+                            String ttdid_str = content == null ? "" : content[0]; // 时刻表明细id
+                            String fcsj = content == null ? "" : content[1]; // 发车时间
+                            String jhlc = content == null ? "" : content[2]; // 计划里程
+                            String fzdname = content == null ? "" : content[3]; // 发车站点名称
+                            String bctype = content == null ? "" : content[4]; // 班次类型
+                            String xldir = content == null ? "" : content[5]; // 线路上下行
+                            String isfb = content == null ? "" : content[6]; // 是否分班
+
+                            String qdzCode = content == null ? "" : content[7]; // 起点站编码
+                            String zdzCode = content == null ? "" : content[8]; // 终点站编码
+
+                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode);
+
+                            if (StringUtils.isNotEmpty(fzdname))
+                                headarrays[c] = fzdname;
+                            fcInfos.add(fcInfo);
+
+
+                            // 计算班次里程
+                            if (StringUtils.isNotEmpty(jhlc)) {
+                                if ("in".equals(bctype) || "out".equals(bctype) || "ldks".equals(bctype)) {
+                                    bc_ks += 1;
+                                    lc_ks += Double.valueOf(jhlc);
+
+                                    all_bc_ks += 1;
+                                    all_lc_ks += Double.valueOf(jhlc);
+
+                                } else {
+                                    bc_yy += 1;
+                                    lc_yy += Double.valueOf(jhlc);
+
+                                    all_bc_yy += 1;
+                                    all_lc_yy += Double.valueOf(jhlc);
+                                }
+                            }
+
+                        } catch (Exception exp) {
+                            exp.printStackTrace();
+                            LOGGER.info("第{}行，第{}列数据有问题，数据={}，异常message={}", r, c, content_str, exp.getCause());
+                            break;
+                        }
+
+                    }
+
+                    // 添加一列 空驶班次/空驶里程，fcsj放置数据
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null));
+
+                    // 添加一列 营运班次/营运里程，fcsj放置数据
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null));
+
+                    editInfo.getContents().add(fcInfos);
+                }
+                editInfo.getHeader().addAll(Arrays.asList(headarrays));
+
+                editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.3f,营运里程=%.3f,总里程=%.3f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy, all_lc_ks + all_lc_yy));
+            }
+
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
+
+            return editInfo;
         } catch (Exception exp) {
-            throw new ScheduleException(exp);
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
         }
     }
+
 }
 package com.bsth.service.schedule.datatools;
 import com.bsth.service.schedule.exception.ScheduleException;
+import org.apache.commons.lang3.StringUtils;
-import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * Created by xu on 17/5/16.
  */
 public interface TTInfoDetailForEdit {
-    File exportDataForEdit(Integer xlid, Long ttid) throws ScheduleException;
+    /**
+     * 发车信息内部类。
+     */
+    public static class FcInfo {
+        /** 时刻明细id */
+        private Long ttdid;
+        /** 发车时间 */
+        private String fcsj;
+        /** 班次类型 */
+        private String bc_type;
+        /** 线路上下行 */
+        private String xldir;
+        /** 是偶分班 */
+        private Boolean isfb;
+
+        /** 起点站code */
+        private String qdzCode;
+        /** 终点站code */
+        private String zdzCode;
+
+        public FcInfo() {
+        }
+
+        public FcInfo(
+                String ttdid_str,
+                String bc_type,
+                String fcsj,
+                String xldir,
+                String isfb,
+                String qdzCode,
+                String zdzCode) {
+            this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
+            this.bc_type = bc_type;
+            this.fcsj = fcsj;
+            this.xldir = xldir;
+            if ("N".equals(isfb))
+                this.isfb = false;
+            else if ("Y".equals(isfb) || "true".equals(isfb))
+                this.isfb = true;
+            else
+                this.isfb = false;
+
+            if (StringUtils.isNotEmpty(qdzCode) && !"null".equals(qdzCode)) {
+                this.qdzCode = qdzCode;
+            }
+            if (StringUtils.isNotEmpty(zdzCode) && !"null".equals(zdzCode)) {
+                this.zdzCode = zdzCode;
+            }
+
+        }
+
+        public Long getTtdid() {
+            return ttdid;
+        }
+
+        public void setTtdid(Long ttdid) {
+            this.ttdid = ttdid;
+        }
+
+        public String getFcsj() {
+            return fcsj;
+        }
+
+        public void setFcsj(String fcsj) {
+            this.fcsj = fcsj;
+        }
+
+        public String getBc_type() {
+            return bc_type;
+        }
+
+        public void setBc_type(String bc_type) {
+            this.bc_type = bc_type;
+        }
+
+        public String getXldir() {
+            return xldir;
+        }
+
+        public void setXldir(String xldir) {
+            this.xldir = xldir;
+        }
+
+        public Boolean getIsfb() {
+            return isfb;
+        }
+
+        public void setIsfb(Boolean isfb) {
+            this.isfb = isfb;
+        }
+
+        public String getQdzCode() {
+            return qdzCode;
+        }
+
+        public void setQdzCode(String qdzCode) {
+            this.qdzCode = qdzCode;
+        }
+
+        public String getZdzCode() {
+            return zdzCode;
+        }
+
+        public void setZdzCode(String zdzCode) {
+            this.zdzCode = zdzCode;
+        }
+    }
+
+    /**
+     * 时刻表编辑用的返回数据。
+     */
+    public static class EditInfo {
+        /** 标题数据 */
+        private List<String> header = new ArrayList<>();
+        /** 内容数据 */
+        private List<List<FcInfo>> contents = new ArrayList<>();
+
+        /** 营运描述 */
+        private String yy_desc;
+
+        public List<String> getHeader() {
+            return header;
+        }
+
+        public void setHeader(List<String> header) {
+            this.header = header;
+        }
+
+        public List<List<FcInfo>> getContents() {
+            return contents;
+        }
+
+        public void setContents(List<List<FcInfo>> contents) {
+            this.contents = contents;
+        }
+
+        public String getYy_desc() {
+            return yy_desc;
+        }
+
+        public void setYy_desc(String yy_desc) {
+            this.yy_desc = yy_desc;
+        }
+    }
+
+    /**
+     * 获取待编辑的数据。
+     * @param xlid 线路id
+     * @param ttid 时刻表id
+     * @param maxfcno 最大发车顺序号
+     * @return
+     */
+    EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException;
+
 }
@@ -69,8 +69,6 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     @Autowired
     private TTInfoDetailRepository ttInfoDetailRepository;
     @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
     private LineRepository lineRepository;
     @Autowired
     private TTInfoRepository infoRepository;
@@ -114,6 +112,11 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     }
     @Override
+    public Long findMaxFcno(Integer xlid, Long ttinfoid) {
+        return ttInfoDetailRepository.findMaxFcno(xlid, ttinfoid);
+    }
+
+    @Override
     public TTInfoDetail findById(Long aLong) {
         return ttInfoDetailRepository.findOneExtend(aLong);
     }
@@ -135,128 +138,12 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
         return dataToolsService.exportData(params);
     }
-    @Override
-    public TTInfoDetailService.EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException {
-        try {
-            LOGGER.info("//---------------- 时刻表编辑用数据输出 start... ----------------//");
-
-            // 附加参数
-            String outputFilePath = String.format("ttinfodetail_(id=%s)_foredit-%s",
-                    String.valueOf(ttid), new DateTime().toString("yyyyMMddHHmmss"));
-
-            ttInfoDetailForEdit.exportDataForEdit(xlid, ttid);
-
-            TTInfoDetailService.EditInfo editInfo = new TTInfoDetailService.EditInfo(); // 输出数据
-
-            // 1.6、获取最大的发车数，用于输出数据的数量
-            Long maxfcno = ttInfoDetailRepository.findMaxFcno(xlid, ttid);
-            LOGGER.info("最大发车顺序号={}", maxfcno);
-            if (maxfcno != null) {
-                // 2、读取ktr生成的excel数据，组织编辑用数据返回
-                // 2-1、读取Excel文件
-                Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
-                        File.separator + outputFilePath + ".xls"));
-                Sheet sheet = book.getSheet(0);
-
-                // 2-2、处理数据
-                int all_bc_ks = 0; // 总空驶班次
-                int all_bc_yy = 0; // 总营运班次
-                double all_lc_ks = 0; // 总空驶里程
-                double all_lc_yy = 0; // 总营运里程
-
-                String[] headarrays = new String[maxfcno.intValue() + 3];
-                headarrays[0] = "路牌";
-                headarrays[maxfcno.intValue() + 1] = "空驶班次/空驶里程";
-                headarrays[maxfcno.intValue() + 2] = "运营班次/运营里程";
-
-                for (int r = 1; r < sheet.getRows(); r++) {
-                    List<TTInfoDetailService.FcInfo> fcInfos = new ArrayList<>();
-                    // 每行第一列都是路牌
-                    fcInfos.add(new TTInfoDetailService.FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null)); // 用fcsj放置路牌显示
-
-                    int bc_ks = 0; // 空驶班次
-                    int bc_yy = 0; // 营运班次
-                    double lc_ks = 0; // 空驶里程
-                    double lc_yy = 0; // 营运里程
-
-                    for (int c = 1; c <= maxfcno; c++) {
-                        String content_str = sheet.getCell(c, r).getContents();
-                        try {
-                            String[] content = StringUtils.isEmpty(content_str) ? null : content_str.split(","); // 总的内容
-
-                            String ttdid_str = content == null ? "" : content[0]; // 时刻表明细id
-                            String fcsj = content == null ? "" : content[1]; // 发车时间
-                            String jhlc = content == null ? "" : content[2]; // 计划里程
-                            String fzdname = content == null ? "" : content[3]; // 发车站点名称
-                            String bctype = content == null ? "" : content[4]; // 班次类型
-                            String xldir = content == null ? "" : content[5]; // 线路上下行
-                            String isfb = content == null ? "" : content[6]; // 是否分班
-
-                            String qdzCode = content == null ? "" : content[7]; // 起点站编码
-                            String zdzCode = content == null ? "" : content[8]; // 终点站编码
-
-                            TTInfoDetailService.FcInfo fcInfo = new TTInfoDetailService.FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode);
-
-                            if (StringUtils.isNotEmpty(fzdname))
-                                headarrays[c] = fzdname;
-                            fcInfos.add(fcInfo);
-
-
-                            // 计算班次里程
-                            if (StringUtils.isNotEmpty(jhlc)) {
-                                if ("in".equals(bctype) || "out".equals(bctype) || "ldks".equals(bctype)) {
-                                    bc_ks += 1;
-                                    lc_ks += Double.valueOf(jhlc);
-
-                                    all_bc_ks += 1;
-                                    all_lc_ks += Double.valueOf(jhlc);
-
-                                } else {
-                                    bc_yy += 1;
-                                    lc_yy += Double.valueOf(jhlc);
-
-                                    all_bc_yy += 1;
-                                    all_lc_yy += Double.valueOf(jhlc);
-                                }
-                            }
-
-                        } catch (Exception exp) {
-                            exp.printStackTrace();
-                            LOGGER.info("第{}行，第{}列数据有问题，数据={}，异常message={}", r, c, content_str, exp.getCause());
-                            break;
-                        }
-
-                    }
-
-                    // 添加一列 空驶班次/空驶里程，fcsj放置数据
-                    fcInfos.add(new TTInfoDetailService.FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null));
-
-                    // 添加一列 营运班次/营运里程，fcsj放置数据
-                    fcInfos.add(new TTInfoDetailService.FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null));
-                    editInfo.getContents().add(fcInfos);
-                }
-                editInfo.getHeader().addAll(Arrays.asList(headarrays));
-
-                editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.3f,营运里程=%.3f,总里程=%.3f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy, all_lc_ks + all_lc_yy));
-            }
-
-            LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
-
-            return editInfo;
-        } catch (Exception exp) {
-            LOGGER.info("//---------------- 时刻表编辑用数据输出 failed... ----------------//");
-
-            StringWriter sw = new StringWriter();
-            exp.printStackTrace(new PrintWriter(sw));
-            LOGGER.info(sw.toString());
-
-            throw new ScheduleException(exp.getMessage());
-        }
+    @Override
+    public TTInfoDetailForEdit.EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException {
+        return ttInfoDetailForEdit.getEditInfo(xlid, ttid, maxfcno);
     }
-
-
     @Override
     public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename) throws ScheduleException {
         try {
@@ -125,7 +125,7 @@ public class DataToolsServiceImpl implements DataToolsService {
             exp.printStackTrace(new PrintWriter(sw));
             LOGGER.info(sw.toString());
-            throw new ScheduleException("上传文件错误！");
+            throw new ScheduleException(exp);
         }
     }
@@ -184,7 +184,7 @@ public class DataToolsServiceImpl implements DataToolsService {
             exp.printStackTrace(new PrintWriter(sw));
             LOGGER.info(sw.toString());
-            throw new ScheduleException("导入数据错误！");
+            throw new ScheduleException(exp);
         } finally {
             // 清除日志操作
             KettleLogStore.discardLines(transLogId, true);
@@ -259,7 +259,7 @@ public class DataToolsServiceImpl implements DataToolsService {
             exp.printStackTrace(new PrintWriter(sw));
             LOGGER.info(sw.toString());
-            throw new ScheduleException("导出数据错误！");
+            throw new ScheduleException(exp);
         } finally {
             // 清除日志操作
             KettleLogStore.discardLines(transLogId, true);
@@ -6,7 +6,7 @@ spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
-spring.jpa.show-sql= true
+spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
@@ -20,7 +20,7 @@
 20=排班规则备注
 ##21=时刻表，两点间空驶，算空驶
 22=搭班编码自动生成
-23=时刻表明细修改终点站停驶（停止1个半小时以上）
+##23=时刻表明细修改终点站停驶（停止1个半小时以上）
 ##24=线路标准里如果里程是0，用标准里程
 ##25=规则导出的日期格式修正
 ##26=人员录入，工号规则前加 "{公司编码}-"