时刻表数据带线路版本v2

1、修改导入时的判定，全部要带版本，选择当前也要差当前版本号 2、修改导入时的判定逻辑，带线路版本，excel里站点名使用正则表达式->{数字}过滤，站点名不用like用eq 3、修改导入ktr，站点名过滤的正则表达式修改为 /->\d+/g，明细数据插入时带版本 4、修改导出ktr，站点名后加->{数字} 5、修改导入ktr的文件名，并修改相应的配置类 6、修改相关的前端页面及js

时刻表数据带线路版本v2
1、修改导入时的判定，全部要带版本，选择当前也要差当前版本号 2、修改导入时的判定逻辑，带线路版本，excel里站点名使用正则表达式->{数字}过滤，站点名不用like用eq 3、修改导入ktr，站点名过滤的正则表达式修改为 /->\d+/g，明细数据插入时带版本 4、修改导出ktr，站点名后加->{数字} 5、修改导入ktr的文件名，并修改相应的配置类 6、修改相关的前端页面及js
徐烜
1 parent 55bc42ec
Showing 7 changed files with 47 additions and 70 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/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/utils/DataToolsProperties.java
src/main/resources/datatools/config-dev.properties
src/main/resources/datatools/config-prod.properties
@@ -32,30 +32,18 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
      * @param sheetname sheet名字
      * @param lineid 线路id
      * @param linename 线路名称
+     * @param lineversion 线路版本
      * @return
      */
     @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST)
     public Map<String, Object> validate_sheet(
-            String filename, String sheetname, Integer lineid, String linename,
-            Integer zdlytype, Integer zdlyversion) {
+            String filename, String sheetname, Integer lineid, String linename, Integer lineversion) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            if (zdlytype == null) {
-                throw new Exception("请选择路由版本类型");
-            } else {
-                if (zdlytype == 1) {
-                    ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, null);
-                } else if (zdlytype == 2) {
-                    if (zdlyversion == null || zdlyversion == -1) {
-                        throw new Exception("请选择具体版本");
-                    } else {
-                        ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, zdlyversion);
-                    }
-                } else {
-                    throw new Exception("未知路由版本类型");
-                }
+            if (lineversion == null) {
+                throw new Exception("线路版本未知");
             }
-
+            ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, lineversion);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -34,14 +34,14 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
      * @param filename excel文件全路径名
      * @param sheetname sheet名字
      * @param lineid 线路id
-     * @param zdlyversion 站点路由版本
+     * @param lineversion 线路版本
      */
     void validateExcelSheet(
             String filename,
             String sheetname,
             Integer lineid,
             String linename,
-            Integer zdlyversion) throws ScheduleException;
+            Integer lineversion) throws ScheduleException;
     /**
      * 验证关联的线路标准信息（以后放到规则引擎里去做）。
@@ -72,6 +72,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         try {
             LOGGER.info("//---------------- 导入时刻表明细 start... ----------------//");
+            if (params.get("lineversion") == null) {
+                throw new Exception("线路版本未知");
+            }
+
             String filename = file.getAbsolutePath(); // xls xlsx 文件名
             String sheetname = String.valueOf(params.get("sheetname")); // sheet名字
             Long ttid = Long.valueOf(String.valueOf(params.get("ttid"))); // 时刻表id
@@ -79,7 +83,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             Integer lineid = Integer.valueOf(String.valueOf(params.get("lineinfo"))); // 线路标准id
             String xlname = String.valueOf(params.get("xlname")); // 线路名字
             String ttname = String.valueOf(params.get("ttname")); // 时刻表名字
-            Integer zdlyversion = params.get("zdlyversion") == null ? null : Integer.valueOf(params.get("zdlyversion").toString());
+            Integer lineversion = Integer.valueOf(params.get("lineversion").toString());
             LOGGER.info("参数1, xls文件名={},sheet名字={}", filename, sheetname);
             LOGGER.info("参数2, 线路id={},线路名字={}", xlid, xlname);
@@ -149,30 +153,27 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             // 创建ktr转换所需参数
             Map<String, Object> ktrParms = new HashMap<>();
-            File ktrFile = new File(this.getClass().getResource(
+            // 元数据ktr
+            File mktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
-//            File ktrFile2 = new File(this.getClass().getResource(
-//                    dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
-            File ktrFile2 = new File(this.getClass().getResource(
-                    dataToolsProperties.getTtinfodetailDatainputktr2()).toURI());
-            File ktrFile2_ls = new File(this.getClass().getResource(
-                    dataToolsProperties.getTtinfodetailDatainputktr2ls()).toURI());
+            // 实际数据ktr
+            File ktrFile2_version = new File(this.getClass().getResource(
+                    dataToolsProperties.getTtinfodetailDatainputktr2version()).toURI());
             // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
-            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("transpath", mktrFile.getAbsolutePath());
             ktrParms.put("filepath", fileCal.getAbsolutePath());
             ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
             // 附加参数
-            ktrParms.put("injectktrfile", zdlyversion == null || zdlyversion == -1 ?
-                    ktrFile2.getAbsolutePath() : ktrFile2_ls.getAbsolutePath()); // 注入元数据的ktr文件
+            ktrParms.put("injectktrfile", ktrFile2_version.getAbsolutePath()); // 注入元数据的ktr文件
             ktrParms.put("sheetname", sheetname); // sheet工作区的名字
             ktrParms.put("lineinfoid", lineid); // 线路标准id
             ktrParms.put("xlname", xlname); // 线路名称
             ktrParms.put("xlid", xlid); // 线路id
             ktrParms.put("ttinfoname", ttname); // 时刻表名称
             ktrParms.put("ttid", ttid.intValue()); // 时刻表id
-            ktrParms.put("zdlyversion", zdlyversion); // 站点路由版本
+            ktrParms.put("lineversion", lineversion); // 站点路由版本
             ktrParms.put("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名，以逗号连接
             columnames.remove(0);
             ktrParms.put("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名，以逗号连接
@@ -146,7 +146,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     }
     @Override
-    public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename, Integer zdlyversion) throws ScheduleException {
+    public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename, Integer lineversion) throws ScheduleException {
         try {
             File file = new File(filename);
             Workbook workbook;
@@ -178,7 +178,10 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                         } else {
                             // 正则表达式去除右侧数字
 //                            cell_con = cell_con.replaceAll("[\\d+]", "");
-                            cell_con = cell_con.replaceAll("(\\d+)$", "");
+//                            cell_con = cell_con.replaceAll("(\\d+)$", "");
+
+                            // 如果站名中有类似->{数字}，使用正则表达式过滤掉
+                            cell_con = cell_con.replaceAll("(->\\d+)", "");
                             if (i == 0) { // 第一列必须是路牌2个字
                                 if (!"路牌".equals(cell_con.trim())) {
@@ -189,35 +192,20 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                                         (!"进场".equals(cell_con.trim()))) {
                                     Map<String, Object> p1 = new HashMap<>();
                                     p1.put("line.id_eq", lineid);
-                                    p1.put("stationName_like", cell_con.trim() + "%"); // 使用模糊匹配
-                                    p1.put("stationMark_eq", "B");
+                                    p1.put("stationName_eq", cell_con.trim());
+                                    p1.put("stationMark_eq", "B"); // 起点站
                                     p1.put("destroy_eq", 0); // 未撤销
-
-
-                                    // TODO：这里要修改（起点站有启用撤销的标志的）
-
-                                    if (zdlyversion == null) {
-                                        List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
-                                        if (CollectionUtils.isEmpty(stationRouteList)) {
-                                            throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
-                                        } else if (stationRouteList.size() > 1) {
-                                            throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
-                                        } else if (StringUtils.isEmpty(stationRouteList.get(0).getStationCode())) {
-                                            throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中没有站点编码", i + 1, cell_con.trim(), linename));
-                                        }
-                                    } else {
-                                        p1.put("versions_eq", zdlyversion);
-                                        List<LsStationRoute> lsStationRoutes = (List<LsStationRoute>) stationRouteService.list_ls(p1);
-                                        if (CollectionUtils.isEmpty(lsStationRoutes)) {
-                                            throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
-                                        } else if (lsStationRoutes.size() > 1) {
-                                            throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
-                                        } else if (StringUtils.isEmpty(lsStationRoutes.get(0).getStationCode())) {
-                                            throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中没有站点编码", i + 1, cell_con.trim(), linename));
-                                        }
+                                    p1.put("versions_eq", lineversion); // 带线路版本
+
+                                    List<LsStationRoute> lsStationRoutes = (List<LsStationRoute>) stationRouteService.list_ls(p1);
+                                    if (CollectionUtils.isEmpty(lsStationRoutes)) {
+                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename));
+                                    } else if (lsStationRoutes.size() > 1) {
+                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename));
+                                    } else if (StringUtils.isEmpty(lsStationRoutes.get(0).getStationCode())) {
+                                        throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中没有站点编码", i + 1, cell_con.trim(), linename));
                                     }
-
                                 }
                             }
@@ -75,12 +75,12 @@ public class DataToolsProperties {
     /** 时刻表明细信息导入 */
     @NotNull
     private String ttinfodetailDatainputktr;
-    /** 时刻表明细信息导入 */
+    /** 时刻表明细信息导入2 */
     @NotNull
     private String ttinfodetailDatainputktr2;
-    /** 时刻表明细信息导入 */
+    /** 时刻表明细信息导入2（带版本） */
     @NotNull
-    private String ttinfodetailDatainputktr2ls;
+    private String ttinfodetailDatainputktr2version;
     /** 排班规则信息导入 */
     @NotNull
     private String scheduleruleDatainputktr;
@@ -314,12 +314,12 @@ public class DataToolsProperties {
         this.carsconfigDataoutputktr = carsconfigDataoutputktr;
     }
-    public String getTtinfodetailDatainputktr2ls() {
-        return ttinfodetailDatainputktr2ls;
+    public String getTtinfodetailDatainputktr2version() {
+        return ttinfodetailDatainputktr2version;
     }
-    public void setTtinfodetailDatainputktr2ls(String ttinfodetailDatainputktr2ls) {
-        this.ttinfodetailDatainputktr2ls = ttinfodetailDatainputktr2ls;
+    public void setTtinfodetailDatainputktr2version(String ttinfodetailDatainputktr2version) {
+        this.ttinfodetailDatainputktr2version = ttinfodetailDatainputktr2version;
     }
     public String getEmployeesconfigDataoutputktr() {
@@ -39,8 +39,8 @@ datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
 datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
 # 时刻表明细信息导入2
 datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
-# 时刻表明细信息导入2_ls
-datatools.ttinfodetail_datainputktr2ls=/datatools/ktrs/ttinfodetailDataInput2_ls.ktr
+# 时刻表明细信息导入2（版本化）
+datatools.ttinfodetail_datainputktr2version=/datatools/ktrs/ttinfodetailDataInput2_version.ktr
 # 车辆配置信息导入
 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr
@@ -40,8 +40,8 @@ datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
 datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
 # 时刻表明细信息导入2
 datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
-# 时刻表明细信息导入2_ls
-datatools.ttinfodetail_datainputktr2ls=/datatools/ktrs/ttinfodetailDataInput2_ls.ktr
+# 时刻表明细信息导入2（版本化）
+datatools.ttinfodetail_datainputktr2version=/datatools/ktrs/ttinfodetailDataInput2_version.ktr
 # 车辆配置信息导入
 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr