Commit df0f514bd657bd94263d366e81a4b4c7e857c353
Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
Showing
21 changed files
with
681 additions
and
368 deletions
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
| @@ -55,6 +55,23 @@ public class TTInfoController extends BController<TTInfo, Long> { | @@ -55,6 +55,23 @@ public class TTInfoController extends BController<TTInfo, Long> { | ||
| 55 | return rtn; | 55 | return rtn; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | + @RequestMapping(value = "/versiondesc2/{lineid}/{status}") | ||
| 59 | + public Map<String, Object> getLineVersionDesc2( | ||
| 60 | + @PathVariable(value = "lineid") Integer lineid, | ||
| 61 | + @PathVariable(value = "status") Integer status) { | ||
| 62 | + Map<String, Object> rtn = new HashMap<>(); | ||
| 63 | + try { | ||
| 64 | + rtn.put("status", ResponseCode.SUCCESS); | ||
| 65 | + rtn.put("data", ttInfoService.getLineVersions(lineid, status)); | ||
| 66 | + | ||
| 67 | + } catch (Exception exp) { | ||
| 68 | + rtn.put("status", ResponseCode.ERROR); | ||
| 69 | + rtn.put("msg", exp.getMessage()); | ||
| 70 | + } | ||
| 71 | + | ||
| 72 | + return rtn; | ||
| 73 | + } | ||
| 74 | + | ||
| 58 | @RequestMapping(value = "/validate_name", method = RequestMethod.GET) | 75 | @RequestMapping(value = "/validate_name", method = RequestMethod.GET) |
| 59 | public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) { | 76 | public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) { |
| 60 | Map<String, Object> rtn = new HashMap<>(); | 77 | Map<String, Object> rtn = new HashMap<>(); |
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
| @@ -32,30 +32,18 @@ public class TTInfoDetailController extends BController<TTInfoDetail, Long> { | @@ -32,30 +32,18 @@ public class TTInfoDetailController extends BController<TTInfoDetail, Long> { | ||
| 32 | * @param sheetname sheet名字 | 32 | * @param sheetname sheet名字 |
| 33 | * @param lineid 线路id | 33 | * @param lineid 线路id |
| 34 | * @param linename 线路名称 | 34 | * @param linename 线路名称 |
| 35 | + * @param lineversion 线路版本 | ||
| 35 | * @return | 36 | * @return |
| 36 | */ | 37 | */ |
| 37 | @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST) | 38 | @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST) |
| 38 | public Map<String, Object> validate_sheet( | 39 | public Map<String, Object> validate_sheet( |
| 39 | - String filename, String sheetname, Integer lineid, String linename, | ||
| 40 | - Integer zdlytype, Integer zdlyversion) { | 40 | + String filename, String sheetname, Integer lineid, String linename, Integer lineversion) { |
| 41 | Map<String, Object> rtn = new HashMap<>(); | 41 | Map<String, Object> rtn = new HashMap<>(); |
| 42 | try { | 42 | try { |
| 43 | - if (zdlytype == null) { | ||
| 44 | - throw new Exception("请选择路由版本类型"); | ||
| 45 | - } else { | ||
| 46 | - if (zdlytype == 1) { | ||
| 47 | - ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, null); | ||
| 48 | - } else if (zdlytype == 2) { | ||
| 49 | - if (zdlyversion == null || zdlyversion == -1) { | ||
| 50 | - throw new Exception("请选择具体版本"); | ||
| 51 | - } else { | ||
| 52 | - ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, zdlyversion); | ||
| 53 | - } | ||
| 54 | - } else { | ||
| 55 | - throw new Exception("未知路由版本类型"); | ||
| 56 | - } | 43 | + if (lineversion == null) { |
| 44 | + throw new Exception("线路版本未知"); | ||
| 57 | } | 45 | } |
| 58 | - | 46 | + ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename, lineversion); |
| 59 | rtn.put("status", ResponseCode.SUCCESS); | 47 | rtn.put("status", ResponseCode.SUCCESS); |
| 60 | } catch (Exception exp) { | 48 | } catch (Exception exp) { |
| 61 | rtn.put("status", ResponseCode.ERROR); | 49 | rtn.put("status", ResponseCode.ERROR); |
src/main/java/com/bsth/repository/schedule/TTInfoRepository.java
| @@ -11,7 +11,9 @@ import org.springframework.data.jpa.repository.EntityGraph; | @@ -11,7 +11,9 @@ import org.springframework.data.jpa.repository.EntityGraph; | ||
| 11 | import org.springframework.data.jpa.repository.Query; | 11 | import org.springframework.data.jpa.repository.Query; |
| 12 | import org.springframework.stereotype.Repository; | 12 | import org.springframework.stereotype.Repository; |
| 13 | 13 | ||
| 14 | +import javax.persistence.Tuple; | ||
| 14 | import java.util.List; | 15 | import java.util.List; |
| 16 | +import java.util.Map; | ||
| 15 | 17 | ||
| 16 | /** | 18 | /** |
| 17 | * Created by xu on 16/5/12. | 19 | * Created by xu on 16/5/12. |
| @@ -31,4 +33,19 @@ public interface TTInfoRepository extends BaseRepository<TTInfo, Long> { | @@ -31,4 +33,19 @@ public interface TTInfoRepository extends BaseRepository<TTInfo, Long> { | ||
| 31 | 33 | ||
| 32 | @Query("select t from TTInfo t where t.xl = ?1 and t.isCancel = false") | 34 | @Query("select t from TTInfo t where t.xl = ?1 and t.isCancel = false") |
| 33 | List<TTInfo> findInCanceledByXl(Line xl); | 35 | List<TTInfo> findInCanceledByXl(Line xl); |
| 36 | + | ||
| 37 | + @Query(value = "select new map(lv.name as name, lv.startDate as sd, " + | ||
| 38 | + "lv.status as status, lv.versions as version) " + | ||
| 39 | + "from LineVersions lv where lv.line.id = ?1 ") | ||
| 40 | + List<Map<String, Object>> findLineVersionDescs(Integer lineId); | ||
| 41 | + | ||
| 42 | + @Query(value = "select new map(lv.name as name, lv.startDate as sd, " + | ||
| 43 | + "lv.status as status, lv.versions as version) " + | ||
| 44 | + "from LineVersions lv where lv.line.id = ?1 and lv.versions = ?2 ") | ||
| 45 | + List<Map<String, Object>> findLineVersionDescs2(Integer lineId, Integer version); | ||
| 46 | + | ||
| 47 | + @Query(value = "select new map(lv.name as name, lv.versions as version) " + | ||
| 48 | + "from LineVersions lv where lv.line.id = ?1 and lv.status = ?2 ") | ||
| 49 | + List<Map<String, Object>> findLineVersionDescs3(Integer lineId, Integer status); | ||
| 50 | + | ||
| 34 | } | 51 | } |
src/main/java/com/bsth/service/schedule/TTInfoDetailService.java
| @@ -34,14 +34,14 @@ public interface TTInfoDetailService extends BService<TTInfoDetail, Long> { | @@ -34,14 +34,14 @@ public interface TTInfoDetailService extends BService<TTInfoDetail, Long> { | ||
| 34 | * @param filename excel文件全路径名 | 34 | * @param filename excel文件全路径名 |
| 35 | * @param sheetname sheet名字 | 35 | * @param sheetname sheet名字 |
| 36 | * @param lineid 线路id | 36 | * @param lineid 线路id |
| 37 | - * @param zdlyversion 站点路由版本 | 37 | + * @param lineversion 线路版本 |
| 38 | */ | 38 | */ |
| 39 | void validateExcelSheet( | 39 | void validateExcelSheet( |
| 40 | String filename, | 40 | String filename, |
| 41 | String sheetname, | 41 | String sheetname, |
| 42 | Integer lineid, | 42 | Integer lineid, |
| 43 | String linename, | 43 | String linename, |
| 44 | - Integer zdlyversion) throws ScheduleException; | 44 | + Integer lineversion) throws ScheduleException; |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * 验证关联的线路标准信息（以后放到规则引擎里去做）。 | 47 | * 验证关联的线路标准信息（以后放到规则引擎里去做）。 |
src/main/java/com/bsth/service/schedule/TTInfoService.java
| @@ -21,4 +21,6 @@ public interface TTInfoService extends BService<TTInfo, Long> { | @@ -21,4 +21,6 @@ public interface TTInfoService extends BService<TTInfo, Long> { | ||
| 21 | 21 | ||
| 22 | String getLineVersionDesc(Integer lineId, Integer version); | 22 | String getLineVersionDesc(Integer lineId, Integer version); |
| 23 | 23 | ||
| 24 | + List<Map<String, Object>> getLineVersions(Integer lineId, Integer status); | ||
| 25 | + | ||
| 24 | } | 26 | } |
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
| @@ -72,6 +72,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -72,6 +72,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 72 | try { | 72 | try { |
| 73 | LOGGER.info("//---------------- 导入时刻表明细 start... ----------------//"); | 73 | LOGGER.info("//---------------- 导入时刻表明细 start... ----------------//"); |
| 74 | 74 | ||
| 75 | + if (params.get("lineversion") == null) { | ||
| 76 | + throw new Exception("线路版本未知"); | ||
| 77 | + } | ||
| 78 | + | ||
| 75 | String filename = file.getAbsolutePath(); // xls xlsx 文件名 | 79 | String filename = file.getAbsolutePath(); // xls xlsx 文件名 |
| 76 | String sheetname = String.valueOf(params.get("sheetname")); // sheet名字 | 80 | String sheetname = String.valueOf(params.get("sheetname")); // sheet名字 |
| 77 | Long ttid = Long.valueOf(String.valueOf(params.get("ttid"))); // 时刻表id | 81 | Long ttid = Long.valueOf(String.valueOf(params.get("ttid"))); // 时刻表id |
| @@ -79,7 +83,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -79,7 +83,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 79 | Integer lineid = Integer.valueOf(String.valueOf(params.get("lineinfo"))); // 线路标准id | 83 | Integer lineid = Integer.valueOf(String.valueOf(params.get("lineinfo"))); // 线路标准id |
| 80 | String xlname = String.valueOf(params.get("xlname")); // 线路名字 | 84 | String xlname = String.valueOf(params.get("xlname")); // 线路名字 |
| 81 | String ttname = String.valueOf(params.get("ttname")); // 时刻表名字 | 85 | String ttname = String.valueOf(params.get("ttname")); // 时刻表名字 |
| 82 | - Integer zdlyversion = params.get("zdlyversion") == null ? null : Integer.valueOf(params.get("zdlyversion").toString()); | 86 | + Integer lineversion = Integer.valueOf(params.get("lineversion").toString()); |
| 83 | 87 | ||
| 84 | LOGGER.info("参数1, xls文件名={},sheet名字={}", filename, sheetname); | 88 | LOGGER.info("参数1, xls文件名={},sheet名字={}", filename, sheetname); |
| 85 | LOGGER.info("参数2, 线路id={},线路名字={}", xlid, xlname); | 89 | LOGGER.info("参数2, 线路id={},线路名字={}", xlid, xlname); |
| @@ -149,30 +153,27 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -149,30 +153,27 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 149 | 153 | ||
| 150 | // 创建ktr转换所需参数 | 154 | // 创建ktr转换所需参数 |
| 151 | Map<String, Object> ktrParms = new HashMap<>(); | 155 | Map<String, Object> ktrParms = new HashMap<>(); |
| 152 | - File ktrFile = new File(this.getClass().getResource( | 156 | + // 元数据ktr |
| 157 | + File mktrFile = new File(this.getClass().getResource( | ||
| 153 | dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI()); | 158 | dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI()); |
| 154 | -// File ktrFile2 = new File(this.getClass().getResource( | ||
| 155 | -// dataToolsProperties.getTtinfodetailDatainputktr()).toURI()); | ||
| 156 | - File ktrFile2 = new File(this.getClass().getResource( | ||
| 157 | - dataToolsProperties.getTtinfodetailDatainputktr2()).toURI()); | ||
| 158 | - File ktrFile2_ls = new File(this.getClass().getResource( | ||
| 159 | - dataToolsProperties.getTtinfodetailDatainputktr2ls()).toURI()); | 159 | + // 实际数据ktr |
| 160 | + File ktrFile2_version = new File(this.getClass().getResource( | ||
| 161 | + dataToolsProperties.getTtinfodetailDatainputktr2version()).toURI()); | ||
| 160 | 162 | ||
| 161 | // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径 | 163 | // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径 |
| 162 | - ktrParms.put("transpath", ktrFile.getAbsolutePath()); | 164 | + ktrParms.put("transpath", mktrFile.getAbsolutePath()); |
| 163 | ktrParms.put("filepath", fileCal.getAbsolutePath()); | 165 | ktrParms.put("filepath", fileCal.getAbsolutePath()); |
| 164 | ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir()); | 166 | ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir()); |
| 165 | 167 | ||
| 166 | // 附加参数 | 168 | // 附加参数 |
| 167 | - ktrParms.put("injectktrfile", zdlyversion == null || zdlyversion == -1 ? | ||
| 168 | - ktrFile2.getAbsolutePath() : ktrFile2_ls.getAbsolutePath()); // 注入元数据的ktr文件 | 169 | + ktrParms.put("injectktrfile", ktrFile2_version.getAbsolutePath()); // 注入元数据的ktr文件 |
| 169 | ktrParms.put("sheetname", sheetname); // sheet工作区的名字 | 170 | ktrParms.put("sheetname", sheetname); // sheet工作区的名字 |
| 170 | ktrParms.put("lineinfoid", lineid); // 线路标准id | 171 | ktrParms.put("lineinfoid", lineid); // 线路标准id |
| 171 | ktrParms.put("xlname", xlname); // 线路名称 | 172 | ktrParms.put("xlname", xlname); // 线路名称 |
| 172 | ktrParms.put("xlid", xlid); // 线路id | 173 | ktrParms.put("xlid", xlid); // 线路id |
| 173 | ktrParms.put("ttinfoname", ttname); // 时刻表名称 | 174 | ktrParms.put("ttinfoname", ttname); // 时刻表名称 |
| 174 | ktrParms.put("ttid", ttid.intValue()); // 时刻表id | 175 | ktrParms.put("ttid", ttid.intValue()); // 时刻表id |
| 175 | - ktrParms.put("zdlyversion", zdlyversion); // 站点路由版本 | 176 | + ktrParms.put("lineversion", lineversion); // 站点路由版本 |
| 176 | ktrParms.put("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名，以逗号连接 | 177 | ktrParms.put("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名，以逗号连接 |
| 177 | columnames.remove(0); | 178 | columnames.remove(0); |
| 178 | ktrParms.put("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名，以逗号连接 | 179 | ktrParms.put("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名，以逗号连接 |
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
| @@ -1485,7 +1485,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1485,7 +1485,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1485 | 1485 | ||
| 1486 | try { | 1486 | try { |
| 1487 | String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name," | 1487 | String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name," |
| 1488 | - + " a.cc_service, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line" | 1488 | + + " a.cc_service, a.remarks, a.adjust_exps, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line" |
| 1489 | + " where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'" | 1489 | + " where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'" |
| 1490 | + " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'"; | 1490 | + " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'"; |
| 1491 | if(line.length() != 0) | 1491 | if(line.length() != 0) |
| @@ -1512,6 +1512,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1512,6 +1512,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1512 | schedule.setGsName(rs.getString("gs_name")); | 1512 | schedule.setGsName(rs.getString("gs_name")); |
| 1513 | schedule.setFgsName(rs.getString("fgs_name")); | 1513 | schedule.setFgsName(rs.getString("fgs_name")); |
| 1514 | schedule.setCcService(rs.getBoolean("cc_service")); | 1514 | schedule.setCcService(rs.getBoolean("cc_service")); |
| 1515 | + schedule.setRemarks(rs.getString("remarks")!=null?rs.getString("remarks"):""); | ||
| 1516 | + schedule.setAdjustExps(rs.getString("adjust_exps")!=null?rs.getString("adjust_exps"):""); | ||
| 1515 | 1517 | ||
| 1516 | int startOpt = 0; | 1518 | int startOpt = 0; |
| 1517 | if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){ | 1519 | if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){ |
| @@ -1569,6 +1571,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1569,6 +1571,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1569 | subCompanyName = s.getFgsName(); | 1571 | subCompanyName = s.getFgsName(); |
| 1570 | } | 1572 | } |
| 1571 | 1573 | ||
| 1574 | + List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>(); | ||
| 1572 | for(String xlName : keyMap.keySet()){ | 1575 | for(String xlName : keyMap.keySet()){ |
| 1573 | List<Map<String, Object>> tempList = new ArrayList<Map<String,Object>>(); | 1576 | List<Map<String, Object>> tempList = new ArrayList<Map<String,Object>>(); |
| 1574 | Map<String, Object> tempMap = new HashMap<String, Object>(); | 1577 | Map<String, Object> tempMap = new HashMap<String, Object>(); |
| @@ -1630,10 +1633,38 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1630,10 +1633,38 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1630 | temp.put("sjfcLast0", s4.getFcsjActual()); | 1633 | temp.put("sjfcLast0", s4.getFcsjActual()); |
| 1631 | temp.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0); | 1634 | temp.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0); |
| 1632 | jhbc += 2; | 1635 | jhbc += 2; |
| 1633 | - if(delayFirst0 <= 1l && delayFirst0 >= -3l) | 1636 | + if(delayFirst0 <= 1l && delayFirst0 >= -3l){ |
| 1634 | sjbc++; | 1637 | sjbc++; |
| 1635 | - if(delayLast0 <= 1l && delayLast0 >= -3l) | 1638 | + } else { |
| 1639 | + Map<String, Object> m = new HashMap<String, Object>(); | ||
| 1640 | + m.put("date", date.substring(5)); | ||
| 1641 | + m.put("line", xlName); | ||
| 1642 | + m.put("firstOrLast", "上行首发"); | ||
| 1643 | + m.put("qdz", s1.getQdzName()); | ||
| 1644 | + m.put("jhfc", s1.getFcsj()); | ||
| 1645 | + m.put("sjfc", s2.getFcsjActual()); | ||
| 1646 | + m.put("delay", delayFirst0>0?"+"+delayFirst0:delayFirst0); | ||
| 1647 | + m.put("remarks1", s1.getRemarks()); | ||
| 1648 | + m.put("remarks2", s2.getRemarks()); | ||
| 1649 | + m.put("remarks", s1.getRemarks() + s2.getRemarks()); | ||
| 1650 | + mapList.add(m); | ||
| 1651 | + } | ||
| 1652 | + if(delayLast0 <= 1l && delayLast0 >= -3l){ | ||
| 1636 | sjbc++; | 1653 | sjbc++; |
| 1654 | + } else { | ||
| 1655 | + Map<String, Object> m = new HashMap<String, Object>(); | ||
| 1656 | + m.put("date", date.substring(5)); | ||
| 1657 | + m.put("line", xlName); | ||
| 1658 | + m.put("firstOrLast", "上行末发"); | ||
| 1659 | + m.put("qdz", s3.getQdzName()); | ||
| 1660 | + m.put("jhfc", s3.getFcsj()); | ||
| 1661 | + m.put("sjfc", s4.getFcsjActual()); | ||
| 1662 | + m.put("delay", delayLast0>0?"+"+delayLast0:delayLast0); | ||
| 1663 | + m.put("remarks1", s3.getRemarks()); | ||
| 1664 | + m.put("remarks2", s4.getRemarks()); | ||
| 1665 | + m.put("remarks", s3.getRemarks() + s4.getRemarks()); | ||
| 1666 | + mapList.add(m); | ||
| 1667 | + } | ||
| 1637 | } else { | 1668 | } else { |
| 1638 | temp.put("qdzFirst0", "--"); | 1669 | temp.put("qdzFirst0", "--"); |
| 1639 | temp.put("jhfcFirst0", "/"); | 1670 | temp.put("jhfcFirst0", "/"); |
| @@ -1662,10 +1693,40 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1662,10 +1693,40 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1662 | temp.put("sjfcLast1", s4.getFcsjActual()); | 1693 | temp.put("sjfcLast1", s4.getFcsjActual()); |
| 1663 | temp.put("delayLast1", delayLast1>0?"+"+delayLast1:delayLast1); | 1694 | temp.put("delayLast1", delayLast1>0?"+"+delayLast1:delayLast1); |
| 1664 | jhbc += 2; | 1695 | jhbc += 2; |
| 1665 | - if(delayFirst1 <= 1l && delayFirst1 >= -3l) | 1696 | + if(delayFirst1 <= 1l && delayFirst1 >= -2l){ |
| 1666 | sjbc++; | 1697 | sjbc++; |
| 1667 | - if(delayLast1 <= 1l && delayLast1 >= -3l) | 1698 | + } else { |
| 1699 | + Map<String, Object> m = new HashMap<String, Object>(); | ||
| 1700 | + m.put("date", date.substring(5)); | ||
| 1701 | + m.put("line", xlName); | ||
| 1702 | + m.put("firstOrLast", "下行首发"); | ||
| 1703 | + m.put("qdz", s1.getQdzName()); | ||
| 1704 | + m.put("jhfc", s1.getFcsj()); | ||
| 1705 | + m.put("sjfc", s2.getFcsjActual()); | ||
| 1706 | + m.put("delay", delayFirst1>0?"+"+delayFirst1:delayFirst1); | ||
| 1707 | + m.put("remarks1", s1.getRemarks()); | ||
| 1708 | + m.put("remarks2", s2.getRemarks()); | ||
| 1709 | + m.put("remarks", s1.getRemarks() + s2.getAdjustExps()); | ||
| 1710 | + mapList.add(m); | ||
| 1711 | + } | ||
| 1712 | + | ||
| 1713 | + if(delayLast1 <= 1l && delayLast1 >= -2l){ | ||
| 1668 | sjbc++; | 1714 | sjbc++; |
| 1715 | + } else { | ||
| 1716 | + Map<String, Object> m = new HashMap<String, Object>(); | ||
| 1717 | + m.put("date", date.substring(5)); | ||
| 1718 | + m.put("line", xlName); | ||
| 1719 | + m.put("firstOrLast", "下行末发"); | ||
| 1720 | + m.put("qdz", s3.getQdzName()); | ||
| 1721 | + m.put("jhfc", s3.getFcsj()); | ||
| 1722 | + m.put("sjfc", s4.getFcsjActual()); | ||
| 1723 | + m.put("delay", delayLast1>0?"+"+delayLast1:delayLast1); | ||
| 1724 | + m.put("remarks1", s3.getRemarks()); | ||
| 1725 | + m.put("remarks2", s4.getRemarks()); | ||
| 1726 | + m.put("remarks", s3.getRemarks() + s4.getRemarks()); | ||
| 1727 | + mapList.add(m); | ||
| 1728 | + } | ||
| 1729 | + | ||
| 1669 | } else { | 1730 | } else { |
| 1670 | temp.put("qdzFirst1", "--"); | 1731 | temp.put("qdzFirst1", "--"); |
| 1671 | temp.put("jhfcFirst1", "/"); | 1732 | temp.put("jhfcFirst1", "/"); |
| @@ -1692,14 +1753,20 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1692,14 +1753,20 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1692 | Map<String, Object> tempMap = new HashMap<String, Object>(); | 1753 | Map<String, Object> tempMap = new HashMap<String, Object>(); |
| 1693 | if(resList.size() > 0){ | 1754 | if(resList.size() > 0){ |
| 1694 | tempMap.put("date", "合计汇总"); | 1755 | tempMap.put("date", "合计汇总"); |
| 1695 | - int jhbc = 0, sjbc = 0; | 1756 | + int jhbc = 0, sjbc = 0, i = 0; |
| 1696 | for(Map<String, Object> m : resList){ | 1757 | for(Map<String, Object> m : resList){ |
| 1697 | jhbc += Integer.valueOf(m.get("jhbc").toString()); | 1758 | jhbc += Integer.valueOf(m.get("jhbc").toString()); |
| 1698 | sjbc += Integer.valueOf(m.get("sjbc").toString()); | 1759 | sjbc += Integer.valueOf(m.get("sjbc").toString()); |
| 1699 | } | 1760 | } |
| 1700 | tempMap.put("jhbc", jhbc); | 1761 | tempMap.put("jhbc", jhbc); |
| 1701 | tempMap.put("sjbc", sjbc); | 1762 | tempMap.put("sjbc", sjbc); |
| 1702 | - tempMap.put("zdl", nf.format((float) sjbc / jhbc *100) + "%"); | 1763 | + tempMap.put("zdl", nf.format((float) sjbc / jhbc * 100) + "%"); |
| 1764 | + for(Map<String, Object> m : mapList){ | ||
| 1765 | + m.put("no", ++i); | ||
| 1766 | + m.put("company", companyName); | ||
| 1767 | + m.put("subCompany", subCompanyName); | ||
| 1768 | + } | ||
| 1769 | + tempMap.put("map", mapList); | ||
| 1703 | if(!type.equals("export")) | 1770 | if(!type.equals("export")) |
| 1704 | resList.add(tempMap); | 1771 | resList.add(tempMap); |
| 1705 | } | 1772 | } |
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
| @@ -146,7 +146,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | @@ -146,7 +146,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | ||
| 146 | } | 146 | } |
| 147 | 147 | ||
| 148 | @Override | 148 | @Override |
| 149 | - public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename, Integer zdlyversion) throws ScheduleException { | 149 | + public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename, Integer lineversion) throws ScheduleException { |
| 150 | try { | 150 | try { |
| 151 | File file = new File(filename); | 151 | File file = new File(filename); |
| 152 | Workbook workbook; | 152 | Workbook workbook; |
| @@ -178,7 +178,10 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | @@ -178,7 +178,10 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | ||
| 178 | } else { | 178 | } else { |
| 179 | // 正则表达式去除右侧数字 | 179 | // 正则表达式去除右侧数字 |
| 180 | // cell_con = cell_con.replaceAll("[\\d+]", ""); | 180 | // cell_con = cell_con.replaceAll("[\\d+]", ""); |
| 181 | - cell_con = cell_con.replaceAll("(\\d+)$", ""); | 181 | +// cell_con = cell_con.replaceAll("(\\d+)$", ""); |
| 182 | + | ||
| 183 | + // 如果站名中有类似->{数字}，使用正则表达式过滤掉 | ||
| 184 | + cell_con = cell_con.replaceAll("(->\\d+)", ""); | ||
| 182 | 185 | ||
| 183 | if (i == 0) { // 第一列必须是路牌2个字 | 186 | if (i == 0) { // 第一列必须是路牌2个字 |
| 184 | if (!"路牌".equals(cell_con.trim())) { | 187 | if (!"路牌".equals(cell_con.trim())) { |
| @@ -189,35 +192,20 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | @@ -189,35 +192,20 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | ||
| 189 | (!"进场".equals(cell_con.trim()))) { | 192 | (!"进场".equals(cell_con.trim()))) { |
| 190 | Map<String, Object> p1 = new HashMap<>(); | 193 | Map<String, Object> p1 = new HashMap<>(); |
| 191 | p1.put("line.id_eq", lineid); | 194 | p1.put("line.id_eq", lineid); |
| 192 | - p1.put("stationName_like", cell_con.trim() + "%"); // 使用模糊匹配 | ||
| 193 | - p1.put("stationMark_eq", "B"); | 195 | + p1.put("stationName_eq", cell_con.trim()); |
| 196 | + p1.put("stationMark_eq", "B"); // 起点站 | ||
| 194 | p1.put("destroy_eq", 0); // 未撤销 | 197 | p1.put("destroy_eq", 0); // 未撤销 |
| 195 | - | ||
| 196 | - | ||
| 197 | - // TODO：这里要修改（起点站有启用撤销的标志的） | ||
| 198 | - | ||
| 199 | - if (zdlyversion == null) { | ||
| 200 | - List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1); | ||
| 201 | - if (CollectionUtils.isEmpty(stationRouteList)) { | ||
| 202 | - throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename)); | ||
| 203 | - } else if (stationRouteList.size() > 1) { | ||
| 204 | - throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename)); | ||
| 205 | - } else if (StringUtils.isEmpty(stationRouteList.get(0).getStationCode())) { | ||
| 206 | - throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中没有站点编码", i + 1, cell_con.trim(), linename)); | ||
| 207 | - } | ||
| 208 | - } else { | ||
| 209 | - p1.put("versions_eq", zdlyversion); | ||
| 210 | - List<LsStationRoute> lsStationRoutes = (List<LsStationRoute>) stationRouteService.list_ls(p1); | ||
| 211 | - if (CollectionUtils.isEmpty(lsStationRoutes)) { | ||
| 212 | - throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename)); | ||
| 213 | - } else if (lsStationRoutes.size() > 1) { | ||
| 214 | - throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename)); | ||
| 215 | - } else if (StringUtils.isEmpty(lsStationRoutes.get(0).getStationCode())) { | ||
| 216 | - throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中没有站点编码", i + 1, cell_con.trim(), linename)); | ||
| 217 | - } | 198 | + p1.put("versions_eq", lineversion); // 带线路版本 |
| 199 | + | ||
| 200 | + List<LsStationRoute> lsStationRoutes = (List<LsStationRoute>) stationRouteService.list_ls(p1); | ||
| 201 | + if (CollectionUtils.isEmpty(lsStationRoutes)) { | ||
| 202 | + throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename)); | ||
| 203 | + } else if (lsStationRoutes.size() > 1) { | ||
| 204 | + throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename)); | ||
| 205 | + } else if (StringUtils.isEmpty(lsStationRoutes.get(0).getStationCode())) { | ||
| 206 | + throw new Exception(String.format("第1行，第%d列数据%s在%s站点路由中没有站点编码", i + 1, cell_con.trim(), linename)); | ||
| 218 | } | 207 | } |
| 219 | 208 | ||
| 220 | - | ||
| 221 | } | 209 | } |
| 222 | 210 | ||
| 223 | } | 211 | } |
src/main/java/com/bsth/service/schedule/impl/TTInfoServiceImpl.java
| 1 | package com.bsth.service.schedule.impl; | 1 | package com.bsth.service.schedule.impl; |
| 2 | 2 | ||
| 3 | -import com.bsth.entity.LineVersions; | ||
| 4 | import com.bsth.entity.schedule.TTInfo; | 3 | import com.bsth.entity.schedule.TTInfo; |
| 5 | import com.bsth.entity.schedule.TTInfoBackup; | 4 | import com.bsth.entity.schedule.TTInfoBackup; |
| 6 | import com.bsth.entity.schedule.TTInfoDetail; | 5 | import com.bsth.entity.schedule.TTInfoDetail; |
| 7 | import com.bsth.repository.schedule.TTInfoBackupRepository; | 6 | import com.bsth.repository.schedule.TTInfoBackupRepository; |
| 8 | import com.bsth.repository.schedule.TTInfoDetailRepository; | 7 | import com.bsth.repository.schedule.TTInfoDetailRepository; |
| 9 | import com.bsth.repository.schedule.TTInfoRepository; | 8 | import com.bsth.repository.schedule.TTInfoRepository; |
| 10 | -import com.bsth.service.LineVersionsService; | ||
| 11 | import com.bsth.service.schedule.TTInfoService; | 9 | import com.bsth.service.schedule.TTInfoService; |
| 12 | import com.bsth.service.schedule.exception.ScheduleException; | 10 | import com.bsth.service.schedule.exception.ScheduleException; |
| 13 | import com.bsth.service.schedule.utils.TimeTableProto; | 11 | import com.bsth.service.schedule.utils.TimeTableProto; |
| @@ -24,6 +22,7 @@ import org.springframework.util.CollectionUtils; | @@ -24,6 +22,7 @@ import org.springframework.util.CollectionUtils; | ||
| 24 | 22 | ||
| 25 | import java.io.PrintWriter; | 23 | import java.io.PrintWriter; |
| 26 | import java.io.StringWriter; | 24 | import java.io.StringWriter; |
| 25 | +import java.sql.Timestamp; | ||
| 27 | import java.util.*; | 26 | import java.util.*; |
| 28 | 27 | ||
| 29 | /** | 28 | /** |
| @@ -40,8 +39,6 @@ public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTI | @@ -40,8 +39,6 @@ public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTI | ||
| 40 | private TTInfoDetailRepository ttInfoDetailRepository; | 39 | private TTInfoDetailRepository ttInfoDetailRepository; |
| 41 | @Autowired | 40 | @Autowired |
| 42 | private TTInfoBackupRepository ttInfoBackupRepository; | 41 | private TTInfoBackupRepository ttInfoBackupRepository; |
| 43 | - @Autowired | ||
| 44 | - private LineVersionsService lineVersionsService; | ||
| 45 | 42 | ||
| 46 | @Override | 43 | @Override |
| 47 | public void validate_name(TTInfo ttInfo) throws ScheduleException { | 44 | public void validate_name(TTInfo ttInfo) throws ScheduleException { |
| @@ -140,15 +137,18 @@ public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTI | @@ -140,15 +137,18 @@ public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTI | ||
| 140 | 137 | ||
| 141 | @Override | 138 | @Override |
| 142 | public List<Map<String, Object>> getLineStationRouteVersions(Integer lineId) { | 139 | public List<Map<String, Object>> getLineStationRouteVersions(Integer lineId) { |
| 143 | - // 获取线路版本 | ||
| 144 | - List<LineVersions> lineVersionsList = lineVersionsService.findByLineCode(lineId); | 140 | + // 获取线路版本数据 |
| 141 | + List<Map<String, Object>> lineVersionDescs = ttInfoRepository.findLineVersionDescs(lineId); | ||
| 145 | // 按照version版本降序排序 | 142 | // 按照version版本降序排序 |
| 146 | - Collections.sort(lineVersionsList, new Comparator<LineVersions>() { | 143 | + Collections.sort(lineVersionDescs, new Comparator<Map<String, Object>>() { |
| 147 | @Override | 144 | @Override |
| 148 | - public int compare(LineVersions o1, LineVersions o2) { | ||
| 149 | - if (o1.getVersions() > o2.getVersions()) { | 145 | + public int compare(Map<String, Object> o1, Map<String, Object> o2) { |
| 146 | + int o1_v = Integer.parseInt(o1.get("version").toString()); | ||
| 147 | + int o2_v = Integer.parseInt(o2.get("version").toString()); | ||
| 148 | + | ||
| 149 | + if (o1_v > o2_v) { | ||
| 150 | return -1; | 150 | return -1; |
| 151 | - } else if (o1.getVersions() < o2.getVersions()) { | 151 | + } else if (o1_v < o2_v) { |
| 152 | return 1; | 152 | return 1; |
| 153 | } else { | 153 | } else { |
| 154 | return 0; | 154 | return 0; |
| @@ -158,14 +158,19 @@ public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTI | @@ -158,14 +158,19 @@ public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTI | ||
| 158 | 158 | ||
| 159 | // 取最开始的2条记录 | 159 | // 取最开始的2条记录 |
| 160 | List<Map<String, Object>> mapList = new ArrayList<>(); | 160 | List<Map<String, Object>> mapList = new ArrayList<>(); |
| 161 | - for (LineVersions lv: lineVersionsList) { | ||
| 162 | - String vname = lv.getName(); | ||
| 163 | - String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日"); | ||
| 164 | - String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新"); | 161 | + for (Map<String, Object> lv: lineVersionDescs) { |
| 162 | + String t_name = (String) lv.get("name"); | ||
| 163 | + Timestamp t_sd = (Timestamp) lv.get("sd"); | ||
| 164 | + int status = Integer.parseInt(lv.get("status").toString()); | ||
| 165 | + int version = Integer.parseInt(lv.get("version").toString()); | ||
| 166 | + | ||
| 167 | + String vname = t_name; | ||
| 168 | + String rq = t_sd == null ? "未知启用日期" : new DateTime(t_sd).toString("YYYY年MM月dd日"); | ||
| 169 | + String sdesc = status == 0 ? "历史" : (status == 1 ? "当前" : "待更新"); | ||
| 165 | 170 | ||
| 166 | Map<String, Object> value = new HashMap<>(); | 171 | Map<String, Object> value = new HashMap<>(); |
| 167 | value.put("desc", vname + "-" + rq + "-" + sdesc); | 172 | value.put("desc", vname + "-" + rq + "-" + sdesc); |
| 168 | - value.put("version", lv.getVersions()); | 173 | + value.put("version", version); |
| 169 | 174 | ||
| 170 | mapList.add(value); | 175 | mapList.add(value); |
| 171 | 176 | ||
| @@ -180,28 +185,34 @@ public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTI | @@ -180,28 +185,34 @@ public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTI | ||
| 180 | @Override | 185 | @Override |
| 181 | public String getLineVersionDesc(Integer lineId, Integer version) { | 186 | public String getLineVersionDesc(Integer lineId, Integer version) { |
| 182 | // 查找指定版本，并判定 | 187 | // 查找指定版本，并判定 |
| 183 | - Map<String, Object> param = new HashMap<>(); | ||
| 184 | - param.put("line_eq", lineId); | ||
| 185 | - param.put("versions_eq", version); | ||
| 186 | - List<LineVersions> lineVersionsList = (List<LineVersions>) lineVersionsService.list(param); | 188 | + List<Map<String, Object>> lineVersionDescs = ttInfoRepository.findLineVersionDescs2(lineId, version); |
| 187 | 189 | ||
| 188 | - LineVersions lv; | ||
| 189 | - if (CollectionUtils.isEmpty(lineVersionsList)) { | 190 | + Map<String, Object> lv; |
| 191 | + if (CollectionUtils.isEmpty(lineVersionDescs)) { | ||
| 190 | return "未知版本"; | 192 | return "未知版本"; |
| 191 | - } else if (lineVersionsList.size() > 1) { | 193 | + } else if (lineVersionDescs.size() > 1) { |
| 192 | return "重复版本"; | 194 | return "重复版本"; |
| 193 | } else { | 195 | } else { |
| 194 | - lv = lineVersionsList.get(0); | 196 | + lv = lineVersionDescs.get(0); |
| 195 | } | 197 | } |
| 196 | 198 | ||
| 197 | - String vname = lv.getName(); | ||
| 198 | - String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日"); | ||
| 199 | - String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新"); | 199 | + String t_name = (String) lv.get("name"); |
| 200 | + Timestamp t_sd = (Timestamp) lv.get("sd"); | ||
| 201 | + int status = Integer.parseInt(lv.get("status").toString()); | ||
| 202 | + | ||
| 203 | + String vname = t_name; | ||
| 204 | + String rq = t_sd == null ? "未知启用日期" : new DateTime(t_sd).toString("YYYY年MM月dd日"); | ||
| 205 | + String sdesc = status == 0 ? "历史" : (status == 1 ? "当前" : "待更新"); | ||
| 200 | 206 | ||
| 201 | return String.format("%s-%s-%s", vname, rq, sdesc); | 207 | return String.format("%s-%s-%s", vname, rq, sdesc); |
| 202 | } | 208 | } |
| 203 | 209 | ||
| 204 | @Override | 210 | @Override |
| 211 | + public List<Map<String, Object>> getLineVersions(Integer lineId, Integer status) { | ||
| 212 | + return ttInfoRepository.findLineVersionDescs3(lineId, status); | ||
| 213 | + } | ||
| 214 | + | ||
| 215 | + @Override | ||
| 205 | @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.REPEATABLE_READ) | 216 | @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.REPEATABLE_READ) |
| 206 | public void backUp(Long ttInfoId) throws ScheduleException { | 217 | public void backUp(Long ttInfoId) throws ScheduleException { |
| 207 | LOG.info(">>>>>>开始备份时刻表<<<<<<"); | 218 | LOG.info(">>>>>>开始备份时刻表<<<<<<"); |
src/main/java/com/bsth/service/schedule/utils/DataToolsProperties.java
| @@ -75,12 +75,12 @@ public class DataToolsProperties { | @@ -75,12 +75,12 @@ public class DataToolsProperties { | ||
| 75 | /** 时刻表明细信息导入 */ | 75 | /** 时刻表明细信息导入 */ |
| 76 | @NotNull | 76 | @NotNull |
| 77 | private String ttinfodetailDatainputktr; | 77 | private String ttinfodetailDatainputktr; |
| 78 | - /** 时刻表明细信息导入 */ | 78 | + /** 时刻表明细信息导入2 */ |
| 79 | @NotNull | 79 | @NotNull |
| 80 | private String ttinfodetailDatainputktr2; | 80 | private String ttinfodetailDatainputktr2; |
| 81 | - /** 时刻表明细信息导入 */ | 81 | + /** 时刻表明细信息导入2（带版本） */ |
| 82 | @NotNull | 82 | @NotNull |
| 83 | - private String ttinfodetailDatainputktr2ls; | 83 | + private String ttinfodetailDatainputktr2version; |
| 84 | /** 排班规则信息导入 */ | 84 | /** 排班规则信息导入 */ |
| 85 | @NotNull | 85 | @NotNull |
| 86 | private String scheduleruleDatainputktr; | 86 | private String scheduleruleDatainputktr; |
| @@ -314,12 +314,12 @@ public class DataToolsProperties { | @@ -314,12 +314,12 @@ public class DataToolsProperties { | ||
| 314 | this.carsconfigDataoutputktr = carsconfigDataoutputktr; | 314 | this.carsconfigDataoutputktr = carsconfigDataoutputktr; |
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | - public String getTtinfodetailDatainputktr2ls() { | ||
| 318 | - return ttinfodetailDatainputktr2ls; | 317 | + public String getTtinfodetailDatainputktr2version() { |
| 318 | + return ttinfodetailDatainputktr2version; | ||
| 319 | } | 319 | } |
| 320 | 320 | ||
| 321 | - public void setTtinfodetailDatainputktr2ls(String ttinfodetailDatainputktr2ls) { | ||
| 322 | - this.ttinfodetailDatainputktr2ls = ttinfodetailDatainputktr2ls; | 321 | + public void setTtinfodetailDatainputktr2version(String ttinfodetailDatainputktr2version) { |
| 322 | + this.ttinfodetailDatainputktr2version = ttinfodetailDatainputktr2version; | ||
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | public String getEmployeesconfigDataoutputktr() { | 325 | public String getEmployeesconfigDataoutputktr() { |
src/main/resources/datatools/config-dev.properties
| @@ -39,8 +39,8 @@ datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr | @@ -39,8 +39,8 @@ datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr | ||
| 39 | datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr | 39 | datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr |
| 40 | # 时刻表明细信息导入2 | 40 | # 时刻表明细信息导入2 |
| 41 | datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr | 41 | datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr |
| 42 | -# 时刻表明细信息导入2_ls | ||
| 43 | -datatools.ttinfodetail_datainputktr2ls=/datatools/ktrs/ttinfodetailDataInput2_ls.ktr | 42 | +# 时刻表明细信息导入2（版本化） |
| 43 | +datatools.ttinfodetail_datainputktr2version=/datatools/ktrs/ttinfodetailDataInput2_version.ktr | ||
| 44 | 44 | ||
| 45 | # 车辆配置信息导入 | 45 | # 车辆配置信息导入 |
| 46 | datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr | 46 | datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr |
src/main/resources/datatools/config-prod.properties
| @@ -40,8 +40,8 @@ datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr | @@ -40,8 +40,8 @@ datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr | ||
| 40 | datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr | 40 | datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr |
| 41 | # 时刻表明细信息导入2 | 41 | # 时刻表明细信息导入2 |
| 42 | datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr | 42 | datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr |
| 43 | -# 时刻表明细信息导入2_ls | ||
| 44 | -datatools.ttinfodetail_datainputktr2ls=/datatools/ktrs/ttinfodetailDataInput2_ls.ktr | 43 | +# 时刻表明细信息导入2（版本化） |
| 44 | +datatools.ttinfodetail_datainputktr2version=/datatools/ktrs/ttinfodetailDataInput2_version.ktr | ||
| 45 | 45 | ||
| 46 | # 车辆配置信息导入 | 46 | # 车辆配置信息导入 |
| 47 | datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr | 47 | datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr |
src/main/resources/datatools/ktrs/ttinfodetailDataInput2_ls.ktr renamed to src/main/resources/datatools/ktrs/ttinfodetailDataInput2_version.ktr
| @@ -416,6 +416,7 @@ | @@ -416,6 +416,7 @@ | ||
| 416 | <hop> <from>类型修正 3</from><to>插入/更新bsth_c_s_ttinfo_detail 3</to><enabled>Y</enabled> </hop> | 416 | <hop> <from>类型修正 3</from><to>插入/更新bsth_c_s_ttinfo_detail 3</to><enabled>Y</enabled> </hop> |
| 417 | <hop> <from>查找路牌关联</from><to>站点路由版本类型</to><enabled>Y</enabled> </hop> | 417 | <hop> <from>查找路牌关联</from><to>站点路由版本类型</to><enabled>Y</enabled> </hop> |
| 418 | <hop> <from>站点路由版本类型</from><to>计算班次类型</to><enabled>Y</enabled> </hop> | 418 | <hop> <from>站点路由版本类型</from><to>计算班次类型</to><enabled>Y</enabled> </hop> |
| 419 | + <hop> <from>站点路由版本类型</from><to>更新时刻表主表版本</to><enabled>Y</enabled> </hop> | ||
| 419 | </order> | 420 | </order> |
| 420 | <step> | 421 | <step> |
| 421 | <name>上下行NULL判定</name> | 422 | <name>上下行NULL判定</name> |
| @@ -829,7 +830,7 @@ | @@ -829,7 +830,7 @@ | ||
| 829 | <optimizationLevel>9</optimizationLevel> | 830 | <optimizationLevel>9</optimizationLevel> |
| 830 | <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | 831 | <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> |
| 831 | <jsScript_name>Script 1</jsScript_name> | 832 | <jsScript_name>Script 1</jsScript_name> |
| 832 | - <jsScript_script>//Script here

// 使用正则表达式去除站点名称右侧多余的数字
qdzname = qdzname.replace(/(\d+$)/g,'');
if (qdzname != "出场" && qdzname != "进场") {
 qdzname = qdzname + "%"; // 模糊匹配标识符
}

// sendtime处理，hhmm，hh:mm，hh,mm
var sendtime_calcu = sendtime.replace(/\s/g, "");
if (sendtime.length == 5) { // 最长格式，包括分隔符，统一把分隔符替换成冒号
 sendtime_calcu = sendtime.substr(0, 2) + ":" + sendtime.substr(3, 2);
} else if (sendtime.length == 4) {
 if (sendtime.indexOf(":") > 0) { // 冒号分隔，无需修改
 sendtime_calcu = sendtime;
 } else if (sendtime.indexOf(",") > 0) { // 逗号分隔，改成冒号分隔
 sendtime_calcu = sendtime.substr(0, 1) + ":" + sendtime.substr(2, 2);
 } else { // 无分隔符，改成冒号分隔
 sendtime_calcu = sendtime.substr(0, 2) + ":" + sendtime.substr(2, 2);
 }
} else if (sendtime.length == 3) { // 无分隔符，改成冒号分隔
 sendtime_calcu = sendtime.substr(0, 1) + ":" + sendtime.substr(1, 2);
}

// 全部修正完毕后，如果长度不是5，前面补0
if (sendtime_calcu.length != 5) {
 sendtime_calcu = "0" + sendtime_calcu;
}

// 设置分班
var isfb = 0;

// 设置停驶
var ists = 0;

// 设置isCanceled
var iscanceled = 0;</jsScript_script> | 833 | + <jsScript_script>//Script here

// 如果站名中有类似->{数字}，使用正则表达式过滤掉
qdzname = qdzname.replace(/->\d+/g,'');
if (qdzname != "出场" && qdzname != "进场") {
 qdzname = qdzname + "%"; // 模糊匹配标识符
}

// sendtime处理，hhmm，hh:mm，hh,mm
var sendtime_calcu = sendtime.replace(/\s/g, "");
if (sendtime.length == 5) { // 最长格式，包括分隔符，统一把分隔符替换成冒号
 sendtime_calcu = sendtime.substr(0, 2) + ":" + sendtime.substr(3, 2);
} else if (sendtime.length == 4) {
 if (sendtime.indexOf(":") > 0) { // 冒号分隔，无需修改
 sendtime_calcu = sendtime;
 } else if (sendtime.indexOf(",") > 0) { // 逗号分隔，改成冒号分隔
 sendtime_calcu = sendtime.substr(0, 1) + ":" + sendtime.substr(2, 2);
 } else { // 无分隔符，改成冒号分隔
 sendtime_calcu = sendtime.substr(0, 2) + ":" + sendtime.substr(2, 2);
 }
} else if (sendtime.length == 3) { // 无分隔符，改成冒号分隔
 sendtime_calcu = sendtime.substr(0, 1) + ":" + sendtime.substr(1, 2);
}

// 全部修正完毕后，如果长度不是5，前面补0
if (sendtime_calcu.length != 5) {
 sendtime_calcu = "0" + sendtime_calcu;
}

// 设置分班
var isfb = 0;

// 设置停驶
var ists = 0;

// 设置isCanceled
var iscanceled = 0;</jsScript_script> |
| 833 | </jsScript> </jsScripts> <fields> <field> <name>qdzname</name> | 834 | </jsScript> </jsScripts> <fields> <field> <name>qdzname</name> |
| 834 | <rename>qdzname</rename> | 835 | <rename>qdzname</rename> |
| 835 | <type>String</type> | 836 | <type>String</type> |
| @@ -1095,6 +1096,11 @@ | @@ -1095,6 +1096,11 @@ | ||
| 1095 | <rename>ists</rename> | 1096 | <rename>ists</rename> |
| 1096 | <update>Y</update> | 1097 | <update>Y</update> |
| 1097 | </value> | 1098 | </value> |
| 1099 | + <value> | ||
| 1100 | + <name>line_version</name> | ||
| 1101 | + <rename>version</rename> | ||
| 1102 | + <update>Y</update> | ||
| 1103 | + </value> | ||
| 1098 | </lookup> | 1104 | </lookup> |
| 1099 | <cluster_schema/> | 1105 | <cluster_schema/> |
| 1100 | <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | 1106 | <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> |
| @@ -1241,6 +1247,11 @@ | @@ -1241,6 +1247,11 @@ | ||
| 1241 | <rename>ists</rename> | 1247 | <rename>ists</rename> |
| 1242 | <update>Y</update> | 1248 | <update>Y</update> |
| 1243 | </value> | 1249 | </value> |
| 1250 | + <value> | ||
| 1251 | + <name>line_version</name> | ||
| 1252 | + <rename>version</rename> | ||
| 1253 | + <update>Y</update> | ||
| 1254 | + </value> | ||
| 1244 | </lookup> | 1255 | </lookup> |
| 1245 | <cluster_schema/> | 1256 | <cluster_schema/> |
| 1246 | <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | 1257 | <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> |
| @@ -1387,6 +1398,11 @@ | @@ -1387,6 +1398,11 @@ | ||
| 1387 | <rename>ists</rename> | 1398 | <rename>ists</rename> |
| 1388 | <update>Y</update> | 1399 | <update>Y</update> |
| 1389 | </value> | 1400 | </value> |
| 1401 | + <value> | ||
| 1402 | + <name>line_version</name> | ||
| 1403 | + <rename>version</rename> | ||
| 1404 | + <update>Y</update> | ||
| 1405 | + </value> | ||
| 1390 | </lookup> | 1406 | </lookup> |
| 1391 | <cluster_schema/> | 1407 | <cluster_schema/> |
| 1392 | <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | 1408 | <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> |
| @@ -1465,6 +1481,45 @@ | @@ -1465,6 +1481,45 @@ | ||
| 1465 | </step> | 1481 | </step> |
| 1466 | 1482 | ||
| 1467 | <step> | 1483 | <step> |
| 1484 | + <name>更新时刻表主表版本</name> | ||
| 1485 | + <type>Update</type> | ||
| 1486 | + <description/> | ||
| 1487 | + <distribute>Y</distribute> | ||
| 1488 | + <custom_distribution/> | ||
| 1489 | + <copies>1</copies> | ||
| 1490 | + <partitioning> | ||
| 1491 | + <method>none</method> | ||
| 1492 | + <schema_name/> | ||
| 1493 | + </partitioning> | ||
| 1494 | + <connection>bus_control_variable</connection> | ||
| 1495 | + <skip_lookup>N</skip_lookup> | ||
| 1496 | + <commit>100</commit> | ||
| 1497 | + <use_batch>N</use_batch> | ||
| 1498 | + <error_ignored>N</error_ignored> | ||
| 1499 | + <ignore_flag_field/> | ||
| 1500 | + <lookup> | ||
| 1501 | + <schema/> | ||
| 1502 | + <table>bsth_c_s_ttinfo</table> | ||
| 1503 | + <key> | ||
| 1504 | + <name>ttid</name> | ||
| 1505 | + <field>id</field> | ||
| 1506 | + <condition>=</condition> | ||
| 1507 | + <name2/> | ||
| 1508 | + </key> | ||
| 1509 | + <value> | ||
| 1510 | + <name>line_version</name> | ||
| 1511 | + <rename>version</rename> | ||
| 1512 | + </value> | ||
| 1513 | + </lookup> | ||
| 1514 | + <cluster_schema/> | ||
| 1515 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1516 | + <xloc>863</xloc> | ||
| 1517 | + <yloc>338</yloc> | ||
| 1518 | + <draw>Y</draw> | ||
| 1519 | + </GUI> | ||
| 1520 | + </step> | ||
| 1521 | + | ||
| 1522 | + <step> | ||
| 1468 | <name>查找停车场1</name> | 1523 | <name>查找停车场1</name> |
| 1469 | <type>DBLookup</type> | 1524 | <type>DBLookup</type> |
| 1470 | <description/> | 1525 | <description/> |
| @@ -2197,7 +2252,7 @@ | @@ -2197,7 +2252,7 @@ | ||
| 2197 | <cluster_schema/> | 2252 | <cluster_schema/> |
| 2198 | <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | 2253 | <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> |
| 2199 | <xloc>1013</xloc> | 2254 | <xloc>1013</xloc> |
| 2200 | - <yloc>265</yloc> | 2255 | + <yloc>221</yloc> |
| 2201 | <draw>Y</draw> | 2256 | <draw>Y</draw> |
| 2202 | </GUI> | 2257 | </GUI> |
| 2203 | </step> | 2258 | </step> |
| @@ -2733,6 +2788,41 @@ | @@ -2733,6 +2788,41 @@ | ||
| 2733 | </step> | 2788 | </step> |
| 2734 | 2789 | ||
| 2735 | <step> | 2790 | <step> |
| 2791 | + <name>站点路由版本类型</name> | ||
| 2792 | + <type>SelectValues</type> | ||
| 2793 | + <description/> | ||
| 2794 | + <distribute>N</distribute> | ||
| 2795 | + <custom_distribution/> | ||
| 2796 | + <copies>1</copies> | ||
| 2797 | + <partitioning> | ||
| 2798 | + <method>none</method> | ||
| 2799 | + <schema_name/> | ||
| 2800 | + </partitioning> | ||
| 2801 | + <fields> <select_unspecified>Y</select_unspecified> | ||
| 2802 | + <meta> <name>zdlyversion_</name> | ||
| 2803 | + <rename>version</rename> | ||
| 2804 | + <type>Integer</type> | ||
| 2805 | + <length>-2</length> | ||
| 2806 | + <precision>-2</precision> | ||
| 2807 | + <conversion_mask/> | ||
| 2808 | + <date_format_lenient>false</date_format_lenient> | ||
| 2809 | + <date_format_locale/> | ||
| 2810 | + <date_format_timezone/> | ||
| 2811 | + <lenient_string_to_number>false</lenient_string_to_number> | ||
| 2812 | + <encoding/> | ||
| 2813 | + <decimal_symbol/> | ||
| 2814 | + <grouping_symbol/> | ||
| 2815 | + <currency_symbol/> | ||
| 2816 | + <storage_type/> | ||
| 2817 | + </meta> </fields> <cluster_schema/> | ||
| 2818 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2819 | + <xloc>1016</xloc> | ||
| 2820 | + <yloc>305</yloc> | ||
| 2821 | + <draw>Y</draw> | ||
| 2822 | + </GUI> | ||
| 2823 | + </step> | ||
| 2824 | + | ||
| 2825 | + <step> | ||
| 2736 | <name>类型修正</name> | 2826 | <name>类型修正</name> |
| 2737 | <type>SelectValues</type> | 2827 | <type>SelectValues</type> |
| 2738 | <description/> | 2828 | <description/> |
| @@ -3071,41 +3161,6 @@ | @@ -3071,41 +3161,6 @@ | ||
| 3071 | </GUI> | 3161 | </GUI> |
| 3072 | </step> | 3162 | </step> |
| 3073 | 3163 | ||
| 3074 | - <step> | ||
| 3075 | - <name>站点路由版本类型</name> | ||
| 3076 | - <type>SelectValues</type> | ||
| 3077 | - <description/> | ||
| 3078 | - <distribute>Y</distribute> | ||
| 3079 | - <custom_distribution/> | ||
| 3080 | - <copies>1</copies> | ||
| 3081 | - <partitioning> | ||
| 3082 | - <method>none</method> | ||
| 3083 | - <schema_name/> | ||
| 3084 | - </partitioning> | ||
| 3085 | - <fields> <select_unspecified>Y</select_unspecified> | ||
| 3086 | - <meta> <name>zdlyversion_</name> | ||
| 3087 | - <rename>version</rename> | ||
| 3088 | - <type>Integer</type> | ||
| 3089 | - <length>-2</length> | ||
| 3090 | - <precision>-2</precision> | ||
| 3091 | - <conversion_mask/> | ||
| 3092 | - <date_format_lenient>false</date_format_lenient> | ||
| 3093 | - <date_format_locale/> | ||
| 3094 | - <date_format_timezone/> | ||
| 3095 | - <lenient_string_to_number>false</lenient_string_to_number> | ||
| 3096 | - <encoding/> | ||
| 3097 | - <decimal_symbol/> | ||
| 3098 | - <grouping_symbol/> | ||
| 3099 | - <currency_symbol/> | ||
| 3100 | - <storage_type/> | ||
| 3101 | - </meta> </fields> <cluster_schema/> | ||
| 3102 | - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 3103 | - <xloc>1015</xloc> | ||
| 3104 | - <yloc>333</yloc> | ||
| 3105 | - <draw>Y</draw> | ||
| 3106 | - </GUI> | ||
| 3107 | - </step> | ||
| 3108 | - | ||
| 3109 | <step_error_handling> | 3164 | <step_error_handling> |
| 3110 | <error> | 3165 | <error> |
| 3111 | <source_step>插入/更新bsth_c_s_ttinfo_detail</source_step> | 3166 | <source_step>插入/更新bsth_c_s_ttinfo_detail</source_step> |
src/main/resources/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
| @@ -35,6 +35,11 @@ | @@ -35,6 +35,11 @@ | ||
| 35 | <description>线路标准id</description> | 35 | <description>线路标准id</description> |
| 36 | </parameter> | 36 | </parameter> |
| 37 | <parameter> | 37 | <parameter> |
| 38 | + <name>lineversion</name> | ||
| 39 | + <default_value>-1</default_value> | ||
| 40 | + <description>线路版本</description> | ||
| 41 | + </parameter> | ||
| 42 | + <parameter> | ||
| 38 | <name>normalizefieldnames</name> | 43 | <name>normalizefieldnames</name> |
| 39 | <default_value>出场,东川路地铁站1,塘泾路尚义路1,东川路地铁站2,塘泾路尚义路2,东川路地铁站3,塘泾路尚义路3,东川路地铁站4,塘泾路尚义路4,东川路地铁站5,塘泾路尚义路5,东川路地铁站6,塘泾路尚义路6,东川路地铁站7,塘泾路尚义路7,东川路地铁站8,塘泾路尚义路8,东川路地铁站9,塘泾路尚义路9,东川路地铁站10,塘泾路尚义路10,进场</default_value> | 44 | <default_value>出场,东川路地铁站1,塘泾路尚义路1,东川路地铁站2,塘泾路尚义路2,东川路地铁站3,塘泾路尚义路3,东川路地铁站4,塘泾路尚义路4,东川路地铁站5,塘泾路尚义路5,东川路地铁站6,塘泾路尚义路6,东川路地铁站7,塘泾路尚义路7,东川路地铁站8,塘泾路尚义路8,东川路地铁站9,塘泾路尚义路9,东川路地铁站10,塘泾路尚义路10,进场</default_value> |
| 40 | <description>数据范式化字段名，以逗号连接</description> | 45 | <description>数据范式化字段名，以逗号连接</description> |
| @@ -62,18 +67,13 @@ | @@ -62,18 +67,13 @@ | ||
| 62 | <parameter> | 67 | <parameter> |
| 63 | <name>xlid</name> | 68 | <name>xlid</name> |
| 64 | <default_value>-999</default_value> | 69 | <default_value>-999</default_value> |
| 65 | - <description/> | 70 | + <description>线路id</description> |
| 66 | </parameter> | 71 | </parameter> |
| 67 | <parameter> | 72 | <parameter> |
| 68 | <name>xlname</name> | 73 | <name>xlname</name> |
| 69 | <default_value>闵行26路</default_value> | 74 | <default_value>闵行26路</default_value> |
| 70 | <description>线路名称</description> | 75 | <description>线路名称</description> |
| 71 | </parameter> | 76 | </parameter> |
| 72 | - <parameter> | ||
| 73 | - <name>zdlyversion</name> | ||
| 74 | - <default_value>-1</default_value> | ||
| 75 | - <description/> | ||
| 76 | - </parameter> | ||
| 77 | </parameters> | 77 | </parameters> |
| 78 | <log> | 78 | <log> |
| 79 | <trans-log-table><connection/> | 79 | <trans-log-table><connection/> |
| @@ -436,15 +436,15 @@ | @@ -436,15 +436,15 @@ | ||
| 436 | <source_step>增加normalize元数据</source_step> | 436 | <source_step>增加normalize元数据</source_step> |
| 437 | <source_field>nfieldname</source_field> | 437 | <source_field>nfieldname</source_field> |
| 438 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | 438 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> |
| 439 | - <target_attribute_key>LENGTH</target_attribute_key> | ||
| 440 | - <target_detail>Y</target_detail> | ||
| 441 | - <source_step>增加excel字段其他元数据</source_step> | ||
| 442 | - <source_field>length</source_field> | ||
| 443 | - </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | ||
| 444 | <target_attribute_key>SHEET_NAME</target_attribute_key> | 439 | <target_attribute_key>SHEET_NAME</target_attribute_key> |
| 445 | <target_detail>Y</target_detail> | 440 | <target_detail>Y</target_detail> |
| 446 | <source_step>获取excel文件名</source_step> | 441 | <source_step>获取excel文件名</source_step> |
| 447 | <source_field>sheetname_</source_field> | 442 | <source_field>sheetname_</source_field> |
| 443 | + </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | ||
| 444 | + <target_attribute_key>LENGTH</target_attribute_key> | ||
| 445 | + <target_detail>Y</target_detail> | ||
| 446 | + <source_step>增加excel字段其他元数据</source_step> | ||
| 447 | + <source_field>length</source_field> | ||
| 448 | </mapping> <mapping> <target_step_name>增加时刻表名字，线路名字，停车场名字</target_step_name> | 448 | </mapping> <mapping> <target_step_name>增加时刻表名字，线路名字，停车场名字</target_step_name> |
| 449 | <target_attribute_key>NAME</target_attribute_key> | 449 | <target_attribute_key>NAME</target_attribute_key> |
| 450 | <target_detail>Y</target_detail> | 450 | <target_detail>Y</target_detail> |
| @@ -460,41 +460,41 @@ | @@ -460,41 +460,41 @@ | ||
| 460 | <target_detail>Y</target_detail> | 460 | <target_detail>Y</target_detail> |
| 461 | <source_step>列拆分为多行</source_step> | 461 | <source_step>列拆分为多行</source_step> |
| 462 | <source_field>fieldName</source_field> | 462 | <source_field>fieldName</source_field> |
| 463 | - </mapping> <mapping> <target_step_name>行转列</target_step_name> | ||
| 464 | - <target_attribute_key>VALUE</target_attribute_key> | ||
| 465 | - <target_detail>Y</target_detail> | ||
| 466 | - <source_step>列拆分为多行 2</source_step> | ||
| 467 | - <source_field>fieldName</source_field> | ||
| 468 | </mapping> <mapping> <target_step_name>Excel输入</target_step_name> | 463 | </mapping> <mapping> <target_step_name>Excel输入</target_step_name> |
| 469 | <target_attribute_key>TRIM_TYPE</target_attribute_key> | 464 | <target_attribute_key>TRIM_TYPE</target_attribute_key> |
| 470 | <target_detail>Y</target_detail> | 465 | <target_detail>Y</target_detail> |
| 471 | <source_step>列拆分为多行</source_step> | 466 | <source_step>列拆分为多行</source_step> |
| 472 | <source_field>trim_type</source_field> | 467 | <source_field>trim_type</source_field> |
| 473 | </mapping> <mapping> <target_step_name>行转列</target_step_name> | 468 | </mapping> <mapping> <target_step_name>行转列</target_step_name> |
| 474 | - <target_attribute_key>NORMALISED</target_attribute_key> | 469 | + <target_attribute_key>VALUE</target_attribute_key> |
| 475 | <target_detail>Y</target_detail> | 470 | <target_detail>Y</target_detail> |
| 476 | <source_step>列拆分为多行 2</source_step> | 471 | <source_step>列拆分为多行 2</source_step> |
| 477 | - <source_field>value</source_field> | 472 | + <source_field>fieldName</source_field> |
| 478 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | 473 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> |
| 479 | <target_attribute_key>REPEAT</target_attribute_key> | 474 | <target_attribute_key>REPEAT</target_attribute_key> |
| 480 | <target_detail>Y</target_detail> | 475 | <target_detail>Y</target_detail> |
| 481 | <source_step>增加excel字段其他元数据</source_step> | 476 | <source_step>增加excel字段其他元数据</source_step> |
| 482 | <source_field>repeat</source_field> | 477 | <source_field>repeat</source_field> |
| 483 | - </mapping> <mapping> <target_step_name>班次数据范式化</target_step_name> | 478 | + </mapping> <mapping> <target_step_name>行转列</target_step_name> |
| 484 | <target_attribute_key>NORMALISED</target_attribute_key> | 479 | <target_attribute_key>NORMALISED</target_attribute_key> |
| 485 | <target_detail>Y</target_detail> | 480 | <target_detail>Y</target_detail> |
| 486 | - <source_step>增加normalize元数据</source_step> | ||
| 487 | - <source_field>valuefield</source_field> | 481 | + <source_step>列拆分为多行 2</source_step> |
| 482 | + <source_field>value</source_field> | ||
| 488 | </mapping> <mapping> <target_step_name>班次数据范式化</target_step_name> | 483 | </mapping> <mapping> <target_step_name>班次数据范式化</target_step_name> |
| 489 | - <target_attribute_key>VALUE</target_attribute_key> | 484 | + <target_attribute_key>NORMALISED</target_attribute_key> |
| 490 | <target_detail>Y</target_detail> | 485 | <target_detail>Y</target_detail> |
| 491 | <source_step>增加normalize元数据</source_step> | 486 | <source_step>增加normalize元数据</source_step> |
| 492 | - <source_field>nfieldname</source_field> | 487 | + <source_field>valuefield</source_field> |
| 493 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | 488 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> |
| 494 | <target_attribute_key>FORMAT</target_attribute_key> | 489 | <target_attribute_key>FORMAT</target_attribute_key> |
| 495 | <target_detail>Y</target_detail> | 490 | <target_detail>Y</target_detail> |
| 496 | <source_step>增加excel字段其他元数据</source_step> | 491 | <source_step>增加excel字段其他元数据</source_step> |
| 497 | <source_field>format</source_field> | 492 | <source_field>format</source_field> |
| 493 | + </mapping> <mapping> <target_step_name>班次数据范式化</target_step_name> | ||
| 494 | + <target_attribute_key>VALUE</target_attribute_key> | ||
| 495 | + <target_detail>Y</target_detail> | ||
| 496 | + <source_step>增加normalize元数据</source_step> | ||
| 497 | + <source_field>nfieldname</source_field> | ||
| 498 | </mapping> <mapping> <target_step_name>Excel输入</target_step_name> | 498 | </mapping> <mapping> <target_step_name>Excel输入</target_step_name> |
| 499 | <target_attribute_key>PRECISION</target_attribute_key> | 499 | <target_attribute_key>PRECISION</target_attribute_key> |
| 500 | <target_detail>Y</target_detail> | 500 | <target_detail>Y</target_detail> |
| @@ -917,6 +917,63 @@ | @@ -917,6 +917,63 @@ | ||
| 917 | </step> | 917 | </step> |
| 918 | 918 | ||
| 919 | <step> | 919 | <step> |
| 920 | + <name>增加站点路由版本 metadata</name> | ||
| 921 | + <type>Constant</type> | ||
| 922 | + <description/> | ||
| 923 | + <distribute>Y</distribute> | ||
| 924 | + <custom_distribution/> | ||
| 925 | + <copies>1</copies> | ||
| 926 | + <partitioning> | ||
| 927 | + <method>none</method> | ||
| 928 | + <schema_name/> | ||
| 929 | + </partitioning> | ||
| 930 | + <fields> | ||
| 931 | + <field> | ||
| 932 | + <name>col_name</name> | ||
| 933 | + <type>String</type> | ||
| 934 | + <format/> | ||
| 935 | + <currency/> | ||
| 936 | + <decimal/> | ||
| 937 | + <group/> | ||
| 938 | + <nullif>zdlyversion_</nullif> | ||
| 939 | + <length>-1</length> | ||
| 940 | + <precision>-1</precision> | ||
| 941 | + <set_empty_string>N</set_empty_string> | ||
| 942 | + </field> | ||
| 943 | + <field> | ||
| 944 | + <name>col_type</name> | ||
| 945 | + <type>String</type> | ||
| 946 | + <format/> | ||
| 947 | + <currency/> | ||
| 948 | + <decimal/> | ||
| 949 | + <group/> | ||
| 950 | + <nullif>String</nullif> | ||
| 951 | + <length>-1</length> | ||
| 952 | + <precision>-1</precision> | ||
| 953 | + <set_empty_string>N</set_empty_string> | ||
| 954 | + </field> | ||
| 955 | + <field> | ||
| 956 | + <name>col_value</name> | ||
| 957 | + <type>String</type> | ||
| 958 | + <format/> | ||
| 959 | + <currency/> | ||
| 960 | + <decimal/> | ||
| 961 | + <group/> | ||
| 962 | + <nullif>replace</nullif> | ||
| 963 | + <length>-1</length> | ||
| 964 | + <precision>-1</precision> | ||
| 965 | + <set_empty_string>N</set_empty_string> | ||
| 966 | + </field> | ||
| 967 | + </fields> | ||
| 968 | + <cluster_schema/> | ||
| 969 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 970 | + <xloc>390</xloc> | ||
| 971 | + <yloc>532</yloc> | ||
| 972 | + <draw>Y</draw> | ||
| 973 | + </GUI> | ||
| 974 | + </step> | ||
| 975 | + | ||
| 976 | + <step> | ||
| 920 | <name>增加线路名称metadata</name> | 977 | <name>增加线路名称metadata</name> |
| 921 | <type>Constant</type> | 978 | <type>Constant</type> |
| 922 | <description/> | 979 | <description/> |
| @@ -1056,6 +1113,31 @@ | @@ -1056,6 +1113,31 @@ | ||
| 1056 | </step> | 1113 | </step> |
| 1057 | 1114 | ||
| 1058 | <step> | 1115 | <step> |
| 1116 | + <name>替换站点路由版本</name> | ||
| 1117 | + <type>SetValueField</type> | ||
| 1118 | + <description/> | ||
| 1119 | + <distribute>Y</distribute> | ||
| 1120 | + <custom_distribution/> | ||
| 1121 | + <copies>1</copies> | ||
| 1122 | + <partitioning> | ||
| 1123 | + <method>none</method> | ||
| 1124 | + <schema_name/> | ||
| 1125 | + </partitioning> | ||
| 1126 | + <fields> | ||
| 1127 | + <field> | ||
| 1128 | + <name>col_value</name> | ||
| 1129 | + <replaceby>zdlyversion_</replaceby> | ||
| 1130 | + </field> | ||
| 1131 | + </fields> | ||
| 1132 | + <cluster_schema/> | ||
| 1133 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1134 | + <xloc>594</xloc> | ||
| 1135 | + <yloc>532</yloc> | ||
| 1136 | + <draw>Y</draw> | ||
| 1137 | + </GUI> | ||
| 1138 | + </step> | ||
| 1139 | + | ||
| 1140 | + <step> | ||
| 1059 | <name>替换线路名称</name> | 1141 | <name>替换线路名称</name> |
| 1060 | <type>SetValueField</type> | 1142 | <type>SetValueField</type> |
| 1061 | <description/> | 1143 | <description/> |
| @@ -1081,6 +1163,38 @@ | @@ -1081,6 +1163,38 @@ | ||
| 1081 | </step> | 1163 | </step> |
| 1082 | 1164 | ||
| 1083 | <step> | 1165 | <step> |
| 1166 | + <name>站点路由版本metadata字段</name> | ||
| 1167 | + <type>SelectValues</type> | ||
| 1168 | + <description/> | ||
| 1169 | + <distribute>Y</distribute> | ||
| 1170 | + <custom_distribution/> | ||
| 1171 | + <copies>1</copies> | ||
| 1172 | + <partitioning> | ||
| 1173 | + <method>none</method> | ||
| 1174 | + <schema_name/> | ||
| 1175 | + </partitioning> | ||
| 1176 | + <fields> <field> <name>col_name</name> | ||
| 1177 | + <rename/> | ||
| 1178 | + <length>-2</length> | ||
| 1179 | + <precision>-2</precision> | ||
| 1180 | + </field> <field> <name>col_type</name> | ||
| 1181 | + <rename/> | ||
| 1182 | + <length>-2</length> | ||
| 1183 | + <precision>-2</precision> | ||
| 1184 | + </field> <field> <name>col_value</name> | ||
| 1185 | + <rename/> | ||
| 1186 | + <length>-2</length> | ||
| 1187 | + <precision>-2</precision> | ||
| 1188 | + </field> <select_unspecified>N</select_unspecified> | ||
| 1189 | + </fields> <cluster_schema/> | ||
| 1190 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1191 | + <xloc>741</xloc> | ||
| 1192 | + <yloc>533</yloc> | ||
| 1193 | + <draw>Y</draw> | ||
| 1194 | + </GUI> | ||
| 1195 | + </step> | ||
| 1196 | + | ||
| 1197 | + <step> | ||
| 1084 | <name>线路名称metadata字段</name> | 1198 | <name>线路名称metadata字段</name> |
| 1085 | <type>SelectValues</type> | 1199 | <type>SelectValues</type> |
| 1086 | <description/> | 1200 | <description/> |
| @@ -1302,6 +1416,39 @@ | @@ -1302,6 +1416,39 @@ | ||
| 1302 | </step> | 1416 | </step> |
| 1303 | 1417 | ||
| 1304 | <step> | 1418 | <step> |
| 1419 | + <name>获取站点路由version</name> | ||
| 1420 | + <type>GetVariable</type> | ||
| 1421 | + <description/> | ||
| 1422 | + <distribute>Y</distribute> | ||
| 1423 | + <custom_distribution/> | ||
| 1424 | + <copies>1</copies> | ||
| 1425 | + <partitioning> | ||
| 1426 | + <method>none</method> | ||
| 1427 | + <schema_name/> | ||
| 1428 | + </partitioning> | ||
| 1429 | + <fields> | ||
| 1430 | + <field> | ||
| 1431 | + <name>zdlyversion_</name> | ||
| 1432 | + <variable>${lineversion}</variable> | ||
| 1433 | + <type>String</type> | ||
| 1434 | + <format/> | ||
| 1435 | + <currency/> | ||
| 1436 | + <decimal/> | ||
| 1437 | + <group/> | ||
| 1438 | + <length>-1</length> | ||
| 1439 | + <precision>-1</precision> | ||
| 1440 | + <trim_type>none</trim_type> | ||
| 1441 | + </field> | ||
| 1442 | + </fields> | ||
| 1443 | + <cluster_schema/> | ||
| 1444 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1445 | + <xloc>187</xloc> | ||
| 1446 | + <yloc>534</yloc> | ||
| 1447 | + <draw>Y</draw> | ||
| 1448 | + </GUI> | ||
| 1449 | + </step> | ||
| 1450 | + | ||
| 1451 | + <step> | ||
| 1305 | <name>获取线路名称</name> | 1452 | <name>获取线路名称</name> |
| 1306 | <type>GetVariable</type> | 1453 | <type>GetVariable</type> |
| 1307 | <description/> | 1454 | <description/> |
| @@ -1419,153 +1566,6 @@ | @@ -1419,153 +1566,6 @@ | ||
| 1419 | </GUI> | 1566 | </GUI> |
| 1420 | </step> | 1567 | </step> |
| 1421 | 1568 | ||
| 1422 | - <step> | ||
| 1423 | - <name>增加站点路由版本 metadata</name> | ||
| 1424 | - <type>Constant</type> | ||
| 1425 | - <description/> | ||
| 1426 | - <distribute>Y</distribute> | ||
| 1427 | - <custom_distribution/> | ||
| 1428 | - <copies>1</copies> | ||
| 1429 | - <partitioning> | ||
| 1430 | - <method>none</method> | ||
| 1431 | - <schema_name/> | ||
| 1432 | - </partitioning> | ||
| 1433 | - <fields> | ||
| 1434 | - <field> | ||
| 1435 | - <name>col_name</name> | ||
| 1436 | - <type>String</type> | ||
| 1437 | - <format/> | ||
| 1438 | - <currency/> | ||
| 1439 | - <decimal/> | ||
| 1440 | - <group/> | ||
| 1441 | - <nullif>zdlyversion_</nullif> | ||
| 1442 | - <length>-1</length> | ||
| 1443 | - <precision>-1</precision> | ||
| 1444 | - <set_empty_string>N</set_empty_string> | ||
| 1445 | - </field> | ||
| 1446 | - <field> | ||
| 1447 | - <name>col_type</name> | ||
| 1448 | - <type>String</type> | ||
| 1449 | - <format/> | ||
| 1450 | - <currency/> | ||
| 1451 | - <decimal/> | ||
| 1452 | - <group/> | ||
| 1453 | - <nullif>String</nullif> | ||
| 1454 | - <length>-1</length> | ||
| 1455 | - <precision>-1</precision> | ||
| 1456 | - <set_empty_string>N</set_empty_string> | ||
| 1457 | - </field> | ||
| 1458 | - <field> | ||
| 1459 | - <name>col_value</name> | ||
| 1460 | - <type>String</type> | ||
| 1461 | - <format/> | ||
| 1462 | - <currency/> | ||
| 1463 | - <decimal/> | ||
| 1464 | - <group/> | ||
| 1465 | - <nullif>replace</nullif> | ||
| 1466 | - <length>-1</length> | ||
| 1467 | - <precision>-1</precision> | ||
| 1468 | - <set_empty_string>N</set_empty_string> | ||
| 1469 | - </field> | ||
| 1470 | - </fields> | ||
| 1471 | - <cluster_schema/> | ||
| 1472 | - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1473 | - <xloc>390</xloc> | ||
| 1474 | - <yloc>532</yloc> | ||
| 1475 | - <draw>Y</draw> | ||
| 1476 | - </GUI> | ||
| 1477 | - </step> | ||
| 1478 | - | ||
| 1479 | - <step> | ||
| 1480 | - <name>替换站点路由版本</name> | ||
| 1481 | - <type>SetValueField</type> | ||
| 1482 | - <description/> | ||
| 1483 | - <distribute>Y</distribute> | ||
| 1484 | - <custom_distribution/> | ||
| 1485 | - <copies>1</copies> | ||
| 1486 | - <partitioning> | ||
| 1487 | - <method>none</method> | ||
| 1488 | - <schema_name/> | ||
| 1489 | - </partitioning> | ||
| 1490 | - <fields> | ||
| 1491 | - <field> | ||
| 1492 | - <name>col_value</name> | ||
| 1493 | - <replaceby>zdlyversion_</replaceby> | ||
| 1494 | - </field> | ||
| 1495 | - </fields> | ||
| 1496 | - <cluster_schema/> | ||
| 1497 | - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1498 | - <xloc>594</xloc> | ||
| 1499 | - <yloc>532</yloc> | ||
| 1500 | - <draw>Y</draw> | ||
| 1501 | - </GUI> | ||
| 1502 | - </step> | ||
| 1503 | - | ||
| 1504 | - <step> | ||
| 1505 | - <name>站点路由版本metadata字段</name> | ||
| 1506 | - <type>SelectValues</type> | ||
| 1507 | - <description/> | ||
| 1508 | - <distribute>Y</distribute> | ||
| 1509 | - <custom_distribution/> | ||
| 1510 | - <copies>1</copies> | ||
| 1511 | - <partitioning> | ||
| 1512 | - <method>none</method> | ||
| 1513 | - <schema_name/> | ||
| 1514 | - </partitioning> | ||
| 1515 | - <fields> <field> <name>col_name</name> | ||
| 1516 | - <rename/> | ||
| 1517 | - <length>-2</length> | ||
| 1518 | - <precision>-2</precision> | ||
| 1519 | - </field> <field> <name>col_type</name> | ||
| 1520 | - <rename/> | ||
| 1521 | - <length>-2</length> | ||
| 1522 | - <precision>-2</precision> | ||
| 1523 | - </field> <field> <name>col_value</name> | ||
| 1524 | - <rename/> | ||
| 1525 | - <length>-2</length> | ||
| 1526 | - <precision>-2</precision> | ||
| 1527 | - </field> <select_unspecified>N</select_unspecified> | ||
| 1528 | - </fields> <cluster_schema/> | ||
| 1529 | - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1530 | - <xloc>741</xloc> | ||
| 1531 | - <yloc>533</yloc> | ||
| 1532 | - <draw>Y</draw> | ||
| 1533 | - </GUI> | ||
| 1534 | - </step> | ||
| 1535 | - | ||
| 1536 | - <step> | ||
| 1537 | - <name>获取站点路由version</name> | ||
| 1538 | - <type>GetVariable</type> | ||
| 1539 | - <description/> | ||
| 1540 | - <distribute>Y</distribute> | ||
| 1541 | - <custom_distribution/> | ||
| 1542 | - <copies>1</copies> | ||
| 1543 | - <partitioning> | ||
| 1544 | - <method>none</method> | ||
| 1545 | - <schema_name/> | ||
| 1546 | - </partitioning> | ||
| 1547 | - <fields> | ||
| 1548 | - <field> | ||
| 1549 | - <name>zdlyversion_</name> | ||
| 1550 | - <variable>${zdlyversion}</variable> | ||
| 1551 | - <type>String</type> | ||
| 1552 | - <format/> | ||
| 1553 | - <currency/> | ||
| 1554 | - <decimal/> | ||
| 1555 | - <group/> | ||
| 1556 | - <length>-1</length> | ||
| 1557 | - <precision>-1</precision> | ||
| 1558 | - <trim_type>none</trim_type> | ||
| 1559 | - </field> | ||
| 1560 | - </fields> | ||
| 1561 | - <cluster_schema/> | ||
| 1562 | - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1563 | - <xloc>187</xloc> | ||
| 1564 | - <yloc>534</yloc> | ||
| 1565 | - <draw>Y</draw> | ||
| 1566 | - </GUI> | ||
| 1567 | - </step> | ||
| 1568 | - | ||
| 1569 | <step_error_handling> | 1569 | <step_error_handling> |
| 1570 | </step_error_handling> | 1570 | </step_error_handling> |
| 1571 | <slave-step-copy-partition-distribution> | 1571 | <slave-step-copy-partition-distribution> |
src/main/resources/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | </parameter> | 16 | </parameter> |
| 17 | <parameter> | 17 | <parameter> |
| 18 | <name>injectktrfile</name> | 18 | <name>injectktrfile</name> |
| 19 | - <default_value>/Users/xu/resource/project_code/bsth_project/bsth_control/src/main/resources/datatools/ktrs/ttinfodetailDataOutput.ktr</default_value> | 19 | + <default_value>/Users/xu/resource/project_code/bsth_project/bsth_control_parent/bsth_control/src/main/resources/datatools/ktrs/ttinfodetailDataOutput.ktr</default_value> |
| 20 | <description>注入元数据的ktr文件</description> | 20 | <description>注入元数据的ktr文件</description> |
| 21 | </parameter> | 21 | </parameter> |
| 22 | <parameter> | 22 | <parameter> |
| @@ -91,8 +91,8 @@ | @@ -91,8 +91,8 @@ | ||
| 91 | <notepads> | 91 | <notepads> |
| 92 | <notepad> | 92 | <notepad> |
| 93 | <note>TODO：如果groupby 加入bctype，
则以发车顺序号，班次类型分组的数据可能重复，
应为班次类型可能不一样（导入之后人为修改的，如正常班次改成区间），
因为导出时必须数据不重复，这里的解决方法，只使用发车顺序号分组，
以后建议，还是原来的方式分组，然后把更新时间晚的去除

以后改成去除重复纪录</note> | 93 | <note>TODO：如果groupby 加入bctype，
则以发车顺序号，班次类型分组的数据可能重复，
应为班次类型可能不一样（导入之后人为修改的，如正常班次改成区间），
因为导出时必须数据不重复，这里的解决方法，只使用发车顺序号分组，
以后建议，还是原来的方式分组，然后把更新时间晚的去除

以后改成去除重复纪录</note> |
| 94 | - <xloc>37</xloc> | ||
| 95 | - <yloc>309</yloc> | 94 | + <xloc>46</xloc> |
| 95 | + <yloc>400</yloc> | ||
| 96 | <width>406</width> | 96 | <width>406</width> |
| 97 | <heigth>122</heigth> | 97 | <heigth>122</heigth> |
| 98 | <fontname>YaHei Consolas Hybrid</fontname> | 98 | <fontname>YaHei Consolas Hybrid</fontname> |
| @@ -368,6 +368,29 @@ | @@ -368,6 +368,29 @@ | ||
| 368 | </step> | 368 | </step> |
| 369 | 369 | ||
| 370 | <step> | 370 | <step> |
| 371 | + <name>去除重复记录</name> | ||
| 372 | + <type>Unique</type> | ||
| 373 | + <description/> | ||
| 374 | + <distribute>Y</distribute> | ||
| 375 | + <custom_distribution/> | ||
| 376 | + <copies>1</copies> | ||
| 377 | + <partitioning> | ||
| 378 | + <method>none</method> | ||
| 379 | + <schema_name/> | ||
| 380 | + </partitioning> | ||
| 381 | + <count_rows>N</count_rows> | ||
| 382 | + <count_field/> | ||
| 383 | + <reject_duplicate_row>N</reject_duplicate_row> | ||
| 384 | + <error_description/> | ||
| 385 | + <fields> </fields> <cluster_schema/> | ||
| 386 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 387 | + <xloc>842</xloc> | ||
| 388 | + <yloc>592</yloc> | ||
| 389 | + <draw>Y</draw> | ||
| 390 | + </GUI> | ||
| 391 | + </step> | ||
| 392 | + | ||
| 393 | + <step> | ||
| 371 | <name>字段选择</name> | 394 | <name>字段选择</name> |
| 372 | <type>SelectValues</type> | 395 | <type>SelectValues</type> |
| 373 | <description/> | 396 | <description/> |
| @@ -590,7 +613,7 @@ | @@ -590,7 +613,7 @@ | ||
| 590 | <optimizationLevel>9</optimizationLevel> | 613 | <optimizationLevel>9</optimizationLevel> |
| 591 | <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | 614 | <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> |
| 592 | <jsScript_name>Script 1</jsScript_name> | 615 | <jsScript_name>Script 1</jsScript_name> |
| 593 | - <jsScript_script>//Script here

var fieldname; // 字段名
var fieldtype; // 字段类型

if (bc_type == 'in') {
 fieldname = '进场' + fcno;
} else if (bc_type == 'out') {
 fieldname = '出场' + fcno;
} else if (bc_type == 'normal') {
 fieldname = zdname + fcno;
} else {
 fieldname = zdname + fcno;
} 

fieldtype = 'String';
</jsScript_script> | 616 | + <jsScript_script>//Script here

var fieldname; // 字段名
var fieldtype; // 字段类型

if (bc_type == 'in') {
 fieldname = '进场' + "->" + fcno;
} else if (bc_type == 'out') {
 fieldname = '出场' + "->" + fcno;
} else if (bc_type == 'normal') {
 fieldname = zdname + "->" + fcno;
} else {
 fieldname = zdname + "->" + fcno;
} 

fieldtype = 'String';
</jsScript_script> |
| 594 | </jsScript> </jsScripts> <fields> <field> <name>fieldname</name> | 617 | </jsScript> </jsScripts> <fields> <field> <name>fieldname</name> |
| 595 | <rename>fieldname</rename> | 618 | <rename>fieldname</rename> |
| 596 | <type>String</type> | 619 | <type>String</type> |
| @@ -626,7 +649,7 @@ | @@ -626,7 +649,7 @@ | ||
| 626 | <optimizationLevel>9</optimizationLevel> | 649 | <optimizationLevel>9</optimizationLevel> |
| 627 | <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | 650 | <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> |
| 628 | <jsScript_name>Script 1</jsScript_name> | 651 | <jsScript_name>Script 1</jsScript_name> |
| 629 | - <jsScript_script>//Script here

var targetfieldname; // 目标字段名
var targettype; // 目标类型
var valuefieldname; // 值字段名
var keyvalue; // 关键字值

if (bc_type == 'in') {
 targetfieldname = '进场' + fcno;
} else if (bc_type == 'out') {
 targetfieldname = '出场' + fcno;
} else if (bc_type == 'normal') {
 targetfieldname = zdname + fcno;
} else {
 targetfieldname = zdname + fcno;
} 

targettype = 'String';
valuefieldname = 'fcsj';
keyvalue = fcno;
</jsScript_script> | 652 | + <jsScript_script>//Script here

var targetfieldname; // 目标字段名
var targettype; // 目标类型
var valuefieldname; // 值字段名
var keyvalue; // 关键字值

if (bc_type == 'in') {
 targetfieldname = '进场' + "->" + fcno;
} else if (bc_type == 'out') {
 targetfieldname = '出场' + "->" + fcno;
} else if (bc_type == 'normal') {
 targetfieldname = zdname + "->" + fcno;
} else {
 targetfieldname = zdname + "->" + fcno;
} 

targettype = 'String';
valuefieldname = 'fcsj';
keyvalue = fcno;
</jsScript_script> |
| 630 | </jsScript> </jsScripts> <fields> <field> <name>targetfieldname</name> | 653 | </jsScript> </jsScripts> <fields> <field> <name>targetfieldname</name> |
| 631 | <rename>targetfieldname</rename> | 654 | <rename>targetfieldname</rename> |
| 632 | <type>String</type> | 655 | <type>String</type> |
| @@ -718,29 +741,6 @@ | @@ -718,29 +741,6 @@ | ||
| 718 | </GUI> | 741 | </GUI> |
| 719 | </step> | 742 | </step> |
| 720 | 743 | ||
| 721 | - <step> | ||
| 722 | - <name>去除重复记录</name> | ||
| 723 | - <type>Unique</type> | ||
| 724 | - <description/> | ||
| 725 | - <distribute>Y</distribute> | ||
| 726 | - <custom_distribution/> | ||
| 727 | - <copies>1</copies> | ||
| 728 | - <partitioning> | ||
| 729 | - <method>none</method> | ||
| 730 | - <schema_name/> | ||
| 731 | - </partitioning> | ||
| 732 | - <count_rows>N</count_rows> | ||
| 733 | - <count_field/> | ||
| 734 | - <reject_duplicate_row>N</reject_duplicate_row> | ||
| 735 | - <error_description/> | ||
| 736 | - <fields> </fields> <cluster_schema/> | ||
| 737 | - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 738 | - <xloc>842</xloc> | ||
| 739 | - <yloc>592</yloc> | ||
| 740 | - <draw>Y</draw> | ||
| 741 | - </GUI> | ||
| 742 | - </step> | ||
| 743 | - | ||
| 744 | <step_error_handling> | 744 | <step_error_handling> |
| 745 | </step_error_handling> | 745 | </step_error_handling> |
| 746 | <slave-step-copy-partition-distribution> | 746 | <slave-step-copy-partition-distribution> |
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
| @@ -75,11 +75,11 @@ | @@ -75,11 +75,11 @@ | ||
| 75 | </table> | 75 | </table> |
| 76 | </div> | 76 | </div> |
| 77 | <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px"> | 77 | <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px"> |
| 78 | + <input class="btn btn-default hidden" type="button" id="exportMap" value="导出明细" style="float: right;"/> | ||
| 78 | <table class="table table-bordered table-hover table-checkable" id="map"> | 79 | <table class="table table-bordered table-hover table-checkable" id="map"> |
| 79 | <thead> | 80 | <thead> |
| 80 | <tr class="hidden"> | 81 | <tr class="hidden"> |
| 81 | - <th style="display: none;"></th> | ||
| 82 | - <th rowspan="2">日期</th> | 82 | + <th rowspan="2" align="center">日期</th> |
| 83 | <th rowspan="2">线路</th> | 83 | <th rowspan="2">线路</th> |
| 84 | <th colspan="4">上行首发</th> | 84 | <th colspan="4">上行首发</th> |
| 85 | <th colspan="4">上行末发</th> | 85 | <th colspan="4">上行末发</th> |
| @@ -87,8 +87,7 @@ | @@ -87,8 +87,7 @@ | ||
| 87 | <th colspan="4">下行末发</th> | 87 | <th colspan="4">下行末发</th> |
| 88 | </tr> | 88 | </tr> |
| 89 | <tr class="hidden"> | 89 | <tr class="hidden"> |
| 90 | - <th style="display: none;"></th> | ||
| 91 | - <th>站点</th> | 90 | + <th align="center">站点</th> |
| 92 | <th>计发</th> | 91 | <th>计发</th> |
| 93 | <th>实发</th> | 92 | <th>实发</th> |
| 94 | <th>快慢</th> | 93 | <th>快慢</th> |
| @@ -110,12 +109,33 @@ | @@ -110,12 +109,33 @@ | ||
| 110 | 109 | ||
| 111 | </tbody> | 110 | </tbody> |
| 112 | </table> | 111 | </table> |
| 112 | + | ||
| 113 | + <input class="btn btn-default hidden" type="button" id="exportSumMap" value="导出明细" style="float: right;"/> | ||
| 114 | + <table class="table table-bordered table-hover table-checkable" id="sumMap"> | ||
| 115 | + <thead> | ||
| 116 | + <tr class="hidden"> | ||
| 117 | + <th align="center">序号</th> | ||
| 118 | + <th>日期</th> | ||
| 119 | + <th>分公司</th> | ||
| 120 | + <th>线路</th> | ||
| 121 | + <th>首末班次</th> | ||
| 122 | + <th>计发</th> | ||
| 123 | + <th>实发</th> | ||
| 124 | + <th>误差</th> | ||
| 125 | + <th>调度路单备注</th> | ||
| 126 | + </tr> | ||
| 127 | + </thead> | ||
| 128 | + <tbody> | ||
| 129 | + | ||
| 130 | + </tbody> | ||
| 131 | + </table> | ||
| 113 | </div> | 132 | </div> |
| 114 | </div> | 133 | </div> |
| 115 | </div> | 134 | </div> |
| 116 | </div> | 135 | </div> |
| 117 | </div> | 136 | </div> |
| 118 | 137 | ||
| 138 | +<script type="text/javascript" src="js/jquery.table2excel.min.js"></script> | ||
| 119 | <script> | 139 | <script> |
| 120 | $(function(){ | 140 | $(function(){ |
| 121 | $('#export').attr('disabled', "true"); | 141 | $('#export').attr('disabled', "true"); |
| @@ -124,12 +144,9 @@ | @@ -124,12 +144,9 @@ | ||
| 124 | if (!$('body').hasClass('page-sidebar-closed')) | 144 | if (!$('body').hasClass('page-sidebar-closed')) |
| 125 | $('.menu-toggler.sidebar-toggler').click(); | 145 | $('.menu-toggler.sidebar-toggler').click(); |
| 126 | 146 | ||
| 127 | - $("#startDate,#endDate").datetimepicker({ | ||
| 128 | - format : 'YYYY-MM-DD', | ||
| 129 | - locale : 'zh-cn' | ||
| 130 | - }); | ||
| 131 | 147 | ||
| 132 | var d = new Date(); | 148 | var d = new Date(); |
| 149 | + d.setTime(d.getTime() - 1*1000*60*60*24); | ||
| 133 | var year = d.getFullYear(); | 150 | var year = d.getFullYear(); |
| 134 | var month = d.getMonth() + 1; | 151 | var month = d.getMonth() + 1; |
| 135 | var day = d.getDate(); | 152 | var day = d.getDate(); |
| @@ -137,7 +154,13 @@ | @@ -137,7 +154,13 @@ | ||
| 137 | month = "0" + month; | 154 | month = "0" + month; |
| 138 | if(day < 10) | 155 | if(day < 10) |
| 139 | day = "0" + day; | 156 | day = "0" + day; |
| 140 | - $("#startDate,#endDate").val(year + "-" + month + "-" + day); | 157 | + var dateTime = year + "-" + month + "-" + day; |
| 158 | + $("#startDate,#endDate").datetimepicker({ | ||
| 159 | + format : 'YYYY-MM-DD', | ||
| 160 | + locale : 'zh-cn', | ||
| 161 | + maxDate : dateTime | ||
| 162 | + }); | ||
| 163 | + $("#startDate,#endDate").val(dateTime); | ||
| 141 | 164 | ||
| 142 | var fage=false; | 165 | var fage=false; |
| 143 | var xlList; | 166 | var xlList; |
| @@ -218,14 +241,32 @@ | @@ -218,14 +241,32 @@ | ||
| 218 | var list; | 241 | var list; |
| 219 | $("#forms tbody").on("click","a",function(){ | 242 | $("#forms tbody").on("click","a",function(){ |
| 220 | var index = $(this).parent().parent().index(); | 243 | var index = $(this).parent().parent().index(); |
| 221 | - $.each(list, function(i, g){ | ||
| 222 | - if(index == i){ | ||
| 223 | - var tbodyHtml = template('list_maps',{list:g.map}); | ||
| 224 | - $('#map tbody').html(tbodyHtml); | ||
| 225 | - $("#map .hidden").removeClass("hidden"); | ||
| 226 | - $("html,body").animate({scrollTop:$("#map").offset().top},1000); | ||
| 227 | - } | ||
| 228 | - }); | 244 | + if(index < list.length - 1){ |
| 245 | + $.each(list, function(i, g){ | ||
| 246 | + if(index == i){ | ||
| 247 | + var tbodyHtml = template('list_maps',{list:g.map}); | ||
| 248 | + $('#map tbody').html(tbodyHtml); | ||
| 249 | + $("#sumMap tr").addClass("hidden"); | ||
| 250 | + $("#exportSumMap").addClass("hidden"); | ||
| 251 | + $("#map .hidden").removeClass("hidden"); | ||
| 252 | + $("#exportMap").removeClass("hidden"); | ||
| 253 | + $("html,body").animate({scrollTop:$("#map").offset().top},1000); | ||
| 254 | + } | ||
| 255 | + }); | ||
| 256 | + } else { | ||
| 257 | + var tempList = []; | ||
| 258 | + $.each(list, function(i, g){ | ||
| 259 | + if(index == i){ | ||
| 260 | + var tbodyHtml = template('list_sumMaps',{list:g.map}); | ||
| 261 | + $('#sumMap tbody').html(tbodyHtml); | ||
| 262 | + $("#map tr").addClass("hidden"); | ||
| 263 | + $("#exportMap").addClass("hidden"); | ||
| 264 | + $("#sumMap .hidden").removeClass("hidden"); | ||
| 265 | + $("#exportSumMap").removeClass("hidden"); | ||
| 266 | + $("html,body").animate({scrollTop:$("#sumMap").offset().top},1000); | ||
| 267 | + } | ||
| 268 | + }); | ||
| 269 | + } | ||
| 229 | }); | 270 | }); |
| 230 | 271 | ||
| 231 | $("#query").on("click",jsDoQuery); | 272 | $("#query").on("click",jsDoQuery); |
| @@ -260,6 +301,7 @@ | @@ -260,6 +301,7 @@ | ||
| 260 | params['type'] = "query"; | 301 | params['type'] = "query"; |
| 261 | $("#forms .hidden").removeClass("hidden"); | 302 | $("#forms .hidden").removeClass("hidden"); |
| 262 | $("#map tr").addClass("hidden"); | 303 | $("#map tr").addClass("hidden"); |
| 304 | + $("#sumMap tr").addClass("hidden"); | ||
| 263 | $get('/pcpc/firstAndLastBus_sum', params, function(result){ | 305 | $get('/pcpc/firstAndLastBus_sum', params, function(result){ |
| 264 | // 把数据填充到模版中 | 306 | // 把数据填充到模版中 |
| 265 | var tbodyHtml = template('list_firstAndLastBus_sum',{list:result}); | 307 | var tbodyHtml = template('list_firstAndLastBus_sum',{list:result}); |
| @@ -288,6 +330,28 @@ | @@ -288,6 +330,28 @@ | ||
| 288 | }); | 330 | }); |
| 289 | }); | 331 | }); |
| 290 | 332 | ||
| 333 | + $("#exportMap").on("click",function(){ | ||
| 334 | + $("#map").table2excel({ | ||
| 335 | + exclue: ".noExl", | ||
| 336 | + name: "Excel Document Name.xlsx", | ||
| 337 | + filename: "线路首末班", | ||
| 338 | + exclude_img: true, | ||
| 339 | + exclude_links: true, | ||
| 340 | + exclude_inputs: true | ||
| 341 | + }); | ||
| 342 | + }); | ||
| 343 | + | ||
| 344 | + $("#exportSumMap").on("click",function(){ | ||
| 345 | + $("#sumMap").table2excel({ | ||
| 346 | + exclue: ".noExl", | ||
| 347 | + name: "Excel Document Name.xlsx", | ||
| 348 | + filename: "首末班误点班次", | ||
| 349 | + exclude_img: true, | ||
| 350 | + exclude_links: true, | ||
| 351 | + exclude_inputs: true | ||
| 352 | + }); | ||
| 353 | + }); | ||
| 354 | + | ||
| 291 | 355 | ||
| 292 | }); | 356 | }); |
| 293 | 357 | ||
| @@ -307,7 +371,7 @@ | @@ -307,7 +371,7 @@ | ||
| 307 | <td colspan='4'>{{obj.date}}</td> | 371 | <td colspan='4'>{{obj.date}}</td> |
| 308 | <td>{{obj.jhbc}}</td> | 372 | <td>{{obj.jhbc}}</td> |
| 309 | <td>{{obj.sjbc}}</td> | 373 | <td>{{obj.sjbc}}</td> |
| 310 | - <td>{{obj.zdl}}</td> | 374 | + <td><a id='delay'>{{obj.zdl}}</a></td> |
| 311 | {{/if}} | 375 | {{/if}} |
| 312 | </tr> | 376 | </tr> |
| 313 | {{/each}} | 377 | {{/each}} |
| @@ -368,4 +432,19 @@ | @@ -368,4 +432,19 @@ | ||
| 368 | {{/if}} | 432 | {{/if}} |
| 369 | </tr> | 433 | </tr> |
| 370 | {{/each}} | 434 | {{/each}} |
| 435 | +</script> | ||
| 436 | +<script type="text/html" id="list_sumMaps"> | ||
| 437 | + {{each list as obj i}} | ||
| 438 | + <tr> | ||
| 439 | + <td>{{obj.no}}</td> | ||
| 440 | + <td>{{obj.date}}</td> | ||
| 441 | + <td>{{obj.subCompany}}</td> | ||
| 442 | + <td>{{obj.line}}</td> | ||
| 443 | + <td>{{obj.firstOrLast}}</td> | ||
| 444 | + <td>{{obj.jhfc}}</td> | ||
| 445 | + <td>{{obj.sjfc}}</td> | ||
| 446 | + <td> {{obj.delay}}</td> | ||
| 447 | + <td>{{obj.remarks1}}</td> | ||
| 448 | + </tr> | ||
| 449 | + {{/each}} | ||
| 371 | </script> | 450 | </script> |
| 372 | \ No newline at end of file | 451 | \ No newline at end of file |
src/main/resources/static/pages/forms/statement/js/jquery.table2excel.min.js
0 → 100644
| 1 | +/* | ||
| 2 | + * jQuery table2excel - v1.1.1 | ||
| 3 | + * jQuery plugin to export an .xls file in browser from an HTML table | ||
| 4 | + * https://github.com/rainabba/jquery-table2excel | ||
| 5 | + * | ||
| 6 | + * Made by rainabba | ||
| 7 | + * Under MIT License | ||
| 8 | + */ | ||
| 9 | +!function(a,b,c,d){function e(b,c){this.element=b,this.settings=a.extend({},k,c),this._defaults=k,this._name=j,this.init()}function f(a){return a.filename?a.filename:"table2excel"}function g(a){var b=/(\s+alt\s*=\s*"([^"]*)"|\s+alt\s*=\s*'([^']*)')/i;return a.replace(/<img[^>]*>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}function h(a){return a.replace(/<a[^>]*>|<\/a>/gi,"")}function i(a){var b=/(\s+value\s*=\s*"([^"]*)"|\s+value\s*=\s*'([^']*)')/i;return a.replace(/<input[^>]*>|<\/input>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}var j="table2excel",k={exclude:".noExl",name:"Table2Excel",filename:"table2excel",fileext:".xls",exclude_img:!0,exclude_links:!0,exclude_inputs:!0};e.prototype={init:function(){var b=this;b.template={head:'<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><meta http-equiv="content-type" content="application/vnd.ms-excel; charset=UTF-8"><head>\x3c!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets>',sheet:{head:"<x:ExcelWorksheet><x:Name>",tail:"</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>"},mid:"</x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--\x3e</head><body>",table:{head:"<table>",tail:"</table>"},foot:"</body></html>"},b.tableRows=[],a(b.element).each(function(c,d){var e="";a(d).find("tr").not(b.settings.exclude).each(function(c,d){e+="<tr>",a(d).find("td,th").not(b.settings.exclude).each(function(c,d){var f={rows:a(this).attr("rowspan"),cols:a(this).attr("colspan"),flag:a(d).find(b.settings.exclude)};f.flag.length>0?e+="<td> </td>":f.rows&f.cols?e+="<td>"+a(d).html()+"</td>":(e+="<td",f.rows>0&&(e+=" rowspan='"+f.rows+"' "),f.cols>0&&(e+=" colspan='"+f.cols+"' "),e+="/>"+a(d).html()+"</td>")}),e+="</tr>",console.log(e)}),b.settings.exclude_img&&(e=g(e)),b.settings.exclude_links&&(e=h(e)),b.settings.exclude_inputs&&(e=i(e)),b.tableRows.push(e)}),b.tableToExcel(b.tableRows,b.settings.name,b.settings.sheetName)},tableToExcel:function(d,e,g){var h,i,j,k=this,l="";if(k.format=function(a,b){return a.replace(/{(\w+)}/g,function(a,c){return b[c]})},g=void 0===g?"Sheet":g,k.ctx={worksheet:e||"Worksheet",table:d,sheetName:g},l=k.template.head,a.isArray(d))for(h in d)l+=k.template.sheet.head+g+h+k.template.sheet.tail;if(l+=k.template.mid,a.isArray(d))for(h in d)l+=k.template.table.head+"{table"+h+"}"+k.template.table.tail;l+=k.template.foot;for(h in d)k.ctx["table"+h]=d[h];if(delete k.ctx.table,!c.documentMode){var m=new Blob([k.format(l,k.ctx)],{type:"application/vnd.ms-excel"});b.URL=b.URL||b.webkitURL,i=b.URL.createObjectURL(m),j=c.createElement("a"),j.download=f(k.settings),j.href=i,c.body.appendChild(j),j.click(),c.body.removeChild(j)}else if("undefined"!=typeof Blob){l=k.format(l,k.ctx),l=[l];var n=new Blob(l,{type:"text/html"});b.navigator.msSaveBlob(n,f(k.settings))}else txtArea1.document.open("text/html","replace"),txtArea1.document.write(k.format(l,k.ctx)),txtArea1.document.close(),txtArea1.focus(),sa=txtArea1.document.execCommand("SaveAs",!0,f(k.settings));return!0}},a.fn[j]=function(b){var c=this;return c.each(function(){a.data(c,"plugin_"+j)||a.data(c,"plugin_"+j,new e(this,b))}),c}}(jQuery,window,document); | ||
| 0 | \ No newline at end of file | 10 | \ No newline at end of file |
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
| @@ -745,6 +745,25 @@ angular.module('ScheduleApp').factory( | @@ -745,6 +745,25 @@ angular.module('ScheduleApp').factory( | ||
| 745 | } | 745 | } |
| 746 | } | 746 | } |
| 747 | } | 747 | } |
| 748 | + ), | ||
| 749 | + | ||
| 750 | + lineverions: $resource( | ||
| 751 | + '/tic_ec/versiondesc2/:lineId/:status', | ||
| 752 | + {}, | ||
| 753 | + { | ||
| 754 | + list: { | ||
| 755 | + method: 'GET', | ||
| 756 | + isArray: true, | ||
| 757 | + transformResponse: function(rs) { | ||
| 758 | + var dst = angular.fromJson(rs); | ||
| 759 | + if (dst.status == 'SUCCESS') { | ||
| 760 | + return dst.data; | ||
| 761 | + } else { | ||
| 762 | + return dst; // 业务错误留给控制器处理 | ||
| 763 | + } | ||
| 764 | + } | ||
| 765 | + } | ||
| 766 | + } | ||
| 748 | ) | 767 | ) |
| 749 | }; | 768 | }; |
| 750 | 769 |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/form.html
| @@ -106,7 +106,7 @@ | @@ -106,7 +106,7 @@ | ||
| 106 | <label class="col-md-2 control-label">站点路由版本类型*：</label> | 106 | <label class="col-md-2 control-label">站点路由版本类型*：</label> |
| 107 | <div class="col-md-4"> | 107 | <div class="col-md-4"> |
| 108 | <sa-Select5 name="zdlytype" | 108 | <sa-Select5 name="zdlytype" |
| 109 | - model="ctrl.ttInfoDetailManageForForm" | 109 | + model="ctrl" |
| 110 | cmaps="{'zdlytype': 'value'}" | 110 | cmaps="{'zdlytype': 'value'}" |
| 111 | dcname="zdlytype" | 111 | dcname="zdlytype" |
| 112 | icname="value" | 112 | icname="value" |
| @@ -117,20 +117,24 @@ | @@ -117,20 +117,24 @@ | ||
| 117 | searchexp="this.name" | 117 | searchexp="this.name" |
| 118 | required > | 118 | required > |
| 119 | </sa-Select5> | 119 | </sa-Select5> |
| 120 | + <input type="hidden" name="lineversion" ng-model="ctrl.ttInfoDetailManageForForm.lineversion" required/> | ||
| 120 | </div> | 121 | </div> |
| 121 | <!-- 隐藏快，显示验证信息 --> | 122 | <!-- 隐藏快，显示验证信息 --> |
| 122 | <div class="alert alert-danger well-sm" ng-show="myForm.zdlytype.$error.required"> | 123 | <div class="alert alert-danger well-sm" ng-show="myForm.zdlytype.$error.required"> |
| 123 | 请选择站点路由版本类型 | 124 | 请选择站点路由版本类型 |
| 124 | </div> | 125 | </div> |
| 126 | + <div class="alert alert-danger well-sm" ng-show="myForm.lineversion.$error.required"> | ||
| 127 | + 未知线路版本 | ||
| 128 | + </div> | ||
| 125 | </div> | 129 | </div> |
| 126 | 130 | ||
| 127 | - <div class="form-group has-success has-feedback" ng-if="ctrl.ttInfoDetailManageForForm.zdlytype == 2"> | 131 | + <div class="form-group has-success has-feedback" ng-if="ctrl.zdlytype == 2"> |
| 128 | <label class="col-md-2 control-label">最近版本列表*：</label> | 132 | <label class="col-md-2 control-label">最近版本列表*：</label> |
| 129 | <div class="col-md-4"> | 133 | <div class="col-md-4"> |
| 130 | - <sa-Select5 name="zdlyversion" | 134 | + <sa-Select5 name="lineversion_sel" |
| 131 | model="ctrl.ttInfoDetailManageForForm" | 135 | model="ctrl.ttInfoDetailManageForForm" |
| 132 | - cmaps="{'zdlyversion' : 'version'}" | ||
| 133 | - dcname="zdlyversion" | 136 | + cmaps="{'lineversion' : 'version'}" |
| 137 | + dcname="lineversion" | ||
| 134 | icname="version" | 138 | icname="version" |
| 135 | dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.ttInfoDetailManageForForm.xlid}, atype:'rs_version_list' } | json }}" | 139 | dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.ttInfoDetailManageForForm.xlid}, atype:'rs_version_list' } | json }}" |
| 136 | iterobjname="item" | 140 | iterobjname="item" |
| @@ -139,8 +143,9 @@ | @@ -139,8 +143,9 @@ | ||
| 139 | searchexp="this.desc" | 143 | searchexp="this.desc" |
| 140 | required > | 144 | required > |
| 141 | </sa-Select5> | 145 | </sa-Select5> |
| 146 | + | ||
| 142 | </div> | 147 | </div> |
| 143 | - <div class="alert alert-danger well-sm" ng-show="myForm.zdlyversion.$error.required"> | 148 | + <div class="alert alert-danger well-sm" ng-show="myForm.lineversion_sel.$error.required"> |
| 144 | 必须选择版本列表 | 149 | 必须选择版本列表 |
| 145 | </div> | 150 | </div> |
| 146 | </div> | 151 | </div> |
| @@ -168,8 +173,7 @@ | @@ -168,8 +173,7 @@ | ||
| 168 | 'sheetname': ctrl.ttInfoDetailManageForForm.sheetname, | 173 | 'sheetname': ctrl.ttInfoDetailManageForForm.sheetname, |
| 169 | 'lineid' : ctrl.ttInfoDetailManageForForm.xlid, | 174 | 'lineid' : ctrl.ttInfoDetailManageForForm.xlid, |
| 170 | 'linename' : ctrl.ttInfoDetailManageForForm.xlname, | 175 | 'linename' : ctrl.ttInfoDetailManageForForm.xlname, |
| 171 | - 'zdlytype': ctrl.ttInfoDetailManageForForm.zdlytype, | ||
| 172 | - 'zdlyversion' : ctrl.ttInfoDetailManageForForm.zdlyversion | 176 | + 'lineversion' : ctrl.ttInfoDetailManageForForm.lineversion |
| 173 | } | json}}"/> | 177 | } | json}}"/> |
| 174 | </div> | 178 | </div> |
| 175 | <!-- 隐藏块，显示验证信息 --> | 179 | <!-- 隐藏块，显示验证信息 --> |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/module.js
| @@ -3,7 +3,8 @@ angular.module('ScheduleApp').factory( | @@ -3,7 +3,8 @@ angular.module('ScheduleApp').factory( | ||
| 3 | 'TtInfoDetailManageService', | 3 | 'TtInfoDetailManageService', |
| 4 | [ | 4 | [ |
| 5 | 'TimeTableDetailManageService_g', | 5 | 'TimeTableDetailManageService_g', |
| 6 | - function(service) { | 6 | + 'TTInfoManageService_g', |
| 7 | + function(service, service2) { | ||
| 7 | // TODO： | 8 | // TODO： |
| 8 | 9 | ||
| 9 | return { | 10 | return { |
| @@ -17,6 +18,16 @@ angular.module('ScheduleApp').factory( | @@ -17,6 +18,16 @@ angular.module('ScheduleApp').factory( | ||
| 17 | getEditInfo: function(xlid, ttid) { | 18 | getEditInfo: function(xlid, ttid) { |
| 18 | var params = {xlid : xlid, ttid : ttid}; | 19 | var params = {xlid : xlid, ttid : ttid}; |
| 19 | return service.edit.list(params).$promise; | 20 | return service.edit.list(params).$promise; |
| 21 | + }, | ||
| 22 | + /** | ||
| 23 | + * 获取当前线路版本。 | ||
| 24 | + * @param xlid | ||
| 25 | + * @returns {*|Function|promise|n} | ||
| 26 | + */ | ||
| 27 | + getCurrentLineVersion: function(xlid) { | ||
| 28 | + var params = {'lineId': xlid, 'status': 1}; | ||
| 29 | + return service2.lineverions.list(params).$promise; | ||
| 30 | + | ||
| 20 | } | 31 | } |
| 21 | }; | 32 | }; |
| 22 | } | 33 | } |
| @@ -31,7 +42,8 @@ angular.module('ScheduleApp').controller( | @@ -31,7 +42,8 @@ angular.module('ScheduleApp').controller( | ||
| 31 | 'FileUploader', | 42 | 'FileUploader', |
| 32 | '$stateParams', | 43 | '$stateParams', |
| 33 | '$state', | 44 | '$state', |
| 34 | - function(service, FileUploader, $stateParams, $state) { | 45 | + '$scope', |
| 46 | + function(service, FileUploader, $stateParams, $state, $scope) { | ||
| 35 | var self = this; | 47 | var self = this; |
| 36 | var xlid = $stateParams.xlid; | 48 | var xlid = $stateParams.xlid; |
| 37 | var ttid = $stateParams.ttid; | 49 | var ttid = $stateParams.ttid; |
| @@ -40,10 +52,35 @@ angular.module('ScheduleApp').controller( | @@ -40,10 +52,35 @@ angular.module('ScheduleApp').controller( | ||
| 40 | 52 | ||
| 41 | self.title = xlname + '（' + ttname + '）' + '时刻表明细信息excel数据导入'; | 53 | self.title = xlname + '（' + ttname + '）' + '时刻表明细信息excel数据导入'; |
| 42 | 54 | ||
| 55 | + // 站点路由选择类型 | ||
| 56 | + self.zdlytype = 1; | ||
| 57 | + | ||
| 58 | + $scope.$watch( | ||
| 59 | + function() { | ||
| 60 | + return self.zdlytype; | ||
| 61 | + }, | ||
| 62 | + function(n, o) { | ||
| 63 | + if (n == 1) { | ||
| 64 | + // 初始获取线路当前版本 | ||
| 65 | + service.getCurrentLineVersion(xlid).then( | ||
| 66 | + function(result) { | ||
| 67 | + if (result.length == 0) { | ||
| 68 | + alert("没有线路当前版本"); | ||
| 69 | + } else if (result.length > 1) { | ||
| 70 | + alert("有多个线路当前版本"); | ||
| 71 | + } else { | ||
| 72 | + self.ttInfoDetailManageForForm.lineversion = result[0].version; | ||
| 73 | + } | ||
| 74 | + } | ||
| 75 | + ); | ||
| 76 | + } | ||
| 77 | + }, | ||
| 78 | + true | ||
| 79 | + ); | ||
| 80 | + | ||
| 43 | // 欲保存的表单信息，双向绑定 | 81 | // 欲保存的表单信息，双向绑定 |
| 44 | self.ttInfoDetailManageForForm = { | 82 | self.ttInfoDetailManageForForm = { |
| 45 | - zdlytype: 1, // 站点路由类型 | ||
| 46 | - zdlyversion: -1, // 站点路由版本 | 83 | + lineversion: undefined, // 线路版本 |
| 47 | xlid: xlid, // 线路id | 84 | xlid: xlid, // 线路id |
| 48 | ttid: ttid, // 时刻表id | 85 | ttid: ttid, // 时刻表id |
| 49 | xlname: xlname, // 线路名称 | 86 | xlname: xlname, // 线路名称 |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/service.js
| @@ -71,6 +71,25 @@ angular.module('ScheduleApp').factory( | @@ -71,6 +71,25 @@ angular.module('ScheduleApp').factory( | ||
| 71 | } | 71 | } |
| 72 | } | 72 | } |
| 73 | } | 73 | } |
| 74 | + ), | ||
| 75 | + | ||
| 76 | + lineverions: $resource( | ||
| 77 | + '/tic_ec/versiondesc2/:lineId/:status', | ||
| 78 | + {}, | ||
| 79 | + { | ||
| 80 | + list: { | ||
| 81 | + method: 'GET', | ||
| 82 | + isArray: true, | ||
| 83 | + transformResponse: function(rs) { | ||
| 84 | + var dst = angular.fromJson(rs); | ||
| 85 | + if (dst.status == 'SUCCESS') { | ||
| 86 | + return dst.data; | ||
| 87 | + } else { | ||
| 88 | + return dst; // 业务错误留给控制器处理 | ||
| 89 | + } | ||
| 90 | + } | ||
| 91 | + } | ||
| 92 | + } | ||
| 74 | ) | 93 | ) |
| 75 | }; | 94 | }; |
| 76 | 95 |