Commit e4e24e2d6ee6aba06a6dbcd50d25a573f93d0077
Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
Showing
50 changed files
with
4201 additions
and
302 deletions
src/main/java/com/bsth/Application.java
| @@ -17,7 +17,7 @@ import java.util.concurrent.ScheduledExecutorService; | @@ -17,7 +17,7 @@ import java.util.concurrent.ScheduledExecutorService; | ||
| 17 | @SpringBootApplication | 17 | @SpringBootApplication |
| 18 | public class Application extends SpringBootServletInitializer { | 18 | public class Application extends SpringBootServletInitializer { |
| 19 | 19 | ||
| 20 | - public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(17); | 20 | + public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(18); |
| 21 | 21 | ||
| 22 | @Override | 22 | @Override |
| 23 | protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { | 23 | protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { |
src/main/java/com/bsth/XDApplication.java
| 1 | package com.bsth; | 1 | package com.bsth; |
| 2 | 2 | ||
| 3 | import com.bsth.data.BasicData; | 3 | import com.bsth.data.BasicData; |
| 4 | +import com.bsth.data.LineVersionsData; | ||
| 4 | import com.bsth.data.ThreadMonotor; | 5 | import com.bsth.data.ThreadMonotor; |
| 5 | import com.bsth.data.car_out_info.UpdateDBThread; | 6 | import com.bsth.data.car_out_info.UpdateDBThread; |
| 6 | import com.bsth.data.directive.DirectivesPstThread; | 7 | import com.bsth.data.directive.DirectivesPstThread; |
| 7 | import com.bsth.data.forecast.SampleTimeDataLoader; | 8 | import com.bsth.data.forecast.SampleTimeDataLoader; |
| 8 | import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread; | 9 | import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread; |
| 10 | +import com.bsth.data.gpsdata_v2.thread.OfflineMonitorThread; | ||
| 9 | import com.bsth.data.msg_queue.DirectivePushQueue; | 11 | import com.bsth.data.msg_queue.DirectivePushQueue; |
| 10 | import com.bsth.data.msg_queue.WebSocketPushQueue; | 12 | import com.bsth.data.msg_queue.WebSocketPushQueue; |
| 11 | import com.bsth.data.schedule.DayOfSchedule; | 13 | import com.bsth.data.schedule.DayOfSchedule; |
| @@ -67,6 +69,12 @@ public class XDApplication implements CommandLineRunner { | @@ -67,6 +69,12 @@ public class XDApplication implements CommandLineRunner { | ||
| 67 | @Autowired | 69 | @Autowired |
| 68 | GpsDataLoaderThread gpsDataLoader; | 70 | GpsDataLoaderThread gpsDataLoader; |
| 69 | 71 | ||
| 72 | + @Autowired | ||
| 73 | + OfflineMonitorThread offlineMonitorThread; | ||
| 74 | + | ||
| 75 | + @Autowired | ||
| 76 | + LineVersionsData lineVersionsData; | ||
| 77 | + | ||
| 70 | private static long timeDiff; | 78 | private static long timeDiff; |
| 71 | private static long timeDiffTraffic; | 79 | private static long timeDiffTraffic; |
| 72 | 80 | ||
| @@ -134,11 +142,11 @@ public class XDApplication implements CommandLineRunner { | @@ -134,11 +142,11 @@ public class XDApplication implements CommandLineRunner { | ||
| 134 | sexec.scheduleWithFixedDelay(scheduleLateThread, 70, 30, TimeUnit.SECONDS);//检查班次误点 | 142 | sexec.scheduleWithFixedDelay(scheduleLateThread, 70, 30, TimeUnit.SECONDS);//检查班次误点 |
| 135 | sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据 | 143 | sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据 |
| 136 | 144 | ||
| 137 | - //sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 | 145 | + sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 |
| 138 | sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程 | 146 | sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程 |
| 139 | sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库 | 147 | sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库 |
| 140 | sexec.scheduleWithFixedDelay(directivesPstThread, 180, 120, TimeUnit.SECONDS);//调度指令延迟入库 | 148 | sexec.scheduleWithFixedDelay(directivesPstThread, 180, 120, TimeUnit.SECONDS);//调度指令延迟入库 |
| 141 | - sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听(防止重要的线程阻塞、异常结束。以及部分主备切换工作) | 149 | + //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听(防止重要的线程阻塞、异常结束。以及部分主备切换工作) |
| 142 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 | 150 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 |
| 143 | sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新 | 151 | sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新 |
| 144 | sexec.scheduleWithFixedDelay(autoExecScanThread, 160, 50, TimeUnit.SECONDS);//班次自动执行 | 152 | sexec.scheduleWithFixedDelay(autoExecScanThread, 160, 50, TimeUnit.SECONDS);//班次自动执行 |
| @@ -146,7 +154,7 @@ public class XDApplication implements CommandLineRunner { | @@ -146,7 +154,7 @@ public class XDApplication implements CommandLineRunner { | ||
| 146 | WebSocketPushQueue.start();//消息队列 -webSocket ,推送至线调web页面的 | 154 | WebSocketPushQueue.start();//消息队列 -webSocket ,推送至线调web页面的 |
| 147 | 155 | ||
| 148 | /** 线调为其他程序提供的数据 --写入数据库 */ | 156 | /** 线调为其他程序提供的数据 --写入数据库 */ |
| 149 | - sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 40, TimeUnit.SECONDS);//发车信息(发车屏、信息发布) | 157 | + sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息(发车屏、信息发布) |
| 150 | //线路首末班数据(网关用,班次更新时写入) | 158 | //线路首末班数据(网关用,班次更新时写入) |
| 151 | //com.bsth.data.schedule.f_a_l.FirstAndLastHandler | 159 | //com.bsth.data.schedule.f_a_l.FirstAndLastHandler |
| 152 | sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息(网关用,补信号) | 160 | sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息(网关用,补信号) |
| @@ -156,5 +164,8 @@ public class XDApplication implements CommandLineRunner { | @@ -156,5 +164,8 @@ public class XDApplication implements CommandLineRunner { | ||
| 156 | sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS); | 164 | sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS); |
| 157 | //计算油、公里加注 | 165 | //计算油、公里加注 |
| 158 | sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS); | 166 | sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS); |
| 167 | + | ||
| 168 | + //线路版本更新 | ||
| 169 | + sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS); | ||
| 159 | } | 170 | } |
| 160 | } | 171 | } |
src/main/java/com/bsth/common/Constants.java
| @@ -33,6 +33,8 @@ public class Constants { | @@ -33,6 +33,8 @@ public class Constants { | ||
| 33 | 33 | ||
| 34 | //车载网关上行接口 | 34 | //车载网关上行接口 |
| 35 | public static final String UPSTREAM_URL = "/control/upstream"; | 35 | public static final String UPSTREAM_URL = "/control/upstream"; |
| 36 | + //rfid 上传入口 | ||
| 37 | + public static final String UP_RFID_URL = "/rfid/**"; | ||
| 36 | 38 | ||
| 37 | public static final String SESSION_USERNAME = "sessionUserName"; | 39 | public static final String SESSION_USERNAME = "sessionUserName"; |
| 38 | public static final String COMPANY_AUTHORITYS = "cmyAuths"; | 40 | public static final String COMPANY_AUTHORITYS = "cmyAuths"; |
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
| @@ -2,14 +2,16 @@ package com.bsth.controller.schedule.core; | @@ -2,14 +2,16 @@ package com.bsth.controller.schedule.core; | ||
| 2 | 2 | ||
| 3 | import com.bsth.common.ResponseCode; | 3 | import com.bsth.common.ResponseCode; |
| 4 | import com.bsth.controller.schedule.BController; | 4 | import com.bsth.controller.schedule.BController; |
| 5 | +import com.bsth.entity.LineVersions; | ||
| 5 | import com.bsth.entity.schedule.TTInfo; | 6 | import com.bsth.entity.schedule.TTInfo; |
| 7 | +import com.bsth.service.LineVersionsService; | ||
| 6 | import com.bsth.service.schedule.TTInfoService; | 8 | import com.bsth.service.schedule.TTInfoService; |
| 7 | import com.bsth.service.schedule.exception.ScheduleException; | 9 | import com.bsth.service.schedule.exception.ScheduleException; |
| 10 | +import org.joda.time.DateTime; | ||
| 8 | import org.springframework.beans.factory.annotation.Autowired; | 11 | import org.springframework.beans.factory.annotation.Autowired; |
| 9 | import org.springframework.web.bind.annotation.*; | 12 | import org.springframework.web.bind.annotation.*; |
| 10 | 13 | ||
| 11 | -import java.util.HashMap; | ||
| 12 | -import java.util.Map; | 14 | +import java.util.*; |
| 13 | 15 | ||
| 14 | /** | 16 | /** |
| 15 | * Created by xu on 16/12/20. | 17 | * Created by xu on 16/12/20. |
| @@ -19,6 +21,56 @@ import java.util.Map; | @@ -19,6 +21,56 @@ import java.util.Map; | ||
| 19 | public class TTInfoController extends BController<TTInfo, Long> { | 21 | public class TTInfoController extends BController<TTInfo, Long> { |
| 20 | @Autowired | 22 | @Autowired |
| 21 | private TTInfoService ttInfoService; | 23 | private TTInfoService ttInfoService; |
| 24 | + @Autowired | ||
| 25 | + private LineVersionsService lineVersionsService; | ||
| 26 | + | ||
| 27 | + @RequestMapping(value = "/stationroute/{lineid}", method = RequestMethod.GET) | ||
| 28 | + public Map<String, Object> getLineStationRouteVersions(@PathVariable(value = "lineid") Integer lineid) { | ||
| 29 | + Map<String, Object> rtn = new HashMap<>(); | ||
| 30 | + try { | ||
| 31 | + List<LineVersions> lineVersionses = lineVersionsService.findByLineCode(lineid); | ||
| 32 | + Collections.sort(lineVersionses, new Comparator<LineVersions>() { | ||
| 33 | + @Override | ||
| 34 | + public int compare(LineVersions o1, LineVersions o2) { | ||
| 35 | + if (o1.getVersions() > o2.getVersions()) { | ||
| 36 | + return -1; | ||
| 37 | + } else if (o1.getVersions() < o2.getVersions()) { | ||
| 38 | + return 1; | ||
| 39 | + } else { | ||
| 40 | + return 0; | ||
| 41 | + } | ||
| 42 | + } | ||
| 43 | + }); | ||
| 44 | + | ||
| 45 | + // 取最近2条记录 | ||
| 46 | + List<Map<String, Object>> mapList = new ArrayList<>(); | ||
| 47 | + for (LineVersions lv: lineVersionses) { | ||
| 48 | + String vname = lv.getName(); | ||
| 49 | + String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日"); | ||
| 50 | + String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新"); | ||
| 51 | + | ||
| 52 | + Map<String, Object> value = new HashMap<>(); | ||
| 53 | + value.put("desc", vname + "-" + rq + "-" + sdesc); | ||
| 54 | + value.put("version", lv.getVersions()); | ||
| 55 | + | ||
| 56 | + mapList.add(value); | ||
| 57 | + | ||
| 58 | + if (mapList.size() == 2) { | ||
| 59 | + break; | ||
| 60 | + } | ||
| 61 | + } | ||
| 62 | + | ||
| 63 | + rtn.put("status", ResponseCode.SUCCESS); | ||
| 64 | + rtn.put("data", mapList); | ||
| 65 | + | ||
| 66 | + } catch (Exception exp) { | ||
| 67 | + rtn.put("status", ResponseCode.ERROR); | ||
| 68 | + rtn.put("msg", exp.getMessage()); | ||
| 69 | + } | ||
| 70 | + | ||
| 71 | + return rtn; | ||
| 72 | + | ||
| 73 | + } | ||
| 22 | 74 | ||
| 23 | @RequestMapping(value = "/validate_name", method = RequestMethod.GET) | 75 | @RequestMapping(value = "/validate_name", method = RequestMethod.GET) |
| 24 | public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) { | 76 | public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) { |
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
| @@ -35,10 +35,27 @@ public class TTInfoDetailController extends BController<TTInfoDetail, Long> { | @@ -35,10 +35,27 @@ public class TTInfoDetailController extends BController<TTInfoDetail, Long> { | ||
| 35 | * @return | 35 | * @return |
| 36 | */ | 36 | */ |
| 37 | @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST) | 37 | @RequestMapping(value = "/validate/sheet", method = RequestMethod.POST) |
| 38 | - public Map<String, Object> validate_sheet(String filename, String sheetname, Integer lineid, String linename) { | 38 | + public Map<String, Object> validate_sheet( |
| 39 | + String filename, String sheetname, Integer lineid, String linename, | ||
| 40 | + Integer zdlytype, Integer zdlyversion) { | ||
| 39 | Map<String, Object> rtn = new HashMap<>(); | 41 | Map<String, Object> rtn = new HashMap<>(); |
| 40 | try { | 42 | try { |
| 41 | - ttInfoDetailService.validateExcelSheet(filename, sheetname, lineid, linename); | 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 | + } | ||
| 57 | + } | ||
| 58 | + | ||
| 42 | rtn.put("status", ResponseCode.SUCCESS); | 59 | rtn.put("status", ResponseCode.SUCCESS); |
| 43 | } catch (Exception exp) { | 60 | } catch (Exception exp) { |
| 44 | rtn.put("status", ResponseCode.ERROR); | 61 | rtn.put("status", ResponseCode.ERROR); |
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
| @@ -68,7 +68,7 @@ public class DataHandleProcess { | @@ -68,7 +68,7 @@ public class DataHandleProcess { | ||
| 68 | count = new CountDownLatch(ks.size()); | 68 | count = new CountDownLatch(ks.size()); |
| 69 | 69 | ||
| 70 | for (Integer index : ks) { | 70 | for (Integer index : ks) { |
| 71 | - threadPool.submit(new SignalHandleThread(dataListMap.get(index), count)); | 71 | + threadPool.execute(new SignalHandleThread(dataListMap.get(index), count)); |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | //等待子线程结束 | 74 | //等待子线程结束 |
| @@ -97,6 +97,9 @@ public class DataHandleProcess { | @@ -97,6 +97,9 @@ public class DataHandleProcess { | ||
| 97 | try { | 97 | try { |
| 98 | for (GpsEntity gps : list) { | 98 | for (GpsEntity gps : list) { |
| 99 | try{ | 99 | try{ |
| 100 | + if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20) | ||
| 101 | + continue; | ||
| 102 | + | ||
| 100 | gpsStateProcess.process(gps);//状态处理 | 103 | gpsStateProcess.process(gps);//状态处理 |
| 101 | stationInsideProcess.process(gps);//场站内外判定 | 104 | stationInsideProcess.process(gps);//场站内外判定 |
| 102 | reverseRouteProcess.process(gps);//反向路由处理 | 105 | reverseRouteProcess.process(gps);//反向路由处理 |
| @@ -132,4 +135,4 @@ public class DataHandleProcess { | @@ -132,4 +135,4 @@ public class DataHandleProcess { | ||
| 132 | return t; | 135 | return t; |
| 133 | } | 136 | } |
| 134 | } | 137 | } |
| 135 | -} | 138 | +} |
| 136 | \ No newline at end of file | 139 | \ No newline at end of file |
src/main/java/com/bsth/data/gpsdata_v2/cache/GeoCacheData.java
| @@ -278,7 +278,7 @@ public class GeoCacheData { | @@ -278,7 +278,7 @@ public class GeoCacheData { | ||
| 278 | int len = coords.length; | 278 | int len = coords.length; |
| 279 | for (int i = 0; i < len; i++) { | 279 | for (int i = 0; i < len; i++) { |
| 280 | temps = coords[i].split(" "); | 280 | temps = coords[i].split(" "); |
| 281 | - cds.add(new Point(Float.parseFloat(temps[1]), Float.parseFloat(temps[0]))); | 281 | + cds.add(new Point(Float.parseFloat(temps[0]), Float.parseFloat(temps[1]))); |
| 282 | } | 282 | } |
| 283 | return new Polygon(cds); | 283 | return new Polygon(cds); |
| 284 | } | 284 | } |
| @@ -297,6 +297,19 @@ public class GeoCacheData { | @@ -297,6 +297,19 @@ public class GeoCacheData { | ||
| 297 | } | 297 | } |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | + /** | ||
| 301 | + * 是否是环线 | ||
| 302 | + * @param lineId | ||
| 303 | + * @return | ||
| 304 | + */ | ||
| 305 | + public static boolean isLoopLine(String lineId) { | ||
| 306 | + List<StationRoute> srs = getStationRoute(lineId , 0); | ||
| 307 | + if(srs.get(0).getName().equals(srs.get(srs.size()- 1).getName()) | ||
| 308 | + && getStationRoute(lineId , 1).size()==2) | ||
| 309 | + return true; | ||
| 310 | + return false; | ||
| 311 | + } | ||
| 312 | + | ||
| 300 | private static class PreconditionGeoComp implements Comparator<PreconditionGeo>{ | 313 | private static class PreconditionGeoComp implements Comparator<PreconditionGeo>{ |
| 301 | 314 | ||
| 302 | @Override | 315 | @Override |
| @@ -308,4 +321,4 @@ public class GeoCacheData { | @@ -308,4 +321,4 @@ public class GeoCacheData { | ||
| 308 | public static Map<String, String> sectionCode2NameMap(){ | 321 | public static Map<String, String> sectionCode2NameMap(){ |
| 309 | return sectionCode2Name; | 322 | return sectionCode2Name; |
| 310 | } | 323 | } |
| 311 | -} | 324 | +} |
| 312 | \ No newline at end of file | 325 | \ No newline at end of file |
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
| @@ -33,6 +33,15 @@ public class GpsCacheData { | @@ -33,6 +33,15 @@ public class GpsCacheData { | ||
| 33 | return gpsCacheMap.get(device); | 33 | return gpsCacheMap.get(device); |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | + /** | ||
| 37 | + * 清除车辆的轨迹数据 | ||
| 38 | + * @param nbbm | ||
| 39 | + */ | ||
| 40 | + public static void remove(String nbbm){ | ||
| 41 | + logger.info("清除车辆到离站轨迹, " + nbbm); | ||
| 42 | + trailListMultimap.removeAll(nbbm); | ||
| 43 | + } | ||
| 44 | + | ||
| 36 | public static GpsExecTrail gpsExecTrail(String nbbm){ | 45 | public static GpsExecTrail gpsExecTrail(String nbbm){ |
| 37 | List<GpsExecTrail> list = trailListMultimap.get(nbbm); | 46 | List<GpsExecTrail> list = trailListMultimap.get(nbbm); |
| 38 | 47 | ||
| @@ -104,6 +113,29 @@ public class GpsCacheData { | @@ -104,6 +113,29 @@ public class GpsCacheData { | ||
| 104 | return null; | 113 | return null; |
| 105 | } | 114 | } |
| 106 | 115 | ||
| 116 | + /** | ||
| 117 | + * 最后一段轨迹 | ||
| 118 | + * @param gps | ||
| 119 | + * @return | ||
| 120 | + */ | ||
| 121 | + public static int lastInTrailsSize(GpsEntity gps) { | ||
| 122 | + //int size = 0; | ||
| 123 | + List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm()); | ||
| 124 | + if(null == trails || trails.size() == 0) | ||
| 125 | + return 0; | ||
| 126 | + | ||
| 127 | + GpsExecTrail gs = trails.get(trails.size() - 1); | ||
| 128 | + if(gs.isEnd()) | ||
| 129 | + return 0; | ||
| 130 | + | ||
| 131 | + Set<String> set = new HashSet<>(); | ||
| 132 | + for(GpsEntity g : gs.getSrs()){ | ||
| 133 | + if(g.getInstation() == 1) | ||
| 134 | + set.add(g.getStation().getName()); | ||
| 135 | + } | ||
| 136 | + return set.size(); | ||
| 137 | + } | ||
| 138 | + | ||
| 107 | public static List<StationRoute> prevMultiStation(GpsEntity gps) { | 139 | public static List<StationRoute> prevMultiStation(GpsEntity gps) { |
| 108 | List<StationRoute> rs = new ArrayList<>(); | 140 | List<StationRoute> rs = new ArrayList<>(); |
| 109 | List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm()); | 141 | List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm()); |
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
| @@ -42,40 +42,55 @@ public class InStationProcess { | @@ -42,40 +42,55 @@ public class InStationProcess { | ||
| 42 | 42 | ||
| 43 | Logger logger = LoggerFactory.getLogger(this.getClass()); | 43 | Logger logger = LoggerFactory.getLogger(this.getClass()); |
| 44 | 44 | ||
| 45 | - public void process(GpsEntity gps){ | 45 | + public void process(GpsEntity gps) { |
| 46 | GpsEntity prev = GpsCacheData.getPrev(gps); | 46 | GpsEntity prev = GpsCacheData.getPrev(gps); |
| 47 | 47 | ||
| 48 | - if(isInsideStation(gps) && | ||
| 49 | - (prev == null || !isInsideStation(prev) || !prev.getStopNo().equals(gps.getStopNo()))){ | ||
| 50 | - inStation(gps, prev); //进站 | 48 | + if(null == prev) |
| 49 | + return; | ||
| 50 | + | ||
| 51 | + //从站外到站内 | ||
| 52 | + if(prev.getInstation() == 0 && gps.getInstation() > 0){ | ||
| 53 | + inStation(gps, prev); | ||
| 51 | } | 54 | } |
| 52 | - } | ||
| 53 | 55 | ||
| 54 | - private boolean isInsideStation(GpsEntity gps){ | ||
| 55 | - return gps.getInstation() >= 1; | 56 | + //从站内到另一个站内 |
| 57 | + if(prev.getInstation() == 1 && gps.getInstation() == 1 | ||
| 58 | + && !prev.getStopNo().equals(gps.getStopNo()) | ||
| 59 | + && !prev.getStation().getName().equals(gps.getStation().getName())) | ||
| 60 | + inStation(gps, prev); | ||
| 61 | + | ||
| 62 | + //从场内到站内 | ||
| 63 | + if(prev.getInstation() == 2 && gps.getInstation() == 1){ | ||
| 64 | + inStation(gps, prev); | ||
| 65 | + } | ||
| 66 | + | ||
| 67 | + //被起点站覆盖的情况下进场 | ||
| 68 | + if(isInPark(gps, prev)) | ||
| 69 | + inStation(gps, prev); | ||
| 56 | } | 70 | } |
| 57 | 71 | ||
| 58 | /** | 72 | /** |
| 59 | * 进站 | 73 | * 进站 |
| 74 | + * | ||
| 60 | * @param gps | 75 | * @param gps |
| 61 | * @param prev | 76 | * @param prev |
| 62 | */ | 77 | */ |
| 63 | - private void inStation(GpsEntity gps, GpsEntity prev){ | ||
| 64 | - boolean flow=true; | ||
| 65 | - //要经过一个中途站才能进 | ||
| 66 | - StationRoute s = GpsCacheData.prevStation(gps); | 78 | + private void inStation(GpsEntity gps, GpsEntity prev) { |
| 79 | + ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm()); | ||
| 80 | + boolean flow = true; | ||
| 81 | + //要经过2个中途站才能进 | ||
| 82 | + int count = GpsCacheData.lastInTrailsSize(gps); | ||
| 67 | List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown()); | 83 | List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown()); |
| 68 | - if(routes.size() > 3 && null != s && s.getName().equals(gps.getStation().getName())){ | 84 | + if (isNotInOut(sch) && gps.getInstation() == 1 && routes.size() > 4 |
| 85 | + && count < 2) { | ||
| 69 | logger.info("没有进中途站,拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp()); | 86 | logger.info("没有进中途站,拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp()); |
| 70 | flow = false; | 87 | flow = false; |
| 71 | } | 88 | } |
| 72 | 89 | ||
| 73 | - | ||
| 74 | - ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm()); | ||
| 75 | - boolean isEnd=false; | 90 | + boolean isEnd = false; |
| 76 | 91 | ||
| 77 | //进终点 | 92 | //进终点 |
| 78 | - if(flow && null != sch && sch.getZdzCode().equals(gps.getStopNo())){ | 93 | + if (flow && null != sch && sch.getZdzCode().equals(gps.getStopNo())) { |
| 79 | inEndStation(sch, gps); | 94 | inEndStation(sch, gps); |
| 80 | isEnd = true; | 95 | isEnd = true; |
| 81 | } | 96 | } |
| @@ -83,18 +98,23 @@ public class InStationProcess { | @@ -83,18 +98,23 @@ public class InStationProcess { | ||
| 83 | GpsCacheData.in(gps, isEnd); | 98 | GpsCacheData.in(gps, isEnd); |
| 84 | } | 99 | } |
| 85 | 100 | ||
| 101 | + private boolean isNotInOut(ScheduleRealInfo sch) { | ||
| 102 | + return !sch.getBcType().equals("in") && !sch.getBcType().equals("out"); | ||
| 103 | + } | ||
| 104 | + | ||
| 86 | /** | 105 | /** |
| 87 | * 进班次终点 | 106 | * 进班次终点 |
| 107 | + * | ||
| 88 | * @param gps | 108 | * @param gps |
| 89 | */ | 109 | */ |
| 90 | private void inEndStation(ScheduleRealInfo sch, GpsEntity gps) { | 110 | private void inEndStation(ScheduleRealInfo sch, GpsEntity gps) { |
| 91 | String nbbm = sch.getClZbh(); | 111 | String nbbm = sch.getClZbh(); |
| 92 | //校验进站前置约束 | 112 | //校验进站前置约束 |
| 93 | - if(!validInPremise(gps)) | 113 | + if (!validInPremise(gps)) |
| 94 | return; | 114 | return; |
| 95 | 115 | ||
| 96 | //实达时间不覆盖 | 116 | //实达时间不覆盖 |
| 97 | - if(StringUtils.isNotEmpty(sch.getZdsjActual())) | 117 | + if (StringUtils.isNotEmpty(sch.getZdsjActual())) |
| 98 | return; | 118 | return; |
| 99 | 119 | ||
| 100 | //应用到离站缓冲区设置参数 | 120 | //应用到离站缓冲区设置参数 |
| @@ -110,14 +130,14 @@ public class InStationProcess { | @@ -110,14 +130,14 @@ public class InStationProcess { | ||
| 110 | 130 | ||
| 111 | //车辆的下一个班次 | 131 | //车辆的下一个班次 |
| 112 | ScheduleRealInfo next = dayOfSchedule.next(sch); | 132 | ScheduleRealInfo next = dayOfSchedule.next(sch); |
| 113 | - if(next != null){ | 133 | + if (next != null) { |
| 114 | dayOfSchedule.addExecPlan(next); | 134 | dayOfSchedule.addExecPlan(next); |
| 115 | inStationAndInPark(sch, next);//进站既进场 | 135 | inStationAndInPark(sch, next);//进站既进场 |
| 116 | } | 136 | } |
| 117 | 137 | ||
| 118 | //路牌的下一个班次,页面显示起点实际到达时间 | 138 | //路牌的下一个班次,页面显示起点实际到达时间 |
| 119 | ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch); | 139 | ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch); |
| 120 | - if(lpNext != null){ | 140 | + if (lpNext != null) { |
| 121 | lpNext.setQdzArrDatesj(sch.getZdsjActual()); | 141 | lpNext.setQdzArrDatesj(sch.getZdsjActual()); |
| 122 | } | 142 | } |
| 123 | 143 | ||
| @@ -138,33 +158,34 @@ public class InStationProcess { | @@ -138,33 +158,34 @@ public class InStationProcess { | ||
| 138 | DirectivePushQueue.put6002(next, doneSum, "到站@系统"); | 158 | DirectivePushQueue.put6002(next, doneSum, "到站@系统"); |
| 139 | 159 | ||
| 140 | //套跑 -下发线路切换指令 | 160 | //套跑 -下发线路切换指令 |
| 141 | - if(null != next && !next.getXlBm().equals(sch.getXlBm())){ | 161 | + if (null != next && !next.getXlBm().equals(sch.getXlBm())) { |
| 142 | gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统"); | 162 | gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统"); |
| 143 | } | 163 | } |
| 144 | 164 | ||
| 145 | - if(null == next && gps.isService()) | 165 | + |
| 166 | + if (null == next && gps.isService()) | ||
| 146 | nonService(sch, "结束@系统");//班次结束 | 167 | nonService(sch, "结束@系统");//班次结束 |
| 147 | - else if(dayOfSchedule.emptyService(next)) | 168 | + else if (null != next && dayOfSchedule.emptyService(next)) |
| 148 | nonService(sch, "空驶@系统");//下一班非营运 | 169 | nonService(sch, "空驶@系统");//下一班非营运 |
| 149 | } | 170 | } |
| 150 | 171 | ||
| 151 | /** | 172 | /** |
| 152 | * 校验进站前置约束 | 173 | * 校验进站前置约束 |
| 174 | + * | ||
| 153 | * @param gps | 175 | * @param gps |
| 154 | * @return | 176 | * @return |
| 155 | */ | 177 | */ |
| 156 | private boolean validInPremise(GpsEntity gps) { | 178 | private boolean validInPremise(GpsEntity gps) { |
| 157 | StationRoute sr = gps.getStation(); | 179 | StationRoute sr = gps.getStation(); |
| 158 | - if(null == sr || !sr.isPremise()) | 180 | + if (null == sr || !sr.isPremise()) |
| 159 | return true; | 181 | return true; |
| 160 | 182 | ||
| 161 | String premiseCode = gps.getPremiseCode(); | 183 | String premiseCode = gps.getPremiseCode(); |
| 162 | 184 | ||
| 163 | - if(StringUtils.isNotEmpty(premiseCode) && premiseCode.equals(gps.getStopNo())){ | 185 | + if (StringUtils.isNotEmpty(premiseCode) && premiseCode.equals(gps.getStopNo())) { |
| 164 | logger.info("满足前置进站约束 " + premiseCode); | 186 | logger.info("满足前置进站约束 " + premiseCode); |
| 165 | return true; | 187 | return true; |
| 166 | - } | ||
| 167 | - else{ | 188 | + } else { |
| 168 | logger.info(gps.getNbbm() + " not premiseCode 不满足前置进站约束 " + premiseCode); | 189 | logger.info(gps.getNbbm() + " not premiseCode 不满足前置进站约束 " + premiseCode); |
| 169 | } | 190 | } |
| 170 | return false; | 191 | return false; |
| @@ -172,9 +193,10 @@ public class InStationProcess { | @@ -172,9 +193,10 @@ public class InStationProcess { | ||
| 172 | 193 | ||
| 173 | /** | 194 | /** |
| 174 | * 进站既进场 | 195 | * 进站既进场 |
| 196 | + * | ||
| 175 | * @param sch | 197 | * @param sch |
| 176 | */ | 198 | */ |
| 177 | - private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){ | 199 | + private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next) { |
| 178 | LineConfig config = lineConfigData.get(sch.getXlBm()); | 200 | LineConfig config = lineConfigData.get(sch.getXlBm()); |
| 179 | //限定出站既出场的停车场 | 201 | //限定出站既出场的停车场 |
| 180 | String park = config.getTwinsPark(); | 202 | String park = config.getTwinsPark(); |
| @@ -191,7 +213,7 @@ public class InStationProcess { | @@ -191,7 +213,7 @@ public class InStationProcess { | ||
| 191 | 213 | ||
| 192 | //分班的时候,需要再跳过1个班次 | 214 | //分班的时候,需要再跳过1个班次 |
| 193 | next = dayOfSchedule.next(next); | 215 | next = dayOfSchedule.next(next); |
| 194 | - if(next != null) | 216 | + if (next != null) |
| 195 | dayOfSchedule.addExecPlan(next); | 217 | dayOfSchedule.addExecPlan(next); |
| 196 | 218 | ||
| 197 | //进场,切换成非营运状态 | 219 | //进场,切换成非营运状态 |
| @@ -200,27 +222,28 @@ public class InStationProcess { | @@ -200,27 +222,28 @@ public class InStationProcess { | ||
| 200 | } | 222 | } |
| 201 | 223 | ||
| 202 | 224 | ||
| 203 | - private boolean isEmptyMileage(ScheduleRealInfo sch){ | ||
| 204 | - return sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0; | 225 | + private boolean isEmptyMileage(ScheduleRealInfo sch) { |
| 226 | + return sch.getBcsj() == 0 || sch.getJhlcOrig().intValue() == 0; | ||
| 205 | } | 227 | } |
| 206 | 228 | ||
| 207 | 229 | ||
| 208 | /** | 230 | /** |
| 209 | * 切换为非营运状态 | 231 | * 切换为非营运状态 |
| 232 | + * | ||
| 210 | * @param sch | 233 | * @param sch |
| 211 | * @param sender | 234 | * @param sender |
| 212 | */ | 235 | */ |
| 213 | - private void nonService(ScheduleRealInfo sch, String sender){ | 236 | + private void nonService(ScheduleRealInfo sch, String sender) { |
| 214 | gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, sender); | 237 | gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, sender); |
| 215 | } | 238 | } |
| 216 | 239 | ||
| 217 | - private void endSch(ScheduleRealInfo sch, Long t){ | 240 | + private void endSch(ScheduleRealInfo sch, Long t) { |
| 218 | sch.setFcsjActualAll(t); | 241 | sch.setFcsjActualAll(t); |
| 219 | sch.setZdsjActualAll(t); | 242 | sch.setZdsjActualAll(t); |
| 220 | } | 243 | } |
| 221 | 244 | ||
| 222 | private void transformUpDown(GpsEntity gps, ScheduleRealInfo sch) { | 245 | private void transformUpDown(GpsEntity gps, ScheduleRealInfo sch) { |
| 223 | - if(null == sch) | 246 | + if (null == sch) |
| 224 | return; | 247 | return; |
| 225 | byte upDown = Byte.parseByte(sch.getXlDir()); | 248 | byte upDown = Byte.parseByte(sch.getXlDir()); |
| 226 | //gps 切换走向 | 249 | //gps 切换走向 |
| @@ -233,4 +256,10 @@ public class InStationProcess { | @@ -233,4 +256,10 @@ public class InStationProcess { | ||
| 233 | gps.setStopNo(station.getCode()); | 256 | gps.setStopNo(station.getCode()); |
| 234 | } | 257 | } |
| 235 | } | 258 | } |
| 236 | -} | 259 | + |
| 260 | + private boolean isInPark(GpsEntity gps, GpsEntity prve){ | ||
| 261 | + if(StringUtils.isNotEmpty(gps.getCarparkNo()) && StringUtils.isEmpty(prve.getCarparkNo())) | ||
| 262 | + return true; | ||
| 263 | + return false; | ||
| 264 | + } | ||
| 265 | +} | ||
| 237 | \ No newline at end of file | 266 | \ No newline at end of file |
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
| @@ -4,6 +4,7 @@ import com.bsth.data.LineConfigData; | @@ -4,6 +4,7 @@ import com.bsth.data.LineConfigData; | ||
| 4 | import com.bsth.data.gpsdata_v2.cache.GpsCacheData; | 4 | import com.bsth.data.gpsdata_v2.cache.GpsCacheData; |
| 5 | import com.bsth.data.gpsdata_v2.entity.GpsEntity; | 5 | import com.bsth.data.gpsdata_v2.entity.GpsEntity; |
| 6 | import com.bsth.data.gpsdata_v2.status_manager.GpsStatusManager; | 6 | import com.bsth.data.gpsdata_v2.status_manager.GpsStatusManager; |
| 7 | +import com.bsth.data.gpsdata_v2.utils.SignalSchPlanMatcher; | ||
| 7 | import com.bsth.data.schedule.DayOfSchedule; | 8 | import com.bsth.data.schedule.DayOfSchedule; |
| 8 | import com.bsth.data.schedule.late_adjust.LateAdjustHandle; | 9 | import com.bsth.data.schedule.late_adjust.LateAdjustHandle; |
| 9 | import com.bsth.entity.realcontrol.LineConfig; | 10 | import com.bsth.entity.realcontrol.LineConfig; |
| @@ -34,28 +35,53 @@ public class OutStationProcess { | @@ -34,28 +35,53 @@ public class OutStationProcess { | ||
| 34 | SendUtils sendUtils; | 35 | SendUtils sendUtils; |
| 35 | 36 | ||
| 36 | @Autowired | 37 | @Autowired |
| 38 | + SignalSchPlanMatcher signalSchPlanMatcher; | ||
| 39 | + | ||
| 40 | + @Autowired | ||
| 37 | GpsStatusManager gpsStatusManager; | 41 | GpsStatusManager gpsStatusManager; |
| 42 | + private final static int MAX_BEFORE_TIME = 1000 * 60 * 120; | ||
| 38 | 43 | ||
| 39 | public void process(GpsEntity gps){ | 44 | public void process(GpsEntity gps){ |
| 40 | GpsEntity prev = GpsCacheData.getPrev(gps); | 45 | GpsEntity prev = GpsCacheData.getPrev(gps); |
| 41 | - if(gps.getInstation()==0 && prev!=null && isInsideStation(prev)){ | ||
| 42 | - outStation(gps); //出站 | ||
| 43 | - } | ||
| 44 | - } | ||
| 45 | 46 | ||
| 46 | - private boolean isInsideStation(GpsEntity gps){ | ||
| 47 | - return gps.getInstation() >= 1; | 47 | + if(null == prev) |
| 48 | + return; | ||
| 49 | + | ||
| 50 | + //从站内到站外 | ||
| 51 | + if(prev.getInstation() > 0 && gps.getInstation() == 0) | ||
| 52 | + outStation(gps, prev); | ||
| 53 | + | ||
| 54 | + //从站内到另一个站内 | ||
| 55 | + if(prev.getInstation() > 0 && gps.getInstation() > 0 | ||
| 56 | + && !prev.getStopNo().equals(gps.getStopNo())) | ||
| 57 | + outStation(gps, prev); | ||
| 58 | + | ||
| 59 | + //在被起点站覆盖的情况下出场 | ||
| 60 | + if(isOutPark(gps, prev)) | ||
| 61 | + outStation(gps, prev); | ||
| 48 | } | 62 | } |
| 49 | 63 | ||
| 50 | /** | 64 | /** |
| 51 | * 出站 | 65 | * 出站 |
| 52 | * @param gps | 66 | * @param gps |
| 53 | */ | 67 | */ |
| 54 | - private void outStation(GpsEntity gps) { | 68 | + private void outStation(GpsEntity gps, GpsEntity prev) { |
| 55 | ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm()); | 69 | ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm()); |
| 56 | 70 | ||
| 57 | //起点发车 | 71 | //起点发车 |
| 58 | - if (null != sch && sch.getQdzCode().equals(gps.getStopNo())){ | 72 | + if (null != sch && |
| 73 | + (sch.getQdzCode().equals(prev.getStopNo()) || sch.getQdzCode().equals(prev.getCarparkNo()))){ | ||
| 74 | + //发车班次匹配 | ||
| 75 | + if(!signalSchPlanMatcher.outMatch(gps, sch)){ | ||
| 76 | + outStation(gps, prev); | ||
| 77 | + return; | ||
| 78 | + } | ||
| 79 | + | ||
| 80 | + int diff = (int) (sch.getDfsjT() - gps.getTimestamp()); | ||
| 81 | + //首班出场最多提前2小时 | ||
| 82 | + if((dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME / 2) | ||
| 83 | + return; | ||
| 84 | + | ||
| 59 | gps.setPremiseCode(null);//清除前置围栏标记 | 85 | gps.setPremiseCode(null);//清除前置围栏标记 |
| 60 | 86 | ||
| 61 | if(StringUtils.isNotEmpty(sch.getFcsjActual()) | 87 | if(StringUtils.isNotEmpty(sch.getFcsjActual()) |
| @@ -113,6 +139,10 @@ public class OutStationProcess { | @@ -113,6 +139,10 @@ public class OutStationProcess { | ||
| 113 | if(Math.abs(t2 - c) < threshold && c - t1 > threshold){ | 139 | if(Math.abs(t2 - c) < threshold && c - t1 > threshold){ |
| 114 | return true; | 140 | return true; |
| 115 | } | 141 | } |
| 142 | + | ||
| 143 | + if(c - t1 > 1000 * 60 * 60 * 2 && Math.abs(t2 - c) < c - t1){ | ||
| 144 | + return true; | ||
| 145 | + } | ||
| 116 | return false; | 146 | return false; |
| 117 | } | 147 | } |
| 118 | 148 | ||
| @@ -155,4 +185,10 @@ public class OutStationProcess { | @@ -155,4 +185,10 @@ public class OutStationProcess { | ||
| 155 | sch.setFcsjActualAll(t); | 185 | sch.setFcsjActualAll(t); |
| 156 | sch.setZdsjActualAll(t); | 186 | sch.setZdsjActualAll(t); |
| 157 | } | 187 | } |
| 158 | -} | 188 | + |
| 189 | + private boolean isOutPark(GpsEntity gps, GpsEntity prve){ | ||
| 190 | + if(StringUtils.isNotEmpty(prve.getCarparkNo()) && StringUtils.isEmpty(gps.getCarparkNo())) | ||
| 191 | + return true; | ||
| 192 | + return false; | ||
| 193 | + } | ||
| 194 | +} | ||
| 159 | \ No newline at end of file | 195 | \ No newline at end of file |
src/main/java/com/bsth/data/gpsdata_v2/handlers/ReverseRouteProcess.java
| 1 | package com.bsth.data.gpsdata_v2.handlers; | 1 | package com.bsth.data.gpsdata_v2.handlers; |
| 2 | 2 | ||
| 3 | +import com.bsth.data.gpsdata_v2.cache.GeoCacheData; | ||
| 3 | import com.bsth.data.gpsdata_v2.cache.GpsCacheData; | 4 | import com.bsth.data.gpsdata_v2.cache.GpsCacheData; |
| 4 | import com.bsth.data.gpsdata_v2.entity.GpsEntity; | 5 | import com.bsth.data.gpsdata_v2.entity.GpsEntity; |
| 5 | import com.bsth.data.gpsdata_v2.entity.StationRoute; | 6 | import com.bsth.data.gpsdata_v2.entity.StationRoute; |
| @@ -25,7 +26,7 @@ public class ReverseRouteProcess { | @@ -25,7 +26,7 @@ public class ReverseRouteProcess { | ||
| 25 | DayOfSchedule dayOfSchedule; | 26 | DayOfSchedule dayOfSchedule; |
| 26 | 27 | ||
| 27 | public void process(GpsEntity gps){ | 28 | public void process(GpsEntity gps){ |
| 28 | - if(reversRoute(gps)){ | 29 | + if(reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){ |
| 29 | ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm()); | 30 | ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm()); |
| 30 | if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId())) | 31 | if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId())) |
| 31 | return; | 32 | return; |
src/main/java/com/bsth/data/gpsdata_v2/rfid/UploadRfidDataService.java
| 1 | package com.bsth.data.gpsdata_v2.rfid; | 1 | package com.bsth.data.gpsdata_v2.rfid; |
| 2 | 2 | ||
| 3 | +import com.alibaba.fastjson.JSON; | ||
| 3 | import com.bsth.data.gpsdata_v2.rfid.entity.RfidInoutStation; | 4 | import com.bsth.data.gpsdata_v2.rfid.entity.RfidInoutStation; |
| 4 | import com.bsth.data.gpsdata_v2.rfid.handle.RfidSignalHandle; | 5 | import com.bsth.data.gpsdata_v2.rfid.handle.RfidSignalHandle; |
| 6 | +import org.slf4j.Logger; | ||
| 7 | +import org.slf4j.LoggerFactory; | ||
| 5 | import org.springframework.beans.factory.annotation.Autowired; | 8 | import org.springframework.beans.factory.annotation.Autowired; |
| 6 | import org.springframework.web.bind.annotation.RequestBody; | 9 | import org.springframework.web.bind.annotation.RequestBody; |
| 7 | import org.springframework.web.bind.annotation.RequestMapping; | 10 | import org.springframework.web.bind.annotation.RequestMapping; |
| 11 | +import org.springframework.web.bind.annotation.RequestMethod; | ||
| 8 | import org.springframework.web.bind.annotation.RestController; | 12 | import org.springframework.web.bind.annotation.RestController; |
| 9 | 13 | ||
| 10 | import java.util.List; | 14 | import java.util.List; |
| @@ -14,14 +18,22 @@ import java.util.List; | @@ -14,14 +18,22 @@ import java.util.List; | ||
| 14 | * Created by panzhao on 2017/11/22. | 18 | * Created by panzhao on 2017/11/22. |
| 15 | */ | 19 | */ |
| 16 | @RestController | 20 | @RestController |
| 17 | -@RequestMapping("/up/rfid") | 21 | +@RequestMapping("/rfid") |
| 18 | public class UploadRfidDataService { | 22 | public class UploadRfidDataService { |
| 19 | 23 | ||
| 20 | @Autowired | 24 | @Autowired |
| 21 | RfidSignalHandle rfidSignalHandle; | 25 | RfidSignalHandle rfidSignalHandle; |
| 22 | 26 | ||
| 23 | - @RequestMapping("inside") | 27 | + Logger logger = LoggerFactory.getLogger(this.getClass()); |
| 28 | + | ||
| 29 | + @RequestMapping(value = "inside", method = RequestMethod.POST) | ||
| 24 | public void inside(@RequestBody List<RfidInoutStation> list) { | 30 | public void inside(@RequestBody List<RfidInoutStation> list) { |
| 31 | + logger.info("up rfid: " + JSON.toJSONString(list)); | ||
| 25 | rfidSignalHandle.handle(list); | 32 | rfidSignalHandle.handle(list); |
| 26 | } | 33 | } |
| 27 | -} | 34 | + |
| 35 | + @RequestMapping(value = "test") | ||
| 36 | + public int test() { | ||
| 37 | + return 1; | ||
| 38 | + } | ||
| 39 | +} | ||
| 28 | \ No newline at end of file | 40 | \ No newline at end of file |
src/main/java/com/bsth/data/gpsdata_v2/rfid/entity/RfidInoutStation.java
src/main/java/com/bsth/data/gpsdata_v2/rfid/handle/RfidSignalHandle.java
| @@ -30,13 +30,15 @@ public class RfidSignalHandle { | @@ -30,13 +30,15 @@ public class RfidSignalHandle { | ||
| 30 | @Autowired | 30 | @Autowired |
| 31 | GpsStatusManager gpsStatusManager; | 31 | GpsStatusManager gpsStatusManager; |
| 32 | 32 | ||
| 33 | + private final static int MAX_TIME_DIFF = 1000 * 60 * 60 * 2; | ||
| 34 | + | ||
| 33 | Logger logger = LoggerFactory.getLogger(this.getClass()); | 35 | Logger logger = LoggerFactory.getLogger(this.getClass()); |
| 34 | 36 | ||
| 35 | public void handle(List<RfidInoutStation> list){ | 37 | public void handle(List<RfidInoutStation> list){ |
| 36 | for(RfidInoutStation signal : list){ | 38 | for(RfidInoutStation signal : list){ |
| 37 | - if(signal.getType()==0) | 39 | + if(signal.getType()==2) |
| 38 | in(signal); | 40 | in(signal); |
| 39 | - else if(signal.getType()==1) | 41 | + else if(signal.getType()==4) |
| 40 | out(signal); | 42 | out(signal); |
| 41 | } | 43 | } |
| 42 | } | 44 | } |
| @@ -53,6 +55,10 @@ public class RfidSignalHandle { | @@ -53,6 +55,10 @@ public class RfidSignalHandle { | ||
| 53 | if(null == sch) | 55 | if(null == sch) |
| 54 | return; | 56 | return; |
| 55 | 57 | ||
| 58 | + //最大时间差 | ||
| 59 | + if(Math.abs(sch.getDfsjT() - signal.getT()) > MAX_TIME_DIFF) | ||
| 60 | + return; | ||
| 61 | + | ||
| 56 | if(sch.getQdzCode().equals(signal.getStation()) | 62 | if(sch.getQdzCode().equals(signal.getStation()) |
| 57 | && StringUtils.isEmpty(sch.getFcsjActual())){ | 63 | && StringUtils.isEmpty(sch.getFcsjActual())){ |
| 58 | 64 | ||
| @@ -81,12 +87,18 @@ public class RfidSignalHandle { | @@ -81,12 +87,18 @@ public class RfidSignalHandle { | ||
| 81 | String nbbm = signal.getNbbm(); | 87 | String nbbm = signal.getNbbm(); |
| 82 | ScheduleRealInfo sch = dayOfSchedule.executeCurr(nbbm); | 88 | ScheduleRealInfo sch = dayOfSchedule.executeCurr(nbbm); |
| 83 | 89 | ||
| 90 | + if(null == sch) | ||
| 91 | + return; | ||
| 92 | + | ||
| 93 | + //最大时间差 | ||
| 94 | + if(Math.abs(sch.getDfsjT() - signal.getT()) > MAX_TIME_DIFF) | ||
| 95 | + return; | ||
| 96 | + | ||
| 84 | if(sch.getZdzCode().equals(signal.getStation()) | 97 | if(sch.getZdzCode().equals(signal.getStation()) |
| 85 | && StringUtils.isEmpty(sch.getZdsjActual())){ | 98 | && StringUtils.isEmpty(sch.getZdsjActual())){ |
| 86 | 99 | ||
| 87 | sch.setZdsjActualAll(signal.getT()); | 100 | sch.setZdsjActualAll(signal.getT()); |
| 88 | 101 | ||
| 89 | - | ||
| 90 | //持久化 | 102 | //持久化 |
| 91 | dayOfSchedule.save(sch); | 103 | dayOfSchedule.save(sch); |
| 92 | 104 | ||
| @@ -94,7 +106,6 @@ public class RfidSignalHandle { | @@ -94,7 +106,6 @@ public class RfidSignalHandle { | ||
| 94 | ScheduleRealInfo next = dayOfSchedule.next(sch); | 106 | ScheduleRealInfo next = dayOfSchedule.next(sch); |
| 95 | if(next != null){ | 107 | if(next != null){ |
| 96 | dayOfSchedule.addExecPlan(next); | 108 | dayOfSchedule.addExecPlan(next); |
| 97 | - //inStationAndInPark(sch, next);//进站既进场 | ||
| 98 | } | 109 | } |
| 99 | 110 | ||
| 100 | //路牌的下一个班次,页面显示起点实际到达时间 | 111 | //路牌的下一个班次,页面显示起点实际到达时间 |
| @@ -121,7 +132,7 @@ public class RfidSignalHandle { | @@ -121,7 +132,7 @@ public class RfidSignalHandle { | ||
| 121 | 132 | ||
| 122 | if(null == next) | 133 | if(null == next) |
| 123 | nonService(sch, "rfid1@系统");//班次结束 | 134 | nonService(sch, "rfid1@系统");//班次结束 |
| 124 | - else if(dayOfSchedule.emptyService(next)) | 135 | + else if(null != next && dayOfSchedule.emptyService(next)) |
| 125 | nonService(sch, "rfid2@系统");//下一班非营运 | 136 | nonService(sch, "rfid2@系统");//下一班非营运 |
| 126 | } | 137 | } |
| 127 | }catch (Exception e){ | 138 | }catch (Exception e){ |
| @@ -137,4 +148,4 @@ public class RfidSignalHandle { | @@ -137,4 +148,4 @@ public class RfidSignalHandle { | ||
| 137 | private void nonService(ScheduleRealInfo sch, String sender){ | 148 | private void nonService(ScheduleRealInfo sch, String sender){ |
| 138 | gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, sender); | 149 | gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, sender); |
| 139 | } | 150 | } |
| 140 | -} | 151 | +} |
| 141 | \ No newline at end of file | 152 | \ No newline at end of file |
src/main/java/com/bsth/data/gpsdata_v2/thread/OfflineMonitorThread.java
0 → 100644
| 1 | +package com.bsth.data.gpsdata_v2.thread; | ||
| 2 | + | ||
| 3 | +import com.bsth.data.gpsdata_v2.GpsRealData; | ||
| 4 | +import com.bsth.data.gpsdata_v2.entity.GpsEntity; | ||
| 5 | +import com.bsth.websocket.handler.SendUtils; | ||
| 6 | +import org.slf4j.Logger; | ||
| 7 | +import org.slf4j.LoggerFactory; | ||
| 8 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 9 | +import org.springframework.stereotype.Component; | ||
| 10 | + | ||
| 11 | +import java.util.Collection; | ||
| 12 | + | ||
| 13 | +/** | ||
| 14 | + * GPS掉离线监控 | ||
| 15 | + * Created by panzhao on 2017/1/11. | ||
| 16 | + */ | ||
| 17 | +@Component | ||
| 18 | +public class OfflineMonitorThread extends Thread{ | ||
| 19 | + | ||
| 20 | + @Autowired | ||
| 21 | + GpsRealData gpsRealData; | ||
| 22 | + | ||
| 23 | + //掉线阈值 | ||
| 24 | + private final static int LOSE_TIME = 1000 * 60 * 10; | ||
| 25 | + | ||
| 26 | + Logger logger = LoggerFactory.getLogger(this.getClass()); | ||
| 27 | + | ||
| 28 | + @Autowired | ||
| 29 | + SendUtils sendUtils; | ||
| 30 | + | ||
| 31 | + //无任务时 离线阈值 | ||
| 32 | + //private final static int OFFLINE_TIME = 1000 * 60 * 10; | ||
| 33 | + | ||
| 34 | + @Override | ||
| 35 | + public void run() { | ||
| 36 | + try{ | ||
| 37 | + long t = System.currentTimeMillis(); | ||
| 38 | + Collection<GpsEntity> list = gpsRealData.all(); | ||
| 39 | + | ||
| 40 | + String state; | ||
| 41 | + for(GpsEntity gps : list){ | ||
| 42 | + state = gps.getAbnormalStatus(); | ||
| 43 | + | ||
| 44 | + if(state != null && state.equals("offline")) | ||
| 45 | + continue; | ||
| 46 | + | ||
| 47 | + if (t - gps.getTimestamp() > LOSE_TIME){ | ||
| 48 | + gps.offline(); | ||
| 49 | + | ||
| 50 | + //通知页面有设备掉线 | ||
| 51 | + sendUtils.deviceOffline(gps); | ||
| 52 | + } | ||
| 53 | + } | ||
| 54 | + }catch (Exception e){ | ||
| 55 | + logger.error("", e); | ||
| 56 | + } | ||
| 57 | + } | ||
| 58 | +} |
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
| @@ -40,6 +40,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | @@ -40,6 +40,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | ||
| 40 | static InStationProcess inStationProcess; | 40 | static InStationProcess inStationProcess; |
| 41 | static OutStationProcess outStationProcess; | 41 | static OutStationProcess outStationProcess; |
| 42 | static AbnormalStateProcess abnormalStateProcess; | 42 | static AbnormalStateProcess abnormalStateProcess; |
| 43 | + static ReverseRouteProcess reverseRouteProcess; | ||
| 43 | 44 | ||
| 44 | public void recovery() { | 45 | public void recovery() { |
| 45 | List<GpsEntity> list = loadData(); | 46 | List<GpsEntity> list = loadData(); |
| @@ -59,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | @@ -59,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | ||
| 59 | for (String nbbm : keys) { | 60 | for (String nbbm : keys) { |
| 60 | Collections.sort(listMap.get(nbbm), comp); | 61 | Collections.sort(listMap.get(nbbm), comp); |
| 61 | threadPool.submit(new RecoveryThread(listMap.get(nbbm), count)); | 62 | threadPool.submit(new RecoveryThread(listMap.get(nbbm), count)); |
| 62 | - /*if(nbbm.equals("W2H-015")) | 63 | + /*if(nbbm.equals("W7C-035")) |
| 63 | new RecoveryThread(listMap.get(nbbm), count).run();*/ | 64 | new RecoveryThread(listMap.get(nbbm), count).run();*/ |
| 64 | /*if(lineId.equals("60028")) | 65 | /*if(lineId.equals("60028")) |
| 65 | new RecoveryThread(listMap.get(lineId), count).run();*/ | 66 | new RecoveryThread(listMap.get(lineId), count).run();*/ |
| @@ -83,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | @@ -83,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | ||
| 83 | Calendar calendar = Calendar.getInstance(); | 84 | Calendar calendar = Calendar.getInstance(); |
| 84 | int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR); | 85 | int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR); |
| 85 | 86 | ||
| 86 | - String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=" + dayOfYear; | 87 | + String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=327"; //+ dayOfYear; |
| 87 | JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource()); | 88 | JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource()); |
| 88 | 89 | ||
| 89 | List<GpsEntity> list = | 90 | List<GpsEntity> list = |
| @@ -100,6 +101,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | @@ -100,6 +101,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | ||
| 100 | gps.setLineId(rs.getString("LINE_ID")); | 101 | gps.setLineId(rs.getString("LINE_ID")); |
| 101 | gps.setTimestamp(rs.getLong("TS")); | 102 | gps.setTimestamp(rs.getLong("TS")); |
| 102 | gps.setUpDown((byte) getUpOrDown(rs.getLong("SERVICE_STATE"))); | 103 | gps.setUpDown((byte) getUpOrDown(rs.getLong("SERVICE_STATE"))); |
| 104 | + gps.setServerTimestamp(rs.getLong("SERVER_TS")); | ||
| 103 | return gps; | 105 | return gps; |
| 104 | } | 106 | } |
| 105 | }); | 107 | }); |
| @@ -125,6 +127,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | @@ -125,6 +127,7 @@ public class GpsDataRecovery implements ApplicationContextAware { | ||
| 125 | inStationProcess = applicationContext.getBean(InStationProcess.class); | 127 | inStationProcess = applicationContext.getBean(InStationProcess.class); |
| 126 | outStationProcess = applicationContext.getBean(OutStationProcess.class); | 128 | outStationProcess = applicationContext.getBean(OutStationProcess.class); |
| 127 | abnormalStateProcess = applicationContext.getBean(AbnormalStateProcess.class); | 129 | abnormalStateProcess = applicationContext.getBean(AbnormalStateProcess.class); |
| 130 | + reverseRouteProcess = applicationContext.getBean(ReverseRouteProcess.class); | ||
| 128 | } | 131 | } |
| 129 | 132 | ||
| 130 | public static class GpsComp implements Comparator<GpsEntity> { | 133 | public static class GpsComp implements Comparator<GpsEntity> { |
| @@ -151,9 +154,15 @@ public class GpsDataRecovery implements ApplicationContextAware { | @@ -151,9 +154,15 @@ public class GpsDataRecovery implements ApplicationContextAware { | ||
| 151 | for (GpsEntity gps : list) { | 154 | for (GpsEntity gps : list) { |
| 152 | try { | 155 | try { |
| 153 | 156 | ||
| 157 | + /*if(gps.getTimestamp() >= 1511396220000L) | ||
| 158 | + System.out.println("aaa");*/ | ||
| 159 | + | ||
| 160 | + if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20) | ||
| 161 | + continue; | ||
| 162 | + | ||
| 154 | gpsStateProcess.process(gps);//状态处理 | 163 | gpsStateProcess.process(gps);//状态处理 |
| 155 | stationInsideProcess.process(gps);//场站内外判定 | 164 | stationInsideProcess.process(gps);//场站内外判定 |
| 156 | - | 165 | + reverseRouteProcess.process(gps);//反向路由处理 |
| 157 | 166 | ||
| 158 | abnormalStateProcess.process(gps);//超速越界 | 167 | abnormalStateProcess.process(gps);//超速越界 |
| 159 | 168 |
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataUtils.java
| @@ -25,7 +25,7 @@ public class GpsDataUtils { | @@ -25,7 +25,7 @@ public class GpsDataUtils { | ||
| 25 | 25 | ||
| 26 | try { | 26 | try { |
| 27 | for (GpsEntity gps : list) { | 27 | for (GpsEntity gps : list) { |
| 28 | - if (gps.getValid() == 0) | 28 | + if (gps.getValid() == 0 && Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20) |
| 29 | rs.add(gps); | 29 | rs.add(gps); |
| 30 | } | 30 | } |
| 31 | 31 |
src/main/java/com/bsth/data/gpsdata_v2/utils/SignalSchPlanMatcher.java
0 → 100644
| 1 | +package com.bsth.data.gpsdata_v2.utils; | ||
| 2 | + | ||
| 3 | +import com.bsth.data.gpsdata_v2.entity.GpsEntity; | ||
| 4 | +import com.bsth.data.schedule.DayOfSchedule; | ||
| 5 | +import com.bsth.data.schedule.ScheduleComparator; | ||
| 6 | +import com.bsth.entity.realcontrol.ScheduleRealInfo; | ||
| 7 | +import org.apache.commons.lang3.StringUtils; | ||
| 8 | +import org.slf4j.Logger; | ||
| 9 | +import org.slf4j.LoggerFactory; | ||
| 10 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 11 | +import org.springframework.stereotype.Component; | ||
| 12 | + | ||
| 13 | +import java.util.Collections; | ||
| 14 | +import java.util.List; | ||
| 15 | + | ||
| 16 | +/** | ||
| 17 | + * 班次匹配器 | ||
| 18 | + * Created by panzhao on 2016/12/31. | ||
| 19 | + */ | ||
| 20 | +@Component | ||
| 21 | +public class SignalSchPlanMatcher { | ||
| 22 | + | ||
| 23 | + @Autowired | ||
| 24 | + DayOfSchedule dayOfSchedule; | ||
| 25 | + | ||
| 26 | + static ScheduleComparator.DFSJ schComp = new ScheduleComparator.DFSJ(); | ||
| 27 | + | ||
| 28 | + Logger log = LoggerFactory.getLogger(this.getClass()); | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 发车信号匹配 | ||
| 32 | + * @param gps | ||
| 33 | + * @param sch | ||
| 34 | + * @return | ||
| 35 | + */ | ||
| 36 | + public boolean outMatch(GpsEntity gps, ScheduleRealInfo sch){ | ||
| 37 | + long t = gps.getTimestamp(); | ||
| 38 | + if(t < sch.getDfsjT()) | ||
| 39 | + return true; | ||
| 40 | + | ||
| 41 | + try{ | ||
| 42 | + //晚于待发时间 10 分钟 ,匹配一下最佳的班次 | ||
| 43 | + if(t - sch.getDfsjT() > 1000 * 60 * 10){ | ||
| 44 | + ScheduleRealInfo near = searchNearOut(gps); | ||
| 45 | + | ||
| 46 | + if(null != near && !near.getId().equals(sch.getId())){ | ||
| 47 | + dayOfSchedule.addExecPlan(near); | ||
| 48 | + return false; | ||
| 49 | + } | ||
| 50 | + } | ||
| 51 | + | ||
| 52 | + }catch (Exception e){ | ||
| 53 | + log.error("", e); | ||
| 54 | + } | ||
| 55 | + return true; | ||
| 56 | + /*try{ | ||
| 57 | + //会不会是分班没有完成 | ||
| 58 | + if(sch.getBcType().equals("in") && t - sch.getDfsjT() > 1000 * 60 * 20){ | ||
| 59 | + ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal"); | ||
| 60 | + | ||
| 61 | + if(fbFirst == null || !fbFirst.getQdzCode().equals(gps.getStopNo())) | ||
| 62 | + return; | ||
| 63 | + | ||
| 64 | + long dt = fbFirst.getDfsjT(); | ||
| 65 | + //晚于待发前4分钟 -执行分班的首个营运 | ||
| 66 | + if(dt - t < 1000 * 60 * 4){ | ||
| 67 | + dayOfSchedule.addExecPlan(fbFirst); | ||
| 68 | + return; | ||
| 69 | + } | ||
| 70 | + } | ||
| 71 | + | ||
| 72 | + //线路编码不匹配 | ||
| 73 | + if("out".equals(sch.getBcType()) && !sch.getXlBm().equals(gps.getLineId())){ | ||
| 74 | + ScheduleRealInfo nextOut = dayOfSchedule.nextByBcType(sch, "out"); | ||
| 75 | + if(nextOut != null && nextOut.getXlBm().equals(gps.getLineId()) | ||
| 76 | + && fcSpace(sch, gps) > fcSpace(nextOut, gps)){ | ||
| 77 | + dayOfSchedule.addExecPlan(nextOut); | ||
| 78 | + return; | ||
| 79 | + } | ||
| 80 | + } | ||
| 81 | + }catch (Exception e){ | ||
| 82 | + log.error("", e); | ||
| 83 | + } | ||
| 84 | + | ||
| 85 | + //下一个相同走向的班次 | ||
| 86 | + ScheduleRealInfo next = dayOfSchedule.nextSame(sch); | ||
| 87 | + if(next == null || !next.getQdzCode().equals(sch.getQdzCode())) | ||
| 88 | + return; | ||
| 89 | + | ||
| 90 | + //晚于班次间隔百分之70,跳下一个班次 | ||
| 91 | + double s = (int) (next.getDfsjT() - sch.getDfsjT()); | ||
| 92 | + double r = (int) (t - sch.getDfsjT()); | ||
| 93 | + if(r / s > 0.7){ | ||
| 94 | + if(dayOfSchedule.addExecPlan(next)) | ||
| 95 | + outMatch(gps, next); | ||
| 96 | + }*/ | ||
| 97 | + } | ||
| 98 | + | ||
| 99 | + /** | ||
| 100 | + * 搜索一个离发车信号最近的班次 | ||
| 101 | + * @param gps | ||
| 102 | + * @return | ||
| 103 | + */ | ||
| 104 | + private ScheduleRealInfo searchNearOut(GpsEntity gps) { | ||
| 105 | + List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(gps.getNbbm()); | ||
| 106 | + //排序 | ||
| 107 | + Collections.sort(list, schComp); | ||
| 108 | + | ||
| 109 | + ScheduleRealInfo near = null; | ||
| 110 | + int diff, minDiff=-1; | ||
| 111 | + for(ScheduleRealInfo sch : list){ | ||
| 112 | + | ||
| 113 | + if(StringUtils.isNotEmpty(sch.getFcsjActual())) | ||
| 114 | + continue; | ||
| 115 | + | ||
| 116 | + if(StringUtils.isNotEmpty(sch.getZdsjActual())) | ||
| 117 | + continue; | ||
| 118 | + | ||
| 119 | + diff = (int) Math.abs(gps.getTimestamp() - sch.getDfsjT()); | ||
| 120 | + if(null == near || diff < minDiff){ | ||
| 121 | + near = sch; | ||
| 122 | + minDiff = diff; | ||
| 123 | + } | ||
| 124 | + } | ||
| 125 | + return near; | ||
| 126 | + } | ||
| 127 | +} |
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
| @@ -219,7 +219,7 @@ public class SchAttrCalculator { | @@ -219,7 +219,7 @@ public class SchAttrCalculator { | ||
| 219 | boolean limitPark = StringUtils.isNotEmpty(park); | 219 | boolean limitPark = StringUtils.isNotEmpty(park); |
| 220 | 220 | ||
| 221 | ScheduleRealInfo sch, prev = null; | 221 | ScheduleRealInfo sch, prev = null; |
| 222 | - for(int i = list.size() - 1; i > 0; i --){ | 222 | + for(int i = list.size() - 1; i >= 0; i --){ |
| 223 | sch = list.get(i); | 223 | sch = list.get(i); |
| 224 | 224 | ||
| 225 | //如果是出站既出场,忽略出场班次 | 225 | //如果是出站既出场,忽略出场班次 |
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
| @@ -3,6 +3,7 @@ package com.bsth.data.schedule.thread; | @@ -3,6 +3,7 @@ package com.bsth.data.schedule.thread; | ||
| 3 | import com.bsth.data.BasicData; | 3 | import com.bsth.data.BasicData; |
| 4 | import com.bsth.data.LineConfigData; | 4 | import com.bsth.data.LineConfigData; |
| 5 | import com.bsth.data.directive.DayOfDirectives; | 5 | import com.bsth.data.directive.DayOfDirectives; |
| 6 | +import com.bsth.data.gpsdata_v2.cache.GpsCacheData; | ||
| 6 | import com.bsth.data.pilot80.PilotReport; | 7 | import com.bsth.data.pilot80.PilotReport; |
| 7 | import com.bsth.data.schedule.DayOfSchedule; | 8 | import com.bsth.data.schedule.DayOfSchedule; |
| 8 | import com.bsth.data.schedule.f_a_l.FirstAndLastHandler; | 9 | import com.bsth.data.schedule.f_a_l.FirstAndLastHandler; |
| @@ -60,8 +61,10 @@ public class ScheduleRefreshThread extends Thread{ | @@ -60,8 +61,10 @@ public class ScheduleRefreshThread extends Thread{ | ||
| 60 | try{ | 61 | try{ |
| 61 | //清除指令数据 | 62 | //清除指令数据 |
| 62 | Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode); | 63 | Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode); |
| 63 | - for(String car : cars) | 64 | + for(String car : cars){ |
| 64 | dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car)); | 65 | dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car)); |
| 66 | + GpsCacheData.remove(car); | ||
| 67 | + } | ||
| 65 | //清除驾驶员上报数据 | 68 | //清除驾驶员上报数据 |
| 66 | pilotReport.clear(lineCode); | 69 | pilotReport.clear(lineCode); |
| 67 | }catch (Exception e){ | 70 | }catch (Exception e){ |
src/main/java/com/bsth/data/summary/service/impl/DestroySituationServiceImpl.java
| @@ -29,6 +29,34 @@ public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituatio | @@ -29,6 +29,34 @@ public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituatio | ||
| 29 | Logger logger = LoggerFactory.getLogger(this.getClass()); | 29 | Logger logger = LoggerFactory.getLogger(this.getClass()); |
| 30 | 30 | ||
| 31 | @Override | 31 | @Override |
| 32 | + public Iterable<DestroySituation> list(Map<String, Object> map) { | ||
| 33 | + List<DestroySituation> list = (List<DestroySituation>) super.list(map); | ||
| 34 | + | ||
| 35 | + //排序 | ||
| 36 | + Collections.sort(list, new Comparator<DestroySituation>() { | ||
| 37 | + @Override | ||
| 38 | + public int compare(DestroySituation o1, DestroySituation o2) { | ||
| 39 | + int i = o1.getRq().compareTo(o2.getRq()); | ||
| 40 | + if(i != 0) | ||
| 41 | + return i; | ||
| 42 | + | ||
| 43 | + i = o1.getLineName().compareTo(o2.getLineName()); | ||
| 44 | + if(i != 0) | ||
| 45 | + return i; | ||
| 46 | + | ||
| 47 | + i = (int) (o1.getT() - o2.getT()); | ||
| 48 | + if(i != 0) | ||
| 49 | + return i; | ||
| 50 | + | ||
| 51 | + i = o1.getReason().compareTo(o2.getReason()); | ||
| 52 | + | ||
| 53 | + return i; | ||
| 54 | + } | ||
| 55 | + }); | ||
| 56 | + return list; | ||
| 57 | + } | ||
| 58 | + | ||
| 59 | + @Override | ||
| 32 | public void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) { | 60 | public void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) { |
| 33 | try { | 61 | try { |
| 34 | map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString() | 62 | map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString() |
| @@ -46,7 +74,21 @@ public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituatio | @@ -46,7 +74,21 @@ public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituatio | ||
| 46 | Collections.sort(list, new Comparator<DestroySituation>() { | 74 | Collections.sort(list, new Comparator<DestroySituation>() { |
| 47 | @Override | 75 | @Override |
| 48 | public int compare(DestroySituation o1, DestroySituation o2) { | 76 | public int compare(DestroySituation o1, DestroySituation o2) { |
| 49 | - return (int) (o1.getT() - o2.getT()); | 77 | + int i = o1.getRq().compareTo(o2.getRq()); |
| 78 | + if(i != 0) | ||
| 79 | + return i; | ||
| 80 | + | ||
| 81 | + i = o1.getLineName().compareTo(o2.getLineName()); | ||
| 82 | + if(i != 0) | ||
| 83 | + return i; | ||
| 84 | + | ||
| 85 | + i = (int) (o1.getT() - o2.getT()); | ||
| 86 | + if(i != 0) | ||
| 87 | + return i; | ||
| 88 | + | ||
| 89 | + i = o1.getReason().compareTo(o2.getReason()); | ||
| 90 | + | ||
| 91 | + return i; | ||
| 50 | } | 92 | } |
| 51 | }); | 93 | }); |
| 52 | 94 |
src/main/java/com/bsth/filter/BaseFilter.java
| @@ -17,7 +17,7 @@ public abstract class BaseFilter implements Filter { | @@ -17,7 +17,7 @@ public abstract class BaseFilter implements Filter { | ||
| 17 | * 白名单 | 17 | * 白名单 |
| 18 | */ | 18 | */ |
| 19 | private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE, | 19 | private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE, |
| 20 | - Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS }; | 20 | + Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL }; |
| 21 | 21 | ||
| 22 | @Override | 22 | @Override |
| 23 | public void destroy() { | 23 | public void destroy() { |
src/main/java/com/bsth/security/filter/LoginInterceptor.java
| @@ -33,7 +33,7 @@ public class LoginInterceptor implements Filter { | @@ -33,7 +33,7 @@ public class LoginInterceptor implements Filter { | ||
| 33 | * 相比于 BaseFilter,此处对线调GPS请求进行了拦截验证 | 33 | * 相比于 BaseFilter,此处对线调GPS请求进行了拦截验证 |
| 34 | */ | 34 | */ |
| 35 | private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE, | 35 | private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE, |
| 36 | - Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES }; | 36 | + Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL }; |
| 37 | 37 | ||
| 38 | 38 | ||
| 39 | @Override | 39 | @Override |
src/main/java/com/bsth/service/StationRouteService.java
| 1 | package com.bsth.service; | 1 | package com.bsth.service; |
| 2 | 2 | ||
| 3 | +import java.util.Iterator; | ||
| 3 | import java.util.List; | 4 | import java.util.List; |
| 4 | import java.util.Map; | 5 | import java.util.Map; |
| 5 | 6 | ||
| 6 | import javax.servlet.http.HttpServletResponse; | 7 | import javax.servlet.http.HttpServletResponse; |
| 7 | 8 | ||
| 9 | +import com.bsth.entity.LsStationRoute; | ||
| 8 | import com.bsth.entity.StationRoute; | 10 | import com.bsth.entity.StationRoute; |
| 9 | import com.bsth.entity.StationRouteCache; | 11 | import com.bsth.entity.StationRouteCache; |
| 10 | 12 | ||
| @@ -24,7 +26,14 @@ import com.bsth.entity.StationRouteCache; | @@ -24,7 +26,14 @@ import com.bsth.entity.StationRouteCache; | ||
| 24 | * | 26 | * |
| 25 | */ | 27 | */ |
| 26 | public interface StationRouteService extends BaseService<StationRoute, Integer> { | 28 | public interface StationRouteService extends BaseService<StationRoute, Integer> { |
| 27 | - | 29 | + |
| 30 | + /** | ||
| 31 | + * 历史查询。 | ||
| 32 | + * @param map | ||
| 33 | + * @return | ||
| 34 | + */ | ||
| 35 | + Iterable<LsStationRoute> list_ls(Map<String, Object> map); | ||
| 36 | + | ||
| 28 | /** | 37 | /** |
| 29 | * | 38 | * |
| 30 | * @Title: list | 39 | * @Title: list |
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
| 1 | package com.bsth.service.impl; | 1 | package com.bsth.service.impl; |
| 2 | 2 | ||
| 3 | import com.bsth.common.ResponseCode; | 3 | import com.bsth.common.ResponseCode; |
| 4 | -import com.bsth.entity.Line; | ||
| 5 | -import com.bsth.entity.Station; | ||
| 6 | -import com.bsth.entity.StationRoute; | ||
| 7 | -import com.bsth.entity.StationRouteCache; | 4 | +import com.bsth.entity.*; |
| 8 | import com.bsth.entity.search.CustomerSpecs; | 5 | import com.bsth.entity.search.CustomerSpecs; |
| 9 | -import com.bsth.repository.LineRepository; | ||
| 10 | -import com.bsth.repository.SectionRouteRepository; | ||
| 11 | -import com.bsth.repository.StationRepository; | ||
| 12 | -import com.bsth.repository.StationRouteCacheRepository; | ||
| 13 | -import com.bsth.repository.StationRouteRepository; | 6 | +import com.bsth.repository.*; |
| 14 | import com.bsth.service.StationRouteService; | 7 | import com.bsth.service.StationRouteService; |
| 15 | import com.bsth.util.ExcelUtil; | 8 | import com.bsth.util.ExcelUtil; |
| 16 | import com.bsth.util.FTPClientUtils; | 9 | import com.bsth.util.FTPClientUtils; |
| @@ -66,6 +59,16 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ | @@ -66,6 +59,16 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ | ||
| 66 | 59 | ||
| 67 | @Autowired | 60 | @Autowired |
| 68 | private StationRepository stationRepository; | 61 | private StationRepository stationRepository; |
| 62 | + | ||
| 63 | + @Autowired | ||
| 64 | + private LsStationRouteRepository lsStationRouteRepository; | ||
| 65 | + | ||
| 66 | + public Iterable<LsStationRoute> list_ls(Map<String, Object> map) { | ||
| 67 | + List<Sort.Order> orderList = new ArrayList<>(); | ||
| 68 | + orderList.add(new Sort.Order(Direction.ASC, "directions")); | ||
| 69 | + orderList.add(new Sort.Order(Direction.ASC, "stationRouteCode")); | ||
| 70 | + return lsStationRouteRepository.findAll(new CustomerSpecs<LsStationRoute>(map), new Sort(orderList)); | ||
| 71 | + } | ||
| 69 | 72 | ||
| 70 | @Override | 73 | @Override |
| 71 | public Iterable<StationRoute> list(Map<String, Object> map) { | 74 | public Iterable<StationRoute> list(Map<String, Object> map) { |
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -3400,7 +3400,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3400,7 +3400,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3400 | boolean dest2 = sch.getStatus() == -1; | 3400 | boolean dest2 = sch.getStatus() == -1; |
| 3401 | if (!dest1 && dest2) { | 3401 | if (!dest1 && dest2) { |
| 3402 | oldSch.destroy(); | 3402 | oldSch.destroy(); |
| 3403 | - oldSch.setAdjustExps(sch.getAdjustExps()); | ||
| 3404 | aflog.log("烂班"); | 3403 | aflog.log("烂班"); |
| 3405 | } | 3404 | } |
| 3406 | else if(dest1 && !dest2){ | 3405 | else if(dest1 && !dest2){ |
| @@ -3412,6 +3411,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3412,6 +3411,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3412 | aflog.log("撤销烂班"); | 3411 | aflog.log("撤销烂班"); |
| 3413 | } | 3412 | } |
| 3414 | 3413 | ||
| 3414 | + oldSch.setAdjustExps(sch.getAdjustExps()); | ||
| 3415 | 3415 | ||
| 3416 | /** | 3416 | /** |
| 3417 | * 修改班次里程 | 3417 | * 修改班次里程 |
src/main/java/com/bsth/service/schedule/TTInfoDetailService.java
| @@ -34,12 +34,14 @@ public interface TTInfoDetailService extends BService<TTInfoDetail, Long> { | @@ -34,12 +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 | */ | 38 | */ |
| 38 | void validateExcelSheet( | 39 | void validateExcelSheet( |
| 39 | String filename, | 40 | String filename, |
| 40 | String sheetname, | 41 | String sheetname, |
| 41 | Integer lineid, | 42 | Integer lineid, |
| 42 | - String linename) throws ScheduleException; | 43 | + String linename, |
| 44 | + Integer zdlyversion) throws ScheduleException; | ||
| 43 | 45 | ||
| 44 | /** | 46 | /** |
| 45 | * 验证关联的线路标准信息(以后放到规则引擎里去做)。 | 47 | * 验证关联的线路标准信息(以后放到规则引擎里去做)。 |
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
| @@ -79,6 +79,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -79,6 +79,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 79 | Integer lineid = Integer.valueOf(String.valueOf(params.get("lineinfo"))); // 线路标准id | 79 | Integer lineid = Integer.valueOf(String.valueOf(params.get("lineinfo"))); // 线路标准id |
| 80 | String xlname = String.valueOf(params.get("xlname")); // 线路名字 | 80 | String xlname = String.valueOf(params.get("xlname")); // 线路名字 |
| 81 | String ttname = String.valueOf(params.get("ttname")); // 时刻表名字 | 81 | String ttname = String.valueOf(params.get("ttname")); // 时刻表名字 |
| 82 | + Integer zdlyversion = params.get("zdlyversion") == null ? null : Integer.valueOf(params.get("zdlyversion").toString()); | ||
| 82 | 83 | ||
| 83 | LOGGER.info("参数1, xls文件名={},sheet名字={}", filename, sheetname); | 84 | LOGGER.info("参数1, xls文件名={},sheet名字={}", filename, sheetname); |
| 84 | LOGGER.info("参数2, 线路id={},线路名字={}", xlid, xlname); | 85 | LOGGER.info("参数2, 线路id={},线路名字={}", xlid, xlname); |
| @@ -154,6 +155,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -154,6 +155,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 154 | // dataToolsProperties.getTtinfodetailDatainputktr()).toURI()); | 155 | // dataToolsProperties.getTtinfodetailDatainputktr()).toURI()); |
| 155 | File ktrFile2 = new File(this.getClass().getResource( | 156 | File ktrFile2 = new File(this.getClass().getResource( |
| 156 | dataToolsProperties.getTtinfodetailDatainputktr2()).toURI()); | 157 | dataToolsProperties.getTtinfodetailDatainputktr2()).toURI()); |
| 158 | + File ktrFile2_ls = new File(this.getClass().getResource( | ||
| 159 | + dataToolsProperties.getTtinfodetailDatainputktr2ls()).toURI()); | ||
| 157 | 160 | ||
| 158 | // 通用参数,转换文件路径,excel输入文件路径,错误输出文件路径 | 161 | // 通用参数,转换文件路径,excel输入文件路径,错误输出文件路径 |
| 159 | ktrParms.put("transpath", ktrFile.getAbsolutePath()); | 162 | ktrParms.put("transpath", ktrFile.getAbsolutePath()); |
| @@ -161,12 +164,15 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -161,12 +164,15 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 161 | ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir()); | 164 | ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir()); |
| 162 | 165 | ||
| 163 | // 附加参数 | 166 | // 附加参数 |
| 164 | - ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件 | 167 | + ktrParms.put("injectktrfile", zdlyversion == null || zdlyversion == -1 ? |
| 168 | + ktrFile2.getAbsolutePath() : ktrFile2_ls.getAbsolutePath()); // 注入元数据的ktr文件 | ||
| 165 | ktrParms.put("sheetname", sheetname); // sheet工作区的名字 | 169 | ktrParms.put("sheetname", sheetname); // sheet工作区的名字 |
| 166 | ktrParms.put("lineinfoid", lineid); // 线路标准id | 170 | ktrParms.put("lineinfoid", lineid); // 线路标准id |
| 167 | ktrParms.put("xlname", xlname); // 线路名称 | 171 | ktrParms.put("xlname", xlname); // 线路名称 |
| 172 | + ktrParms.put("xlid", xlid); // 线路id | ||
| 168 | ktrParms.put("ttinfoname", ttname); // 时刻表名称 | 173 | ktrParms.put("ttinfoname", ttname); // 时刻表名称 |
| 169 | ktrParms.put("ttid", ttid.intValue()); // 时刻表id | 174 | ktrParms.put("ttid", ttid.intValue()); // 时刻表id |
| 175 | + ktrParms.put("zdlyversion", zdlyversion); // 站点路由版本 | ||
| 170 | ktrParms.put("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名,以逗号连接 | 176 | ktrParms.put("excelfieldnames", StringUtils.join(columnames.toArray(), ",")); // 时刻表excel输入字段名,以逗号连接 |
| 171 | columnames.remove(0); | 177 | columnames.remove(0); |
| 172 | ktrParms.put("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名,以逗号连接 | 178 | ktrParms.put("normalizefieldnames", StringUtils.join(columnames.toArray(), ",")); // 数据范式化字段名,以逗号连接 |
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
| @@ -3,10 +3,7 @@ package com.bsth.service.schedule.impl; | @@ -3,10 +3,7 @@ package com.bsth.service.schedule.impl; | ||
| 3 | import com.alibaba.fastjson.JSONArray; | 3 | import com.alibaba.fastjson.JSONArray; |
| 4 | import com.alibaba.fastjson.JSONObject; | 4 | import com.alibaba.fastjson.JSONObject; |
| 5 | import com.bsth.common.ResponseCode; | 5 | import com.bsth.common.ResponseCode; |
| 6 | -import com.bsth.entity.CarPark; | ||
| 7 | -import com.bsth.entity.Line; | ||
| 8 | -import com.bsth.entity.LineInformation; | ||
| 9 | -import com.bsth.entity.StationRoute; | 6 | +import com.bsth.entity.*; |
| 10 | import com.bsth.entity.schedule.GuideboardInfo; | 7 | import com.bsth.entity.schedule.GuideboardInfo; |
| 11 | import com.bsth.entity.schedule.TTInfoDetail; | 8 | import com.bsth.entity.schedule.TTInfoDetail; |
| 12 | import com.bsth.repository.CarParkRepository; | 9 | import com.bsth.repository.CarParkRepository; |
| @@ -149,7 +146,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | @@ -149,7 +146,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | ||
| 149 | } | 146 | } |
| 150 | 147 | ||
| 151 | @Override | 148 | @Override |
| 152 | - public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename) throws ScheduleException { | 149 | + public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename, Integer zdlyversion) throws ScheduleException { |
| 153 | try { | 150 | try { |
| 154 | File file = new File(filename); | 151 | File file = new File(filename); |
| 155 | Workbook workbook; | 152 | Workbook workbook; |
| @@ -199,14 +196,28 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | @@ -199,14 +196,28 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im | ||
| 199 | 196 | ||
| 200 | // TODO:这里要修改(起点站有启用撤销的标志的) | 197 | // TODO:这里要修改(起点站有启用撤销的标志的) |
| 201 | 198 | ||
| 202 | - List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1); | ||
| 203 | - if (CollectionUtils.isEmpty(stationRouteList)) { | ||
| 204 | - throw new Exception(String.format("第1行,第%d列数据%s在%s站点路由中不是起点站", i + 1, cell_con.trim(), linename)); | ||
| 205 | - } else if (stationRouteList.size() > 1) { | ||
| 206 | - throw new Exception(String.format("第1行,第%d列数据%s在%s站点路由中上下行都是起点站", i + 1, cell_con.trim(), linename)); | ||
| 207 | - } else if (StringUtils.isEmpty(stationRouteList.get(0).getStationCode())) { | ||
| 208 | - throw new Exception(String.format("第1行,第%d列数据%s在%s站点路由中没有站点编码", i + 1, cell_con.trim(), linename)); | 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 | + } | ||
| 209 | } | 218 | } |
| 219 | + | ||
| 220 | + | ||
| 210 | } | 221 | } |
| 211 | 222 | ||
| 212 | } | 223 | } |
src/main/java/com/bsth/service/schedule/utils/DataToolsProperties.java
| @@ -78,6 +78,9 @@ public class DataToolsProperties { | @@ -78,6 +78,9 @@ public class DataToolsProperties { | ||
| 78 | /** 时刻表明细信息导入 */ | 78 | /** 时刻表明细信息导入 */ |
| 79 | @NotNull | 79 | @NotNull |
| 80 | private String ttinfodetailDatainputktr2; | 80 | private String ttinfodetailDatainputktr2; |
| 81 | + /** 时刻表明细信息导入 */ | ||
| 82 | + @NotNull | ||
| 83 | + private String ttinfodetailDatainputktr2ls; | ||
| 81 | /** 排班规则信息导入 */ | 84 | /** 排班规则信息导入 */ |
| 82 | @NotNull | 85 | @NotNull |
| 83 | private String scheduleruleDatainputktr; | 86 | private String scheduleruleDatainputktr; |
| @@ -311,6 +314,14 @@ public class DataToolsProperties { | @@ -311,6 +314,14 @@ public class DataToolsProperties { | ||
| 311 | this.carsconfigDataoutputktr = carsconfigDataoutputktr; | 314 | this.carsconfigDataoutputktr = carsconfigDataoutputktr; |
| 312 | } | 315 | } |
| 313 | 316 | ||
| 317 | + public String getTtinfodetailDatainputktr2ls() { | ||
| 318 | + return ttinfodetailDatainputktr2ls; | ||
| 319 | + } | ||
| 320 | + | ||
| 321 | + public void setTtinfodetailDatainputktr2ls(String ttinfodetailDatainputktr2ls) { | ||
| 322 | + this.ttinfodetailDatainputktr2ls = ttinfodetailDatainputktr2ls; | ||
| 323 | + } | ||
| 324 | + | ||
| 314 | public String getEmployeesconfigDataoutputktr() { | 325 | public String getEmployeesconfigDataoutputktr() { |
| 315 | return employeesconfigDataoutputktr; | 326 | return employeesconfigDataoutputktr; |
| 316 | } | 327 | } |
src/main/java/com/bsth/websocket/entity/WsScheduleRealInfo.java
| @@ -19,6 +19,8 @@ import java.util.Set; | @@ -19,6 +19,8 @@ import java.util.Set; | ||
| 19 | public class WsScheduleRealInfo { | 19 | public class WsScheduleRealInfo { |
| 20 | 20 | ||
| 21 | public static WsScheduleRealInfo getInstance(ScheduleRealInfo sch){ | 21 | public static WsScheduleRealInfo getInstance(ScheduleRealInfo sch){ |
| 22 | + if(null == sch) | ||
| 23 | + return null; | ||
| 22 | WsScheduleRealInfo wss = new WsScheduleRealInfo(); | 24 | WsScheduleRealInfo wss = new WsScheduleRealInfo(); |
| 23 | wss.id = sch.getId(); | 25 | wss.id = sch.getId(); |
| 24 | wss.scheduleDateStr = sch.getScheduleDateStr(); | 26 | wss.scheduleDateStr = sch.getScheduleDateStr(); |
src/main/resources/datatools/config-dev.properties
| @@ -39,6 +39,8 @@ datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr | @@ -39,6 +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 | 44 | ||
| 43 | # 车辆配置信息导入 | 45 | # 车辆配置信息导入 |
| 44 | datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr | 46 | datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr |
src/main/resources/datatools/config-prod.properties
| @@ -40,6 +40,8 @@ datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr | @@ -40,6 +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 | 45 | ||
| 44 | # 车辆配置信息导入 | 46 | # 车辆配置信息导入 |
| 45 | datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr | 47 | datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr |
src/main/resources/datatools/ktrs/ttinfodetailDataInput2_ls.ktr
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<transformation> | ||
| 3 | + <info> | ||
| 4 | + <name>时刻表明细导入-站点路由版本</name> | ||
| 5 | + <description>时刻表明细信息导入</description> | ||
| 6 | + <extended_description>时刻表明细信息</extended_description> | ||
| 7 | + <trans_version/> | ||
| 8 | + <trans_type>Normal</trans_type> | ||
| 9 | + <trans_status>0</trans_status> | ||
| 10 | + <directory>/</directory> | ||
| 11 | + <parameters> | ||
| 12 | + </parameters> | ||
| 13 | + <log> | ||
| 14 | +<trans-log-table><connection/> | ||
| 15 | +<schema/> | ||
| 16 | +<table/> | ||
| 17 | +<size_limit_lines/> | ||
| 18 | +<interval/> | ||
| 19 | +<timeout_days/> | ||
| 20 | +<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STATUS</id><enabled>Y</enabled><name>STATUS</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name><subject/></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name><subject/></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name><subject/></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name><subject/></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name><subject/></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name><subject/></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>STARTDATE</id><enabled>Y</enabled><name>STARTDATE</name></field><field><id>ENDDATE</id><enabled>Y</enabled><name>ENDDATE</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>DEPDATE</id><enabled>Y</enabled><name>DEPDATE</name></field><field><id>REPLAYDATE</id><enabled>Y</enabled><name>REPLAYDATE</name></field><field><id>LOG_FIELD</id><enabled>Y</enabled><name>LOG_FIELD</name></field><field><id>EXECUTING_SERVER</id><enabled>N</enabled><name>EXECUTING_SERVER</name></field><field><id>EXECUTING_USER</id><enabled>N</enabled><name>EXECUTING_USER</name></field><field><id>CLIENT</id><enabled>N</enabled><name>CLIENT</name></field></trans-log-table> | ||
| 21 | +<perf-log-table><connection/> | ||
| 22 | +<schema/> | ||
| 23 | +<table/> | ||
| 24 | +<interval/> | ||
| 25 | +<timeout_days/> | ||
| 26 | +<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>SEQ_NR</id><enabled>Y</enabled><name>SEQ_NR</name></field><field><id>LOGDATE</id><enabled>Y</enabled><name>LOGDATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>INPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>INPUT_BUFFER_ROWS</name></field><field><id>OUTPUT_BUFFER_ROWS</id><enabled>Y</enabled><name>OUTPUT_BUFFER_ROWS</name></field></perf-log-table> | ||
| 27 | +<channel-log-table><connection/> | ||
| 28 | +<schema/> | ||
| 29 | +<table/> | ||
| 30 | +<timeout_days/> | ||
| 31 | +<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>LOGGING_OBJECT_TYPE</id><enabled>Y</enabled><name>LOGGING_OBJECT_TYPE</name></field><field><id>OBJECT_NAME</id><enabled>Y</enabled><name>OBJECT_NAME</name></field><field><id>OBJECT_COPY</id><enabled>Y</enabled><name>OBJECT_COPY</name></field><field><id>REPOSITORY_DIRECTORY</id><enabled>Y</enabled><name>REPOSITORY_DIRECTORY</name></field><field><id>FILENAME</id><enabled>Y</enabled><name>FILENAME</name></field><field><id>OBJECT_ID</id><enabled>Y</enabled><name>OBJECT_ID</name></field><field><id>OBJECT_REVISION</id><enabled>Y</enabled><name>OBJECT_REVISION</name></field><field><id>PARENT_CHANNEL_ID</id><enabled>Y</enabled><name>PARENT_CHANNEL_ID</name></field><field><id>ROOT_CHANNEL_ID</id><enabled>Y</enabled><name>ROOT_CHANNEL_ID</name></field></channel-log-table> | ||
| 32 | +<step-log-table><connection/> | ||
| 33 | +<schema/> | ||
| 34 | +<table/> | ||
| 35 | +<timeout_days/> | ||
| 36 | +<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>TRANSNAME</id><enabled>Y</enabled><name>TRANSNAME</name></field><field><id>STEPNAME</id><enabled>Y</enabled><name>STEPNAME</name></field><field><id>STEP_COPY</id><enabled>Y</enabled><name>STEP_COPY</name></field><field><id>LINES_READ</id><enabled>Y</enabled><name>LINES_READ</name></field><field><id>LINES_WRITTEN</id><enabled>Y</enabled><name>LINES_WRITTEN</name></field><field><id>LINES_UPDATED</id><enabled>Y</enabled><name>LINES_UPDATED</name></field><field><id>LINES_INPUT</id><enabled>Y</enabled><name>LINES_INPUT</name></field><field><id>LINES_OUTPUT</id><enabled>Y</enabled><name>LINES_OUTPUT</name></field><field><id>LINES_REJECTED</id><enabled>Y</enabled><name>LINES_REJECTED</name></field><field><id>ERRORS</id><enabled>Y</enabled><name>ERRORS</name></field><field><id>LOG_FIELD</id><enabled>N</enabled><name>LOG_FIELD</name></field></step-log-table> | ||
| 37 | +<metrics-log-table><connection/> | ||
| 38 | +<schema/> | ||
| 39 | +<table/> | ||
| 40 | +<timeout_days/> | ||
| 41 | +<field><id>ID_BATCH</id><enabled>Y</enabled><name>ID_BATCH</name></field><field><id>CHANNEL_ID</id><enabled>Y</enabled><name>CHANNEL_ID</name></field><field><id>LOG_DATE</id><enabled>Y</enabled><name>LOG_DATE</name></field><field><id>METRICS_DATE</id><enabled>Y</enabled><name>METRICS_DATE</name></field><field><id>METRICS_CODE</id><enabled>Y</enabled><name>METRICS_CODE</name></field><field><id>METRICS_DESCRIPTION</id><enabled>Y</enabled><name>METRICS_DESCRIPTION</name></field><field><id>METRICS_SUBJECT</id><enabled>Y</enabled><name>METRICS_SUBJECT</name></field><field><id>METRICS_TYPE</id><enabled>Y</enabled><name>METRICS_TYPE</name></field><field><id>METRICS_VALUE</id><enabled>Y</enabled><name>METRICS_VALUE</name></field></metrics-log-table> | ||
| 42 | + </log> | ||
| 43 | + <maxdate> | ||
| 44 | + <connection/> | ||
| 45 | + <table/> | ||
| 46 | + <field/> | ||
| 47 | + <offset>0.0</offset> | ||
| 48 | + <maxdiff>0.0</maxdiff> | ||
| 49 | + </maxdate> | ||
| 50 | + <size_rowset>10000</size_rowset> | ||
| 51 | + <sleep_time_empty>50</sleep_time_empty> | ||
| 52 | + <sleep_time_full>50</sleep_time_full> | ||
| 53 | + <unique_connections>N</unique_connections> | ||
| 54 | + <feedback_shown>Y</feedback_shown> | ||
| 55 | + <feedback_size>50000</feedback_size> | ||
| 56 | + <using_thread_priorities>Y</using_thread_priorities> | ||
| 57 | + <shared_objects_file/> | ||
| 58 | + <capture_step_performance>N</capture_step_performance> | ||
| 59 | + <step_performance_capturing_delay>1000</step_performance_capturing_delay> | ||
| 60 | + <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit> | ||
| 61 | + <dependencies> | ||
| 62 | + </dependencies> | ||
| 63 | + <partitionschemas> | ||
| 64 | + </partitionschemas> | ||
| 65 | + <slaveservers> | ||
| 66 | + </slaveservers> | ||
| 67 | + <clusterschemas> | ||
| 68 | + </clusterschemas> | ||
| 69 | + <created_user>-</created_user> | ||
| 70 | + <created_date>2016/06/30 12:21:57.536</created_date> | ||
| 71 | + <modified_user>-</modified_user> | ||
| 72 | + <modified_date>2016/06/30 12:21:57.536</modified_date> | ||
| 73 | + <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> | ||
| 74 | + <is_key_private>N</is_key_private> | ||
| 75 | + </info> | ||
| 76 | + <notepads> | ||
| 77 | + <notepad> | ||
| 78 | + <note>字典表对应(以后直接查找表 bsth_c_sys_dictionary)
类型 代码 名称
LineTrend 0 上行
LineTrend 1 下行
ScheduleType normal 正常班次
ScheduleType out 出场
ScheduleType in 进场
ScheduleType temp 临加
ScheduleType region 区间
ScheduleType venting 放空
ScheduleType major 放大站</note> | ||
| 79 | + <xloc>606</xloc> | ||
| 80 | + <yloc>129</yloc> | ||
| 81 | + <width>332</width> | ||
| 82 | + <heigth>186</heigth> | ||
| 83 | + <fontname>YaHei Consolas Hybrid</fontname> | ||
| 84 | + <fontsize>12</fontsize> | ||
| 85 | + <fontbold>N</fontbold> | ||
| 86 | + <fontitalic>N</fontitalic> | ||
| 87 | + <fontcolorred>0</fontcolorred> | ||
| 88 | + <fontcolorgreen>0</fontcolorgreen> | ||
| 89 | + <fontcolorblue>0</fontcolorblue> | ||
| 90 | + <backgroundcolorred>255</backgroundcolorred> | ||
| 91 | + <backgroundcolorgreen>205</backgroundcolorgreen> | ||
| 92 | + <backgroundcolorblue>112</backgroundcolorblue> | ||
| 93 | + <bordercolorred>100</bordercolorred> | ||
| 94 | + <bordercolorgreen>100</bordercolorgreen> | ||
| 95 | + <bordercolorblue>100</bordercolorblue> | ||
| 96 | + <drawshadow>Y</drawshadow> | ||
| 97 | + </notepad> | ||
| 98 | + <notepad> | ||
| 99 | + <note>因为时刻表输入格式不确定性,主要因为表结构是反范式化的,
所以需要外部动态指定愿数据,头三个step动态指定愿数据

</note> | ||
| 100 | + <xloc>79</xloc> | ||
| 101 | + <yloc>206</yloc> | ||
| 102 | + <width>346</width> | ||
| 103 | + <heigth>74</heigth> | ||
| 104 | + <fontname>YaHei Consolas Hybrid</fontname> | ||
| 105 | + <fontsize>12</fontsize> | ||
| 106 | + <fontbold>N</fontbold> | ||
| 107 | + <fontitalic>N</fontitalic> | ||
| 108 | + <fontcolorred>0</fontcolorred> | ||
| 109 | + <fontcolorgreen>0</fontcolorgreen> | ||
| 110 | + <fontcolorblue>0</fontcolorblue> | ||
| 111 | + <backgroundcolorred>255</backgroundcolorred> | ||
| 112 | + <backgroundcolorgreen>205</backgroundcolorgreen> | ||
| 113 | + <backgroundcolorblue>112</backgroundcolorblue> | ||
| 114 | + <bordercolorred>100</bordercolorred> | ||
| 115 | + <bordercolorgreen>100</bordercolorgreen> | ||
| 116 | + <bordercolorblue>100</bordercolorblue> | ||
| 117 | + <drawshadow>Y</drawshadow> | ||
| 118 | + </notepad> | ||
| 119 | + <notepad> | ||
| 120 | + <note>这里有些问题
在window2012的环境下,
MySql数据库查询中如果返回中文内容的字段,这个内容乱码
解决办法,就是数据库查询全部缓存,就不乱码
linux环境下没问题</note> | ||
| 121 | + <xloc>721</xloc> | ||
| 122 | + <yloc>762</yloc> | ||
| 123 | + <width>333</width> | ||
| 124 | + <heigth>90</heigth> | ||
| 125 | + <fontname>YaHei Consolas Hybrid</fontname> | ||
| 126 | + <fontsize>12</fontsize> | ||
| 127 | + <fontbold>N</fontbold> | ||
| 128 | + <fontitalic>N</fontitalic> | ||
| 129 | + <fontcolorred>0</fontcolorred> | ||
| 130 | + <fontcolorgreen>0</fontcolorgreen> | ||
| 131 | + <fontcolorblue>0</fontcolorblue> | ||
| 132 | + <backgroundcolorred>255</backgroundcolorred> | ||
| 133 | + <backgroundcolorgreen>205</backgroundcolorgreen> | ||
| 134 | + <backgroundcolorblue>112</backgroundcolorblue> | ||
| 135 | + <bordercolorred>100</bordercolorred> | ||
| 136 | + <bordercolorgreen>100</bordercolorgreen> | ||
| 137 | + <bordercolorblue>100</bordercolorblue> | ||
| 138 | + <drawshadow>Y</drawshadow> | ||
| 139 | + </notepad> | ||
| 140 | + <notepad> | ||
| 141 | + <note>出场班次,方向有时确定不准,
空的情况下设定为0(上行)</note> | ||
| 142 | + <xloc>104</xloc> | ||
| 143 | + <yloc>939</yloc> | ||
| 144 | + <width>178</width> | ||
| 145 | + <heigth>42</heigth> | ||
| 146 | + <fontname>YaHei Consolas Hybrid</fontname> | ||
| 147 | + <fontsize>12</fontsize> | ||
| 148 | + <fontbold>N</fontbold> | ||
| 149 | + <fontitalic>N</fontitalic> | ||
| 150 | + <fontcolorred>0</fontcolorred> | ||
| 151 | + <fontcolorgreen>0</fontcolorgreen> | ||
| 152 | + <fontcolorblue>0</fontcolorblue> | ||
| 153 | + <backgroundcolorred>255</backgroundcolorred> | ||
| 154 | + <backgroundcolorgreen>205</backgroundcolorgreen> | ||
| 155 | + <backgroundcolorblue>112</backgroundcolorblue> | ||
| 156 | + <bordercolorred>100</bordercolorred> | ||
| 157 | + <bordercolorgreen>100</bordercolorgreen> | ||
| 158 | + <bordercolorblue>100</bordercolorblue> | ||
| 159 | + <drawshadow>Y</drawshadow> | ||
| 160 | + </notepad> | ||
| 161 | + <notepad> | ||
| 162 | + <note>进场班次,方向有时确定不准,
空的情况下设定为0(上行)</note> | ||
| 163 | + <xloc>578</xloc> | ||
| 164 | + <yloc>1084</yloc> | ||
| 165 | + <width>178</width> | ||
| 166 | + <heigth>42</heigth> | ||
| 167 | + <fontname>YaHei Consolas Hybrid</fontname> | ||
| 168 | + <fontsize>12</fontsize> | ||
| 169 | + <fontbold>N</fontbold> | ||
| 170 | + <fontitalic>N</fontitalic> | ||
| 171 | + <fontcolorred>0</fontcolorred> | ||
| 172 | + <fontcolorgreen>0</fontcolorgreen> | ||
| 173 | + <fontcolorblue>0</fontcolorblue> | ||
| 174 | + <backgroundcolorred>255</backgroundcolorred> | ||
| 175 | + <backgroundcolorgreen>205</backgroundcolorgreen> | ||
| 176 | + <backgroundcolorblue>112</backgroundcolorblue> | ||
| 177 | + <bordercolorred>100</bordercolorred> | ||
| 178 | + <bordercolorgreen>100</bordercolorgreen> | ||
| 179 | + <bordercolorblue>100</bordercolorblue> | ||
| 180 | + <drawshadow>Y</drawshadow> | ||
| 181 | + </notepad> | ||
| 182 | + </notepads> | ||
| 183 | + <connection> | ||
| 184 | + <name>192.168.168.1_jwgl_dw</name> | ||
| 185 | + <server>192.168.168.1</server> | ||
| 186 | + <type>ORACLE</type> | ||
| 187 | + <access>Native</access> | ||
| 188 | + <database>orcl</database> | ||
| 189 | + <port>1521</port> | ||
| 190 | + <username>jwgl_dw</username> | ||
| 191 | + <password>Encrypted 2be98afc86aa7f2e4cb13b977d2adabcd</password> | ||
| 192 | + <servername/> | ||
| 193 | + <data_tablespace/> | ||
| 194 | + <index_tablespace/> | ||
| 195 | + <attributes> | ||
| 196 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 197 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 198 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 199 | + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute> | ||
| 200 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 201 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 202 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 203 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 204 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 205 | + </attributes> | ||
| 206 | + </connection> | ||
| 207 | + <connection> | ||
| 208 | + <name>bus_control_variable</name> | ||
| 209 | + <server>${v_db_ip}</server> | ||
| 210 | + <type>MYSQL</type> | ||
| 211 | + <access>Native</access> | ||
| 212 | + <database>${v_db_dname}</database> | ||
| 213 | + <port>3306</port> | ||
| 214 | + <username>${v_db_uname}</username> | ||
| 215 | + <password>${v_db_pwd}</password> | ||
| 216 | + <servername/> | ||
| 217 | + <data_tablespace/> | ||
| 218 | + <index_tablespace/> | ||
| 219 | + <attributes> | ||
| 220 | + <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute> | ||
| 221 | + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute> | ||
| 222 | + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute> | ||
| 223 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 224 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 225 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 226 | + <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute> | ||
| 227 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 228 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 229 | + <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute> | ||
| 230 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 231 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 232 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 233 | + </attributes> | ||
| 234 | + </connection> | ||
| 235 | + <connection> | ||
| 236 | + <name>bus_control_公司_201</name> | ||
| 237 | + <server>localhost</server> | ||
| 238 | + <type>MYSQL</type> | ||
| 239 | + <access>Native</access> | ||
| 240 | + <database>control</database> | ||
| 241 | + <port>3306</port> | ||
| 242 | + <username>root</username> | ||
| 243 | + <password>Encrypted </password> | ||
| 244 | + <servername/> | ||
| 245 | + <data_tablespace/> | ||
| 246 | + <index_tablespace/> | ||
| 247 | + <attributes> | ||
| 248 | + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute> | ||
| 249 | + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute> | ||
| 250 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 251 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 252 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 253 | + <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute> | ||
| 254 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 255 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 256 | + <attribute><code>STREAM_RESULTS</code><attribute>N</attribute></attribute> | ||
| 257 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 258 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 259 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 260 | + </attributes> | ||
| 261 | + </connection> | ||
| 262 | + <connection> | ||
| 263 | + <name>bus_control_本机</name> | ||
| 264 | + <server>localhost</server> | ||
| 265 | + <type>MYSQL</type> | ||
| 266 | + <access>Native</access> | ||
| 267 | + <database>control</database> | ||
| 268 | + <port>3306</port> | ||
| 269 | + <username>root</username> | ||
| 270 | + <password>Encrypted </password> | ||
| 271 | + <servername/> | ||
| 272 | + <data_tablespace/> | ||
| 273 | + <index_tablespace/> | ||
| 274 | + <attributes> | ||
| 275 | + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute> | ||
| 276 | + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute> | ||
| 277 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 278 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 279 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 280 | + <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute> | ||
| 281 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 282 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 283 | + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute> | ||
| 284 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 285 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 286 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 287 | + </attributes> | ||
| 288 | + </connection> | ||
| 289 | + <connection> | ||
| 290 | + <name>xlab_mysql_youle</name> | ||
| 291 | + <server>101.231.124.8</server> | ||
| 292 | + <type>MYSQL</type> | ||
| 293 | + <access>Native</access> | ||
| 294 | + <database>xlab_youle</database> | ||
| 295 | + <port>45687</port> | ||
| 296 | + <username>xlab-youle</username> | ||
| 297 | + <password>Encrypted 2be98afc86aa78a88aa1be369d187a3df</password> | ||
| 298 | + <servername/> | ||
| 299 | + <data_tablespace/> | ||
| 300 | + <index_tablespace/> | ||
| 301 | + <attributes> | ||
| 302 | + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute> | ||
| 303 | + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute> | ||
| 304 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 305 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 306 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 307 | + <attribute><code>PORT_NUMBER</code><attribute>45687</attribute></attribute> | ||
| 308 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 309 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 310 | + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute> | ||
| 311 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute> | ||
| 312 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute> | ||
| 313 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 314 | + </attributes> | ||
| 315 | + </connection> | ||
| 316 | + <connection> | ||
| 317 | + <name>xlab_mysql_youle(本机)</name> | ||
| 318 | + <server>localhost</server> | ||
| 319 | + <type>MYSQL</type> | ||
| 320 | + <access>Native</access> | ||
| 321 | + <database>xlab_youle</database> | ||
| 322 | + <port>3306</port> | ||
| 323 | + <username>root</username> | ||
| 324 | + <password>Encrypted </password> | ||
| 325 | + <servername/> | ||
| 326 | + <data_tablespace/> | ||
| 327 | + <index_tablespace/> | ||
| 328 | + <attributes> | ||
| 329 | + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute> | ||
| 330 | + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute> | ||
| 331 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 332 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 333 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 334 | + <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute> | ||
| 335 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 336 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 337 | + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute> | ||
| 338 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>N</attribute></attribute> | ||
| 339 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>N</attribute></attribute> | ||
| 340 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 341 | + </attributes> | ||
| 342 | + </connection> | ||
| 343 | + <connection> | ||
| 344 | + <name>xlab_youle</name> | ||
| 345 | + <server/> | ||
| 346 | + <type>MYSQL</type> | ||
| 347 | + <access>JNDI</access> | ||
| 348 | + <database>xlab_youle</database> | ||
| 349 | + <port>1521</port> | ||
| 350 | + <username/> | ||
| 351 | + <password>Encrypted </password> | ||
| 352 | + <servername/> | ||
| 353 | + <data_tablespace/> | ||
| 354 | + <index_tablespace/> | ||
| 355 | + <attributes> | ||
| 356 | + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute> | ||
| 357 | + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute> | ||
| 358 | + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute> | ||
| 359 | + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute> | ||
| 360 | + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute> | ||
| 361 | + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute> | ||
| 362 | + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute> | ||
| 363 | + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 364 | + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute> | ||
| 365 | + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute> | ||
| 366 | + </attributes> | ||
| 367 | + </connection> | ||
| 368 | + <order> | ||
| 369 | + <hop> <from>时刻表明细信息Excel输入</from><to>班次数据范式化</to><enabled>Y</enabled> </hop> | ||
| 370 | + <hop> <from>添加发车顺序号</from><to>过滤记录(发车时间为空)</to><enabled>Y</enabled> </hop> | ||
| 371 | + <hop> <from>过滤记录(发车时间为空)</from><to>添加对应班次数</to><enabled>Y</enabled> </hop> | ||
| 372 | + <hop> <from>添加对应班次数</from><to>处理数据</to><enabled>Y</enabled> </hop> | ||
| 373 | + <hop> <from>处理数据</from><to>分组各个路牌的站</to><enabled>Y</enabled> </hop> | ||
| 374 | + <hop> <from>查找时刻表基础信息关联</from><to>查找路牌关联</to><enabled>Y</enabled> </hop> | ||
| 375 | + <hop> <from>查找线路关联</from><to>查找时刻表基础信息关联</to><enabled>Y</enabled> </hop> | ||
| 376 | + <hop> <from>上下行字典</from><to>班次类型字典</to><enabled>Y</enabled> </hop> | ||
| 377 | + <hop> <from>上下行字典 2</from><to>班次类型字典 2</to><enabled>Y</enabled> </hop> | ||
| 378 | + <hop> <from>上下行字典 3</from><to>班次类型字典 3</to><enabled>Y</enabled> </hop> | ||
| 379 | + <hop> <from>匹配上下行正常班次里程时间</from><to>类型修正</to><enabled>Y</enabled> </hop> | ||
| 380 | + <hop> <from>按照班次类型过滤数据1</from><to>按照班次类型过滤数据2</to><enabled>Y</enabled> </hop> | ||
| 381 | + <hop> <from>按照班次类型过滤数据1</from><to>正常班次数据</to><enabled>Y</enabled> </hop> | ||
| 382 | + <hop> <from>按照班次类型过滤数据2</from><to>出场班次数据</to><enabled>Y</enabled> </hop> | ||
| 383 | + <hop> <from>按照班次类型过滤数据2</from><to>进场班次数据</to><enabled>Y</enabled> </hop> | ||
| 384 | + <hop> <from>查找所有线路上下行里程时间</from><to>匹配上下行正常班次里程时间</to><enabled>Y</enabled> </hop> | ||
| 385 | + <hop> <from>查找终点站关联</from><to>上下行字典</to><enabled>Y</enabled> </hop> | ||
| 386 | + <hop> <from>查找起点站关联并确定上下行</from><to>查找终点站关联</to><enabled>Y</enabled> </hop> | ||
| 387 | + <hop> <from>正常班次_处理数据</from><to>查找起点站关联并确定上下行</to><enabled>Y</enabled> </hop> | ||
| 388 | + <hop> <from>正常班次数据</from><to>正常班次_处理数据</to><enabled>Y</enabled> </hop> | ||
| 389 | + <hop> <from>班次类型字典</from><to>查找所有线路上下行里程时间</to><enabled>Y</enabled> </hop> | ||
| 390 | + <hop> <from>班次类型字典 2</from><to>查找线路出场里程时间</to><enabled>Y</enabled> </hop> | ||
| 391 | + <hop> <from>班次类型字典 3</from><to>查找线路进场里程时间</to><enabled>Y</enabled> </hop> | ||
| 392 | + <hop> <from>计算班次类型</from><to>按照班次类型过滤数据1</to><enabled>Y</enabled> </hop> | ||
| 393 | + <hop> <from>出场班次数据</from><to>查找停车场1</to><enabled>Y</enabled> </hop> | ||
| 394 | + <hop> <from>查找停车场1</from><to>出场班次_确定终点站名字</to><enabled>Y</enabled> </hop> | ||
| 395 | + <hop> <from>出场班次_确定终点站名字</from><to>查找出场终点站关联并确定上下行</to><enabled>Y</enabled> </hop> | ||
| 396 | + <hop> <from>查找出场终点站关联并确定上下行</from><to>上下行字典 2</to><enabled>Y</enabled> </hop> | ||
| 397 | + <hop> <from>进场班次数据</from><to>查找停车场2</to><enabled>Y</enabled> </hop> | ||
| 398 | + <hop> <from>查找停车场2</from><to>进场班次_确定起点站名字</to><enabled>Y</enabled> </hop> | ||
| 399 | + <hop> <from>进场班次_确定起点站名字</from><to>查找进场班次上一个班次的线路方向</to><enabled>Y</enabled> </hop> | ||
| 400 | + <hop> <from>查找进场班次上一个班次的线路方向</from><to>查找进场班次上一个班次的终点站,并作为进场班次的起点站</to><enabled>Y</enabled> </hop> | ||
| 401 | + <hop> <from>字段选择</from><to>添加发车顺序号</to><enabled>Y</enabled> </hop> | ||
| 402 | + <hop> <from>分组各个路牌的站</from><to>查找线路关联</to><enabled>Y</enabled> </hop> | ||
| 403 | + <hop> <from>增加时刻表名字,线路名字,停车场名字</from><to>记录关联 (笛卡尔输出)</to><enabled>Y</enabled> </hop> | ||
| 404 | + <hop> <from>班次数据范式化</from><to>记录关联 (笛卡尔输出)</to><enabled>Y</enabled> </hop> | ||
| 405 | + <hop> <from>记录关联 (笛卡尔输出)</from><to>字段选择</to><enabled>Y</enabled> </hop> | ||
| 406 | + <hop> <from>类型修正</from><to>插入/更新bsth_c_s_ttinfo_detail</to><enabled>Y</enabled> </hop> | ||
| 407 | + <hop> <from>查找进场班次上一个班次的终点站,并作为进场班次的起点站</from><to>查找进场起点站关联确定上下行</to><enabled>Y</enabled> </hop> | ||
| 408 | + <hop> <from>查找进场起点站关联确定上下行</from><to>上下行字典 3</to><enabled>Y</enabled> </hop> | ||
| 409 | + <hop> <from>查找线路出场里程时间</from><to>匹配出场班次里程时间</to><enabled>Y</enabled> </hop> | ||
| 410 | + <hop> <from>查找线路进场里程时间</from><to>匹配进场班次里程时间</to><enabled>Y</enabled> </hop> | ||
| 411 | + <hop> <from>匹配出场班次里程时间</from><to>上下行NULL判定</to><enabled>Y</enabled> </hop> | ||
| 412 | + <hop> <from>上下行NULL判定</from><to>类型修正 2</to><enabled>Y</enabled> </hop> | ||
| 413 | + <hop> <from>类型修正 2</from><to>插入/更新bsth_c_s_ttinfo_detail 2</to><enabled>Y</enabled> </hop> | ||
| 414 | + <hop> <from>匹配进场班次里程时间</from><to>上下行判定 2</to><enabled>Y</enabled> </hop> | ||
| 415 | + <hop> <from>上下行判定 2</from><to>类型修正 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> | ||
| 418 | + <hop> <from>站点路由版本类型</from><to>计算班次类型</to><enabled>Y</enabled> </hop> | ||
| 419 | + </order> | ||
| 420 | + <step> | ||
| 421 | + <name>上下行NULL判定</name> | ||
| 422 | + <type>IfNull</type> | ||
| 423 | + <description/> | ||
| 424 | + <distribute>Y</distribute> | ||
| 425 | + <custom_distribution/> | ||
| 426 | + <copies>1</copies> | ||
| 427 | + <partitioning> | ||
| 428 | + <method>none</method> | ||
| 429 | + <schema_name/> | ||
| 430 | + </partitioning> | ||
| 431 | + <replaceAllByValue/> | ||
| 432 | + <replaceAllMask/> | ||
| 433 | + <selectFields>Y</selectFields> | ||
| 434 | + <selectValuesType>N</selectValuesType> | ||
| 435 | + <setEmptyStringAll>N</setEmptyStringAll> | ||
| 436 | + <valuetypes> | ||
| 437 | + </valuetypes> | ||
| 438 | + <fields> | ||
| 439 | + <field> | ||
| 440 | + <name>sxx</name> | ||
| 441 | + <value>0</value> | ||
| 442 | + <mask/> | ||
| 443 | + <set_empty_string>N</set_empty_string> | ||
| 444 | + </field> | ||
| 445 | + </fields> | ||
| 446 | + <cluster_schema/> | ||
| 447 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 448 | + <xloc>335</xloc> | ||
| 449 | + <yloc>938</yloc> | ||
| 450 | + <draw>Y</draw> | ||
| 451 | + </GUI> | ||
| 452 | + </step> | ||
| 453 | + | ||
| 454 | + <step> | ||
| 455 | + <name>上下行判定 2</name> | ||
| 456 | + <type>IfNull</type> | ||
| 457 | + <description/> | ||
| 458 | + <distribute>Y</distribute> | ||
| 459 | + <custom_distribution/> | ||
| 460 | + <copies>1</copies> | ||
| 461 | + <partitioning> | ||
| 462 | + <method>none</method> | ||
| 463 | + <schema_name/> | ||
| 464 | + </partitioning> | ||
| 465 | + <replaceAllByValue/> | ||
| 466 | + <replaceAllMask/> | ||
| 467 | + <selectFields>Y</selectFields> | ||
| 468 | + <selectValuesType>N</selectValuesType> | ||
| 469 | + <setEmptyStringAll>N</setEmptyStringAll> | ||
| 470 | + <valuetypes> | ||
| 471 | + </valuetypes> | ||
| 472 | + <fields> | ||
| 473 | + <field> | ||
| 474 | + <name>sxx2</name> | ||
| 475 | + <value>0</value> | ||
| 476 | + <mask/> | ||
| 477 | + <set_empty_string>N</set_empty_string> | ||
| 478 | + </field> | ||
| 479 | + </fields> | ||
| 480 | + <cluster_schema/> | ||
| 481 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 482 | + <xloc>804</xloc> | ||
| 483 | + <yloc>1081</yloc> | ||
| 484 | + <draw>Y</draw> | ||
| 485 | + </GUI> | ||
| 486 | + </step> | ||
| 487 | + | ||
| 488 | + <step> | ||
| 489 | + <name>上下行字典</name> | ||
| 490 | + <type>ValueMapper</type> | ||
| 491 | + <description/> | ||
| 492 | + <distribute>Y</distribute> | ||
| 493 | + <custom_distribution/> | ||
| 494 | + <copies>1</copies> | ||
| 495 | + <partitioning> | ||
| 496 | + <method>none</method> | ||
| 497 | + <schema_name/> | ||
| 498 | + </partitioning> | ||
| 499 | + <field_to_use>sxx</field_to_use> | ||
| 500 | + <target_field>sxx_desc</target_field> | ||
| 501 | + <non_match_default/> | ||
| 502 | + <fields> | ||
| 503 | + <field> | ||
| 504 | + <source_value>0</source_value> | ||
| 505 | + <target_value>上行</target_value> | ||
| 506 | + </field> | ||
| 507 | + <field> | ||
| 508 | + <source_value>1</source_value> | ||
| 509 | + <target_value>下行</target_value> | ||
| 510 | + </field> | ||
| 511 | + </fields> | ||
| 512 | + <cluster_schema/> | ||
| 513 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 514 | + <xloc>147</xloc> | ||
| 515 | + <yloc>403</yloc> | ||
| 516 | + <draw>Y</draw> | ||
| 517 | + </GUI> | ||
| 518 | + </step> | ||
| 519 | + | ||
| 520 | + <step> | ||
| 521 | + <name>上下行字典 2</name> | ||
| 522 | + <type>ValueMapper</type> | ||
| 523 | + <description/> | ||
| 524 | + <distribute>Y</distribute> | ||
| 525 | + <custom_distribution/> | ||
| 526 | + <copies>1</copies> | ||
| 527 | + <partitioning> | ||
| 528 | + <method>none</method> | ||
| 529 | + <schema_name/> | ||
| 530 | + </partitioning> | ||
| 531 | + <field_to_use>sxx</field_to_use> | ||
| 532 | + <target_field>sxx_desc</target_field> | ||
| 533 | + <non_match_default/> | ||
| 534 | + <fields> | ||
| 535 | + <field> | ||
| 536 | + <source_value>0</source_value> | ||
| 537 | + <target_value>上行</target_value> | ||
| 538 | + </field> | ||
| 539 | + <field> | ||
| 540 | + <source_value>1</source_value> | ||
| 541 | + <target_value>下行</target_value> | ||
| 542 | + </field> | ||
| 543 | + </fields> | ||
| 544 | + <cluster_schema/> | ||
| 545 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 546 | + <xloc>331</xloc> | ||
| 547 | + <yloc>598</yloc> | ||
| 548 | + <draw>Y</draw> | ||
| 549 | + </GUI> | ||
| 550 | + </step> | ||
| 551 | + | ||
| 552 | + <step> | ||
| 553 | + <name>上下行字典 3</name> | ||
| 554 | + <type>ValueMapper</type> | ||
| 555 | + <description/> | ||
| 556 | + <distribute>Y</distribute> | ||
| 557 | + <custom_distribution/> | ||
| 558 | + <copies>1</copies> | ||
| 559 | + <partitioning> | ||
| 560 | + <method>none</method> | ||
| 561 | + <schema_name/> | ||
| 562 | + </partitioning> | ||
| 563 | + <field_to_use>sxx</field_to_use> | ||
| 564 | + <target_field>sxx_desc</target_field> | ||
| 565 | + <non_match_default/> | ||
| 566 | + <fields> | ||
| 567 | + <field> | ||
| 568 | + <source_value>0</source_value> | ||
| 569 | + <target_value>上行</target_value> | ||
| 570 | + </field> | ||
| 571 | + <field> | ||
| 572 | + <source_value>1</source_value> | ||
| 573 | + <target_value>下行</target_value> | ||
| 574 | + </field> | ||
| 575 | + </fields> | ||
| 576 | + <cluster_schema/> | ||
| 577 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 578 | + <xloc>553</xloc> | ||
| 579 | + <yloc>859</yloc> | ||
| 580 | + <draw>Y</draw> | ||
| 581 | + </GUI> | ||
| 582 | + </step> | ||
| 583 | + | ||
| 584 | + <step> | ||
| 585 | + <name>出场班次_确定终点站名字</name> | ||
| 586 | + <type>ScriptValueMod</type> | ||
| 587 | + <description/> | ||
| 588 | + <distribute>Y</distribute> | ||
| 589 | + <custom_distribution/> | ||
| 590 | + <copies>1</copies> | ||
| 591 | + <partitioning> | ||
| 592 | + <method>none</method> | ||
| 593 | + <schema_name/> | ||
| 594 | + </partitioning> | ||
| 595 | + <compatible>N</compatible> | ||
| 596 | + <optimizationLevel>9</optimizationLevel> | ||
| 597 | + <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | ||
| 598 | + <jsScript_name>Script 1</jsScript_name> | ||
| 599 | + <jsScript_script>//Script here

// 添加站点标识
var cc_groups = qdzgroups.split(","); // 所有班次起点站数组
var zdzname = cc_groups[gno]; // 出场班次的终点站是下个班次的起始站
var endZdtype = 'B';
// var endZdtype = 'E';

var destory = 0; // 未撤销flag</jsScript_script> | ||
| 600 | + </jsScript> </jsScripts> <fields> <field> <name>zdzname</name> | ||
| 601 | + <rename>zdzname</rename> | ||
| 602 | + <type>String</type> | ||
| 603 | + <length>-1</length> | ||
| 604 | + <precision>-1</precision> | ||
| 605 | + <replace>N</replace> | ||
| 606 | + </field> <field> <name>endZdtype</name> | ||
| 607 | + <rename>endZdtype</rename> | ||
| 608 | + <type>String</type> | ||
| 609 | + <length>-1</length> | ||
| 610 | + <precision>-1</precision> | ||
| 611 | + <replace>N</replace> | ||
| 612 | + </field> <field> <name>destory</name> | ||
| 613 | + <rename>destory</rename> | ||
| 614 | + <type>Integer</type> | ||
| 615 | + <length>-1</length> | ||
| 616 | + <precision>-1</precision> | ||
| 617 | + <replace>N</replace> | ||
| 618 | + </field> </fields> <cluster_schema/> | ||
| 619 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 620 | + <xloc>575</xloc> | ||
| 621 | + <yloc>502</yloc> | ||
| 622 | + <draw>Y</draw> | ||
| 623 | + </GUI> | ||
| 624 | + </step> | ||
| 625 | + | ||
| 626 | + <step> | ||
| 627 | + <name>出场班次数据</name> | ||
| 628 | + <type>Dummy</type> | ||
| 629 | + <description/> | ||
| 630 | + <distribute>Y</distribute> | ||
| 631 | + <custom_distribution/> | ||
| 632 | + <copies>1</copies> | ||
| 633 | + <partitioning> | ||
| 634 | + <method>none</method> | ||
| 635 | + <schema_name/> | ||
| 636 | + </partitioning> | ||
| 637 | + <cluster_schema/> | ||
| 638 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 639 | + <xloc>869</xloc> | ||
| 640 | + <yloc>504</yloc> | ||
| 641 | + <draw>Y</draw> | ||
| 642 | + </GUI> | ||
| 643 | + </step> | ||
| 644 | + | ||
| 645 | + <step> | ||
| 646 | + <name>分组各个路牌的站</name> | ||
| 647 | + <type>GroupBy</type> | ||
| 648 | + <description/> | ||
| 649 | + <distribute>Y</distribute> | ||
| 650 | + <custom_distribution/> | ||
| 651 | + <copies>1</copies> | ||
| 652 | + <partitioning> | ||
| 653 | + <method>none</method> | ||
| 654 | + <schema_name/> | ||
| 655 | + </partitioning> | ||
| 656 | + <all_rows>Y</all_rows> | ||
| 657 | + <ignore_aggregate>N</ignore_aggregate> | ||
| 658 | + <field_ignore/> | ||
| 659 | + <directory>%%java.io.tmpdir%%</directory> | ||
| 660 | + <prefix>grp</prefix> | ||
| 661 | + <add_linenr>Y</add_linenr> | ||
| 662 | + <linenr_fieldname>gno</linenr_fieldname> | ||
| 663 | + <give_back_row>N</give_back_row> | ||
| 664 | + <group> | ||
| 665 | + <field> | ||
| 666 | + <name>lp</name> | ||
| 667 | + </field> | ||
| 668 | + </group> | ||
| 669 | + <fields> | ||
| 670 | + <field> | ||
| 671 | + <aggregate>qdzgroups</aggregate> | ||
| 672 | + <subject>qdzname</subject> | ||
| 673 | + <type>CONCAT_STRING</type> | ||
| 674 | + <valuefield>,</valuefield> | ||
| 675 | + </field> | ||
| 676 | + </fields> | ||
| 677 | + <cluster_schema/> | ||
| 678 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 679 | + <xloc>892</xloc> | ||
| 680 | + <yloc>44</yloc> | ||
| 681 | + <draw>Y</draw> | ||
| 682 | + </GUI> | ||
| 683 | + </step> | ||
| 684 | + | ||
| 685 | + <step> | ||
| 686 | + <name>匹配上下行正常班次里程时间</name> | ||
| 687 | + <type>ScriptValueMod</type> | ||
| 688 | + <description/> | ||
| 689 | + <distribute>Y</distribute> | ||
| 690 | + <custom_distribution/> | ||
| 691 | + <copies>1</copies> | ||
| 692 | + <partitioning> | ||
| 693 | + <method>none</method> | ||
| 694 | + <schema_name/> | ||
| 695 | + </partitioning> | ||
| 696 | + <compatible>N</compatible> | ||
| 697 | + <optimizationLevel>9</optimizationLevel> | ||
| 698 | + <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | ||
| 699 | + <jsScript_name>Script 1</jsScript_name> | ||
| 700 | + <jsScript_script>//Script here

var jhlc; // 计划里程
var bcsj; // 班次时间

// 时间范围正则表达式
var timeRex = /^([01]?[0-9]|2[0-3]):[0-5][0-9]$/;
// 发车时间转换成日期
var fcsj_hour = str2num(sendtime_calcu.substr(0, 2), "#");
var fcsj_min = str2num(sendtime_calcu.substr(3, 2), "#");
var fcsj_date = new Date(2000,1,1,fcsj_hour,fcsj_min,0);

// 判定是否早高峰
var isZgf = false;
if (timeRex.test(early_start_time) && timeRex.test(early_end_time) && early_up_time != null && early_down_time != null) {
 var early_s_hour = str2num(early_start_time.substr(0, 2), "#");
 var early_s_min = str2num(early_start_time.substr(3, 2), "#");
 var early_s_date = new Date(2000,1,1,early_s_hour,early_s_min,0);

 var early_e_hour = str2num(early_end_time.substr(0, 2), "#");
 var early_e_min = str2num(early_end_time.substr(3, 2), "#");
 var early_e_date = new Date(2000,1,1,early_e_hour,early_e_min,0);

 if (fcsj_date >= early_s_date && fcsj_date <= early_e_date) {
 isZgf = true;
 }
}

// 判定是否晚高峰
var isWgf = false;
if (timeRex.test(late_start_time) && timeRex.test(late_end_time) && late_up_time != null && late_down_time != null) {
 var late_s_hour = str2num(late_start_time.substr(0, 2), "#");
 var late_s_min = str2num(late_start_time.substr(3, 2), "#");
 var late_s_date = new Date(2000,1,1,late_s_hour,late_s_min,0);

 var late_e_hour = str2num(late_end_time.substr(0, 2), "#");
 var late_e_min = str2num(late_end_time.substr(3, 2), "#");
 var late_e_date = new Date(2000,1,1,late_e_hour,late_e_min,0);

 if (fcsj_date >= late_s_date && fcsj_date <= late_e_date) {
 isWgf = true;
 }
}

// 判定是否晚高峰

if (sxx == 0) { // 上行
 if (isZgf) {
 jhlc = up_mileage;
 bcsj = early_up_time != 0 ? early_up_time : up_travel_time;
 } else if (isWgf) {
 jhlc = up_mileage;
 bcsj = late_up_time != 0 ? late_up_time : up_travel_time;
 } else {
 jhlc = up_mileage;
 bcsj = up_travel_time;
 }
} else { // sxx == 1 下行
 if (isZgf) {
 jhlc = down_mileage;
 bcsj = early_down_time != 0 ? early_down_time : down_travel_time;
 } else if (isWgf) {
 jhlc = down_mileage;
 bcsj = late_down_time != 0 ? late_down_time : down_travel_time;
 } else {
 jhlc = down_mileage;
 bcsj = down_travel_time;
 }
}</jsScript_script> | ||
| 701 | + </jsScript> </jsScripts> <fields> <field> <name>jhlc</name> | ||
| 702 | + <rename>jhlc</rename> | ||
| 703 | + <type>String</type> | ||
| 704 | + <length>-1</length> | ||
| 705 | + <precision>-1</precision> | ||
| 706 | + <replace>N</replace> | ||
| 707 | + </field> <field> <name>bcsj</name> | ||
| 708 | + <rename>bcsj</rename> | ||
| 709 | + <type>String</type> | ||
| 710 | + <length>-1</length> | ||
| 711 | + <precision>-1</precision> | ||
| 712 | + <replace>N</replace> | ||
| 713 | + </field> </fields> <cluster_schema/> | ||
| 714 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 715 | + <xloc>148</xloc> | ||
| 716 | + <yloc>674</yloc> | ||
| 717 | + <draw>Y</draw> | ||
| 718 | + </GUI> | ||
| 719 | + </step> | ||
| 720 | + | ||
| 721 | + <step> | ||
| 722 | + <name>匹配出场班次里程时间</name> | ||
| 723 | + <type>ScriptValueMod</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 | + <compatible>N</compatible> | ||
| 733 | + <optimizationLevel>9</optimizationLevel> | ||
| 734 | + <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | ||
| 735 | + <jsScript_name>Script 1</jsScript_name> | ||
| 736 | + <jsScript_script>//Script here

var out_mileage; // 出场计划里程
var out_time; // 出场计划时间

if (sxx == 0) { // 上行
 out_mileage = up_out_mileage;
 out_time = up_out_timer;
} else { // sxx == 1 下行
 out_mileage = down_out_mileage;
 out_time = down_out_timer;
}



</jsScript_script> | ||
| 737 | + </jsScript> </jsScripts> <fields> <field> <name>out_mileage</name> | ||
| 738 | + <rename>out_mileage</rename> | ||
| 739 | + <type>String</type> | ||
| 740 | + <length>-1</length> | ||
| 741 | + <precision>-1</precision> | ||
| 742 | + <replace>N</replace> | ||
| 743 | + </field> <field> <name>out_time</name> | ||
| 744 | + <rename>out_time</rename> | ||
| 745 | + <type>String</type> | ||
| 746 | + <length>-1</length> | ||
| 747 | + <precision>-1</precision> | ||
| 748 | + <replace>N</replace> | ||
| 749 | + </field> </fields> <cluster_schema/> | ||
| 750 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 751 | + <xloc>336</xloc> | ||
| 752 | + <yloc>862</yloc> | ||
| 753 | + <draw>Y</draw> | ||
| 754 | + </GUI> | ||
| 755 | + </step> | ||
| 756 | + | ||
| 757 | + <step> | ||
| 758 | + <name>匹配进场班次里程时间</name> | ||
| 759 | + <type>ScriptValueMod</type> | ||
| 760 | + <description/> | ||
| 761 | + <distribute>Y</distribute> | ||
| 762 | + <custom_distribution/> | ||
| 763 | + <copies>1</copies> | ||
| 764 | + <partitioning> | ||
| 765 | + <method>none</method> | ||
| 766 | + <schema_name/> | ||
| 767 | + </partitioning> | ||
| 768 | + <compatible>N</compatible> | ||
| 769 | + <optimizationLevel>9</optimizationLevel> | ||
| 770 | + <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | ||
| 771 | + <jsScript_name>Script 1</jsScript_name> | ||
| 772 | + <jsScript_script>//Script here

var parade_mileage; // 进场计划里程
var parade_time; // 进场计划时间

if (sxx2 == 0) { // 上行
 parade_mileage = up_in_mileage;
 parade_time = up_in_timer;
} else { // sxx == 1 下行
 parade_mileage = down_in_mileage;
 parade_time = down_in_timer;
}



</jsScript_script> | ||
| 773 | + </jsScript> </jsScripts> <fields> <field> <name>parade_mileage</name> | ||
| 774 | + <rename>parade_mileage</rename> | ||
| 775 | + <type>String</type> | ||
| 776 | + <length>-1</length> | ||
| 777 | + <precision>-1</precision> | ||
| 778 | + <replace>N</replace> | ||
| 779 | + </field> <field> <name>parade_time</name> | ||
| 780 | + <rename>parade_time</rename> | ||
| 781 | + <type>String</type> | ||
| 782 | + <length>-1</length> | ||
| 783 | + <precision>-1</precision> | ||
| 784 | + <replace>N</replace> | ||
| 785 | + </field> </fields> <cluster_schema/> | ||
| 786 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 787 | + <xloc>726</xloc> | ||
| 788 | + <yloc>1005</yloc> | ||
| 789 | + <draw>Y</draw> | ||
| 790 | + </GUI> | ||
| 791 | + </step> | ||
| 792 | + | ||
| 793 | + <step> | ||
| 794 | + <name>增加时刻表名字,线路名字,停车场名字</name> | ||
| 795 | + <type>DataGrid</type> | ||
| 796 | + <description/> | ||
| 797 | + <distribute>Y</distribute> | ||
| 798 | + <custom_distribution/> | ||
| 799 | + <copies>1</copies> | ||
| 800 | + <partitioning> | ||
| 801 | + <method>none</method> | ||
| 802 | + <schema_name/> | ||
| 803 | + </partitioning> | ||
| 804 | + <fields> | ||
| 805 | + </fields> | ||
| 806 | + <data> | ||
| 807 | + <line> </line> | ||
| 808 | + </data> | ||
| 809 | + <cluster_schema/> | ||
| 810 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 811 | + <xloc>110</xloc> | ||
| 812 | + <yloc>133</yloc> | ||
| 813 | + <draw>Y</draw> | ||
| 814 | + </GUI> | ||
| 815 | + </step> | ||
| 816 | + | ||
| 817 | + <step> | ||
| 818 | + <name>处理数据</name> | ||
| 819 | + <type>ScriptValueMod</type> | ||
| 820 | + <description/> | ||
| 821 | + <distribute>Y</distribute> | ||
| 822 | + <custom_distribution/> | ||
| 823 | + <copies>1</copies> | ||
| 824 | + <partitioning> | ||
| 825 | + <method>none</method> | ||
| 826 | + <schema_name/> | ||
| 827 | + </partitioning> | ||
| 828 | + <compatible>N</compatible> | ||
| 829 | + <optimizationLevel>9</optimizationLevel> | ||
| 830 | + <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | ||
| 831 | + <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> </jsScripts> <fields> <field> <name>qdzname</name> | ||
| 834 | + <rename>qdzname</rename> | ||
| 835 | + <type>String</type> | ||
| 836 | + <length>-1</length> | ||
| 837 | + <precision>-1</precision> | ||
| 838 | + <replace>Y</replace> | ||
| 839 | + </field> <field> <name>isfb</name> | ||
| 840 | + <rename>isfb</rename> | ||
| 841 | + <type>Integer</type> | ||
| 842 | + <length>-1</length> | ||
| 843 | + <precision>-1</precision> | ||
| 844 | + <replace>N</replace> | ||
| 845 | + </field> <field> <name>iscanceled</name> | ||
| 846 | + <rename>iscanceled</rename> | ||
| 847 | + <type>Integer</type> | ||
| 848 | + <length>-1</length> | ||
| 849 | + <precision>-1</precision> | ||
| 850 | + <replace>N</replace> | ||
| 851 | + </field> <field> <name>sendtime_calcu</name> | ||
| 852 | + <rename>sendtime_calcu</rename> | ||
| 853 | + <type>String</type> | ||
| 854 | + <length>-1</length> | ||
| 855 | + <precision>-1</precision> | ||
| 856 | + <replace>N</replace> | ||
| 857 | + </field> <field> <name>ists</name> | ||
| 858 | + <rename>ists</rename> | ||
| 859 | + <type>Integer</type> | ||
| 860 | + <length>-1</length> | ||
| 861 | + <precision>-1</precision> | ||
| 862 | + <replace>N</replace> | ||
| 863 | + </field> </fields> <cluster_schema/> | ||
| 864 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 865 | + <xloc>788</xloc> | ||
| 866 | + <yloc>44</yloc> | ||
| 867 | + <draw>Y</draw> | ||
| 868 | + </GUI> | ||
| 869 | + </step> | ||
| 870 | + | ||
| 871 | + <step> | ||
| 872 | + <name>字段选择</name> | ||
| 873 | + <type>SelectValues</type> | ||
| 874 | + <description/> | ||
| 875 | + <distribute>Y</distribute> | ||
| 876 | + <custom_distribution/> | ||
| 877 | + <copies>1</copies> | ||
| 878 | + <partitioning> | ||
| 879 | + <method>none</method> | ||
| 880 | + <schema_name/> | ||
| 881 | + </partitioning> | ||
| 882 | + <fields> <field> <name>路牌</name> | ||
| 883 | + <rename>lp</rename> | ||
| 884 | + <length>-2</length> | ||
| 885 | + <precision>-2</precision> | ||
| 886 | + </field> <field> <name>站点名称</name> | ||
| 887 | + <rename>qdzname</rename> | ||
| 888 | + <length>-2</length> | ||
| 889 | + <precision>-2</precision> | ||
| 890 | + </field> <field> <name>发车时间</name> | ||
| 891 | + <rename>sendtime</rename> | ||
| 892 | + <length>-2</length> | ||
| 893 | + <precision>-2</precision> | ||
| 894 | + </field> <select_unspecified>Y</select_unspecified> | ||
| 895 | + </fields> <cluster_schema/> | ||
| 896 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 897 | + <xloc>444</xloc> | ||
| 898 | + <yloc>131</yloc> | ||
| 899 | + <draw>Y</draw> | ||
| 900 | + </GUI> | ||
| 901 | + </step> | ||
| 902 | + | ||
| 903 | + <step> | ||
| 904 | + <name>按照班次类型过滤数据1</name> | ||
| 905 | + <type>FilterRows</type> | ||
| 906 | + <description/> | ||
| 907 | + <distribute>Y</distribute> | ||
| 908 | + <custom_distribution/> | ||
| 909 | + <copies>1</copies> | ||
| 910 | + <partitioning> | ||
| 911 | + <method>none</method> | ||
| 912 | + <schema_name/> | ||
| 913 | + </partitioning> | ||
| 914 | +<send_true_to>正常班次数据</send_true_to> | ||
| 915 | +<send_false_to>按照班次类型过滤数据2</send_false_to> | ||
| 916 | + <compare> | ||
| 917 | +<condition> | ||
| 918 | + <negated>N</negated> | ||
| 919 | + <leftvalue>bctype</leftvalue> | ||
| 920 | + <function>=</function> | ||
| 921 | + <rightvalue/> | ||
| 922 | + <value><name>constant</name><type>String</type><text>正常班次</text><length>-1</length><precision>-1</precision><isnull>N</isnull><mask/></value> </condition> | ||
| 923 | + </compare> | ||
| 924 | + <cluster_schema/> | ||
| 925 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 926 | + <xloc>860</xloc> | ||
| 927 | + <yloc>401</yloc> | ||
| 928 | + <draw>Y</draw> | ||
| 929 | + </GUI> | ||
| 930 | + </step> | ||
| 931 | + | ||
| 932 | + <step> | ||
| 933 | + <name>按照班次类型过滤数据2</name> | ||
| 934 | + <type>FilterRows</type> | ||
| 935 | + <description/> | ||
| 936 | + <distribute>Y</distribute> | ||
| 937 | + <custom_distribution/> | ||
| 938 | + <copies>1</copies> | ||
| 939 | + <partitioning> | ||
| 940 | + <method>none</method> | ||
| 941 | + <schema_name/> | ||
| 942 | + </partitioning> | ||
| 943 | +<send_true_to>出场班次数据</send_true_to> | ||
| 944 | +<send_false_to>进场班次数据</send_false_to> | ||
| 945 | + <compare> | ||
| 946 | +<condition> | ||
| 947 | + <negated>N</negated> | ||
| 948 | + <leftvalue>bctype</leftvalue> | ||
| 949 | + <function>=</function> | ||
| 950 | + <rightvalue/> | ||
| 951 | + <value><name>constant</name><type>String</type><text>出场</text><length>-1</length><precision>-1</precision><isnull>N</isnull><mask/></value> </condition> | ||
| 952 | + </compare> | ||
| 953 | + <cluster_schema/> | ||
| 954 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 955 | + <xloc>995</xloc> | ||
| 956 | + <yloc>503</yloc> | ||
| 957 | + <draw>Y</draw> | ||
| 958 | + </GUI> | ||
| 959 | + </step> | ||
| 960 | + | ||
| 961 | + <step> | ||
| 962 | + <name>插入/更新bsth_c_s_ttinfo_detail</name> | ||
| 963 | + <type>InsertUpdate</type> | ||
| 964 | + <description/> | ||
| 965 | + <distribute>Y</distribute> | ||
| 966 | + <custom_distribution/> | ||
| 967 | + <copies>1</copies> | ||
| 968 | + <partitioning> | ||
| 969 | + <method>none</method> | ||
| 970 | + <schema_name/> | ||
| 971 | + </partitioning> | ||
| 972 | + <connection>bus_control_variable</connection> | ||
| 973 | + <commit>100</commit> | ||
| 974 | + <update_bypassed>N</update_bypassed> | ||
| 975 | + <lookup> | ||
| 976 | + <schema/> | ||
| 977 | + <table>bsth_c_s_ttinfo_detail</table> | ||
| 978 | + <key> | ||
| 979 | + <name>xlid</name> | ||
| 980 | + <field>xl</field> | ||
| 981 | + <condition>=</condition> | ||
| 982 | + <name2/> | ||
| 983 | + </key> | ||
| 984 | + <key> | ||
| 985 | + <name>ttid</name> | ||
| 986 | + <field>ttinfo</field> | ||
| 987 | + <condition>=</condition> | ||
| 988 | + <name2/> | ||
| 989 | + </key> | ||
| 990 | + <key> | ||
| 991 | + <name>lpid</name> | ||
| 992 | + <field>lp</field> | ||
| 993 | + <condition>=</condition> | ||
| 994 | + <name2/> | ||
| 995 | + </key> | ||
| 996 | + <key> | ||
| 997 | + <name>fcno</name> | ||
| 998 | + <field>fcno</field> | ||
| 999 | + <condition>=</condition> | ||
| 1000 | + <name2/> | ||
| 1001 | + </key> | ||
| 1002 | + <key> | ||
| 1003 | + <name>bcs</name> | ||
| 1004 | + <field>bcs</field> | ||
| 1005 | + <condition>=</condition> | ||
| 1006 | + <name2/> | ||
| 1007 | + </key> | ||
| 1008 | + <value> | ||
| 1009 | + <name>lp</name> | ||
| 1010 | + <rename>lpid</rename> | ||
| 1011 | + <update>Y</update> | ||
| 1012 | + </value> | ||
| 1013 | + <value> | ||
| 1014 | + <name>bc_type</name> | ||
| 1015 | + <rename>bctype_code</rename> | ||
| 1016 | + <update>Y</update> | ||
| 1017 | + </value> | ||
| 1018 | + <value> | ||
| 1019 | + <name>bcs</name> | ||
| 1020 | + <rename>bcs</rename> | ||
| 1021 | + <update>Y</update> | ||
| 1022 | + </value> | ||
| 1023 | + <value> | ||
| 1024 | + <name>bcsj</name> | ||
| 1025 | + <rename>bcsj</rename> | ||
| 1026 | + <update>Y</update> | ||
| 1027 | + </value> | ||
| 1028 | + <value> | ||
| 1029 | + <name>fcno</name> | ||
| 1030 | + <rename>fcno</rename> | ||
| 1031 | + <update>Y</update> | ||
| 1032 | + </value> | ||
| 1033 | + <value> | ||
| 1034 | + <name>jhlc</name> | ||
| 1035 | + <rename>jhlc</rename> | ||
| 1036 | + <update>Y</update> | ||
| 1037 | + </value> | ||
| 1038 | + <value> | ||
| 1039 | + <name>fcsj</name> | ||
| 1040 | + <rename>sendtime_calcu</rename> | ||
| 1041 | + <update>Y</update> | ||
| 1042 | + </value> | ||
| 1043 | + <value> | ||
| 1044 | + <name>ttinfo</name> | ||
| 1045 | + <rename>ttid</rename> | ||
| 1046 | + <update>Y</update> | ||
| 1047 | + </value> | ||
| 1048 | + <value> | ||
| 1049 | + <name>xl</name> | ||
| 1050 | + <rename>xlid</rename> | ||
| 1051 | + <update>Y</update> | ||
| 1052 | + </value> | ||
| 1053 | + <value> | ||
| 1054 | + <name>qdz</name> | ||
| 1055 | + <rename>qdzid</rename> | ||
| 1056 | + <update>Y</update> | ||
| 1057 | + </value> | ||
| 1058 | + <value> | ||
| 1059 | + <name>zdz</name> | ||
| 1060 | + <rename>zdzid</rename> | ||
| 1061 | + <update>Y</update> | ||
| 1062 | + </value> | ||
| 1063 | + <value> | ||
| 1064 | + <name>xl_dir</name> | ||
| 1065 | + <rename>sxx</rename> | ||
| 1066 | + <update>Y</update> | ||
| 1067 | + </value> | ||
| 1068 | + <value> | ||
| 1069 | + <name>isfb</name> | ||
| 1070 | + <rename>isfb</rename> | ||
| 1071 | + <update>Y</update> | ||
| 1072 | + </value> | ||
| 1073 | + <value> | ||
| 1074 | + <name>qdz_code</name> | ||
| 1075 | + <rename>qdzcode</rename> | ||
| 1076 | + <update>Y</update> | ||
| 1077 | + </value> | ||
| 1078 | + <value> | ||
| 1079 | + <name>qdz_name</name> | ||
| 1080 | + <rename>qdzname_</rename> | ||
| 1081 | + <update>Y</update> | ||
| 1082 | + </value> | ||
| 1083 | + <value> | ||
| 1084 | + <name>zdz_code</name> | ||
| 1085 | + <rename>zdzcode</rename> | ||
| 1086 | + <update>Y</update> | ||
| 1087 | + </value> | ||
| 1088 | + <value> | ||
| 1089 | + <name>zdz_name</name> | ||
| 1090 | + <rename>zdzname</rename> | ||
| 1091 | + <update>Y</update> | ||
| 1092 | + </value> | ||
| 1093 | + <value> | ||
| 1094 | + <name>ists</name> | ||
| 1095 | + <rename>ists</rename> | ||
| 1096 | + <update>Y</update> | ||
| 1097 | + </value> | ||
| 1098 | + </lookup> | ||
| 1099 | + <cluster_schema/> | ||
| 1100 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1101 | + <xloc>143</xloc> | ||
| 1102 | + <yloc>860</yloc> | ||
| 1103 | + <draw>Y</draw> | ||
| 1104 | + </GUI> | ||
| 1105 | + </step> | ||
| 1106 | + | ||
| 1107 | + <step> | ||
| 1108 | + <name>插入/更新bsth_c_s_ttinfo_detail 2</name> | ||
| 1109 | + <type>InsertUpdate</type> | ||
| 1110 | + <description/> | ||
| 1111 | + <distribute>Y</distribute> | ||
| 1112 | + <custom_distribution/> | ||
| 1113 | + <copies>1</copies> | ||
| 1114 | + <partitioning> | ||
| 1115 | + <method>none</method> | ||
| 1116 | + <schema_name/> | ||
| 1117 | + </partitioning> | ||
| 1118 | + <connection>bus_control_variable</connection> | ||
| 1119 | + <commit>100</commit> | ||
| 1120 | + <update_bypassed>N</update_bypassed> | ||
| 1121 | + <lookup> | ||
| 1122 | + <schema/> | ||
| 1123 | + <table>bsth_c_s_ttinfo_detail</table> | ||
| 1124 | + <key> | ||
| 1125 | + <name>xlid</name> | ||
| 1126 | + <field>xl</field> | ||
| 1127 | + <condition>=</condition> | ||
| 1128 | + <name2/> | ||
| 1129 | + </key> | ||
| 1130 | + <key> | ||
| 1131 | + <name>ttid</name> | ||
| 1132 | + <field>ttinfo</field> | ||
| 1133 | + <condition>=</condition> | ||
| 1134 | + <name2/> | ||
| 1135 | + </key> | ||
| 1136 | + <key> | ||
| 1137 | + <name>lpid</name> | ||
| 1138 | + <field>lp</field> | ||
| 1139 | + <condition>=</condition> | ||
| 1140 | + <name2/> | ||
| 1141 | + </key> | ||
| 1142 | + <key> | ||
| 1143 | + <name>fcno</name> | ||
| 1144 | + <field>fcno</field> | ||
| 1145 | + <condition>=</condition> | ||
| 1146 | + <name2/> | ||
| 1147 | + </key> | ||
| 1148 | + <key> | ||
| 1149 | + <name>bcs</name> | ||
| 1150 | + <field>bcs</field> | ||
| 1151 | + <condition>=</condition> | ||
| 1152 | + <name2/> | ||
| 1153 | + </key> | ||
| 1154 | + <value> | ||
| 1155 | + <name>tcc</name> | ||
| 1156 | + <rename>qdzid</rename> | ||
| 1157 | + <update>Y</update> | ||
| 1158 | + </value> | ||
| 1159 | + <value> | ||
| 1160 | + <name>zdz</name> | ||
| 1161 | + <rename>zdzid</rename> | ||
| 1162 | + <update>Y</update> | ||
| 1163 | + </value> | ||
| 1164 | + <value> | ||
| 1165 | + <name>xl</name> | ||
| 1166 | + <rename>xlid</rename> | ||
| 1167 | + <update>Y</update> | ||
| 1168 | + </value> | ||
| 1169 | + <value> | ||
| 1170 | + <name>ttinfo</name> | ||
| 1171 | + <rename>ttid</rename> | ||
| 1172 | + <update>Y</update> | ||
| 1173 | + </value> | ||
| 1174 | + <value> | ||
| 1175 | + <name>xl_dir</name> | ||
| 1176 | + <rename>sxx</rename> | ||
| 1177 | + <update>Y</update> | ||
| 1178 | + </value> | ||
| 1179 | + <value> | ||
| 1180 | + <name>lp</name> | ||
| 1181 | + <rename>lpid</rename> | ||
| 1182 | + <update>Y</update> | ||
| 1183 | + </value> | ||
| 1184 | + <value> | ||
| 1185 | + <name>jhlc</name> | ||
| 1186 | + <rename>out_mileage</rename> | ||
| 1187 | + <update>Y</update> | ||
| 1188 | + </value> | ||
| 1189 | + <value> | ||
| 1190 | + <name>fcsj</name> | ||
| 1191 | + <rename>sendtime_calcu</rename> | ||
| 1192 | + <update>Y</update> | ||
| 1193 | + </value> | ||
| 1194 | + <value> | ||
| 1195 | + <name>bcsj</name> | ||
| 1196 | + <rename>out_time</rename> | ||
| 1197 | + <update>Y</update> | ||
| 1198 | + </value> | ||
| 1199 | + <value> | ||
| 1200 | + <name>bcs</name> | ||
| 1201 | + <rename>bcs</rename> | ||
| 1202 | + <update>Y</update> | ||
| 1203 | + </value> | ||
| 1204 | + <value> | ||
| 1205 | + <name>fcno</name> | ||
| 1206 | + <rename>fcno</rename> | ||
| 1207 | + <update>Y</update> | ||
| 1208 | + </value> | ||
| 1209 | + <value> | ||
| 1210 | + <name>bc_type</name> | ||
| 1211 | + <rename>bctype_code</rename> | ||
| 1212 | + <update>Y</update> | ||
| 1213 | + </value> | ||
| 1214 | + <value> | ||
| 1215 | + <name>isfb</name> | ||
| 1216 | + <rename>isfb</rename> | ||
| 1217 | + <update>Y</update> | ||
| 1218 | + </value> | ||
| 1219 | + <value> | ||
| 1220 | + <name>qdz_code</name> | ||
| 1221 | + <rename>qdzcode</rename> | ||
| 1222 | + <update>Y</update> | ||
| 1223 | + </value> | ||
| 1224 | + <value> | ||
| 1225 | + <name>qdz_name</name> | ||
| 1226 | + <rename>tn</rename> | ||
| 1227 | + <update>Y</update> | ||
| 1228 | + </value> | ||
| 1229 | + <value> | ||
| 1230 | + <name>zdz_code</name> | ||
| 1231 | + <rename>zdzcode</rename> | ||
| 1232 | + <update>Y</update> | ||
| 1233 | + </value> | ||
| 1234 | + <value> | ||
| 1235 | + <name>zdz_name</name> | ||
| 1236 | + <rename>zdzname_</rename> | ||
| 1237 | + <update>Y</update> | ||
| 1238 | + </value> | ||
| 1239 | + <value> | ||
| 1240 | + <name>ists</name> | ||
| 1241 | + <rename>ists</rename> | ||
| 1242 | + <update>Y</update> | ||
| 1243 | + </value> | ||
| 1244 | + </lookup> | ||
| 1245 | + <cluster_schema/> | ||
| 1246 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1247 | + <xloc>340</xloc> | ||
| 1248 | + <yloc>1087</yloc> | ||
| 1249 | + <draw>Y</draw> | ||
| 1250 | + </GUI> | ||
| 1251 | + </step> | ||
| 1252 | + | ||
| 1253 | + <step> | ||
| 1254 | + <name>插入/更新bsth_c_s_ttinfo_detail 3</name> | ||
| 1255 | + <type>InsertUpdate</type> | ||
| 1256 | + <description/> | ||
| 1257 | + <distribute>Y</distribute> | ||
| 1258 | + <custom_distribution/> | ||
| 1259 | + <copies>1</copies> | ||
| 1260 | + <partitioning> | ||
| 1261 | + <method>none</method> | ||
| 1262 | + <schema_name/> | ||
| 1263 | + </partitioning> | ||
| 1264 | + <connection>bus_control_variable</connection> | ||
| 1265 | + <commit>100</commit> | ||
| 1266 | + <update_bypassed>N</update_bypassed> | ||
| 1267 | + <lookup> | ||
| 1268 | + <schema/> | ||
| 1269 | + <table>bsth_c_s_ttinfo_detail</table> | ||
| 1270 | + <key> | ||
| 1271 | + <name>xlid</name> | ||
| 1272 | + <field>xl</field> | ||
| 1273 | + <condition>=</condition> | ||
| 1274 | + <name2/> | ||
| 1275 | + </key> | ||
| 1276 | + <key> | ||
| 1277 | + <name>ttid</name> | ||
| 1278 | + <field>ttinfo</field> | ||
| 1279 | + <condition>=</condition> | ||
| 1280 | + <name2/> | ||
| 1281 | + </key> | ||
| 1282 | + <key> | ||
| 1283 | + <name>lpid</name> | ||
| 1284 | + <field>lp</field> | ||
| 1285 | + <condition>=</condition> | ||
| 1286 | + <name2/> | ||
| 1287 | + </key> | ||
| 1288 | + <key> | ||
| 1289 | + <name>fcno</name> | ||
| 1290 | + <field>fcno</field> | ||
| 1291 | + <condition>=</condition> | ||
| 1292 | + <name2/> | ||
| 1293 | + </key> | ||
| 1294 | + <key> | ||
| 1295 | + <name>bcs</name> | ||
| 1296 | + <field>bcs</field> | ||
| 1297 | + <condition>=</condition> | ||
| 1298 | + <name2/> | ||
| 1299 | + </key> | ||
| 1300 | + <value> | ||
| 1301 | + <name>fcno</name> | ||
| 1302 | + <rename>fcno</rename> | ||
| 1303 | + <update>Y</update> | ||
| 1304 | + </value> | ||
| 1305 | + <value> | ||
| 1306 | + <name>bcs</name> | ||
| 1307 | + <rename>bcs</rename> | ||
| 1308 | + <update>Y</update> | ||
| 1309 | + </value> | ||
| 1310 | + <value> | ||
| 1311 | + <name>xl</name> | ||
| 1312 | + <rename>xlid</rename> | ||
| 1313 | + <update>Y</update> | ||
| 1314 | + </value> | ||
| 1315 | + <value> | ||
| 1316 | + <name>ttinfo</name> | ||
| 1317 | + <rename>ttid</rename> | ||
| 1318 | + <update>Y</update> | ||
| 1319 | + </value> | ||
| 1320 | + <value> | ||
| 1321 | + <name>lp</name> | ||
| 1322 | + <rename>lpid</rename> | ||
| 1323 | + <update>Y</update> | ||
| 1324 | + </value> | ||
| 1325 | + <value> | ||
| 1326 | + <name>bc_type</name> | ||
| 1327 | + <rename>bctype_code</rename> | ||
| 1328 | + <update>Y</update> | ||
| 1329 | + </value> | ||
| 1330 | + <value> | ||
| 1331 | + <name>bcsj</name> | ||
| 1332 | + <rename>parade_time</rename> | ||
| 1333 | + <update>Y</update> | ||
| 1334 | + </value> | ||
| 1335 | + <value> | ||
| 1336 | + <name>jhlc</name> | ||
| 1337 | + <rename>parade_mileage</rename> | ||
| 1338 | + <update>Y</update> | ||
| 1339 | + </value> | ||
| 1340 | + <value> | ||
| 1341 | + <name>fcsj</name> | ||
| 1342 | + <rename>sendtime_calcu</rename> | ||
| 1343 | + <update>Y</update> | ||
| 1344 | + </value> | ||
| 1345 | + <value> | ||
| 1346 | + <name>xl_dir</name> | ||
| 1347 | + <rename>sxx2</rename> | ||
| 1348 | + <update>Y</update> | ||
| 1349 | + </value> | ||
| 1350 | + <value> | ||
| 1351 | + <name>qdz</name> | ||
| 1352 | + <rename>qdzid</rename> | ||
| 1353 | + <update>Y</update> | ||
| 1354 | + </value> | ||
| 1355 | + <value> | ||
| 1356 | + <name>tcc</name> | ||
| 1357 | + <rename>zdzid</rename> | ||
| 1358 | + <update>Y</update> | ||
| 1359 | + </value> | ||
| 1360 | + <value> | ||
| 1361 | + <name>isfb</name> | ||
| 1362 | + <rename>isfb</rename> | ||
| 1363 | + <update>Y</update> | ||
| 1364 | + </value> | ||
| 1365 | + <value> | ||
| 1366 | + <name>qdz_code</name> | ||
| 1367 | + <rename>qdzcode</rename> | ||
| 1368 | + <update>Y</update> | ||
| 1369 | + </value> | ||
| 1370 | + <value> | ||
| 1371 | + <name>qdz_name</name> | ||
| 1372 | + <rename>qname</rename> | ||
| 1373 | + <update>Y</update> | ||
| 1374 | + </value> | ||
| 1375 | + <value> | ||
| 1376 | + <name>zdz_code</name> | ||
| 1377 | + <rename>zdzcode</rename> | ||
| 1378 | + <update>Y</update> | ||
| 1379 | + </value> | ||
| 1380 | + <value> | ||
| 1381 | + <name>zdz_name</name> | ||
| 1382 | + <rename>tn</rename> | ||
| 1383 | + <update>Y</update> | ||
| 1384 | + </value> | ||
| 1385 | + <value> | ||
| 1386 | + <name>ists</name> | ||
| 1387 | + <rename>ists</rename> | ||
| 1388 | + <update>Y</update> | ||
| 1389 | + </value> | ||
| 1390 | + </lookup> | ||
| 1391 | + <cluster_schema/> | ||
| 1392 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1393 | + <xloc>845</xloc> | ||
| 1394 | + <yloc>899</yloc> | ||
| 1395 | + <draw>Y</draw> | ||
| 1396 | + </GUI> | ||
| 1397 | + </step> | ||
| 1398 | + | ||
| 1399 | + <step> | ||
| 1400 | + <name>时刻表明细信息Excel输入</name> | ||
| 1401 | + <type>ExcelInput</type> | ||
| 1402 | + <description/> | ||
| 1403 | + <distribute>N</distribute> | ||
| 1404 | + <custom_distribution/> | ||
| 1405 | + <copies>1</copies> | ||
| 1406 | + <partitioning> | ||
| 1407 | + <method>none</method> | ||
| 1408 | + <schema_name/> | ||
| 1409 | + </partitioning> | ||
| 1410 | + <header>Y</header> | ||
| 1411 | + <noempty>Y</noempty> | ||
| 1412 | + <stoponempty>N</stoponempty> | ||
| 1413 | + <filefield/> | ||
| 1414 | + <sheetfield/> | ||
| 1415 | + <sheetrownumfield/> | ||
| 1416 | + <rownumfield/> | ||
| 1417 | + <sheetfield/> | ||
| 1418 | + <filefield/> | ||
| 1419 | + <limit>0</limit> | ||
| 1420 | + <encoding/> | ||
| 1421 | + <add_to_result_filenames>Y</add_to_result_filenames> | ||
| 1422 | + <accept_filenames>N</accept_filenames> | ||
| 1423 | + <accept_field/> | ||
| 1424 | + <accept_stepname/> | ||
| 1425 | + <file> | ||
| 1426 | + <name/> | ||
| 1427 | + <filemask/> | ||
| 1428 | + <exclude_filemask/> | ||
| 1429 | + <file_required>N</file_required> | ||
| 1430 | + <include_subfolders>N</include_subfolders> | ||
| 1431 | + </file> | ||
| 1432 | + <fields> | ||
| 1433 | + </fields> | ||
| 1434 | + <sheets> | ||
| 1435 | + <sheet> | ||
| 1436 | + <name/> | ||
| 1437 | + <startrow>0</startrow> | ||
| 1438 | + <startcol>0</startcol> | ||
| 1439 | + </sheet> | ||
| 1440 | + </sheets> | ||
| 1441 | + <strict_types>N</strict_types> | ||
| 1442 | + <error_ignored>N</error_ignored> | ||
| 1443 | + <error_line_skipped>N</error_line_skipped> | ||
| 1444 | + <bad_line_files_destination_directory/> | ||
| 1445 | + <bad_line_files_extension>warning</bad_line_files_extension> | ||
| 1446 | + <error_line_files_destination_directory/> | ||
| 1447 | + <error_line_files_extension>error</error_line_files_extension> | ||
| 1448 | + <line_number_files_destination_directory/> | ||
| 1449 | + <line_number_files_extension>line</line_number_files_extension> | ||
| 1450 | + <shortFileFieldName/> | ||
| 1451 | + <pathFieldName/> | ||
| 1452 | + <hiddenFieldName/> | ||
| 1453 | + <lastModificationTimeFieldName/> | ||
| 1454 | + <uriNameFieldName/> | ||
| 1455 | + <rootUriNameFieldName/> | ||
| 1456 | + <extensionFieldName/> | ||
| 1457 | + <sizeFieldName/> | ||
| 1458 | + <spreadsheet_type>JXL</spreadsheet_type> | ||
| 1459 | + <cluster_schema/> | ||
| 1460 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1461 | + <xloc>112</xloc> | ||
| 1462 | + <yloc>44</yloc> | ||
| 1463 | + <draw>Y</draw> | ||
| 1464 | + </GUI> | ||
| 1465 | + </step> | ||
| 1466 | + | ||
| 1467 | + <step> | ||
| 1468 | + <name>查找停车场1</name> | ||
| 1469 | + <type>DBLookup</type> | ||
| 1470 | + <description/> | ||
| 1471 | + <distribute>Y</distribute> | ||
| 1472 | + <custom_distribution/> | ||
| 1473 | + <copies>1</copies> | ||
| 1474 | + <partitioning> | ||
| 1475 | + <method>none</method> | ||
| 1476 | + <schema_name/> | ||
| 1477 | + </partitioning> | ||
| 1478 | + <connection>bus_control_variable</connection> | ||
| 1479 | + <cache>N</cache> | ||
| 1480 | + <cache_load_all>N</cache_load_all> | ||
| 1481 | + <cache_size>0</cache_size> | ||
| 1482 | + <lookup> | ||
| 1483 | + <schema/> | ||
| 1484 | + <table>bsth_c_car_park</table> | ||
| 1485 | + <orderby/> | ||
| 1486 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 1487 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 1488 | + <key> | ||
| 1489 | + <name>tccname_</name> | ||
| 1490 | + <field>park_name</field> | ||
| 1491 | + <condition>=</condition> | ||
| 1492 | + <name2/> | ||
| 1493 | + </key> | ||
| 1494 | + <value> | ||
| 1495 | + <name>id</name> | ||
| 1496 | + <rename>qdzid</rename> | ||
| 1497 | + <default/> | ||
| 1498 | + <type>Integer</type> | ||
| 1499 | + </value> | ||
| 1500 | + <value> | ||
| 1501 | + <name>park_code</name> | ||
| 1502 | + <rename>qdzcode</rename> | ||
| 1503 | + <default/> | ||
| 1504 | + <type>String</type> | ||
| 1505 | + </value> | ||
| 1506 | + <value> | ||
| 1507 | + <name>park_name</name> | ||
| 1508 | + <rename>tn</rename> | ||
| 1509 | + <default/> | ||
| 1510 | + <type>String</type> | ||
| 1511 | + </value> | ||
| 1512 | + </lookup> | ||
| 1513 | + <cluster_schema/> | ||
| 1514 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1515 | + <xloc>755</xloc> | ||
| 1516 | + <yloc>504</yloc> | ||
| 1517 | + <draw>Y</draw> | ||
| 1518 | + </GUI> | ||
| 1519 | + </step> | ||
| 1520 | + | ||
| 1521 | + <step> | ||
| 1522 | + <name>查找停车场2</name> | ||
| 1523 | + <type>DBLookup</type> | ||
| 1524 | + <description/> | ||
| 1525 | + <distribute>Y</distribute> | ||
| 1526 | + <custom_distribution/> | ||
| 1527 | + <copies>1</copies> | ||
| 1528 | + <partitioning> | ||
| 1529 | + <method>none</method> | ||
| 1530 | + <schema_name/> | ||
| 1531 | + </partitioning> | ||
| 1532 | + <connection>bus_control_variable</connection> | ||
| 1533 | + <cache>N</cache> | ||
| 1534 | + <cache_load_all>N</cache_load_all> | ||
| 1535 | + <cache_size>0</cache_size> | ||
| 1536 | + <lookup> | ||
| 1537 | + <schema/> | ||
| 1538 | + <table>bsth_c_car_park</table> | ||
| 1539 | + <orderby/> | ||
| 1540 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 1541 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 1542 | + <key> | ||
| 1543 | + <name>tccname_</name> | ||
| 1544 | + <field>park_name</field> | ||
| 1545 | + <condition>=</condition> | ||
| 1546 | + <name2/> | ||
| 1547 | + </key> | ||
| 1548 | + <value> | ||
| 1549 | + <name>id</name> | ||
| 1550 | + <rename>zdzid</rename> | ||
| 1551 | + <default/> | ||
| 1552 | + <type>Integer</type> | ||
| 1553 | + </value> | ||
| 1554 | + <value> | ||
| 1555 | + <name>park_code</name> | ||
| 1556 | + <rename>zdzcode</rename> | ||
| 1557 | + <default/> | ||
| 1558 | + <type>String</type> | ||
| 1559 | + </value> | ||
| 1560 | + <value> | ||
| 1561 | + <name>park_name</name> | ||
| 1562 | + <rename>tn</rename> | ||
| 1563 | + <default/> | ||
| 1564 | + <type>String</type> | ||
| 1565 | + </value> | ||
| 1566 | + </lookup> | ||
| 1567 | + <cluster_schema/> | ||
| 1568 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1569 | + <xloc>887</xloc> | ||
| 1570 | + <yloc>608</yloc> | ||
| 1571 | + <draw>Y</draw> | ||
| 1572 | + </GUI> | ||
| 1573 | + </step> | ||
| 1574 | + | ||
| 1575 | + <step> | ||
| 1576 | + <name>查找出场终点站关联并确定上下行</name> | ||
| 1577 | + <type>DBLookup</type> | ||
| 1578 | + <description/> | ||
| 1579 | + <distribute>Y</distribute> | ||
| 1580 | + <custom_distribution/> | ||
| 1581 | + <copies>1</copies> | ||
| 1582 | + <partitioning> | ||
| 1583 | + <method>none</method> | ||
| 1584 | + <schema_name/> | ||
| 1585 | + </partitioning> | ||
| 1586 | + <connection>bus_control_variable</connection> | ||
| 1587 | + <cache>N</cache> | ||
| 1588 | + <cache_load_all>N</cache_load_all> | ||
| 1589 | + <cache_size>0</cache_size> | ||
| 1590 | + <lookup> | ||
| 1591 | + <schema/> | ||
| 1592 | + <table>bsth_c_ls_stationroute</table> | ||
| 1593 | + <orderby/> | ||
| 1594 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 1595 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 1596 | + <key> | ||
| 1597 | + <name>xlid</name> | ||
| 1598 | + <field>line</field> | ||
| 1599 | + <condition>=</condition> | ||
| 1600 | + <name2/> | ||
| 1601 | + </key> | ||
| 1602 | + <key> | ||
| 1603 | + <name>version</name> | ||
| 1604 | + <field>versions</field> | ||
| 1605 | + <condition>=</condition> | ||
| 1606 | + <name2/> | ||
| 1607 | + </key> | ||
| 1608 | + <key> | ||
| 1609 | + <name>zdzname</name> | ||
| 1610 | + <field>station_name</field> | ||
| 1611 | + <condition>LIKE</condition> | ||
| 1612 | + <name2/> | ||
| 1613 | + </key> | ||
| 1614 | + <key> | ||
| 1615 | + <name>endZdtype</name> | ||
| 1616 | + <field>station_mark</field> | ||
| 1617 | + <condition>=</condition> | ||
| 1618 | + <name2/> | ||
| 1619 | + </key> | ||
| 1620 | + <key> | ||
| 1621 | + <name>destory</name> | ||
| 1622 | + <field>destroy</field> | ||
| 1623 | + <condition>=</condition> | ||
| 1624 | + <name2/> | ||
| 1625 | + </key> | ||
| 1626 | + <value> | ||
| 1627 | + <name>station</name> | ||
| 1628 | + <rename>zdzid</rename> | ||
| 1629 | + <default/> | ||
| 1630 | + <type>Integer</type> | ||
| 1631 | + </value> | ||
| 1632 | + <value> | ||
| 1633 | + <name>directions</name> | ||
| 1634 | + <rename>sxx</rename> | ||
| 1635 | + <default/> | ||
| 1636 | + <type>Integer</type> | ||
| 1637 | + </value> | ||
| 1638 | + <value> | ||
| 1639 | + <name>station_code</name> | ||
| 1640 | + <rename>zdzcode</rename> | ||
| 1641 | + <default/> | ||
| 1642 | + <type>String</type> | ||
| 1643 | + </value> | ||
| 1644 | + <value> | ||
| 1645 | + <name>station_name</name> | ||
| 1646 | + <rename>zdzname_</rename> | ||
| 1647 | + <default/> | ||
| 1648 | + <type>String</type> | ||
| 1649 | + </value> | ||
| 1650 | + </lookup> | ||
| 1651 | + <cluster_schema/> | ||
| 1652 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1653 | + <xloc>329</xloc> | ||
| 1654 | + <yloc>505</yloc> | ||
| 1655 | + <draw>Y</draw> | ||
| 1656 | + </GUI> | ||
| 1657 | + </step> | ||
| 1658 | + | ||
| 1659 | + <step> | ||
| 1660 | + <name>查找所有线路上下行里程时间</name> | ||
| 1661 | + <type>DBLookup</type> | ||
| 1662 | + <description/> | ||
| 1663 | + <distribute>Y</distribute> | ||
| 1664 | + <custom_distribution/> | ||
| 1665 | + <copies>1</copies> | ||
| 1666 | + <partitioning> | ||
| 1667 | + <method>none</method> | ||
| 1668 | + <schema_name/> | ||
| 1669 | + </partitioning> | ||
| 1670 | + <connection>bus_control_variable</connection> | ||
| 1671 | + <cache>N</cache> | ||
| 1672 | + <cache_load_all>N</cache_load_all> | ||
| 1673 | + <cache_size>0</cache_size> | ||
| 1674 | + <lookup> | ||
| 1675 | + <schema/> | ||
| 1676 | + <table>bsth_c_line_information</table> | ||
| 1677 | + <orderby/> | ||
| 1678 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 1679 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 1680 | + <key> | ||
| 1681 | + <name>xlid</name> | ||
| 1682 | + <field>line</field> | ||
| 1683 | + <condition>=</condition> | ||
| 1684 | + <name2/> | ||
| 1685 | + </key> | ||
| 1686 | + <value> | ||
| 1687 | + <name>up_mileage</name> | ||
| 1688 | + <rename>up_mileage</rename> | ||
| 1689 | + <default/> | ||
| 1690 | + <type>Number</type> | ||
| 1691 | + </value> | ||
| 1692 | + <value> | ||
| 1693 | + <name>down_mileage</name> | ||
| 1694 | + <rename>down_mileage</rename> | ||
| 1695 | + <default/> | ||
| 1696 | + <type>Number</type> | ||
| 1697 | + </value> | ||
| 1698 | + <value> | ||
| 1699 | + <name>up_travel_time</name> | ||
| 1700 | + <rename>up_travel_time</rename> | ||
| 1701 | + <default/> | ||
| 1702 | + <type>Number</type> | ||
| 1703 | + </value> | ||
| 1704 | + <value> | ||
| 1705 | + <name>down_travel_time</name> | ||
| 1706 | + <rename>down_travel_time</rename> | ||
| 1707 | + <default/> | ||
| 1708 | + <type>Number</type> | ||
| 1709 | + </value> | ||
| 1710 | + <value> | ||
| 1711 | + <name>early_start_time</name> | ||
| 1712 | + <rename>early_start_time</rename> | ||
| 1713 | + <default/> | ||
| 1714 | + <type>String</type> | ||
| 1715 | + </value> | ||
| 1716 | + <value> | ||
| 1717 | + <name>early_end_time</name> | ||
| 1718 | + <rename>early_end_time</rename> | ||
| 1719 | + <default/> | ||
| 1720 | + <type>String</type> | ||
| 1721 | + </value> | ||
| 1722 | + <value> | ||
| 1723 | + <name>early_up_time</name> | ||
| 1724 | + <rename>early_up_time</rename> | ||
| 1725 | + <default/> | ||
| 1726 | + <type>Number</type> | ||
| 1727 | + </value> | ||
| 1728 | + <value> | ||
| 1729 | + <name>early_down_time</name> | ||
| 1730 | + <rename>early_down_time</rename> | ||
| 1731 | + <default/> | ||
| 1732 | + <type>Number</type> | ||
| 1733 | + </value> | ||
| 1734 | + <value> | ||
| 1735 | + <name>late_start_time</name> | ||
| 1736 | + <rename>late_start_time</rename> | ||
| 1737 | + <default/> | ||
| 1738 | + <type>String</type> | ||
| 1739 | + </value> | ||
| 1740 | + <value> | ||
| 1741 | + <name>late_end_time</name> | ||
| 1742 | + <rename>late_end_time</rename> | ||
| 1743 | + <default/> | ||
| 1744 | + <type>String</type> | ||
| 1745 | + </value> | ||
| 1746 | + <value> | ||
| 1747 | + <name>late_up_time</name> | ||
| 1748 | + <rename>late_up_time</rename> | ||
| 1749 | + <default/> | ||
| 1750 | + <type>Number</type> | ||
| 1751 | + </value> | ||
| 1752 | + <value> | ||
| 1753 | + <name>late_down_time</name> | ||
| 1754 | + <rename>late_down_time</rename> | ||
| 1755 | + <default/> | ||
| 1756 | + <type>Number</type> | ||
| 1757 | + </value> | ||
| 1758 | + </lookup> | ||
| 1759 | + <cluster_schema/> | ||
| 1760 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1761 | + <xloc>149</xloc> | ||
| 1762 | + <yloc>581</yloc> | ||
| 1763 | + <draw>Y</draw> | ||
| 1764 | + </GUI> | ||
| 1765 | + </step> | ||
| 1766 | + | ||
| 1767 | + <step> | ||
| 1768 | + <name>查找时刻表基础信息关联</name> | ||
| 1769 | + <type>DBLookup</type> | ||
| 1770 | + <description/> | ||
| 1771 | + <distribute>Y</distribute> | ||
| 1772 | + <custom_distribution/> | ||
| 1773 | + <copies>1</copies> | ||
| 1774 | + <partitioning> | ||
| 1775 | + <method>none</method> | ||
| 1776 | + <schema_name/> | ||
| 1777 | + </partitioning> | ||
| 1778 | + <connection>bus_control_variable</connection> | ||
| 1779 | + <cache>N</cache> | ||
| 1780 | + <cache_load_all>N</cache_load_all> | ||
| 1781 | + <cache_size>0</cache_size> | ||
| 1782 | + <lookup> | ||
| 1783 | + <schema/> | ||
| 1784 | + <table>bsth_c_s_ttinfo</table> | ||
| 1785 | + <orderby/> | ||
| 1786 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 1787 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 1788 | + <key> | ||
| 1789 | + <name>xlid</name> | ||
| 1790 | + <field>xl</field> | ||
| 1791 | + <condition>=</condition> | ||
| 1792 | + <name2/> | ||
| 1793 | + </key> | ||
| 1794 | + <key> | ||
| 1795 | + <name>ttinfoname_</name> | ||
| 1796 | + <field>name</field> | ||
| 1797 | + <condition>=</condition> | ||
| 1798 | + <name2/> | ||
| 1799 | + </key> | ||
| 1800 | + <key> | ||
| 1801 | + <name>iscanceled</name> | ||
| 1802 | + <field>is_cancel</field> | ||
| 1803 | + <condition>=</condition> | ||
| 1804 | + <name2/> | ||
| 1805 | + </key> | ||
| 1806 | + <value> | ||
| 1807 | + <name>id</name> | ||
| 1808 | + <rename>ttid</rename> | ||
| 1809 | + <default/> | ||
| 1810 | + <type>Integer</type> | ||
| 1811 | + </value> | ||
| 1812 | + </lookup> | ||
| 1813 | + <cluster_schema/> | ||
| 1814 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1815 | + <xloc>1011</xloc> | ||
| 1816 | + <yloc>134</yloc> | ||
| 1817 | + <draw>Y</draw> | ||
| 1818 | + </GUI> | ||
| 1819 | + </step> | ||
| 1820 | + | ||
| 1821 | + <step> | ||
| 1822 | + <name>查找线路关联</name> | ||
| 1823 | + <type>DBLookup</type> | ||
| 1824 | + <description/> | ||
| 1825 | + <distribute>Y</distribute> | ||
| 1826 | + <custom_distribution/> | ||
| 1827 | + <copies>1</copies> | ||
| 1828 | + <partitioning> | ||
| 1829 | + <method>none</method> | ||
| 1830 | + <schema_name/> | ||
| 1831 | + </partitioning> | ||
| 1832 | + <connection>bus_control_variable</connection> | ||
| 1833 | + <cache>N</cache> | ||
| 1834 | + <cache_load_all>N</cache_load_all> | ||
| 1835 | + <cache_size>0</cache_size> | ||
| 1836 | + <lookup> | ||
| 1837 | + <schema/> | ||
| 1838 | + <table>bsth_c_line</table> | ||
| 1839 | + <orderby/> | ||
| 1840 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 1841 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 1842 | + <key> | ||
| 1843 | + <name>xlname_</name> | ||
| 1844 | + <field>name</field> | ||
| 1845 | + <condition>=</condition> | ||
| 1846 | + <name2/> | ||
| 1847 | + </key> | ||
| 1848 | + <key> | ||
| 1849 | + <name>iscanceled</name> | ||
| 1850 | + <field>destroy</field> | ||
| 1851 | + <condition>=</condition> | ||
| 1852 | + <name2/> | ||
| 1853 | + </key> | ||
| 1854 | + <value> | ||
| 1855 | + <name>id</name> | ||
| 1856 | + <rename>xlid</rename> | ||
| 1857 | + <default/> | ||
| 1858 | + <type>Integer</type> | ||
| 1859 | + </value> | ||
| 1860 | + </lookup> | ||
| 1861 | + <cluster_schema/> | ||
| 1862 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1863 | + <xloc>1007</xloc> | ||
| 1864 | + <yloc>43</yloc> | ||
| 1865 | + <draw>Y</draw> | ||
| 1866 | + </GUI> | ||
| 1867 | + </step> | ||
| 1868 | + | ||
| 1869 | + <step> | ||
| 1870 | + <name>查找线路出场里程时间</name> | ||
| 1871 | + <type>DBLookup</type> | ||
| 1872 | + <description/> | ||
| 1873 | + <distribute>Y</distribute> | ||
| 1874 | + <custom_distribution/> | ||
| 1875 | + <copies>1</copies> | ||
| 1876 | + <partitioning> | ||
| 1877 | + <method>none</method> | ||
| 1878 | + <schema_name/> | ||
| 1879 | + </partitioning> | ||
| 1880 | + <connection>bus_control_variable</connection> | ||
| 1881 | + <cache>N</cache> | ||
| 1882 | + <cache_load_all>N</cache_load_all> | ||
| 1883 | + <cache_size>0</cache_size> | ||
| 1884 | + <lookup> | ||
| 1885 | + <schema/> | ||
| 1886 | + <table>bsth_c_line_information</table> | ||
| 1887 | + <orderby/> | ||
| 1888 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 1889 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 1890 | + <key> | ||
| 1891 | + <name>xlid</name> | ||
| 1892 | + <field>line</field> | ||
| 1893 | + <condition>=</condition> | ||
| 1894 | + <name2/> | ||
| 1895 | + </key> | ||
| 1896 | + <value> | ||
| 1897 | + <name>up_out_timer</name> | ||
| 1898 | + <rename>up_out_timer</rename> | ||
| 1899 | + <default/> | ||
| 1900 | + <type>Number</type> | ||
| 1901 | + </value> | ||
| 1902 | + <value> | ||
| 1903 | + <name>up_out_mileage</name> | ||
| 1904 | + <rename>up_out_mileage</rename> | ||
| 1905 | + <default/> | ||
| 1906 | + <type>Number</type> | ||
| 1907 | + </value> | ||
| 1908 | + <value> | ||
| 1909 | + <name>down_out_timer</name> | ||
| 1910 | + <rename>down_out_timer</rename> | ||
| 1911 | + <default/> | ||
| 1912 | + <type>Number</type> | ||
| 1913 | + </value> | ||
| 1914 | + <value> | ||
| 1915 | + <name>down_out_mileage</name> | ||
| 1916 | + <rename>down_out_mileage</rename> | ||
| 1917 | + <default/> | ||
| 1918 | + <type>Number</type> | ||
| 1919 | + </value> | ||
| 1920 | + </lookup> | ||
| 1921 | + <cluster_schema/> | ||
| 1922 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1923 | + <xloc>335</xloc> | ||
| 1924 | + <yloc>763</yloc> | ||
| 1925 | + <draw>Y</draw> | ||
| 1926 | + </GUI> | ||
| 1927 | + </step> | ||
| 1928 | + | ||
| 1929 | + <step> | ||
| 1930 | + <name>查找线路进场里程时间</name> | ||
| 1931 | + <type>DBLookup</type> | ||
| 1932 | + <description/> | ||
| 1933 | + <distribute>Y</distribute> | ||
| 1934 | + <custom_distribution/> | ||
| 1935 | + <copies>1</copies> | ||
| 1936 | + <partitioning> | ||
| 1937 | + <method>none</method> | ||
| 1938 | + <schema_name/> | ||
| 1939 | + </partitioning> | ||
| 1940 | + <connection>bus_control_variable</connection> | ||
| 1941 | + <cache>N</cache> | ||
| 1942 | + <cache_load_all>N</cache_load_all> | ||
| 1943 | + <cache_size>0</cache_size> | ||
| 1944 | + <lookup> | ||
| 1945 | + <schema/> | ||
| 1946 | + <table>bsth_c_line_information</table> | ||
| 1947 | + <orderby/> | ||
| 1948 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 1949 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 1950 | + <key> | ||
| 1951 | + <name>xlid</name> | ||
| 1952 | + <field>line</field> | ||
| 1953 | + <condition>=</condition> | ||
| 1954 | + <name2/> | ||
| 1955 | + </key> | ||
| 1956 | + <value> | ||
| 1957 | + <name>up_in_mileage</name> | ||
| 1958 | + <rename>up_in_mileage</rename> | ||
| 1959 | + <default/> | ||
| 1960 | + <type>Number</type> | ||
| 1961 | + </value> | ||
| 1962 | + <value> | ||
| 1963 | + <name>up_in_timer</name> | ||
| 1964 | + <rename>up_in_timer</rename> | ||
| 1965 | + <default/> | ||
| 1966 | + <type>Number</type> | ||
| 1967 | + </value> | ||
| 1968 | + <value> | ||
| 1969 | + <name>down_in_mileage</name> | ||
| 1970 | + <rename>down_in_mileage</rename> | ||
| 1971 | + <default/> | ||
| 1972 | + <type>Number</type> | ||
| 1973 | + </value> | ||
| 1974 | + <value> | ||
| 1975 | + <name>down_in_timer</name> | ||
| 1976 | + <rename>down_in_timer</rename> | ||
| 1977 | + <default/> | ||
| 1978 | + <type>Number</type> | ||
| 1979 | + </value> | ||
| 1980 | + </lookup> | ||
| 1981 | + <cluster_schema/> | ||
| 1982 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 1983 | + <xloc>553</xloc> | ||
| 1984 | + <yloc>1004</yloc> | ||
| 1985 | + <draw>Y</draw> | ||
| 1986 | + </GUI> | ||
| 1987 | + </step> | ||
| 1988 | + | ||
| 1989 | + <step> | ||
| 1990 | + <name>查找终点站关联</name> | ||
| 1991 | + <type>DBLookup</type> | ||
| 1992 | + <description/> | ||
| 1993 | + <distribute>Y</distribute> | ||
| 1994 | + <custom_distribution/> | ||
| 1995 | + <copies>1</copies> | ||
| 1996 | + <partitioning> | ||
| 1997 | + <method>none</method> | ||
| 1998 | + <schema_name/> | ||
| 1999 | + </partitioning> | ||
| 2000 | + <connection>bus_control_variable</connection> | ||
| 2001 | + <cache>N</cache> | ||
| 2002 | + <cache_load_all>N</cache_load_all> | ||
| 2003 | + <cache_size>0</cache_size> | ||
| 2004 | + <lookup> | ||
| 2005 | + <schema/> | ||
| 2006 | + <table>bsth_c_ls_stationroute</table> | ||
| 2007 | + <orderby/> | ||
| 2008 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 2009 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 2010 | + <key> | ||
| 2011 | + <name>xlid</name> | ||
| 2012 | + <field>line</field> | ||
| 2013 | + <condition>=</condition> | ||
| 2014 | + <name2/> | ||
| 2015 | + </key> | ||
| 2016 | + <key> | ||
| 2017 | + <name>version</name> | ||
| 2018 | + <field>versions</field> | ||
| 2019 | + <condition>=</condition> | ||
| 2020 | + <name2/> | ||
| 2021 | + </key> | ||
| 2022 | + <key> | ||
| 2023 | + <name>sxx</name> | ||
| 2024 | + <field>directions</field> | ||
| 2025 | + <condition>=</condition> | ||
| 2026 | + <name2/> | ||
| 2027 | + </key> | ||
| 2028 | + <key> | ||
| 2029 | + <name>endZdtype</name> | ||
| 2030 | + <field>station_mark</field> | ||
| 2031 | + <condition>=</condition> | ||
| 2032 | + <name2/> | ||
| 2033 | + </key> | ||
| 2034 | + <key> | ||
| 2035 | + <name>destory</name> | ||
| 2036 | + <field>destroy</field> | ||
| 2037 | + <condition>=</condition> | ||
| 2038 | + <name2/> | ||
| 2039 | + </key> | ||
| 2040 | + <value> | ||
| 2041 | + <name>station_name</name> | ||
| 2042 | + <rename>zdzname</rename> | ||
| 2043 | + <default/> | ||
| 2044 | + <type>String</type> | ||
| 2045 | + </value> | ||
| 2046 | + <value> | ||
| 2047 | + <name>station</name> | ||
| 2048 | + <rename>zdzid</rename> | ||
| 2049 | + <default/> | ||
| 2050 | + <type>Integer</type> | ||
| 2051 | + </value> | ||
| 2052 | + <value> | ||
| 2053 | + <name>station_code</name> | ||
| 2054 | + <rename>zdzcode</rename> | ||
| 2055 | + <default/> | ||
| 2056 | + <type>String</type> | ||
| 2057 | + </value> | ||
| 2058 | + </lookup> | ||
| 2059 | + <cluster_schema/> | ||
| 2060 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2061 | + <xloc>280</xloc> | ||
| 2062 | + <yloc>404</yloc> | ||
| 2063 | + <draw>Y</draw> | ||
| 2064 | + </GUI> | ||
| 2065 | + </step> | ||
| 2066 | + | ||
| 2067 | + <step> | ||
| 2068 | + <name>查找起点站关联并确定上下行</name> | ||
| 2069 | + <type>DBLookup</type> | ||
| 2070 | + <description/> | ||
| 2071 | + <distribute>Y</distribute> | ||
| 2072 | + <custom_distribution/> | ||
| 2073 | + <copies>1</copies> | ||
| 2074 | + <partitioning> | ||
| 2075 | + <method>none</method> | ||
| 2076 | + <schema_name/> | ||
| 2077 | + </partitioning> | ||
| 2078 | + <connection>bus_control_variable</connection> | ||
| 2079 | + <cache>N</cache> | ||
| 2080 | + <cache_load_all>N</cache_load_all> | ||
| 2081 | + <cache_size>0</cache_size> | ||
| 2082 | + <lookup> | ||
| 2083 | + <schema/> | ||
| 2084 | + <table>bsth_c_ls_stationroute</table> | ||
| 2085 | + <orderby/> | ||
| 2086 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 2087 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 2088 | + <key> | ||
| 2089 | + <name>xlid</name> | ||
| 2090 | + <field>line</field> | ||
| 2091 | + <condition>=</condition> | ||
| 2092 | + <name2/> | ||
| 2093 | + </key> | ||
| 2094 | + <key> | ||
| 2095 | + <name>version</name> | ||
| 2096 | + <field>versions</field> | ||
| 2097 | + <condition>=</condition> | ||
| 2098 | + <name2/> | ||
| 2099 | + </key> | ||
| 2100 | + <key> | ||
| 2101 | + <name>qdzname</name> | ||
| 2102 | + <field>station_name</field> | ||
| 2103 | + <condition>LIKE</condition> | ||
| 2104 | + <name2/> | ||
| 2105 | + </key> | ||
| 2106 | + <key> | ||
| 2107 | + <name>sendZdtype</name> | ||
| 2108 | + <field>station_mark</field> | ||
| 2109 | + <condition>=</condition> | ||
| 2110 | + <name2/> | ||
| 2111 | + </key> | ||
| 2112 | + <key> | ||
| 2113 | + <name>destory</name> | ||
| 2114 | + <field>destroy</field> | ||
| 2115 | + <condition>=</condition> | ||
| 2116 | + <name2/> | ||
| 2117 | + </key> | ||
| 2118 | + <value> | ||
| 2119 | + <name>station</name> | ||
| 2120 | + <rename>qdzid</rename> | ||
| 2121 | + <default/> | ||
| 2122 | + <type>Integer</type> | ||
| 2123 | + </value> | ||
| 2124 | + <value> | ||
| 2125 | + <name>directions</name> | ||
| 2126 | + <rename>sxx</rename> | ||
| 2127 | + <default/> | ||
| 2128 | + <type>Integer</type> | ||
| 2129 | + </value> | ||
| 2130 | + <value> | ||
| 2131 | + <name>station_code</name> | ||
| 2132 | + <rename>qdzcode</rename> | ||
| 2133 | + <default/> | ||
| 2134 | + <type>String</type> | ||
| 2135 | + </value> | ||
| 2136 | + <value> | ||
| 2137 | + <name>station_name</name> | ||
| 2138 | + <rename>qdzname_</rename> | ||
| 2139 | + <default/> | ||
| 2140 | + <type>String</type> | ||
| 2141 | + </value> | ||
| 2142 | + </lookup> | ||
| 2143 | + <cluster_schema/> | ||
| 2144 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2145 | + <xloc>430</xloc> | ||
| 2146 | + <yloc>403</yloc> | ||
| 2147 | + <draw>Y</draw> | ||
| 2148 | + </GUI> | ||
| 2149 | + </step> | ||
| 2150 | + | ||
| 2151 | + <step> | ||
| 2152 | + <name>查找路牌关联</name> | ||
| 2153 | + <type>DBLookup</type> | ||
| 2154 | + <description/> | ||
| 2155 | + <distribute>Y</distribute> | ||
| 2156 | + <custom_distribution/> | ||
| 2157 | + <copies>1</copies> | ||
| 2158 | + <partitioning> | ||
| 2159 | + <method>none</method> | ||
| 2160 | + <schema_name/> | ||
| 2161 | + </partitioning> | ||
| 2162 | + <connection>bus_control_variable</connection> | ||
| 2163 | + <cache>N</cache> | ||
| 2164 | + <cache_load_all>N</cache_load_all> | ||
| 2165 | + <cache_size>0</cache_size> | ||
| 2166 | + <lookup> | ||
| 2167 | + <schema/> | ||
| 2168 | + <table>bsth_c_s_gbi</table> | ||
| 2169 | + <orderby/> | ||
| 2170 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 2171 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 2172 | + <key> | ||
| 2173 | + <name>xlid</name> | ||
| 2174 | + <field>xl</field> | ||
| 2175 | + <condition>=</condition> | ||
| 2176 | + <name2/> | ||
| 2177 | + </key> | ||
| 2178 | + <key> | ||
| 2179 | + <name>lp</name> | ||
| 2180 | + <field>lp_name</field> | ||
| 2181 | + <condition>=</condition> | ||
| 2182 | + <name2/> | ||
| 2183 | + </key> | ||
| 2184 | + <key> | ||
| 2185 | + <name>iscanceled</name> | ||
| 2186 | + <field>is_cancel</field> | ||
| 2187 | + <condition>=</condition> | ||
| 2188 | + <name2/> | ||
| 2189 | + </key> | ||
| 2190 | + <value> | ||
| 2191 | + <name>id</name> | ||
| 2192 | + <rename>lpid</rename> | ||
| 2193 | + <default/> | ||
| 2194 | + <type>Integer</type> | ||
| 2195 | + </value> | ||
| 2196 | + </lookup> | ||
| 2197 | + <cluster_schema/> | ||
| 2198 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2199 | + <xloc>1013</xloc> | ||
| 2200 | + <yloc>265</yloc> | ||
| 2201 | + <draw>Y</draw> | ||
| 2202 | + </GUI> | ||
| 2203 | + </step> | ||
| 2204 | + | ||
| 2205 | + <step> | ||
| 2206 | + <name>查找进场班次上一个班次的线路方向</name> | ||
| 2207 | + <type>DBLookup</type> | ||
| 2208 | + <description/> | ||
| 2209 | + <distribute>Y</distribute> | ||
| 2210 | + <custom_distribution/> | ||
| 2211 | + <copies>1</copies> | ||
| 2212 | + <partitioning> | ||
| 2213 | + <method>none</method> | ||
| 2214 | + <schema_name/> | ||
| 2215 | + </partitioning> | ||
| 2216 | + <connection>bus_control_variable</connection> | ||
| 2217 | + <cache>N</cache> | ||
| 2218 | + <cache_load_all>N</cache_load_all> | ||
| 2219 | + <cache_size>0</cache_size> | ||
| 2220 | + <lookup> | ||
| 2221 | + <schema/> | ||
| 2222 | + <table>bsth_c_ls_stationroute</table> | ||
| 2223 | + <orderby/> | ||
| 2224 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 2225 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 2226 | + <key> | ||
| 2227 | + <name>xlid</name> | ||
| 2228 | + <field>line</field> | ||
| 2229 | + <condition>=</condition> | ||
| 2230 | + <name2/> | ||
| 2231 | + </key> | ||
| 2232 | + <key> | ||
| 2233 | + <name>version</name> | ||
| 2234 | + <field>versions</field> | ||
| 2235 | + <condition>=</condition> | ||
| 2236 | + <name2/> | ||
| 2237 | + </key> | ||
| 2238 | + <key> | ||
| 2239 | + <name>startZdtype_calcu</name> | ||
| 2240 | + <field>station_mark</field> | ||
| 2241 | + <condition>=</condition> | ||
| 2242 | + <name2/> | ||
| 2243 | + </key> | ||
| 2244 | + <key> | ||
| 2245 | + <name>qdzname_calcu</name> | ||
| 2246 | + <field>station_name</field> | ||
| 2247 | + <condition>LIKE</condition> | ||
| 2248 | + <name2/> | ||
| 2249 | + </key> | ||
| 2250 | + <key> | ||
| 2251 | + <name>destory</name> | ||
| 2252 | + <field>destroy</field> | ||
| 2253 | + <condition>=</condition> | ||
| 2254 | + <name2/> | ||
| 2255 | + </key> | ||
| 2256 | + <value> | ||
| 2257 | + <name>directions</name> | ||
| 2258 | + <rename>sxx</rename> | ||
| 2259 | + <default/> | ||
| 2260 | + <type>String</type> | ||
| 2261 | + </value> | ||
| 2262 | + </lookup> | ||
| 2263 | + <cluster_schema/> | ||
| 2264 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2265 | + <xloc>548</xloc> | ||
| 2266 | + <yloc>610</yloc> | ||
| 2267 | + <draw>Y</draw> | ||
| 2268 | + </GUI> | ||
| 2269 | + </step> | ||
| 2270 | + | ||
| 2271 | + <step> | ||
| 2272 | + <name>查找进场班次上一个班次的终点站,并作为进场班次的起点站</name> | ||
| 2273 | + <type>DBLookup</type> | ||
| 2274 | + <description/> | ||
| 2275 | + <distribute>Y</distribute> | ||
| 2276 | + <custom_distribution/> | ||
| 2277 | + <copies>1</copies> | ||
| 2278 | + <partitioning> | ||
| 2279 | + <method>none</method> | ||
| 2280 | + <schema_name/> | ||
| 2281 | + </partitioning> | ||
| 2282 | + <connection>bus_control_variable</connection> | ||
| 2283 | + <cache>N</cache> | ||
| 2284 | + <cache_load_all>Y</cache_load_all> | ||
| 2285 | + <cache_size>0</cache_size> | ||
| 2286 | + <lookup> | ||
| 2287 | + <schema/> | ||
| 2288 | + <table>bsth_c_ls_stationroute</table> | ||
| 2289 | + <orderby/> | ||
| 2290 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 2291 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 2292 | + <key> | ||
| 2293 | + <name>xlid</name> | ||
| 2294 | + <field>line</field> | ||
| 2295 | + <condition>=</condition> | ||
| 2296 | + <name2/> | ||
| 2297 | + </key> | ||
| 2298 | + <key> | ||
| 2299 | + <name>version</name> | ||
| 2300 | + <field>versions</field> | ||
| 2301 | + <condition>=</condition> | ||
| 2302 | + <name2/> | ||
| 2303 | + </key> | ||
| 2304 | + <key> | ||
| 2305 | + <name>endZdtype_calcu</name> | ||
| 2306 | + <field>station_mark</field> | ||
| 2307 | + <condition>=</condition> | ||
| 2308 | + <name2/> | ||
| 2309 | + </key> | ||
| 2310 | + <key> | ||
| 2311 | + <name>sxx</name> | ||
| 2312 | + <field>directions</field> | ||
| 2313 | + <condition>=</condition> | ||
| 2314 | + <name2/> | ||
| 2315 | + </key> | ||
| 2316 | + <key> | ||
| 2317 | + <name>destory</name> | ||
| 2318 | + <field>destroy</field> | ||
| 2319 | + <condition>=</condition> | ||
| 2320 | + <name2/> | ||
| 2321 | + </key> | ||
| 2322 | + <value> | ||
| 2323 | + <name>station_name</name> | ||
| 2324 | + <rename>zdzname_calcu</rename> | ||
| 2325 | + <default/> | ||
| 2326 | + <type>Integer</type> | ||
| 2327 | + </value> | ||
| 2328 | + </lookup> | ||
| 2329 | + <cluster_schema/> | ||
| 2330 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2331 | + <xloc>550</xloc> | ||
| 2332 | + <yloc>701</yloc> | ||
| 2333 | + <draw>Y</draw> | ||
| 2334 | + </GUI> | ||
| 2335 | + </step> | ||
| 2336 | + | ||
| 2337 | + <step> | ||
| 2338 | + <name>查找进场起点站关联确定上下行</name> | ||
| 2339 | + <type>DBLookup</type> | ||
| 2340 | + <description/> | ||
| 2341 | + <distribute>Y</distribute> | ||
| 2342 | + <custom_distribution/> | ||
| 2343 | + <copies>1</copies> | ||
| 2344 | + <partitioning> | ||
| 2345 | + <method>none</method> | ||
| 2346 | + <schema_name/> | ||
| 2347 | + </partitioning> | ||
| 2348 | + <connection>bus_control_variable</connection> | ||
| 2349 | + <cache>N</cache> | ||
| 2350 | + <cache_load_all>N</cache_load_all> | ||
| 2351 | + <cache_size>0</cache_size> | ||
| 2352 | + <lookup> | ||
| 2353 | + <schema/> | ||
| 2354 | + <table>bsth_c_ls_stationroute</table> | ||
| 2355 | + <orderby/> | ||
| 2356 | + <fail_on_multiple>N</fail_on_multiple> | ||
| 2357 | + <eat_row_on_failure>N</eat_row_on_failure> | ||
| 2358 | + <key> | ||
| 2359 | + <name>xlid</name> | ||
| 2360 | + <field>line</field> | ||
| 2361 | + <condition>=</condition> | ||
| 2362 | + <name2/> | ||
| 2363 | + </key> | ||
| 2364 | + <key> | ||
| 2365 | + <name>version</name> | ||
| 2366 | + <field>versions</field> | ||
| 2367 | + <condition>=</condition> | ||
| 2368 | + <name2/> | ||
| 2369 | + </key> | ||
| 2370 | + <key> | ||
| 2371 | + <name>zdzname_calcu</name> | ||
| 2372 | + <field>station_name</field> | ||
| 2373 | + <condition>=</condition> | ||
| 2374 | + <name2/> | ||
| 2375 | + </key> | ||
| 2376 | + <key> | ||
| 2377 | + <name>startZdtype_calcu</name> | ||
| 2378 | + <field>station_mark</field> | ||
| 2379 | + <condition>=</condition> | ||
| 2380 | + <name2/> | ||
| 2381 | + </key> | ||
| 2382 | + <key> | ||
| 2383 | + <name>destory</name> | ||
| 2384 | + <field>destroy</field> | ||
| 2385 | + <condition>=</condition> | ||
| 2386 | + <name2/> | ||
| 2387 | + </key> | ||
| 2388 | + <value> | ||
| 2389 | + <name>directions</name> | ||
| 2390 | + <rename>sxx2</rename> | ||
| 2391 | + <default/> | ||
| 2392 | + <type>Integer</type> | ||
| 2393 | + </value> | ||
| 2394 | + <value> | ||
| 2395 | + <name>station</name> | ||
| 2396 | + <rename>qdzid</rename> | ||
| 2397 | + <default/> | ||
| 2398 | + <type>Integer</type> | ||
| 2399 | + </value> | ||
| 2400 | + <value> | ||
| 2401 | + <name>station_code</name> | ||
| 2402 | + <rename>qdzcode</rename> | ||
| 2403 | + <default/> | ||
| 2404 | + <type>String</type> | ||
| 2405 | + </value> | ||
| 2406 | + <value> | ||
| 2407 | + <name>station_name</name> | ||
| 2408 | + <rename>qname</rename> | ||
| 2409 | + <default/> | ||
| 2410 | + <type>String</type> | ||
| 2411 | + </value> | ||
| 2412 | + </lookup> | ||
| 2413 | + <cluster_schema/> | ||
| 2414 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2415 | + <xloc>551</xloc> | ||
| 2416 | + <yloc>782</yloc> | ||
| 2417 | + <draw>Y</draw> | ||
| 2418 | + </GUI> | ||
| 2419 | + </step> | ||
| 2420 | + | ||
| 2421 | + <step> | ||
| 2422 | + <name>正常班次_处理数据</name> | ||
| 2423 | + <type>ScriptValueMod</type> | ||
| 2424 | + <description/> | ||
| 2425 | + <distribute>Y</distribute> | ||
| 2426 | + <custom_distribution/> | ||
| 2427 | + <copies>1</copies> | ||
| 2428 | + <partitioning> | ||
| 2429 | + <method>none</method> | ||
| 2430 | + <schema_name/> | ||
| 2431 | + </partitioning> | ||
| 2432 | + <compatible>N</compatible> | ||
| 2433 | + <optimizationLevel>9</optimizationLevel> | ||
| 2434 | + <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | ||
| 2435 | + <jsScript_name>Script 1</jsScript_name> | ||
| 2436 | + <jsScript_script>//Script here

// 添加站点标识
var sendZdtype = 'B';
var endZdtype = 'E';

var destory = 0; // 未撤销flag</jsScript_script> | ||
| 2437 | + </jsScript> </jsScripts> <fields> <field> <name>sendZdtype</name> | ||
| 2438 | + <rename>sendZdtype</rename> | ||
| 2439 | + <type>String</type> | ||
| 2440 | + <length>-1</length> | ||
| 2441 | + <precision>-1</precision> | ||
| 2442 | + <replace>N</replace> | ||
| 2443 | + </field> <field> <name>endZdtype</name> | ||
| 2444 | + <rename>endZdtype</rename> | ||
| 2445 | + <type>String</type> | ||
| 2446 | + <length>-1</length> | ||
| 2447 | + <precision>-1</precision> | ||
| 2448 | + <replace>N</replace> | ||
| 2449 | + </field> <field> <name>destory</name> | ||
| 2450 | + <rename>destory</rename> | ||
| 2451 | + <type>Integer</type> | ||
| 2452 | + <length>-1</length> | ||
| 2453 | + <precision>-1</precision> | ||
| 2454 | + <replace>N</replace> | ||
| 2455 | + </field> </fields> <cluster_schema/> | ||
| 2456 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2457 | + <xloc>588</xloc> | ||
| 2458 | + <yloc>403</yloc> | ||
| 2459 | + <draw>Y</draw> | ||
| 2460 | + </GUI> | ||
| 2461 | + </step> | ||
| 2462 | + | ||
| 2463 | + <step> | ||
| 2464 | + <name>正常班次数据</name> | ||
| 2465 | + <type>Dummy</type> | ||
| 2466 | + <description/> | ||
| 2467 | + <distribute>Y</distribute> | ||
| 2468 | + <custom_distribution/> | ||
| 2469 | + <copies>1</copies> | ||
| 2470 | + <partitioning> | ||
| 2471 | + <method>none</method> | ||
| 2472 | + <schema_name/> | ||
| 2473 | + </partitioning> | ||
| 2474 | + <cluster_schema/> | ||
| 2475 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2476 | + <xloc>725</xloc> | ||
| 2477 | + <yloc>404</yloc> | ||
| 2478 | + <draw>Y</draw> | ||
| 2479 | + </GUI> | ||
| 2480 | + </step> | ||
| 2481 | + | ||
| 2482 | + <step> | ||
| 2483 | + <name>添加发车顺序号</name> | ||
| 2484 | + <type>GroupBy</type> | ||
| 2485 | + <description/> | ||
| 2486 | + <distribute>Y</distribute> | ||
| 2487 | + <custom_distribution/> | ||
| 2488 | + <copies>1</copies> | ||
| 2489 | + <partitioning> | ||
| 2490 | + <method>none</method> | ||
| 2491 | + <schema_name/> | ||
| 2492 | + </partitioning> | ||
| 2493 | + <all_rows>Y</all_rows> | ||
| 2494 | + <ignore_aggregate>N</ignore_aggregate> | ||
| 2495 | + <field_ignore/> | ||
| 2496 | + <directory>%%java.io.tmpdir%%</directory> | ||
| 2497 | + <prefix>grp</prefix> | ||
| 2498 | + <add_linenr>Y</add_linenr> | ||
| 2499 | + <linenr_fieldname>fcno</linenr_fieldname> | ||
| 2500 | + <give_back_row>N</give_back_row> | ||
| 2501 | + <group> | ||
| 2502 | + <field> | ||
| 2503 | + <name>lp</name> | ||
| 2504 | + </field> | ||
| 2505 | + </group> | ||
| 2506 | + <fields> | ||
| 2507 | + </fields> | ||
| 2508 | + <cluster_schema/> | ||
| 2509 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2510 | + <xloc>442</xloc> | ||
| 2511 | + <yloc>44</yloc> | ||
| 2512 | + <draw>Y</draw> | ||
| 2513 | + </GUI> | ||
| 2514 | + </step> | ||
| 2515 | + | ||
| 2516 | + <step> | ||
| 2517 | + <name>添加对应班次数</name> | ||
| 2518 | + <type>GroupBy</type> | ||
| 2519 | + <description/> | ||
| 2520 | + <distribute>Y</distribute> | ||
| 2521 | + <custom_distribution/> | ||
| 2522 | + <copies>1</copies> | ||
| 2523 | + <partitioning> | ||
| 2524 | + <method>none</method> | ||
| 2525 | + <schema_name/> | ||
| 2526 | + </partitioning> | ||
| 2527 | + <all_rows>Y</all_rows> | ||
| 2528 | + <ignore_aggregate>N</ignore_aggregate> | ||
| 2529 | + <field_ignore/> | ||
| 2530 | + <directory>%%java.io.tmpdir%%</directory> | ||
| 2531 | + <prefix>grp</prefix> | ||
| 2532 | + <add_linenr>Y</add_linenr> | ||
| 2533 | + <linenr_fieldname>bcs</linenr_fieldname> | ||
| 2534 | + <give_back_row>N</give_back_row> | ||
| 2535 | + <group> | ||
| 2536 | + </group> | ||
| 2537 | + <fields> | ||
| 2538 | + </fields> | ||
| 2539 | + <cluster_schema/> | ||
| 2540 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2541 | + <xloc>692</xloc> | ||
| 2542 | + <yloc>44</yloc> | ||
| 2543 | + <draw>Y</draw> | ||
| 2544 | + </GUI> | ||
| 2545 | + </step> | ||
| 2546 | + | ||
| 2547 | + <step> | ||
| 2548 | + <name>班次数据范式化</name> | ||
| 2549 | + <type>Normaliser</type> | ||
| 2550 | + <description/> | ||
| 2551 | + <distribute>Y</distribute> | ||
| 2552 | + <custom_distribution/> | ||
| 2553 | + <copies>1</copies> | ||
| 2554 | + <partitioning> | ||
| 2555 | + <method>none</method> | ||
| 2556 | + <schema_name/> | ||
| 2557 | + </partitioning> | ||
| 2558 | + <typefield>站点名称</typefield> | ||
| 2559 | + <fields> </fields> <cluster_schema/> | ||
| 2560 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2561 | + <xloc>248</xloc> | ||
| 2562 | + <yloc>44</yloc> | ||
| 2563 | + <draw>Y</draw> | ||
| 2564 | + </GUI> | ||
| 2565 | + </step> | ||
| 2566 | + | ||
| 2567 | + <step> | ||
| 2568 | + <name>班次类型字典</name> | ||
| 2569 | + <type>ValueMapper</type> | ||
| 2570 | + <description/> | ||
| 2571 | + <distribute>Y</distribute> | ||
| 2572 | + <custom_distribution/> | ||
| 2573 | + <copies>1</copies> | ||
| 2574 | + <partitioning> | ||
| 2575 | + <method>none</method> | ||
| 2576 | + <schema_name/> | ||
| 2577 | + </partitioning> | ||
| 2578 | + <field_to_use>bctype</field_to_use> | ||
| 2579 | + <target_field>bctype_code</target_field> | ||
| 2580 | + <non_match_default>未知类型</non_match_default> | ||
| 2581 | + <fields> | ||
| 2582 | + <field> | ||
| 2583 | + <source_value>正常班次</source_value> | ||
| 2584 | + <target_value>normal</target_value> | ||
| 2585 | + </field> | ||
| 2586 | + <field> | ||
| 2587 | + <source_value>出场</source_value> | ||
| 2588 | + <target_value>out</target_value> | ||
| 2589 | + </field> | ||
| 2590 | + <field> | ||
| 2591 | + <source_value>进场</source_value> | ||
| 2592 | + <target_value>in</target_value> | ||
| 2593 | + </field> | ||
| 2594 | + <field> | ||
| 2595 | + <source_value>加油</source_value> | ||
| 2596 | + <target_value>oil</target_value> | ||
| 2597 | + </field> | ||
| 2598 | + <field> | ||
| 2599 | + <source_value>临加</source_value> | ||
| 2600 | + <target_value>temp</target_value> | ||
| 2601 | + </field> | ||
| 2602 | + <field> | ||
| 2603 | + <source_value>区间</source_value> | ||
| 2604 | + <target_value>region</target_value> | ||
| 2605 | + </field> | ||
| 2606 | + <field> | ||
| 2607 | + <source_value>放空</source_value> | ||
| 2608 | + <target_value>venting</target_value> | ||
| 2609 | + </field> | ||
| 2610 | + <field> | ||
| 2611 | + <source_value>放大站</source_value> | ||
| 2612 | + <target_value>major</target_value> | ||
| 2613 | + </field> | ||
| 2614 | + </fields> | ||
| 2615 | + <cluster_schema/> | ||
| 2616 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2617 | + <xloc>149</xloc> | ||
| 2618 | + <yloc>491</yloc> | ||
| 2619 | + <draw>Y</draw> | ||
| 2620 | + </GUI> | ||
| 2621 | + </step> | ||
| 2622 | + | ||
| 2623 | + <step> | ||
| 2624 | + <name>班次类型字典 2</name> | ||
| 2625 | + <type>ValueMapper</type> | ||
| 2626 | + <description/> | ||
| 2627 | + <distribute>Y</distribute> | ||
| 2628 | + <custom_distribution/> | ||
| 2629 | + <copies>1</copies> | ||
| 2630 | + <partitioning> | ||
| 2631 | + <method>none</method> | ||
| 2632 | + <schema_name/> | ||
| 2633 | + </partitioning> | ||
| 2634 | + <field_to_use>bctype</field_to_use> | ||
| 2635 | + <target_field>bctype_code</target_field> | ||
| 2636 | + <non_match_default>未知类型</non_match_default> | ||
| 2637 | + <fields> | ||
| 2638 | + <field> | ||
| 2639 | + <source_value>正常班次</source_value> | ||
| 2640 | + <target_value>normal</target_value> | ||
| 2641 | + </field> | ||
| 2642 | + <field> | ||
| 2643 | + <source_value>出场</source_value> | ||
| 2644 | + <target_value>out</target_value> | ||
| 2645 | + </field> | ||
| 2646 | + <field> | ||
| 2647 | + <source_value>进场</source_value> | ||
| 2648 | + <target_value>in</target_value> | ||
| 2649 | + </field> | ||
| 2650 | + <field> | ||
| 2651 | + <source_value>加油</source_value> | ||
| 2652 | + <target_value>oil</target_value> | ||
| 2653 | + </field> | ||
| 2654 | + <field> | ||
| 2655 | + <source_value>临加</source_value> | ||
| 2656 | + <target_value>temp</target_value> | ||
| 2657 | + </field> | ||
| 2658 | + <field> | ||
| 2659 | + <source_value>区间</source_value> | ||
| 2660 | + <target_value>region</target_value> | ||
| 2661 | + </field> | ||
| 2662 | + <field> | ||
| 2663 | + <source_value>放空</source_value> | ||
| 2664 | + <target_value>venting</target_value> | ||
| 2665 | + </field> | ||
| 2666 | + <field> | ||
| 2667 | + <source_value>放大站</source_value> | ||
| 2668 | + <target_value>major</target_value> | ||
| 2669 | + </field> | ||
| 2670 | + </fields> | ||
| 2671 | + <cluster_schema/> | ||
| 2672 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2673 | + <xloc>333</xloc> | ||
| 2674 | + <yloc>681</yloc> | ||
| 2675 | + <draw>Y</draw> | ||
| 2676 | + </GUI> | ||
| 2677 | + </step> | ||
| 2678 | + | ||
| 2679 | + <step> | ||
| 2680 | + <name>班次类型字典 3</name> | ||
| 2681 | + <type>ValueMapper</type> | ||
| 2682 | + <description/> | ||
| 2683 | + <distribute>Y</distribute> | ||
| 2684 | + <custom_distribution/> | ||
| 2685 | + <copies>1</copies> | ||
| 2686 | + <partitioning> | ||
| 2687 | + <method>none</method> | ||
| 2688 | + <schema_name/> | ||
| 2689 | + </partitioning> | ||
| 2690 | + <field_to_use>bctype</field_to_use> | ||
| 2691 | + <target_field>bctype_code</target_field> | ||
| 2692 | + <non_match_default>未知类型</non_match_default> | ||
| 2693 | + <fields> | ||
| 2694 | + <field> | ||
| 2695 | + <source_value>正常班次</source_value> | ||
| 2696 | + <target_value>normal</target_value> | ||
| 2697 | + </field> | ||
| 2698 | + <field> | ||
| 2699 | + <source_value>出场</source_value> | ||
| 2700 | + <target_value>out</target_value> | ||
| 2701 | + </field> | ||
| 2702 | + <field> | ||
| 2703 | + <source_value>进场</source_value> | ||
| 2704 | + <target_value>in</target_value> | ||
| 2705 | + </field> | ||
| 2706 | + <field> | ||
| 2707 | + <source_value>加油</source_value> | ||
| 2708 | + <target_value>oil</target_value> | ||
| 2709 | + </field> | ||
| 2710 | + <field> | ||
| 2711 | + <source_value>临加</source_value> | ||
| 2712 | + <target_value>temp</target_value> | ||
| 2713 | + </field> | ||
| 2714 | + <field> | ||
| 2715 | + <source_value>区间</source_value> | ||
| 2716 | + <target_value>region</target_value> | ||
| 2717 | + </field> | ||
| 2718 | + <field> | ||
| 2719 | + <source_value>放空</source_value> | ||
| 2720 | + <target_value>venting</target_value> | ||
| 2721 | + </field> | ||
| 2722 | + <field> | ||
| 2723 | + <source_value>放大站</source_value> | ||
| 2724 | + <target_value>major</target_value> | ||
| 2725 | + </field> | ||
| 2726 | + </fields> | ||
| 2727 | + <cluster_schema/> | ||
| 2728 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2729 | + <xloc>551</xloc> | ||
| 2730 | + <yloc>928</yloc> | ||
| 2731 | + <draw>Y</draw> | ||
| 2732 | + </GUI> | ||
| 2733 | + </step> | ||
| 2734 | + | ||
| 2735 | + <step> | ||
| 2736 | + <name>类型修正</name> | ||
| 2737 | + <type>SelectValues</type> | ||
| 2738 | + <description/> | ||
| 2739 | + <distribute>Y</distribute> | ||
| 2740 | + <custom_distribution/> | ||
| 2741 | + <copies>1</copies> | ||
| 2742 | + <partitioning> | ||
| 2743 | + <method>none</method> | ||
| 2744 | + <schema_name/> | ||
| 2745 | + </partitioning> | ||
| 2746 | + <fields> <select_unspecified>N</select_unspecified> | ||
| 2747 | + <meta> <name>jhlc</name> | ||
| 2748 | + <rename>jhlc</rename> | ||
| 2749 | + <type>Number</type> | ||
| 2750 | + <length>-2</length> | ||
| 2751 | + <precision>-2</precision> | ||
| 2752 | + <conversion_mask/> | ||
| 2753 | + <date_format_lenient>false</date_format_lenient> | ||
| 2754 | + <date_format_locale/> | ||
| 2755 | + <date_format_timezone/> | ||
| 2756 | + <lenient_string_to_number>false</lenient_string_to_number> | ||
| 2757 | + <encoding/> | ||
| 2758 | + <decimal_symbol/> | ||
| 2759 | + <grouping_symbol/> | ||
| 2760 | + <currency_symbol/> | ||
| 2761 | + <storage_type/> | ||
| 2762 | + </meta> <meta> <name>bcsj</name> | ||
| 2763 | + <rename>bcsj</rename> | ||
| 2764 | + <type>Integer</type> | ||
| 2765 | + <length>-2</length> | ||
| 2766 | + <precision>-2</precision> | ||
| 2767 | + <conversion_mask/> | ||
| 2768 | + <date_format_lenient>false</date_format_lenient> | ||
| 2769 | + <date_format_locale/> | ||
| 2770 | + <date_format_timezone/> | ||
| 2771 | + <lenient_string_to_number>false</lenient_string_to_number> | ||
| 2772 | + <encoding/> | ||
| 2773 | + <decimal_symbol/> | ||
| 2774 | + <grouping_symbol/> | ||
| 2775 | + <currency_symbol/> | ||
| 2776 | + <storage_type/> | ||
| 2777 | + </meta> </fields> <cluster_schema/> | ||
| 2778 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2779 | + <xloc>146</xloc> | ||
| 2780 | + <yloc>768</yloc> | ||
| 2781 | + <draw>Y</draw> | ||
| 2782 | + </GUI> | ||
| 2783 | + </step> | ||
| 2784 | + | ||
| 2785 | + <step> | ||
| 2786 | + <name>类型修正 2</name> | ||
| 2787 | + <type>SelectValues</type> | ||
| 2788 | + <description/> | ||
| 2789 | + <distribute>Y</distribute> | ||
| 2790 | + <custom_distribution/> | ||
| 2791 | + <copies>1</copies> | ||
| 2792 | + <partitioning> | ||
| 2793 | + <method>none</method> | ||
| 2794 | + <schema_name/> | ||
| 2795 | + </partitioning> | ||
| 2796 | + <fields> <select_unspecified>N</select_unspecified> | ||
| 2797 | + <meta> <name>out_mileage</name> | ||
| 2798 | + <rename>out_mileage</rename> | ||
| 2799 | + <type>Number</type> | ||
| 2800 | + <length>-2</length> | ||
| 2801 | + <precision>-2</precision> | ||
| 2802 | + <conversion_mask/> | ||
| 2803 | + <date_format_lenient>false</date_format_lenient> | ||
| 2804 | + <date_format_locale/> | ||
| 2805 | + <date_format_timezone/> | ||
| 2806 | + <lenient_string_to_number>false</lenient_string_to_number> | ||
| 2807 | + <encoding/> | ||
| 2808 | + <decimal_symbol/> | ||
| 2809 | + <grouping_symbol/> | ||
| 2810 | + <currency_symbol/> | ||
| 2811 | + <storage_type/> | ||
| 2812 | + </meta> <meta> <name>out_time</name> | ||
| 2813 | + <rename>out_time</rename> | ||
| 2814 | + <type>Integer</type> | ||
| 2815 | + <length>-2</length> | ||
| 2816 | + <precision>-2</precision> | ||
| 2817 | + <conversion_mask/> | ||
| 2818 | + <date_format_lenient>false</date_format_lenient> | ||
| 2819 | + <date_format_locale/> | ||
| 2820 | + <date_format_timezone/> | ||
| 2821 | + <lenient_string_to_number>false</lenient_string_to_number> | ||
| 2822 | + <encoding/> | ||
| 2823 | + <decimal_symbol/> | ||
| 2824 | + <grouping_symbol/> | ||
| 2825 | + <currency_symbol/> | ||
| 2826 | + <storage_type/> | ||
| 2827 | + </meta> <meta> <name>sxx</name> | ||
| 2828 | + <rename>sxx</rename> | ||
| 2829 | + <type>Integer</type> | ||
| 2830 | + <length>-2</length> | ||
| 2831 | + <precision>-2</precision> | ||
| 2832 | + <conversion_mask/> | ||
| 2833 | + <date_format_lenient>false</date_format_lenient> | ||
| 2834 | + <date_format_locale/> | ||
| 2835 | + <date_format_timezone/> | ||
| 2836 | + <lenient_string_to_number>false</lenient_string_to_number> | ||
| 2837 | + <encoding/> | ||
| 2838 | + <decimal_symbol/> | ||
| 2839 | + <grouping_symbol/> | ||
| 2840 | + <currency_symbol/> | ||
| 2841 | + <storage_type/> | ||
| 2842 | + </meta> </fields> <cluster_schema/> | ||
| 2843 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2844 | + <xloc>338</xloc> | ||
| 2845 | + <yloc>1008</yloc> | ||
| 2846 | + <draw>Y</draw> | ||
| 2847 | + </GUI> | ||
| 2848 | + </step> | ||
| 2849 | + | ||
| 2850 | + <step> | ||
| 2851 | + <name>类型修正 3</name> | ||
| 2852 | + <type>SelectValues</type> | ||
| 2853 | + <description/> | ||
| 2854 | + <distribute>Y</distribute> | ||
| 2855 | + <custom_distribution/> | ||
| 2856 | + <copies>1</copies> | ||
| 2857 | + <partitioning> | ||
| 2858 | + <method>none</method> | ||
| 2859 | + <schema_name/> | ||
| 2860 | + </partitioning> | ||
| 2861 | + <fields> <select_unspecified>N</select_unspecified> | ||
| 2862 | + <meta> <name>parade_mileage</name> | ||
| 2863 | + <rename>parade_mileage</rename> | ||
| 2864 | + <type>Number</type> | ||
| 2865 | + <length>-2</length> | ||
| 2866 | + <precision>-2</precision> | ||
| 2867 | + <conversion_mask/> | ||
| 2868 | + <date_format_lenient>false</date_format_lenient> | ||
| 2869 | + <date_format_locale/> | ||
| 2870 | + <date_format_timezone/> | ||
| 2871 | + <lenient_string_to_number>false</lenient_string_to_number> | ||
| 2872 | + <encoding/> | ||
| 2873 | + <decimal_symbol/> | ||
| 2874 | + <grouping_symbol/> | ||
| 2875 | + <currency_symbol/> | ||
| 2876 | + <storage_type/> | ||
| 2877 | + </meta> <meta> <name>parade_time</name> | ||
| 2878 | + <rename>parade_time</rename> | ||
| 2879 | + <type>Integer</type> | ||
| 2880 | + <length>-2</length> | ||
| 2881 | + <precision>-2</precision> | ||
| 2882 | + <conversion_mask/> | ||
| 2883 | + <date_format_lenient>false</date_format_lenient> | ||
| 2884 | + <date_format_locale/> | ||
| 2885 | + <date_format_timezone/> | ||
| 2886 | + <lenient_string_to_number>false</lenient_string_to_number> | ||
| 2887 | + <encoding/> | ||
| 2888 | + <decimal_symbol/> | ||
| 2889 | + <grouping_symbol/> | ||
| 2890 | + <currency_symbol/> | ||
| 2891 | + <storage_type/> | ||
| 2892 | + </meta> <meta> <name>sxx2</name> | ||
| 2893 | + <rename>sxx2</rename> | ||
| 2894 | + <type>Integer</type> | ||
| 2895 | + <length>-2</length> | ||
| 2896 | + <precision>-2</precision> | ||
| 2897 | + <conversion_mask/> | ||
| 2898 | + <date_format_lenient>false</date_format_lenient> | ||
| 2899 | + <date_format_locale/> | ||
| 2900 | + <date_format_timezone/> | ||
| 2901 | + <lenient_string_to_number>false</lenient_string_to_number> | ||
| 2902 | + <encoding/> | ||
| 2903 | + <decimal_symbol/> | ||
| 2904 | + <grouping_symbol/> | ||
| 2905 | + <currency_symbol/> | ||
| 2906 | + <storage_type/> | ||
| 2907 | + </meta> </fields> <cluster_schema/> | ||
| 2908 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2909 | + <xloc>847</xloc> | ||
| 2910 | + <yloc>1003</yloc> | ||
| 2911 | + <draw>Y</draw> | ||
| 2912 | + </GUI> | ||
| 2913 | + </step> | ||
| 2914 | + | ||
| 2915 | + <step> | ||
| 2916 | + <name>计算班次类型</name> | ||
| 2917 | + <type>ValueMapper</type> | ||
| 2918 | + <description/> | ||
| 2919 | + <distribute>Y</distribute> | ||
| 2920 | + <custom_distribution/> | ||
| 2921 | + <copies>1</copies> | ||
| 2922 | + <partitioning> | ||
| 2923 | + <method>none</method> | ||
| 2924 | + <schema_name/> | ||
| 2925 | + </partitioning> | ||
| 2926 | + <field_to_use>qdzname</field_to_use> | ||
| 2927 | + <target_field>bctype</target_field> | ||
| 2928 | + <non_match_default>正常班次</non_match_default> | ||
| 2929 | + <fields> | ||
| 2930 | + <field> | ||
| 2931 | + <source_value>出场</source_value> | ||
| 2932 | + <target_value>出场</target_value> | ||
| 2933 | + </field> | ||
| 2934 | + <field> | ||
| 2935 | + <source_value>进场</source_value> | ||
| 2936 | + <target_value>进场</target_value> | ||
| 2937 | + </field> | ||
| 2938 | + </fields> | ||
| 2939 | + <cluster_schema/> | ||
| 2940 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2941 | + <xloc>1014</xloc> | ||
| 2942 | + <yloc>401</yloc> | ||
| 2943 | + <draw>Y</draw> | ||
| 2944 | + </GUI> | ||
| 2945 | + </step> | ||
| 2946 | + | ||
| 2947 | + <step> | ||
| 2948 | + <name>记录关联 (笛卡尔输出)</name> | ||
| 2949 | + <type>JoinRows</type> | ||
| 2950 | + <description/> | ||
| 2951 | + <distribute>Y</distribute> | ||
| 2952 | + <custom_distribution/> | ||
| 2953 | + <copies>1</copies> | ||
| 2954 | + <partitioning> | ||
| 2955 | + <method>none</method> | ||
| 2956 | + <schema_name/> | ||
| 2957 | + </partitioning> | ||
| 2958 | + <directory>%%java.io.tmpdir%%</directory> | ||
| 2959 | + <prefix>out</prefix> | ||
| 2960 | + <cache_size>500</cache_size> | ||
| 2961 | + <main/> | ||
| 2962 | + <compare> | ||
| 2963 | +<condition> | ||
| 2964 | + <negated>N</negated> | ||
| 2965 | + <leftvalue/> | ||
| 2966 | + <function>=</function> | ||
| 2967 | + <rightvalue/> | ||
| 2968 | + </condition> | ||
| 2969 | + </compare> | ||
| 2970 | + <cluster_schema/> | ||
| 2971 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 2972 | + <xloc>310</xloc> | ||
| 2973 | + <yloc>133</yloc> | ||
| 2974 | + <draw>Y</draw> | ||
| 2975 | + </GUI> | ||
| 2976 | + </step> | ||
| 2977 | + | ||
| 2978 | + <step> | ||
| 2979 | + <name>过滤记录(发车时间为空)</name> | ||
| 2980 | + <type>FilterRows</type> | ||
| 2981 | + <description/> | ||
| 2982 | + <distribute>Y</distribute> | ||
| 2983 | + <custom_distribution/> | ||
| 2984 | + <copies>1</copies> | ||
| 2985 | + <partitioning> | ||
| 2986 | + <method>none</method> | ||
| 2987 | + <schema_name/> | ||
| 2988 | + </partitioning> | ||
| 2989 | +<send_true_to/> | ||
| 2990 | +<send_false_to/> | ||
| 2991 | + <compare> | ||
| 2992 | +<condition> | ||
| 2993 | + <negated>N</negated> | ||
| 2994 | + <leftvalue>sendtime</leftvalue> | ||
| 2995 | + <function>IS NOT NULL</function> | ||
| 2996 | + <rightvalue/> | ||
| 2997 | + </condition> | ||
| 2998 | + </compare> | ||
| 2999 | + <cluster_schema/> | ||
| 3000 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 3001 | + <xloc>571</xloc> | ||
| 3002 | + <yloc>44</yloc> | ||
| 3003 | + <draw>Y</draw> | ||
| 3004 | + </GUI> | ||
| 3005 | + </step> | ||
| 3006 | + | ||
| 3007 | + <step> | ||
| 3008 | + <name>进场班次_确定起点站名字</name> | ||
| 3009 | + <type>ScriptValueMod</type> | ||
| 3010 | + <description/> | ||
| 3011 | + <distribute>Y</distribute> | ||
| 3012 | + <custom_distribution/> | ||
| 3013 | + <copies>1</copies> | ||
| 3014 | + <partitioning> | ||
| 3015 | + <method>none</method> | ||
| 3016 | + <schema_name/> | ||
| 3017 | + </partitioning> | ||
| 3018 | + <compatible>N</compatible> | ||
| 3019 | + <optimizationLevel>9</optimizationLevel> | ||
| 3020 | + <jsScripts> <jsScript> <jsScript_type>0</jsScript_type> | ||
| 3021 | + <jsScript_name>Script 1</jsScript_name> | ||
| 3022 | + <jsScript_script>//Script here

// 添加站点标识
var cc_groups = qdzgroups.split(","); // 所有班次起点站数组
var qdzname_calcu = cc_groups[gno - 2]; // 进场班次的起点站是上一个班次的终点站,这里只有上一个班次的起点站,还需要计算
var startZdtype_calcu = 'B';
var endZdtype_calcu = 'E';

var destory = 0; // 未撤销flag</jsScript_script> | ||
| 3023 | + </jsScript> </jsScripts> <fields> <field> <name>qdzname_calcu</name> | ||
| 3024 | + <rename>qdzname_calcu</rename> | ||
| 3025 | + <type>String</type> | ||
| 3026 | + <length>-1</length> | ||
| 3027 | + <precision>-1</precision> | ||
| 3028 | + <replace>N</replace> | ||
| 3029 | + </field> <field> <name>startZdtype_calcu</name> | ||
| 3030 | + <rename>startZdtype_calcu</rename> | ||
| 3031 | + <type>String</type> | ||
| 3032 | + <length>-1</length> | ||
| 3033 | + <precision>-1</precision> | ||
| 3034 | + <replace>N</replace> | ||
| 3035 | + </field> <field> <name>endZdtype_calcu</name> | ||
| 3036 | + <rename>endZdtype_calcu</rename> | ||
| 3037 | + <type>String</type> | ||
| 3038 | + <length>-1</length> | ||
| 3039 | + <precision>-1</precision> | ||
| 3040 | + <replace>N</replace> | ||
| 3041 | + </field> <field> <name>destory</name> | ||
| 3042 | + <rename>destory</rename> | ||
| 3043 | + <type>Integer</type> | ||
| 3044 | + <length>-1</length> | ||
| 3045 | + <precision>-1</precision> | ||
| 3046 | + <replace>N</replace> | ||
| 3047 | + </field> </fields> <cluster_schema/> | ||
| 3048 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 3049 | + <xloc>754</xloc> | ||
| 3050 | + <yloc>610</yloc> | ||
| 3051 | + <draw>Y</draw> | ||
| 3052 | + </GUI> | ||
| 3053 | + </step> | ||
| 3054 | + | ||
| 3055 | + <step> | ||
| 3056 | + <name>进场班次数据</name> | ||
| 3057 | + <type>Dummy</type> | ||
| 3058 | + <description/> | ||
| 3059 | + <distribute>Y</distribute> | ||
| 3060 | + <custom_distribution/> | ||
| 3061 | + <copies>1</copies> | ||
| 3062 | + <partitioning> | ||
| 3063 | + <method>none</method> | ||
| 3064 | + <schema_name/> | ||
| 3065 | + </partitioning> | ||
| 3066 | + <cluster_schema/> | ||
| 3067 | + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI> | ||
| 3068 | + <xloc>997</xloc> | ||
| 3069 | + <yloc>606</yloc> | ||
| 3070 | + <draw>Y</draw> | ||
| 3071 | + </GUI> | ||
| 3072 | + </step> | ||
| 3073 | + | ||
| 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> | ||
| 3110 | + <error> | ||
| 3111 | + <source_step>插入/更新bsth_c_s_ttinfo_detail</source_step> | ||
| 3112 | + <target_step/> | ||
| 3113 | + <is_enabled>Y</is_enabled> | ||
| 3114 | + <nr_valuename>c1</nr_valuename> | ||
| 3115 | + <descriptions_valuename>c2</descriptions_valuename> | ||
| 3116 | + <fields_valuename>c3</fields_valuename> | ||
| 3117 | + <codes_valuename>c4</codes_valuename> | ||
| 3118 | + <max_errors/> | ||
| 3119 | + <max_pct_errors/> | ||
| 3120 | + <min_pct_rows/> | ||
| 3121 | + </error> | ||
| 3122 | + </step_error_handling> | ||
| 3123 | + <slave-step-copy-partition-distribution> | ||
| 3124 | +</slave-step-copy-partition-distribution> | ||
| 3125 | + <slave_transformation>N</slave_transformation> | ||
| 3126 | + | ||
| 3127 | +</transformation> |
src/main/resources/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
| @@ -60,10 +60,20 @@ | @@ -60,10 +60,20 @@ | ||
| 60 | <description>时刻表名称</description> | 60 | <description>时刻表名称</description> |
| 61 | </parameter> | 61 | </parameter> |
| 62 | <parameter> | 62 | <parameter> |
| 63 | + <name>xlid</name> | ||
| 64 | + <default_value>-999</default_value> | ||
| 65 | + <description/> | ||
| 66 | + </parameter> | ||
| 67 | + <parameter> | ||
| 63 | <name>xlname</name> | 68 | <name>xlname</name> |
| 64 | <default_value>闵行26路</default_value> | 69 | <default_value>闵行26路</default_value> |
| 65 | <description>线路名称</description> | 70 | <description>线路名称</description> |
| 66 | </parameter> | 71 | </parameter> |
| 72 | + <parameter> | ||
| 73 | + <name>zdlyversion</name> | ||
| 74 | + <default_value>-1</default_value> | ||
| 75 | + <description/> | ||
| 76 | + </parameter> | ||
| 67 | </parameters> | 77 | </parameters> |
| 68 | <log> | 78 | <log> |
| 69 | <trans-log-table><connection/> | 79 | <trans-log-table><connection/> |
| @@ -339,6 +349,10 @@ | @@ -339,6 +349,10 @@ | ||
| 339 | <hop> <from>获取线路标准id</from><to>停车场编码</to><enabled>Y</enabled> </hop> | 349 | <hop> <from>获取线路标准id</from><to>停车场编码</to><enabled>Y</enabled> </hop> |
| 340 | <hop> <from>停车场编码</from><to>停车场名称</to><enabled>Y</enabled> </hop> | 350 | <hop> <from>停车场编码</from><to>停车场名称</to><enabled>Y</enabled> </hop> |
| 341 | <hop> <from>停车场名称</from><to>增加停车场名称metadata</to><enabled>Y</enabled> </hop> | 351 | <hop> <from>停车场名称</from><to>增加停车场名称metadata</to><enabled>Y</enabled> </hop> |
| 352 | + <hop> <from>增加站点路由版本 metadata</from><to>替换站点路由版本</to><enabled>Y</enabled> </hop> | ||
| 353 | + <hop> <from>替换站点路由版本</from><to>站点路由版本metadata字段</to><enabled>Y</enabled> </hop> | ||
| 354 | + <hop> <from>获取站点路由version</from><to>增加站点路由版本 metadata</to><enabled>Y</enabled> </hop> | ||
| 355 | + <hop> <from>站点路由版本metadata字段</from><to>合并增加常量数据metadata</to><enabled>Y</enabled> </hop> | ||
| 342 | </order> | 356 | </order> |
| 343 | <step> | 357 | <step> |
| 344 | <name>ETL元数据注入</name> | 358 | <name>ETL元数据注入</name> |
| @@ -422,15 +436,15 @@ | @@ -422,15 +436,15 @@ | ||
| 422 | <source_step>增加normalize元数据</source_step> | 436 | <source_step>增加normalize元数据</source_step> |
| 423 | <source_field>nfieldname</source_field> | 437 | <source_field>nfieldname</source_field> |
| 424 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | 438 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> |
| 425 | - <target_attribute_key>SHEET_NAME</target_attribute_key> | ||
| 426 | - <target_detail>Y</target_detail> | ||
| 427 | - <source_step>获取excel文件名</source_step> | ||
| 428 | - <source_field>sheetname_</source_field> | ||
| 429 | - </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | ||
| 430 | <target_attribute_key>LENGTH</target_attribute_key> | 439 | <target_attribute_key>LENGTH</target_attribute_key> |
| 431 | <target_detail>Y</target_detail> | 440 | <target_detail>Y</target_detail> |
| 432 | <source_step>增加excel字段其他元数据</source_step> | 441 | <source_step>增加excel字段其他元数据</source_step> |
| 433 | <source_field>length</source_field> | 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> | ||
| 445 | + <target_detail>Y</target_detail> | ||
| 446 | + <source_step>获取excel文件名</source_step> | ||
| 447 | + <source_field>sheetname_</source_field> | ||
| 434 | </mapping> <mapping> <target_step_name>增加时刻表名字,线路名字,停车场名字</target_step_name> | 448 | </mapping> <mapping> <target_step_name>增加时刻表名字,线路名字,停车场名字</target_step_name> |
| 435 | <target_attribute_key>NAME</target_attribute_key> | 449 | <target_attribute_key>NAME</target_attribute_key> |
| 436 | <target_detail>Y</target_detail> | 450 | <target_detail>Y</target_detail> |
| @@ -446,41 +460,41 @@ | @@ -446,41 +460,41 @@ | ||
| 446 | <target_detail>Y</target_detail> | 460 | <target_detail>Y</target_detail> |
| 447 | <source_step>列拆分为多行</source_step> | 461 | <source_step>列拆分为多行</source_step> |
| 448 | <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> | ||
| 449 | </mapping> <mapping> <target_step_name>Excel输入</target_step_name> | 468 | </mapping> <mapping> <target_step_name>Excel输入</target_step_name> |
| 450 | <target_attribute_key>TRIM_TYPE</target_attribute_key> | 469 | <target_attribute_key>TRIM_TYPE</target_attribute_key> |
| 451 | <target_detail>Y</target_detail> | 470 | <target_detail>Y</target_detail> |
| 452 | <source_step>列拆分为多行</source_step> | 471 | <source_step>列拆分为多行</source_step> |
| 453 | <source_field>trim_type</source_field> | 472 | <source_field>trim_type</source_field> |
| 454 | </mapping> <mapping> <target_step_name>行转列</target_step_name> | 473 | </mapping> <mapping> <target_step_name>行转列</target_step_name> |
| 455 | - <target_attribute_key>VALUE</target_attribute_key> | 474 | + <target_attribute_key>NORMALISED</target_attribute_key> |
| 456 | <target_detail>Y</target_detail> | 475 | <target_detail>Y</target_detail> |
| 457 | <source_step>列拆分为多行 2</source_step> | 476 | <source_step>列拆分为多行 2</source_step> |
| 458 | - <source_field>fieldName</source_field> | 477 | + <source_field>value</source_field> |
| 459 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | 478 | </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> |
| 460 | <target_attribute_key>REPEAT</target_attribute_key> | 479 | <target_attribute_key>REPEAT</target_attribute_key> |
| 461 | <target_detail>Y</target_detail> | 480 | <target_detail>Y</target_detail> |
| 462 | <source_step>增加excel字段其他元数据</source_step> | 481 | <source_step>增加excel字段其他元数据</source_step> |
| 463 | <source_field>repeat</source_field> | 482 | <source_field>repeat</source_field> |
| 464 | - </mapping> <mapping> <target_step_name>行转列</target_step_name> | ||
| 465 | - <target_attribute_key>NORMALISED</target_attribute_key> | ||
| 466 | - <target_detail>Y</target_detail> | ||
| 467 | - <source_step>列拆分为多行 2</source_step> | ||
| 468 | - <source_field>value</source_field> | ||
| 469 | </mapping> <mapping> <target_step_name>班次数据范式化</target_step_name> | 483 | </mapping> <mapping> <target_step_name>班次数据范式化</target_step_name> |
| 470 | <target_attribute_key>NORMALISED</target_attribute_key> | 484 | <target_attribute_key>NORMALISED</target_attribute_key> |
| 471 | <target_detail>Y</target_detail> | 485 | <target_detail>Y</target_detail> |
| 472 | <source_step>增加normalize元数据</source_step> | 486 | <source_step>增加normalize元数据</source_step> |
| 473 | <source_field>valuefield</source_field> | 487 | <source_field>valuefield</source_field> |
| 474 | - </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | ||
| 475 | - <target_attribute_key>FORMAT</target_attribute_key> | ||
| 476 | - <target_detail>Y</target_detail> | ||
| 477 | - <source_step>增加excel字段其他元数据</source_step> | ||
| 478 | - <source_field>format</source_field> | ||
| 479 | </mapping> <mapping> <target_step_name>班次数据范式化</target_step_name> | 488 | </mapping> <mapping> <target_step_name>班次数据范式化</target_step_name> |
| 480 | <target_attribute_key>VALUE</target_attribute_key> | 489 | <target_attribute_key>VALUE</target_attribute_key> |
| 481 | <target_detail>Y</target_detail> | 490 | <target_detail>Y</target_detail> |
| 482 | <source_step>增加normalize元数据</source_step> | 491 | <source_step>增加normalize元数据</source_step> |
| 483 | <source_field>nfieldname</source_field> | 492 | <source_field>nfieldname</source_field> |
| 493 | + </mapping> <mapping> <target_step_name>时刻表明细信息Excel输入</target_step_name> | ||
| 494 | + <target_attribute_key>FORMAT</target_attribute_key> | ||
| 495 | + <target_detail>Y</target_detail> | ||
| 496 | + <source_step>增加excel字段其他元数据</source_step> | ||
| 497 | + <source_field>format</source_field> | ||
| 484 | </mapping> <mapping> <target_step_name>Excel输入</target_step_name> | 498 | </mapping> <mapping> <target_step_name>Excel输入</target_step_name> |
| 485 | <target_attribute_key>PRECISION</target_attribute_key> | 499 | <target_attribute_key>PRECISION</target_attribute_key> |
| 486 | <target_detail>Y</target_detail> | 500 | <target_detail>Y</target_detail> |
| @@ -1405,6 +1419,153 @@ | @@ -1405,6 +1419,153 @@ | ||
| 1405 | </GUI> | 1419 | </GUI> |
| 1406 | </step> | 1420 | </step> |
| 1407 | 1421 | ||
| 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 | + | ||
| 1408 | <step_error_handling> | 1569 | <step_error_handling> |
| 1409 | </step_error_handling> | 1570 | </step_error_handling> |
| 1410 | <slave-step-copy-partition-distribution> | 1571 | <slave-step-copy-partition-distribution> |
src/main/resources/static/pages/base/line/js/line-list-table.js
| @@ -99,8 +99,10 @@ | @@ -99,8 +99,10 @@ | ||
| 99 | // 选择线路,填充线路编码搜索框 | 99 | // 选择线路,填充线路编码搜索框 |
| 100 | $("#lineSelect").on("change",function(){ | 100 | $("#lineSelect").on("change",function(){ |
| 101 | var text = $('#lineSelect').val(); | 101 | var text = $('#lineSelect').val(); |
| 102 | - var linecode = text.split("_"); | ||
| 103 | - $("#lineCodeInput").val(linecode[2]); | 102 | + if(text){ |
| 103 | + var linecode = text.split("_"); | ||
| 104 | + $("#lineCodeInput").val(linecode[2]); | ||
| 105 | + } | ||
| 104 | }); | 106 | }); |
| 105 | 107 | ||
| 106 | function gsdmTogsName(gsD,code) { | 108 | function gsdmTogsName(gsD,code) { |
src/main/resources/static/pages/base/lineversions/js/lineversions-list-table.js
| @@ -89,8 +89,10 @@ | @@ -89,8 +89,10 @@ | ||
| 89 | 89 | ||
| 90 | $('#lineSelect').on('change',function() { | 90 | $('#lineSelect').on('change',function() { |
| 91 | var text = $('#lineSelect').val(); | 91 | var text = $('#lineSelect').val(); |
| 92 | - var linecode = text.split("_"); | ||
| 93 | - $("#lineCodeInput").val(linecode[2]); | 92 | + if(text){ |
| 93 | + var linecode = text.split("_"); | ||
| 94 | + $("#lineCodeInput").val(linecode[2]); | ||
| 95 | + } | ||
| 94 | }); | 96 | }); |
| 95 | 97 | ||
| 96 | function gsdmTogsName(gsD,code) { | 98 | function gsdmTogsName(gsD,code) { |
src/main/resources/static/pages/base/section/js/section-list-table.js
| @@ -165,8 +165,10 @@ | @@ -165,8 +165,10 @@ | ||
| 165 | $('#lineSelect').on('change',function() { | 165 | $('#lineSelect').on('change',function() { |
| 166 | initldNameSelect(); | 166 | initldNameSelect(); |
| 167 | var text = $('#lineSelect').val(); | 167 | var text = $('#lineSelect').val(); |
| 168 | - var linecode = text.split("_"); | ||
| 169 | - $("#lineCodeInput").val(linecode[2]); | 168 | + if(text){ |
| 169 | + var linecode = text.split("_"); | ||
| 170 | + $("#lineCodeInput").val(linecode[2]); | ||
| 171 | + } | ||
| 170 | }); | 172 | }); |
| 171 | $('#dirSelect').on('change',function() { | 173 | $('#dirSelect').on('change',function() { |
| 172 | initldNameSelect(); | 174 | initldNameSelect(); |
src/main/resources/static/pages/base/station/js/station-list-table.js
| @@ -113,8 +113,10 @@ | @@ -113,8 +113,10 @@ | ||
| 113 | initzdNameSelect(); | 113 | initzdNameSelect(); |
| 114 | $('#destroy').val(0); | 114 | $('#destroy').val(0); |
| 115 | var text = $('#lineSelect').val(); | 115 | var text = $('#lineSelect').val(); |
| 116 | - var linecode = text.split("_"); | ||
| 117 | - $("#lineCodeInput").val(linecode[2]); | 116 | + if(text){ |
| 117 | + var linecode = text.split("_"); | ||
| 118 | + $("#lineCodeInput").val(linecode[2]); | ||
| 119 | + } | ||
| 118 | }); | 120 | }); |
| 119 | 121 | ||
| 120 | $('#dirSelect').on('change',function() { | 122 | $('#dirSelect').on('change',function() { |
src/main/resources/static/pages/scheduleApp/module/common/main.js
| @@ -80,6 +80,10 @@ ScheduleApp.factory('DataStore', [ | @@ -80,6 +80,10 @@ ScheduleApp.factory('DataStore', [ | ||
| 80 | {code: "12", name: "保养"}, | 80 | {code: "12", name: "保养"}, |
| 81 | {code: "13", name: "缺人"}, | 81 | {code: "13", name: "缺人"}, |
| 82 | {code: "14", name: "援外"} | 82 | {code: "14", name: "援外"} |
| 83 | + ], | ||
| 84 | + "zdlytype" : [ // 站点路由类型 | ||
| 85 | + {name: "当前版本", value: 1}, | ||
| 86 | + {name: "所有版本(待更新,当前,历史)", value: 2} | ||
| 83 | ] | 87 | ] |
| 84 | }; | 88 | }; |
| 85 | 89 |
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
| @@ -2409,159 +2409,158 @@ angular.module('ScheduleApp').directive('saDategroup', [ | @@ -2409,159 +2409,158 @@ angular.module('ScheduleApp').directive('saDategroup', [ | ||
| 2409 | ]); | 2409 | ]); |
| 2410 | 2410 | ||
| 2411 | 2411 | ||
| 2412 | -/** | ||
| 2413 | - * saFbgsgroup指令 | ||
| 2414 | - * 属性如下: | ||
| 2415 | - * name(必须):控件的名字 | ||
| 2416 | - * model(必须):指定一个外部object,独立作用域,如:model=ctrl.employeeInfoForSave | ||
| 2417 | - * fbgsvalue(必须):绑定的model翻班格式值,如:fbgsvalue={{ctrl.employeeInfoForSave.fbgs}} | ||
| 2418 | - * fbgsname(必须):绑定的model翻班格式字段名,如:fbgsname=fbgs | ||
| 2419 | - * | ||
| 2420 | - * required(可选):是否要用required验证 | ||
| 2421 | - * | ||
| 2422 | - */ | ||
| 2423 | -angular.module('ScheduleApp').directive( | ||
| 2424 | - 'saFbgsgroup', | ||
| 2425 | - [ | ||
| 2426 | - function() { | ||
| 2427 | - return { | ||
| 2428 | - restrict: 'E', | ||
| 2429 | - templateUrl: '/pages/scheduleApp/module/common/dts2/fbgsGroup/saFbgsgroupTemplate.html', | ||
| 2430 | - scope: { | ||
| 2431 | - model: "=" // 独立作用域,关联外部的模型object | ||
| 2432 | - }, | ||
| 2433 | - controllerAs: '$saFbgsgroupCtrl', | ||
| 2434 | - bindToController: true, | ||
| 2435 | - controller: function() { | ||
| 2436 | - var self = this; | ||
| 2437 | - | ||
| 2438 | - self.$$dataSelected = []; // 选中的路牌列表 | ||
| 2439 | - | ||
| 2440 | - // saFbgsgroup组件的ng-model,用于外部绑定等操作 | ||
| 2441 | - self.$$internalmodel = undefined; | ||
| 2442 | - }, | ||
| 2443 | - | ||
| 2444 | - /** | ||
| 2445 | - * 此阶段可以改dom结构,此时angular还没扫描指令, | ||
| 2446 | - * 这里就可以动态添加其他angularjs的指令字符串,如required指令字符串。 | ||
| 2447 | - * @param tElem | ||
| 2448 | - * @param tAttrs | ||
| 2449 | - * @returns {{pre: Function, post: Function}} | ||
| 2450 | - */ | ||
| 2451 | - compile: function(tElem, tAttrs) { | ||
| 2452 | - // 获取所有属性 | ||
| 2453 | - var $name_attr = tAttrs["name"]; // 控件的名字 | ||
| 2454 | - var $required_attr = tAttrs["required"]; // 是否需要required验证 | ||
| 2455 | - var $fbgsname_attr = tAttrs["fbgsname"]; // 绑定的model翻班格式字段名 | ||
| 2456 | - | ||
| 2457 | - // controlAs名字 | ||
| 2458 | - var ctrlAs = '$saFbgsgroupCtrl'; | ||
| 2459 | - | ||
| 2460 | - // 如果有required属性,添加angularjs required验证 | ||
| 2461 | - if ($required_attr != undefined) { | ||
| 2462 | - //console.log(tElem.html()); | ||
| 2463 | - tElem.find("div").attr("required", ""); | ||
| 2464 | - } | ||
| 2465 | - | ||
| 2466 | - return { | ||
| 2467 | - pre: function(scope, element, attr) { | ||
| 2468 | - | ||
| 2469 | - }, | ||
| 2470 | - | ||
| 2471 | - /** | ||
| 2472 | - * 相当于link函数。 | ||
| 2473 | - * @param scope | ||
| 2474 | - * @param element | ||
| 2475 | - * @param attr | ||
| 2476 | - */ | ||
| 2477 | - post: function(scope, element, attr) { | ||
| 2478 | - // name属性 | ||
| 2479 | - if ($name_attr) { | ||
| 2480 | - scope[ctrlAs]["$name_attr"] = $name_attr; | ||
| 2481 | - } | ||
| 2482 | - | ||
| 2483 | - /** | ||
| 2484 | - * 路牌列表点击(路牌列表中选中路牌) | ||
| 2485 | - * @param fbcode | ||
| 2486 | - */ | ||
| 2487 | - scope[ctrlAs].$$internal_fb_click = function(fbcode) { | ||
| 2488 | - scope[ctrlAs].$$dataSelected.push(fbcode); | ||
| 2489 | - }; | ||
| 2490 | - | ||
| 2491 | - /** | ||
| 2492 | - * 选中的路牌双击(删除选中的路牌) | ||
| 2493 | - * @param $index | ||
| 2494 | - */ | ||
| 2495 | - scope[ctrlAs].$$internal_sellplist_dbclick = function($index) { | ||
| 2496 | - scope[ctrlAs].$$dataSelected.splice($index, 1); | ||
| 2497 | - }; | ||
| 2498 | - | ||
| 2499 | - /** | ||
| 2500 | - * 验证内部数据,更新外部model | ||
| 2501 | - */ | ||
| 2502 | - scope[ctrlAs].$$internal_validate_model = function() { | ||
| 2503 | - var data_temp = scope[ctrlAs].$$dataSelected; | ||
| 2504 | - | ||
| 2505 | - if (data_temp && | ||
| 2506 | - data_temp.length > 0) { | ||
| 2507 | - | ||
| 2508 | - // 更新内部model,用于外部验证 | ||
| 2509 | - // 内部model的值暂时随意,以后再改 | ||
| 2510 | - scope[ctrlAs].$$internalmodel = {desc: "ok"}; | ||
| 2511 | - | ||
| 2512 | - // 更新外部model字段 | ||
| 2513 | - if ($fbgsname_attr) { | ||
| 2514 | - console.log("$fbgsname=" + data_temp.join(',')); | ||
| 2515 | - eval("scope[ctrlAs].model" + "." + $fbgsname_attr + " = data_temp.join(',');"); | ||
| 2516 | - } | ||
| 2517 | - | ||
| 2518 | - } else { | ||
| 2519 | - scope[ctrlAs].$$internalmodel = undefined; | ||
| 2520 | - } | ||
| 2521 | - }; | ||
| 2522 | - | ||
| 2523 | - // 监控内部数据,$$data_selected 变化 | ||
| 2524 | - scope.$watch( | ||
| 2525 | - function() { | ||
| 2526 | - return scope[ctrlAs].$$dataSelected; | ||
| 2527 | - }, | ||
| 2528 | - function(newValue, oldValue) { | ||
| 2529 | - scope[ctrlAs].$$internal_validate_model(); | ||
| 2530 | - }, | ||
| 2531 | - true | ||
| 2532 | - ); | ||
| 2533 | - | ||
| 2534 | - // 监控路牌名称范围值的变化,处理初始化赋值 | ||
| 2535 | - attr.$observe("fbgsvalue", function(value) { | ||
| 2536 | - var data_temp = scope[ctrlAs].$$dataSelected; | ||
| 2537 | - | ||
| 2538 | - if (value && value != "" && data_temp && data_temp.length == 0) { | ||
| 2539 | - var data_temp = scope[ctrlAs].$$dataSelected; | ||
| 2540 | - var fbgses = []; | ||
| 2541 | - var i = 0; | ||
| 2542 | - | ||
| 2543 | - if (value.indexOf(",") >= 0) { | ||
| 2544 | - fbgses = value.split(","); | ||
| 2545 | - } else { | ||
| 2546 | - for (i = 0; i < value.length; i++) { | ||
| 2547 | - fbgses.push(value.substr(i, 1)); | ||
| 2548 | - } | ||
| 2549 | - } | ||
| 2550 | - | ||
| 2551 | - if (data_temp && data_temp.length == 0) { // 初始创建 | ||
| 2552 | - for (i = 0; i < fbgses.length; i++) { | ||
| 2553 | - if (fbgses[i] == "1" || fbgses[i] == "0") { | ||
| 2554 | - data_temp.push(fbgses[i]); | ||
| 2555 | - } | ||
| 2556 | - } | ||
| 2557 | - } | ||
| 2558 | - } | ||
| 2559 | - }); | ||
| 2560 | - } | ||
| 2561 | - }; | ||
| 2562 | - } | ||
| 2563 | - } | ||
| 2564 | - } | 2412 | +/** |
| 2413 | + * saFbgsgroup指令 | ||
| 2414 | + * 属性如下: | ||
| 2415 | + * name(必须):控件的名字 | ||
| 2416 | + * model(必须):指定一个外部object,独立作用域,如:model=ctrl.employeeInfoForSave | ||
| 2417 | + * fbgsvalue(必须):绑定的model翻班格式值,如:fbgsvalue={{ctrl.employeeInfoForSave.fbgs}} | ||
| 2418 | + * fbgsname(必须):绑定的model翻班格式字段名,如:fbgsname=fbgs | ||
| 2419 | + * | ||
| 2420 | + * required(可选):是否要用required验证 | ||
| 2421 | + * | ||
| 2422 | + */ | ||
| 2423 | +angular.module('ScheduleApp').directive( | ||
| 2424 | + 'saFbgsgroup', | ||
| 2425 | + [ | ||
| 2426 | + function() { | ||
| 2427 | + return { | ||
| 2428 | + restrict: 'E', | ||
| 2429 | + templateUrl: '/pages/scheduleApp/module/common/dts2/fbgsGroup/saFbgsgroupTemplate.html', | ||
| 2430 | + scope: { | ||
| 2431 | + model: "=" // 独立作用域,关联外部的模型object | ||
| 2432 | + }, | ||
| 2433 | + controllerAs: '$saFbgsgroupCtrl', | ||
| 2434 | + bindToController: true, | ||
| 2435 | + controller: function() { | ||
| 2436 | + var self = this; | ||
| 2437 | + | ||
| 2438 | + self.$$dataSelected = []; // 选中的路牌列表 | ||
| 2439 | + | ||
| 2440 | + // saFbgsgroup组件的ng-model,用于外部绑定等操作 | ||
| 2441 | + self.$$internalmodel = undefined; | ||
| 2442 | + }, | ||
| 2443 | + | ||
| 2444 | + /** | ||
| 2445 | + * 此阶段可以改dom结构,此时angular还没扫描指令, | ||
| 2446 | + * 这里就可以动态添加其他angularjs的指令字符串,如required指令字符串。 | ||
| 2447 | + * @param tElem | ||
| 2448 | + * @param tAttrs | ||
| 2449 | + * @returns {{pre: Function, post: Function}} | ||
| 2450 | + */ | ||
| 2451 | + compile: function(tElem, tAttrs) { | ||
| 2452 | + // 获取所有属性 | ||
| 2453 | + var $name_attr = tAttrs["name"]; // 控件的名字 | ||
| 2454 | + var $required_attr = tAttrs["required"]; // 是否需要required验证 | ||
| 2455 | + var $fbgsname_attr = tAttrs["fbgsname"]; // 绑定的model翻班格式字段名 | ||
| 2456 | + | ||
| 2457 | + // controlAs名字 | ||
| 2458 | + var ctrlAs = '$saFbgsgroupCtrl'; | ||
| 2459 | + | ||
| 2460 | + // 如果有required属性,添加angularjs required验证 | ||
| 2461 | + if ($required_attr != undefined) { | ||
| 2462 | + //console.log(tElem.html()); | ||
| 2463 | + tElem.find("div").attr("required", ""); | ||
| 2464 | + } | ||
| 2465 | + | ||
| 2466 | + return { | ||
| 2467 | + pre: function(scope, element, attr) { | ||
| 2468 | + | ||
| 2469 | + }, | ||
| 2470 | + | ||
| 2471 | + /** | ||
| 2472 | + * 相当于link函数。 | ||
| 2473 | + * @param scope | ||
| 2474 | + * @param element | ||
| 2475 | + * @param attr | ||
| 2476 | + */ | ||
| 2477 | + post: function(scope, element, attr) { | ||
| 2478 | + // name属性 | ||
| 2479 | + if ($name_attr) { | ||
| 2480 | + scope[ctrlAs]["$name_attr"] = $name_attr; | ||
| 2481 | + } | ||
| 2482 | + | ||
| 2483 | + /** | ||
| 2484 | + * 路牌列表点击(路牌列表中选中路牌) | ||
| 2485 | + * @param fbcode | ||
| 2486 | + */ | ||
| 2487 | + scope[ctrlAs].$$internal_fb_click = function(fbcode) { | ||
| 2488 | + scope[ctrlAs].$$dataSelected.push(fbcode); | ||
| 2489 | + }; | ||
| 2490 | + | ||
| 2491 | + /** | ||
| 2492 | + * 选中的路牌双击(删除选中的路牌) | ||
| 2493 | + * @param $index | ||
| 2494 | + */ | ||
| 2495 | + scope[ctrlAs].$$internal_sellplist_dbclick = function($index) { | ||
| 2496 | + scope[ctrlAs].$$dataSelected.splice($index, 1); | ||
| 2497 | + }; | ||
| 2498 | + | ||
| 2499 | + /** | ||
| 2500 | + * 验证内部数据,更新外部model | ||
| 2501 | + */ | ||
| 2502 | + scope[ctrlAs].$$internal_validate_model = function() { | ||
| 2503 | + var data_temp = scope[ctrlAs].$$dataSelected; | ||
| 2504 | + | ||
| 2505 | + if (data_temp && | ||
| 2506 | + data_temp.length > 0) { | ||
| 2507 | + | ||
| 2508 | + // 更新内部model,用于外部验证 | ||
| 2509 | + // 内部model的值暂时随意,以后再改 | ||
| 2510 | + scope[ctrlAs].$$internalmodel = {desc: "ok"}; | ||
| 2511 | + | ||
| 2512 | + // 更新外部model字段 | ||
| 2513 | + if ($fbgsname_attr) { | ||
| 2514 | + console.log("$fbgsname=" + data_temp.join(',')); | ||
| 2515 | + eval("scope[ctrlAs].model" + "." + $fbgsname_attr + " = data_temp.join(',');"); | ||
| 2516 | + } | ||
| 2517 | + | ||
| 2518 | + } else { | ||
| 2519 | + scope[ctrlAs].$$internalmodel = undefined; | ||
| 2520 | + } | ||
| 2521 | + }; | ||
| 2522 | + | ||
| 2523 | + // 监控内部数据,$$data_selected 变化 | ||
| 2524 | + scope.$watch( | ||
| 2525 | + function() { | ||
| 2526 | + return scope[ctrlAs].$$dataSelected; | ||
| 2527 | + }, | ||
| 2528 | + function(newValue, oldValue) { | ||
| 2529 | + scope[ctrlAs].$$internal_validate_model(); | ||
| 2530 | + }, | ||
| 2531 | + true | ||
| 2532 | + ); | ||
| 2533 | + | ||
| 2534 | + // 监控路牌名称范围值的变化,处理初始化赋值 | ||
| 2535 | + attr.$observe("fbgsvalue", function(value) { | ||
| 2536 | + var data_temp = scope[ctrlAs].$$dataSelected; | ||
| 2537 | + | ||
| 2538 | + if (value && value != "" && data_temp && data_temp.length == 0) { // 初始创建 | ||
| 2539 | + var data_temp = scope[ctrlAs].$$dataSelected; | ||
| 2540 | + var fbgses = []; | ||
| 2541 | + var i = 0; | ||
| 2542 | + | ||
| 2543 | + // 分隔翻班格式 | ||
| 2544 | + if (value.indexOf(",") >= 0) { // 以逗号分隔,如 1,1,0,1 | ||
| 2545 | + fbgses = value.split(","); | ||
| 2546 | + } else { | ||
| 2547 | + for (i = 0; i < value.length; i++) { // 字符串形式,如 1101 | ||
| 2548 | + fbgses.push(value.substr(i, 1)); | ||
| 2549 | + } | ||
| 2550 | + } | ||
| 2551 | + | ||
| 2552 | + for (i = 0; i < fbgses.length; i++) { | ||
| 2553 | + if (fbgses[i] == "1" || fbgses[i] == "0") { | ||
| 2554 | + data_temp.push(fbgses[i]); | ||
| 2555 | + } | ||
| 2556 | + } | ||
| 2557 | + } | ||
| 2558 | + }); | ||
| 2559 | + } | ||
| 2560 | + }; | ||
| 2561 | + } | ||
| 2562 | + } | ||
| 2563 | + } | ||
| 2565 | ]); | 2564 | ]); |
| 2566 | 2565 | ||
| 2567 | 2566 |
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice-legacy.js
| @@ -97,6 +97,25 @@ angular.module('ScheduleApp').factory('FileDownload_g', function() { | @@ -97,6 +97,25 @@ angular.module('ScheduleApp').factory('FileDownload_g', function() { | ||
| 97 | // saSelect2指令使用的内部信service | 97 | // saSelect2指令使用的内部信service |
| 98 | angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', function($resource) { | 98 | angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', function($resource) { |
| 99 | return { | 99 | return { |
| 100 | + rs_version_list: $resource( | ||
| 101 | + '/tic_ec/stationroute/:lineid', | ||
| 102 | + {}, | ||
| 103 | + { | ||
| 104 | + list: { | ||
| 105 | + method: 'GET', | ||
| 106 | + isArray: true, | ||
| 107 | + transformResponse: function(rs) { | ||
| 108 | + var dst = angular.fromJson(rs); | ||
| 109 | + if (dst.status == 'SUCCESS') { | ||
| 110 | + return dst.data; | ||
| 111 | + } else { | ||
| 112 | + return dst; // 业务错误留给控制器处理 | ||
| 113 | + } | ||
| 114 | + } | ||
| 115 | + } | ||
| 116 | + } | ||
| 117 | + ), | ||
| 118 | + | ||
| 100 | zd_tcc: $resource( | 119 | zd_tcc: $resource( |
| 101 | '/tidc/zd_tcc', | 120 | '/tidc/zd_tcc', |
| 102 | {}, | 121 | {}, |
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
| 1 | -//所有模块service配置 | 1 | +//所有模块service配置 |
| 2 | // 车辆信息service | 2 | // 车辆信息service |
| 3 | angular.module('ScheduleApp').factory( | 3 | angular.module('ScheduleApp').factory( |
| 4 | 'BusInfoManageService_g', | 4 | 'BusInfoManageService_g', |
| @@ -79,7 +79,7 @@ angular.module('ScheduleApp').factory( | @@ -79,7 +79,7 @@ angular.module('ScheduleApp').factory( | ||
| 79 | 79 | ||
| 80 | } | 80 | } |
| 81 | ] | 81 | ] |
| 82 | -); | 82 | +); |
| 83 | // 车辆设备信息service | 83 | // 车辆设备信息service |
| 84 | angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) { | 84 | angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) { |
| 85 | return $resource( | 85 | return $resource( |
| @@ -119,7 +119,7 @@ angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', | @@ -119,7 +119,7 @@ angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', | ||
| 119 | } | 119 | } |
| 120 | } | 120 | } |
| 121 | ); | 121 | ); |
| 122 | -}]); | 122 | +}]); |
| 123 | // 人员信息service | 123 | // 人员信息service |
| 124 | angular.module('ScheduleApp').factory( | 124 | angular.module('ScheduleApp').factory( |
| 125 | 'EmployeeInfoManageService_g', | 125 | 'EmployeeInfoManageService_g', |
| @@ -183,7 +183,7 @@ angular.module('ScheduleApp').factory( | @@ -183,7 +183,7 @@ angular.module('ScheduleApp').factory( | ||
| 183 | } | 183 | } |
| 184 | ] | 184 | ] |
| 185 | ); | 185 | ); |
| 186 | - | 186 | + |
| 187 | // 车辆配置service | 187 | // 车辆配置service |
| 188 | angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserPrincipal', function($resource, UserPrincipal) { | 188 | angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserPrincipal', function($resource, UserPrincipal) { |
| 189 | return { | 189 | return { |
| @@ -238,7 +238,7 @@ angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserP | @@ -238,7 +238,7 @@ angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserP | ||
| 238 | } | 238 | } |
| 239 | ) | 239 | ) |
| 240 | }; | 240 | }; |
| 241 | -}]); | 241 | +}]); |
| 242 | // 线路运营统计service | 242 | // 线路运营统计service |
| 243 | angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) { | 243 | angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) { |
| 244 | return $resource( | 244 | return $resource( |
| @@ -254,7 +254,7 @@ angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', | @@ -254,7 +254,7 @@ angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', | ||
| 254 | } | 254 | } |
| 255 | ); | 255 | ); |
| 256 | }]); | 256 | }]); |
| 257 | - | 257 | + |
| 258 | // 人员配置service | 258 | // 人员配置service |
| 259 | angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) { | 259 | angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) { |
| 260 | return { | 260 | return { |
| @@ -338,7 +338,7 @@ angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', f | @@ -338,7 +338,7 @@ angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', f | ||
| 338 | } | 338 | } |
| 339 | ) | 339 | ) |
| 340 | }; | 340 | }; |
| 341 | -}]); | 341 | +}]); |
| 342 | // 路牌管理service | 342 | // 路牌管理service |
| 343 | angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) { | 343 | angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) { |
| 344 | return { | 344 | return { |
| @@ -411,7 +411,7 @@ angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', | @@ -411,7 +411,7 @@ angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', | ||
| 411 | } | 411 | } |
| 412 | ) | 412 | ) |
| 413 | }; | 413 | }; |
| 414 | -}]); | 414 | +}]); |
| 415 | // 套跑管理service | 415 | // 套跑管理service |
| 416 | angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', function($resource) { | 416 | angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', function($resource) { |
| 417 | return { | 417 | return { |
| @@ -453,7 +453,7 @@ angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', func | @@ -453,7 +453,7 @@ angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', func | ||
| 453 | } | 453 | } |
| 454 | ) | 454 | ) |
| 455 | }; | 455 | }; |
| 456 | -}]); | 456 | +}]); |
| 457 | // 排班计划管理service | 457 | // 排班计划管理service |
| 458 | angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) { | 458 | angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) { |
| 459 | return { | 459 | return { |
| @@ -612,13 +612,13 @@ angular.module('ScheduleApp').factory('SchedulePlanInfoManageService_g', ['$reso | @@ -612,13 +612,13 @@ angular.module('ScheduleApp').factory('SchedulePlanInfoManageService_g', ['$reso | ||
| 612 | 612 | ||
| 613 | 613 | ||
| 614 | }; | 614 | }; |
| 615 | -}]); | 615 | +}]); |
| 616 | // 排班管理service | 616 | // 排班管理service |
| 617 | angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource', function($resource) { | 617 | angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource', function($resource) { |
| 618 | return { | 618 | return { |
| 619 | rest: $resource( | 619 | rest: $resource( |
| 620 | '/sr1fc/:id', | 620 | '/sr1fc/:id', |
| 621 | - {order: 'xl.id,fbtype,updateDate,carConfigInfo.cl.insideCode', direction: 'ASC,DESC,DESC,ASC', id: '@id'}, | 621 | + {order: 'xl.id,updateDate,carConfigInfo.cl.insideCode', direction: 'ASC,DESC,ASC', id: '@id'}, |
| 622 | { | 622 | { |
| 623 | list: { | 623 | list: { |
| 624 | method: 'GET', | 624 | method: 'GET', |
| @@ -671,7 +671,7 @@ angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource | @@ -671,7 +671,7 @@ angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource | ||
| 671 | ) | 671 | ) |
| 672 | }; | 672 | }; |
| 673 | }]); | 673 | }]); |
| 674 | - | 674 | + |
| 675 | // 时刻表管理service | 675 | // 时刻表管理service |
| 676 | angular.module('ScheduleApp').factory( | 676 | angular.module('ScheduleApp').factory( |
| 677 | 'TTInfoManageService_g', | 677 | 'TTInfoManageService_g', |
| @@ -838,7 +838,7 @@ angular.module('ScheduleApp').factory( | @@ -838,7 +838,7 @@ angular.module('ScheduleApp').factory( | ||
| 838 | } | 838 | } |
| 839 | 839 | ||
| 840 | ] | 840 | ] |
| 841 | -); | 841 | +); |
| 842 | // 项目通用的全局service服务,供不同的controller使用,自定义指令不使用 | 842 | // 项目通用的全局service服务,供不同的controller使用,自定义指令不使用 |
| 843 | 843 | ||
| 844 | // 文件下载服务 | 844 | // 文件下载服务 |
| @@ -938,6 +938,25 @@ angular.module('ScheduleApp').factory('FileDownload_g', function() { | @@ -938,6 +938,25 @@ angular.module('ScheduleApp').factory('FileDownload_g', function() { | ||
| 938 | // saSelect2指令使用的内部信service | 938 | // saSelect2指令使用的内部信service |
| 939 | angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', function($resource) { | 939 | angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', function($resource) { |
| 940 | return { | 940 | return { |
| 941 | + rs_version_list: $resource( | ||
| 942 | + '/tic_ec/stationroute/:lineid', | ||
| 943 | + {}, | ||
| 944 | + { | ||
| 945 | + list: { | ||
| 946 | + method: 'GET', | ||
| 947 | + isArray: true, | ||
| 948 | + transformResponse: function(rs) { | ||
| 949 | + var dst = angular.fromJson(rs); | ||
| 950 | + if (dst.status == 'SUCCESS') { | ||
| 951 | + return dst.data; | ||
| 952 | + } else { | ||
| 953 | + return dst; // 业务错误留给控制器处理 | ||
| 954 | + } | ||
| 955 | + } | ||
| 956 | + } | ||
| 957 | + } | ||
| 958 | + ), | ||
| 959 | + | ||
| 941 | zd_tcc: $resource( | 960 | zd_tcc: $resource( |
| 942 | '/tidc/zd_tcc', | 961 | '/tidc/zd_tcc', |
| 943 | {}, | 962 | {}, |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/form.html
| @@ -103,8 +103,51 @@ | @@ -103,8 +103,51 @@ | ||
| 103 | <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm"> | 103 | <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm"> |
| 104 | <div class="form-body"> | 104 | <div class="form-body"> |
| 105 | <div class="form-group has-success has-feedback"> | 105 | <div class="form-group has-success has-feedback"> |
| 106 | + <label class="col-md-2 control-label">站点路由版本类型*:</label> | ||
| 107 | + <div class="col-md-4"> | ||
| 108 | + <sa-Select5 name="zdlytype" | ||
| 109 | + model="ctrl.ttInfoDetailManageForForm" | ||
| 110 | + cmaps="{'zdlytype': 'value'}" | ||
| 111 | + dcname="zdlytype" | ||
| 112 | + icname="value" | ||
| 113 | + dsparams="{{ {type: 'local', param: 'zdlytype' } | json }}" | ||
| 114 | + iterobjname="item" | ||
| 115 | + iterobjexp="item.name" | ||
| 116 | + searchph="站点路由类型..." | ||
| 117 | + searchexp="this.name" | ||
| 118 | + required > | ||
| 119 | + </sa-Select5> | ||
| 120 | + </div> | ||
| 121 | + <!-- 隐藏快,显示验证信息 --> | ||
| 122 | + <div class="alert alert-danger well-sm" ng-show="myForm.zdlytype.$error.required"> | ||
| 123 | + 请选择站点路由版本类型 | ||
| 124 | + </div> | ||
| 125 | + </div> | ||
| 126 | + | ||
| 127 | + <div class="form-group has-success has-feedback" ng-if="ctrl.ttInfoDetailManageForForm.zdlytype == 2"> | ||
| 128 | + <label class="col-md-2 control-label">最近版本列表*:</label> | ||
| 129 | + <div class="col-md-4"> | ||
| 130 | + <sa-Select5 name="zdlyversion" | ||
| 131 | + model="ctrl.ttInfoDetailManageForForm" | ||
| 132 | + cmaps="{'zdlyversion' : 'version'}" | ||
| 133 | + dcname="zdlyversion" | ||
| 134 | + icname="version" | ||
| 135 | + dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.ttInfoDetailManageForForm.xlid}, atype:'rs_version_list' } | json }}" | ||
| 136 | + iterobjname="item" | ||
| 137 | + iterobjexp="item.desc" | ||
| 138 | + searchph="请输拼音..." | ||
| 139 | + searchexp="this.desc" | ||
| 140 | + required > | ||
| 141 | + </sa-Select5> | ||
| 142 | + </div> | ||
| 143 | + <div class="alert alert-danger well-sm" ng-show="myForm.zdlyversion.$error.required"> | ||
| 144 | + 必须选择版本列表 | ||
| 145 | + </div> | ||
| 146 | + </div> | ||
| 147 | + | ||
| 148 | + <div class="form-group has-success has-feedback"> | ||
| 106 | <label class="col-md-2 control-label">excel工作区*:</label> | 149 | <label class="col-md-2 control-label">excel工作区*:</label> |
| 107 | - <div class="col-md-3"> | 150 | + <div class="col-md-4"> |
| 108 | <sa-Select5 name="sheetname" | 151 | <sa-Select5 name="sheetname" |
| 109 | model="ctrl.ttInfoDetailManageForForm" | 152 | model="ctrl.ttInfoDetailManageForForm" |
| 110 | cmaps="{'sheetname' : 'name'}" | 153 | cmaps="{'sheetname' : 'name'}" |
| @@ -124,7 +167,9 @@ | @@ -124,7 +167,9 @@ | ||
| 124 | 'filename': ctrl.ttInfoDetailManageForForm.filename, | 167 | 'filename': ctrl.ttInfoDetailManageForForm.filename, |
| 125 | 'sheetname': ctrl.ttInfoDetailManageForForm.sheetname, | 168 | 'sheetname': ctrl.ttInfoDetailManageForForm.sheetname, |
| 126 | 'lineid' : ctrl.ttInfoDetailManageForForm.xlid, | 169 | 'lineid' : ctrl.ttInfoDetailManageForForm.xlid, |
| 127 | - 'linename' : ctrl.ttInfoDetailManageForForm.xlname | 170 | + 'linename' : ctrl.ttInfoDetailManageForForm.xlname, |
| 171 | + 'zdlytype': ctrl.ttInfoDetailManageForForm.zdlytype, | ||
| 172 | + 'zdlyversion' : ctrl.ttInfoDetailManageForForm.zdlyversion | ||
| 128 | } | json}}"/> | 173 | } | json}}"/> |
| 129 | </div> | 174 | </div> |
| 130 | <!-- 隐藏块,显示验证信息 --> | 175 | <!-- 隐藏块,显示验证信息 --> |
| @@ -138,7 +183,7 @@ | @@ -138,7 +183,7 @@ | ||
| 138 | 183 | ||
| 139 | <div class="form-group has-success has-feedback"> | 184 | <div class="form-group has-success has-feedback"> |
| 140 | <label class="col-md-2 control-label">线路标准*:</label> | 185 | <label class="col-md-2 control-label">线路标准*:</label> |
| 141 | - <div class="col-md-3"> | 186 | + <div class="col-md-4"> |
| 142 | <sa-Select5 name="lineinfo" | 187 | <sa-Select5 name="lineinfo" |
| 143 | model="ctrl.ttInfoDetailManageForForm" | 188 | model="ctrl.ttInfoDetailManageForForm" |
| 144 | cmaps="{'lineinfo' : 'id'}" | 189 | cmaps="{'lineinfo' : 'id'}" |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/module.js
| @@ -42,6 +42,8 @@ angular.module('ScheduleApp').controller( | @@ -42,6 +42,8 @@ angular.module('ScheduleApp').controller( | ||
| 42 | 42 | ||
| 43 | // 欲保存的表单信息,双向绑定 | 43 | // 欲保存的表单信息,双向绑定 |
| 44 | self.ttInfoDetailManageForForm = { | 44 | self.ttInfoDetailManageForForm = { |
| 45 | + zdlytype: 1, // 站点路由类型 | ||
| 46 | + zdlyversion: -1, // 站点路由版本 | ||
| 45 | xlid: xlid, // 线路id | 47 | xlid: xlid, // 线路id |
| 46 | ttid: ttid, // 时刻表id | 48 | ttid: ttid, // 时刻表id |
| 47 | xlname: xlname, // 线路名称 | 49 | xlname: xlname, // 线路名称 |
src/main/resources/static/pages/summary/destory_sch_detail/list.html
| @@ -246,7 +246,7 @@ | @@ -246,7 +246,7 @@ | ||
| 246 | //开始结束时间 | 246 | //开始结束时间 |
| 247 | data.rq_ge = data.rq.substr(0, 10); | 247 | data.rq_ge = data.rq.substr(0, 10); |
| 248 | data.rq_le = data.rq.substr(13); | 248 | data.rq_le = data.rq.substr(13); |
| 249 | - data.order='t'; | 249 | + //data.order='t'; |
| 250 | delete data.rq; | 250 | delete data.rq; |
| 251 | 251 | ||
| 252 | $.get('/summary/destroy_detail/all', data, function (rs) { | 252 | $.get('/summary/destroy_detail/all', data, function (rs) { |
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/editor.html
| @@ -89,7 +89,7 @@ | @@ -89,7 +89,7 @@ | ||
| 89 | <label class="uk-form-label" >售票员</label> | 89 | <label class="uk-form-label" >售票员</label> |
| 90 | <div class="uk-form-controls"> | 90 | <div class="uk-form-controls"> |
| 91 | <div class="uk-autocomplete uk-form spy-autocom"> | 91 | <div class="uk-autocomplete uk-form spy-autocom"> |
| 92 | - <input type="text" value="{{sch.sGh}}/{{sch.sName}}" name="spy"> | 92 | + <input type="text" name="spy" value="{{sch.sGh}}/{{sch.sName}}" name="spy"> |
| 93 | </div> | 93 | </div> |
| 94 | </div> | 94 | </div> |
| 95 | </div> | 95 | </div> |
| @@ -268,7 +268,7 @@ | @@ -268,7 +268,7 @@ | ||
| 268 | data.jName = data.jsy.split('/')[1]; | 268 | data.jName = data.jsy.split('/')[1]; |
| 269 | delete data.jsy; | 269 | delete data.jsy; |
| 270 | //拆分售票员工号和姓名 | 270 | //拆分售票员工号和姓名 |
| 271 | - if(data.sGh != null){ | 271 | + if(data.spy != null){ |
| 272 | data.sGh = data.spy.split('/')[0]; | 272 | data.sGh = data.spy.split('/')[0]; |
| 273 | data.sName = data.spy.split('/')[1]; | 273 | data.sName = data.spy.split('/')[1]; |
| 274 | delete data.spy; | 274 | delete data.spy; |
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
| @@ -116,6 +116,12 @@ | @@ -116,6 +116,12 @@ | ||
| 116 | "text": "换人换车情况统计表", | 116 | "text": "换人换车情况统计表", |
| 117 | "event": "form_changetochange", | 117 | "event": "form_changetochange", |
| 118 | "icon": "uk-icon-table" | 118 | "icon": "uk-icon-table" |
| 119 | + }, | ||
| 120 | + { | ||
| 121 | + "id": 2.6, | ||
| 122 | + "text": "班次车辆人员日统计", | ||
| 123 | + "event": "form_shifday", | ||
| 124 | + "icon": "uk-icon-table" | ||
| 119 | } | 125 | } |
| 120 | ] | 126 | ] |
| 121 | }, | 127 | }, |
src/main/resources/static/real_control_v2/js/main.js
| @@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(), | @@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(), | ||
| 47 | $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html'); | 47 | $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html'); |
| 48 | }, 1000); | 48 | }, 1000); |
| 49 | //弹出更新说明 | 49 | //弹出更新说明 |
| 50 | - //showUpdateDescription(); | 50 | + showUpdateDescription(); |
| 51 | }); | 51 | }); |
| 52 | 52 | ||
| 53 | function g_emit(id) { | 53 | function g_emit(id) { |
| @@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) { | @@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) { | ||
| 168 | function showUpdateDescription() { | 168 | function showUpdateDescription() { |
| 169 | //更新说明 | 169 | //更新说明 |
| 170 | var updateDescription = { | 170 | var updateDescription = { |
| 171 | - date: '2017-11-08', | ||
| 172 | - text: '<h5>1、现在点击驾驶员请求信使,也可以定位到班次。</h5><h5>2、修复进场班次不会自动误点待发调整的问题。</h5><h5>3、“指令下发记录” 和 “设备上报记录” 加入线路筛选。</h5><h5>4、尝试修复“自动执行的班车线路”和营运线路套跑时,线路切换指令会延迟触发的问题。</h5>' | 171 | + date: '2017-11-24', |
| 172 | + text: '<h5>1、修复23号下午更新后出现的部分线路班次执行问题。</h5><h5>2、尝试接入成山路停车场的RFID信号,以弥补成山路停车场高峰时GPS信号弱的问题。</h5><h5>3、报表管理里加入 “班次车辆人员日统计”</h5><h5>4、现在“历史班次调整”里可以修改烂班原因和售票员</h5>' | ||
| 173 | }; | 173 | }; |
| 174 | 174 | ||
| 175 | var storage = window.localStorage | 175 | var storage = window.localStorage |
src/main/resources/static/real_control_v2/js/north/toolbar.js
| @@ -226,6 +226,9 @@ var gb_northToolbar = (function () { | @@ -226,6 +226,9 @@ var gb_northToolbar = (function () { | ||
| 226 | }, | 226 | }, |
| 227 | sch_edit_info: function () { | 227 | sch_edit_info: function () { |
| 228 | open_modal('/real_control_v2/fragments/north/nav/sch_edit_info/list.html', {}, modal_opts); | 228 | open_modal('/real_control_v2/fragments/north/nav/sch_edit_info/list.html', {}, modal_opts); |
| 229 | + }, | ||
| 230 | + form_shifday: function () { | ||
| 231 | + gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/shifdays/shifday.html', '班次车辆人员日统计'); | ||
| 229 | } | 232 | } |
| 230 | }; | 233 | }; |
| 231 | 234 |