Merge branch 'pudong_jdk8' of http://192.168.168.201:8888/panzhaov5/bsth_control into pudong_jdk8

娄高锋
2 parents 2c557fa4 bb3e8925
Showing 10 changed files with 2262 additions and 2147 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/entity/Personnel.java
src/main/java/com/bsth/entity/schedule/BEntity.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/application-test.properties
src/main/resources/datatools/ktrs/scheduleRuleDataInput.ktr
-package com.bsth.controller.realcontrol;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.*;
-
-import com.bsth.data.forecast.entity.ArrivalEntity;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.util.ReportUtils;
-import com.bsth.util.db.DBUtils_MS;
-import com.bsth.util.db.DBUtils_control;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import com.alibaba.fastjson.JSONArray;
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController;
-import com.bsth.controller.realcontrol.dto.ChangePersonCar;
-import com.bsth.controller.realcontrol.dto.DfsjChange;
-import com.bsth.data.BasicData;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.report.RepairReport;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.service.realcontrol.ScheduleRealInfoService;
-
-@RestController
-@RequestMapping("/realSchedule")
-public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
-
-	@Autowired
-	ScheduleRealInfoService scheduleRealInfoService;
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-
-	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
-	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
-		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
-	}
-
-	@RequestMapping(value = "/lines")
-	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
-		return scheduleRealInfoService.findByLines(lines);
-	}
-
-	@RequestMapping(value = "/car")
-	public List<ScheduleRealInfo> findByCar(String nbbm){
-		return dayOfSchedule.findByNbbm(nbbm);
-	}
-
-	/**
-	 *
-	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
-	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
-	 */
-	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
-	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-										   @RequestParam String dfsj,String bcType,
-										   @RequestParam(defaultValue = "") String opType) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
-	}
-
-	/**
-	 *
-	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔 
-	 */
-	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
-	public Map<String, Object> destroy(@RequestParam String idsStr
-			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
-									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
-		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
-	}
-
-	/**
-	 *
-	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
-	 */
-	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
-	public Map<String, String> carDeviceMapp() {
-		return BasicData.deviceId2NbbmMap.inverse();
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/driver", method = RequestMethod.GET)
-	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findDriverByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
-	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findConductorByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/cars", method = RequestMethod.GET)
-	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findCarByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
-	 */
-	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
-	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
-		return scheduleRealInfoService.sreachVehic(nbbm);
-	}
-	/**
-	 *
-	 * @Title: realOutAdjust
-	 * @Description: TODO(实发调整)
-	 * @param @param id 班次ID
-	 * @param @param fcsjActual 实际发车时间 HH:mm
-	 * @param @param remarks 备注
-	 * @throws
-	 */
-	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
-	public Map<String, Object> realOutAdjust(@RequestParam Map<String, String> map) {
-		return scheduleRealInfoService.realOutAdjust(map);
-	}
-
-	/**
-	 *
-	 * @Title: revokeDestroy
-	 * @Description: TODO(撤销烂班)
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value = "/revokeDestroy", method = RequestMethod.POST)
-	public Map<String, Object> revokeDestroy(@RequestParam Long id){
-		return scheduleRealInfoService.revokeDestroy(id);
-	}
-
-	/**
-	 *
-	 * @Title: revokeRealOutgo
-	 * @Description: TODO(撤销实发)
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value = "/revokeRealOutgo", method = RequestMethod.POST)
-	public Map<String, Object> revokeRealOutgo(@RequestParam Long id){
-		return scheduleRealInfoService.revokeRealOutgo(id);
-	}
-
-	/**
-	 * 撤销执行
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
-	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
-		return scheduleRealInfoService.revokeRealArrive(id);
-	}
-
-	/**
-	 *
-	 * @Title: spaceAdjust
-	 * @Description: TODO(间隔调整)
-	 * @param @param ids 要调整的班次数组ID
-	 * @param @param space 间隔
-	 * @throws
-	 */
-	@RequestMapping(value = "/spaceAdjust", method = RequestMethod.POST)
-	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
-		return scheduleRealInfoService.spaceAdjust(ids, space);
-	}
-
-	/**
-	 *
-	 * @Title: schInfoFineTune
-	 * @Description: TODO(发车信息微调)
-	 * @param @param map
-	 * @throws
-	 */
-	@RequestMapping(value = "/schInfoFineTune", method = RequestMethod.POST)
-	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
-		return scheduleRealInfoService.schInfoFineTune(map);
-	}
-
-	/**
-	 *
-	 * @Title: outgoAdjustAll
-	 * @Description: TODO(批量待发调整)
-	 * @param @param list
-	 * @throws
-	 */
-	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
-	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
-		//反转义
-		params = StringEscapeUtils.unescapeHtml4(params);
-		return scheduleRealInfoService.outgoAdjustAll(params);
-	}
-
-	/**
-	 *
-	 * @Title: findByLineAndUpDown
-	 * @Description: TODO(根据线路和走向获取班次)
-	 * @param @param line
-	 * @param @param upDown
-	 */
-	@RequestMapping(value = "/findByLineAndUpDown")
-	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
-		return dayOfSchedule.findByLineAndUpDown(line, upDown);
-	}
-
-	/**
-	 *
-	 * @Title: findRouteByLine
-	 * @Description: TODO(获取线路的站点，路段路由)
-	 * @param @param lineCode
-	 * @throws
-	 */
-	@RequestMapping(value = "/findRouteByLine")
-	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
-		return scheduleRealInfoService.findRouteByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: removeChildTask
-	 * @Description: TODO(删除子任务)
-	 * @param @param taskId 子任务ID
-	 * @throws
-	 */
-	@RequestMapping(value = "/childTask/{taskId}", method = RequestMethod.DELETE)
-	public Map<String, Object> removeChildTask(@PathVariable("taskId") Long taskId){
-		return scheduleRealInfoService.removeChildTask(taskId);
-	}
-
-	/**
-	 *
-	 * @Title: findByLineCode
-	 * @Description: TODO(根据线路获取班次信息)
-	 * @param @param lineCode
-	 */
-	@RequestMapping(value = "/lineCode/{lineCode}")
-	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
-		return dayOfSchedule.findByLineCode(lineCode);
-	}
-
-	@RequestMapping(value = "/queryUserInfo")
-	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
-												@RequestParam String date,@RequestParam String state) {
-		return scheduleRealInfoService.queryUserInfo(line, date,state);
-	}
-
-	@RequestMapping(value = "/queryUserInfoPx")
-	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
-												  @RequestParam String date,@RequestParam String state,@RequestParam String type) {
-		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
-	}
-
-	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName,@RequestParam String jGh, @RequestParam String clZbh,
-												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
-		return scheduleRealInfoService.exportWaybill(jName,jGh, clZbh, lpName,date,line);
-	}
-
-	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
-			,@RequestParam String date,@RequestParam String line) {
-		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
-	}
-
-
-	@RequestMapping(value = "/dailyInfo")
-	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
-		return scheduleRealInfoService.dailyInfo(line, date, type);
-	}
-
-	@RequestMapping(value = "/historyMessage")
-	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
-										 @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.historyMessage(line, date, code, type);
-	}
-
-	@RequestMapping(value="/findLine")
-	public List<Map<String,String>> findLine(@RequestParam String line){
-		return scheduleRealInfoService.findLine(line);
-	}
-
-	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
-	public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
-	}
-
-	/**
-	 * 路单公里统计 （闵行审计专用）
-	 * @param jGh
-	 * @param clZbh
-	 * @param lpName
-	 * @param date
-	 * @param line
-	 * @return
-	 */
-	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
-	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
-	}
-
-	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
-	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
-	}
-
-	@RequestMapping(value="/findLpName")
-	public List<Map<String,String>> findLpName(@RequestParam String lpName){
-		return scheduleRealInfoService.findLpName(lpName);
-	}
-
-	@RequestMapping(value = "/account")
-	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
-											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
-		return scheduleRealInfoService.account(line, date, code, xlName, type);
-	}
-	
-	@RequestMapping(value = "/accountPx")
-	public List<Map<String,Object>> accountPx(@RequestParam String line, @RequestParam String date,
-											@RequestParam String code,@RequestParam String xlName, @RequestParam String px) {
-		return scheduleRealInfoService.accountPx(line, date, code, xlName, px);
-	}
-
-	@RequestMapping(value = "/correctForm")
-	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
-											@RequestParam String endDate,
-											 @RequestParam String lpName, @RequestParam String code, 
-											 @RequestParam String type,@RequestParam String changType) {
-		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type,changType);
-	}
-	/**
-	 * @Title queryListWaybill
-	 * @Description 查询行车路单列表
-	 * @param jGh 驾驶员名字
-	 * @param clZbh 车辆自编号（内部编号）
-	 * @param lpName 路牌
-	 * @return
-	 */
-	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybill(jGh, clZbh,lpName,date,line);
-	}
-
-	/**
-	 * @Title queryListWaybill
-	 * @Description 查询行车路单列表（闵行审计专用路单）
-	 * @param jName 驾驶员名字
-	 * @param clZbh 车辆自编号（内部编号）
-	 * @param lpName 路牌
-	 * @return
-	 */
-	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
-	}
-
-	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
-													 @RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
-	}
-
-	@RequestMapping(value="/statisticsDaily")
-	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
-													@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
-	}
-
-	@RequestMapping(value="/statisticsDaily_mh_2")
-	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
-													@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
-	}
-
-	@RequestMapping(value="/dispatchDailySum")
-	public List<Map<String,Object>> dispatchDailySum(@RequestParam Map<String, Object> map){
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String nature="0";
-		if(map.get("nature")!=null){
-			nature=map.get("nature").toString();
-		}
-		String type="";
-		if(map.get("type")!=null){
-			type=map.get("type").toString();
-		}
-		return scheduleRealInfoService.dispatchDailySum(date, date2, nature, type);
-	}
-
-	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		String type="";
-		if(map.get("type")!=null){
-			type=map.get("type").toString();
-		}
-		String nature="0";
-		if(map.get("nature")!=null){
-			nature=map.get("nature").toString();
-		}
-		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
-	}
-	
-	/*
-	 * 公里修正报表
-	 */
-	@RequestMapping(value="/mileageReportTj")
-	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
-	}
-	
-	/*
-	 * 班次修正报表
-	 */
-	@RequestMapping(value="/scheduleCorrectionReport")
-	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
-	}
-
-	@RequestMapping(value="/MapById",method = RequestMethod.GET)
-	public Map<String, Object> MapById(@RequestParam("id") Long id){
-		return scheduleRealInfoService.MapById(id);
-	}
-	
-	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
-	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
-		return scheduleRealInfoService.MapByIdQp(id);
-	}
-
-	/**
-	 * @Title: scheduleDaily
-	 * @Description: TODO(调度日报表)
-	 * @param line 线路
-	 * @param date 时间
-	 * @return
-	 */
-	@RequestMapping(value="/scheduleDaily")
-	public Map<String,Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.scheduleDaily(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleList")
-	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleList_zrw")
-	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList_zrw(line,date);
-	}
-	
-	@RequestMapping(value="/realScheduleList_mh_2")
-	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleListQp")
-	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleListQp(line,date);
-	}
-
-	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
-	public synchronized Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
-		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
-		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
-		return scheduleRealInfoService.multi_tzrc(cpcs, null);
-	}
-
-	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
-	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
-		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
-		List<DfsjChange> dfsjcs = JSONArray.parseArray(dcsJson, DfsjChange.class);
-		return scheduleRealInfoService.multi_dftz(dfsjcs);
-	}
-
-	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
-	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
-		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
-	}
-
-	@RequestMapping(value="/history", method=RequestMethod.POST)
-	public Map<String,Object> historySave(ScheduleRealInfo sch){
-		return scheduleRealInfoService.historySave(sch);
-	}
-
-
-	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
-	private final static long ONE_DAY = 1000 * 60 * 60 * 24;
-	/**
-	 * 获取可编辑的历史班次日期
-	 * @return
-	 */
-	@RequestMapping("dateArray")
-	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
-		List<String> rs = new ArrayList<>();
-
-		long t = System.currentTimeMillis();
-		if(c != 1)
-			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
-		for(int i = 0; i < 3; i ++){
-			rs.add(fmtyyyyMMdd.print(t));
-			t -= ONE_DAY;
-		}
-		return rs;
-	}
-
-	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
-	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
-		return scheduleRealInfoService.svgAttr(jsonStr);
-	}
-
-	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
-	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
-		return scheduleRealInfoService.findSvgAttr(idx);
-	}
-
-	@RequestMapping(value = "addRemarks", method = RequestMethod.POST)
-	public Map<String, Object> addRemarks(@RequestParam Long id, @RequestParam String remarks){
-		return scheduleRealInfoService.addRemarks(id, remarks);
-	}
-
-	@RequestMapping(value = "scheduleDailyQp", method = RequestMethod.GET)
-	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.scheduleDailyQp(line,date);
-	}
-
-	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
-	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
-		return scheduleRealInfoService.scheduleDailyExport(map);
-	}
-
-	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
-	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
-		return scheduleRealInfoService.exportWaybillMore(map);
-	}
-
-	/**
-	 * 获取当日计划排班 ， 从计划表抓取数据
-	 * @return
-	 */
-	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
-	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
-		return scheduleRealInfoService.currentSchedulePlan(lineCode);
-	}
-
-	@RequestMapping(value = "lpChangeMulti", method = RequestMethod.POST)
-	public Map<String, Object> lpChangeMulti(@RequestParam String leftIdx, @RequestParam String rightIdx,@RequestParam int type){
-		return scheduleRealInfoService.lpChangeMulti(leftIdx, rightIdx, type);
-	}
-
-	/**
-	 * 删除当日实际排班
-	 * @return
-	 */
-	@RequestMapping(value = "deleteRealSchedule", method = RequestMethod.POST)
-	public Map<String, Object> deleteRealSchedule(@RequestParam String lineCode){
-		return dayOfSchedule.deleteRealSchedule(lineCode);
-	}
-
-	/**
-	 * 从计划表重新加载当日排班
-	 * @param lineCode
-	 * @return
-	 */
-	@RequestMapping(value = "reLoadRealSchedule", method = RequestMethod.POST)
-	public Map<String, Object> reLoadRealSchedule(@RequestParam String lineCode){
-		Map<String, Object> rs = new HashMap<>();
-		List<ScheduleRealInfo> list = dayOfSchedule.findByLineCode(lineCode);
-		if(list != null && list.size() > 0){
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", "失败，" + list.get(0).getXlName() + "当日存在实际排班，无法重新加载。");
-			return rs;
-		}
-
-		int code = dayOfSchedule.reloadSch(lineCode);
-
-		//重新按公司编码索引数据
-		dayOfSchedule.groupByGsbm();
-		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
-		return rs;
-	}
-
-	/**
-	 * 误点调整
-	 * @param idx
-	 * @param minute
-	 * @return
-	 */
-	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
-	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
-		return scheduleRealInfoService.lateAdjust(idx, minute);
-	}
-
-	/**
-	 * 获取所有应发未到的班次
-	 * @param idx
-	 * @return
-	 */
-	@RequestMapping(value = "allLate2")
-	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
-		return scheduleRealInfoService.allLate2(idx);
-	}
-
-	/**
-	 * 添加一个临加到历史库
-	 * @param sch
-	 * @return
-	 */
-	@RequestMapping(value = "history/add", method = RequestMethod.POST)
-	public Map<String, Object> addToHistory(ScheduleRealInfo sch){
-		return scheduleRealInfoService.addToHistory(sch);
-	}
-
-	/**
-	 * 从历史库里删除临加班次
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "history/{id}", method = RequestMethod.DELETE)
-	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
-		return scheduleRealInfoService.deleteToHistory(id);
-	}
-
-    @RequestMapping(value = "isCircleQdz", method = RequestMethod.POST)
-    public Map<String, Object> isCircleQdz(@RequestParam String line,  String nbbm, String ts, String qdzCode){
-        Map<String, Object> map =new HashMap<>();
-        map.put("isExist",scheduleRealInfoService.isCircleQdz(nbbm, ts, line, qdzCode));
-	    return map;
-    }
-	
-	/**
-	 * 从历史库里删除临加班次
-	 * @param param
-	 * @return
-	 */
-	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
-	public Map<String, Object> repairReport(@RequestParam Map<String, Object> param){
-		return scheduleRealInfoService.repairReport(param, true);
-	}
-	
-	@RequestMapping(value = "wxsb", method = RequestMethod.GET)
-	public List<RepairReport> repairReportList(@RequestParam String line, @RequestParam String date, @RequestParam String code, @RequestParam String type){
-		return scheduleRealInfoService.repairReportList(line, date, code, type);
-	}
-	
-	@RequestMapping(value = "lineLevel", method = RequestMethod.GET)
-	public Map<String, String> lineLevel(@RequestParam String idx){
-		return scheduleRealInfoService.getLevelsByLines(Arrays.asList(idx.split(",")));
-	}
-
-	/**
-	 * 反馈安全驾驶系统
-	 * @param param
-	 * @return
-	 */
-	@RequestMapping(value = "ackDsm", method = RequestMethod.POST)
-	public Map<String, Object> ackDsm(@RequestParam Map<String, Object> param){
-		Map<String, Object> res = new HashMap<>();
-		InputStream in = null;
-		SysUser user = SecurityUtils.getCurrentUser();
-		DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
-		StringBuilder url = new StringBuilder("http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?"), uri = new StringBuilder();
-		HttpURLConnection con = null;
-		try {
-			uri.append("ddyName=").append(URLEncoder.encode(user == null ? "admin" : user.getUserName(), "UTF-8"));
-			uri.append("&checkTime=").append(URLEncoder.encode(fmt.print(System.currentTimeMillis()), "UTF-8"));
-			uri.append("&nbbm=").append(URLEncoder.encode(param.get("nbbm").toString(), "UTF-8"));
-			uri.append("&starttime=").append(URLEncoder.encode(fmt.print(Long.parseLong(param.get("ts").toString())), "UTF-8"));
-			url.append(uri);
-			con = (HttpURLConnection)new URL(url.toString()).openConnection();
-			con.setDoInput(true);
-			con.setRequestMethod("POST");
-			con.setConnectTimeout(5000);
-			con.setReadTimeout(5000);
-			con.setRequestProperty("keep-alive", "true");
-			con.setRequestProperty("accept", "*/*");
-			con.setRequestProperty("content-type", "application/x-www-form-urlencoded");
-			con.connect();
-
-			if (con.getResponseCode() == 200) {
-				in = con.getInputStream();
-				ByteArrayOutputStream bout = new ByteArrayOutputStream();
-				IOUtils.copy(in, bout);
-				Map<String, Object> map = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
-				System.out.println(map);
-			}
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			if (con != null) {
-				con.disconnect();
-			}
-		}
-
-		return res;
-	}
-
-	@RequestMapping(value = "exportPlan", method = RequestMethod.GET)
-	public Map<String, Object> exportPlan(@RequestParam String date){
-		Map<String, Object> res = new HashMap<>();
-		DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm");
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-
-		List<Map<String, Object>> list = new ArrayList<>();
-		String sql = "select xl_name,xl_dir,schedule_date,fcsj,cl_zbh,j_name,bcsj from bsth_c_s_sp_info where schedule_date = ? and xl_bm in (22205, 202104, 202105, 202106, 202107, 210415) and bc_type = 'normal'";
-		try{
-			conn = DBUtils_control.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setString(1, date);
-			rs = ps.executeQuery();
-			ObjectMapper mapper = new ObjectMapper();
-
-			while (rs.next()) {
-				SchedulePlan schedulePlan = new SchedulePlan();
-				schedulePlan.setXlName(rs.getString("xl_name"));
-				schedulePlan.setXlDir(rs.getInt("xl_dir"));
-				Date scheduleDate = rs.getDate("schedule_date");
-				schedulePlan.setScheduleDate(new DateTime(scheduleDate.getTime()).toString("yyyy-MM-dd"));
-				String fcsj = rs.getString("fcsj");
-				int bcsj = rs.getInt("bcsj");
-				DateTime fcsjDt = dateTimeFormatter.parseDateTime(schedulePlan.getScheduleDate() + " " + fcsj);
-				schedulePlan.setFcsj(fcsjDt.toString("HH:mm:00"));
-				DateTime ddsjDt = fcsjDt.plusMinutes(bcsj);
-				schedulePlan.setDdsj(ddsjDt.toString("HH:mm:00"));
-				schedulePlan.setSjdStart(fcsjDt.toString("HH:00:00"));
-				DateTime endDt = fcsjDt.plusHours(1);
-				schedulePlan.setSjdEnd(endDt.toString("HH:00:00"));
-				schedulePlan.setClZbh(rs.getString("cl_zbh"));
-				schedulePlan.setJsy(rs.getString("j_name"));
-				schedulePlan.setBcsj(bcsj);
-
-				list.add(mapper.readValue(mapper.writeValueAsString(schedulePlan), HashMap.class));
-			}
-			List<Iterator<?>> iterators = new ArrayList<Iterator<?>>();
-			iterators.add(list.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			String sourcePath = path + "mould/schedulePlan.xls";
-
-			new ReportUtils().excelReplace(iterators, new Object[]{}, sourcePath, path + "export/" + date + "-花博会专线班次.xls");
-
-			res.put("status", ResponseCode.SUCCESS);
-			res.put("msg", "成功");
-		} catch (Exception e) {
-			res.put("status", ResponseCode.ERROR);
-			res.put("msg", e.getMessage());
-		} finally {
-			DBUtils_control.close(rs, ps, conn);
-		}
-
-		return res;
-	}
-
-	public final static class SchedulePlan {
-		private String company = "浦东公司[46]";
-
-		private String xlName = "";
-
-		private int xlDir;
-
-		private String xlDirStr = "";
-
-		private String scheduleDate = "";
-
-		private String sjdStart = "";
-
-		private String sjdEnd = "";
-
-		private String fcsj = "";
-
-		private int bcsj;
-
-		private String ddsj = "";
-
-		private int yys = 25;
-
-		private String clZbh = "";
-
-		private String cph = "";
-
-		private String color = "绿牌";
-
-		private String jsy = "";
-
-		private String jsydh = "";
-
-		private int pj = 10;
-
-		public String getCompany() {
-			return company;
-		}
-
-		public void setCompany(String company) {
-			this.company = company;
-		}
-
-		public String getXlName() {
-			return xlName;
-		}
-
-		public void setXlName(String xlName) {
-			this.xlName = xlName;
-		}
-
-		public int getXlDir() {
-			return xlDir;
-		}
-
-		public void setXlDir(int xlDir) {
-			this.xlDir = xlDir;
-		}
-
-		public String getXlDirStr() {
-			xlDirStr = "";
-			if (xlDir == 0) {
-				xlDirStr = "上行";
-			} else if (xlDir == 1) {
-				xlDirStr = "下行";
-			}
-			return xlDirStr;
-		}
-
-		public void setXlDirStr(String xlDirStr) {
-			this.xlDirStr = xlDirStr;
-		}
-
-		public String getScheduleDate() {
-			return scheduleDate;
-		}
-
-		public void setScheduleDate(String scheduleDate) {
-			this.scheduleDate = scheduleDate;
-		}
-
-		public String getSjdStart() {
-			return sjdStart;
-		}
-
-		public void setSjdStart(String sjdStart) {
-			this.sjdStart = sjdStart;
-		}
-
-		public String getSjdEnd() {
-			return sjdEnd;
-		}
-
-		public void setSjdEnd(String sjdEnd) {
-			this.sjdEnd = sjdEnd;
-		}
-
-		public String getFcsj() {
-			return fcsj;
-		}
-
-		public void setFcsj(String fcsj) {
-			this.fcsj = fcsj;
-		}
-
-		public int getBcsj() {
-			return bcsj;
-		}
-
-		public void setBcsj(int bcsj) {
-			this.bcsj = bcsj;
-		}
-
-		public String getDdsj() {
-			return ddsj;
-		}
-
-		public void setDdsj(String ddsj) {
-			this.ddsj = ddsj;
-		}
-
-		public int getYys() {
-			return yys;
-		}
-
-		public void setYys(int yys) {
-			this.yys = yys;
-		}
-
-		public String getClZbh() {
-			return clZbh;
-		}
-
-		public void setClZbh(String clZbh) {
-			this.clZbh = clZbh;
-		}
-
-		public String getCph() {
-			cph = BasicData.nbbmCompanyPlateMap.get(clZbh);
-			if (cph == null) {
-				cph = "";
-			}
-			return cph;
-		}
-
-		public void setCph(String cph) {
-			this.cph = cph;
-		}
-
-		public String getColor() {
-			return color;
-		}
-
-		public void setColor(String color) {
-			this.color = color;
-		}
-
-		public String getJsy() {
-			return jsy;
-		}
-
-		public void setJsy(String jsy) {
-			this.jsy = jsy;
-		}
-
-		public String getJsydh() {
-			return jsydh;
-		}
-
-		public void setJsydh(String jsydh) {
-			this.jsydh = jsydh;
-		}
-
-		public int getPj() {
-			return pj;
-		}
-
-		public void setPj(int pj) {
-			this.pj = pj;
-		}
-	}
-}
+package com.bsth.controller.realcontrol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.*;
+
+import com.bsth.data.forecast.entity.ArrivalEntity;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.util.ReportUtils;
+import com.bsth.util.db.DBUtils_MS;
+import com.bsth.util.db.DBUtils_control;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.BaseController;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DfsjChange;
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.report.RepairReport;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+
+@RestController
+@RequestMapping("/realSchedule")
+public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
+
+	@Autowired
+	ScheduleRealInfoService scheduleRealInfoService;
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+
+	@Value("${dsm.ack.url}")
+	private String dsmUrl;
+
+	@Value("${cp.ack.url}")
+	private String cpUrl;
+
+	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
+	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
+		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
+	}
+
+	@RequestMapping(value = "/lines")
+	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
+		return scheduleRealInfoService.findByLines(lines);
+	}
+
+	@RequestMapping(value = "/car")
+	public List<ScheduleRealInfo> findByCar(String nbbm){
+		return dayOfSchedule.findByNbbm(nbbm);
+	}
+
+	/**
+	 *
+	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
+	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
+	 */
+	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
+										   @RequestParam String dfsj,String bcType,
+										   @RequestParam(defaultValue = "") String opType) {
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
+	}
+
+	/**
+	 *
+	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔 
+	 */
+	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
+	public Map<String, Object> destroy(@RequestParam String idsStr
+			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
+									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
+		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
+	}
+
+	/**
+	 *
+	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
+	 */
+	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
+	public Map<String, String> carDeviceMapp() {
+		return BasicData.deviceId2NbbmMap.inverse();
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/driver", method = RequestMethod.GET)
+	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findDriverByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
+	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findConductorByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/cars", method = RequestMethod.GET)
+	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findCarByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
+	 */
+	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
+	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
+		return scheduleRealInfoService.sreachVehic(nbbm);
+	}
+	/**
+	 *
+	 * @Title: realOutAdjust
+	 * @Description: TODO(实发调整)
+	 * @param @param id 班次ID
+	 * @param @param fcsjActual 实际发车时间 HH:mm
+	 * @param @param remarks 备注
+	 * @throws
+	 */
+	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
+	public Map<String, Object> realOutAdjust(@RequestParam Map<String, String> map) {
+		return scheduleRealInfoService.realOutAdjust(map);
+	}
+
+	/**
+	 *
+	 * @Title: revokeDestroy
+	 * @Description: TODO(撤销烂班)
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeDestroy", method = RequestMethod.POST)
+	public Map<String, Object> revokeDestroy(@RequestParam Long id){
+		return scheduleRealInfoService.revokeDestroy(id);
+	}
+
+	/**
+	 *
+	 * @Title: revokeRealOutgo
+	 * @Description: TODO(撤销实发)
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeRealOutgo", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealOutgo(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealOutgo(id);
+	}
+
+	/**
+	 * 撤销执行
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealArrive(id);
+	}
+
+	/**
+	 *
+	 * @Title: spaceAdjust
+	 * @Description: TODO(间隔调整)
+	 * @param @param ids 要调整的班次数组ID
+	 * @param @param space 间隔
+	 * @throws
+	 */
+	@RequestMapping(value = "/spaceAdjust", method = RequestMethod.POST)
+	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
+		return scheduleRealInfoService.spaceAdjust(ids, space);
+	}
+
+	/**
+	 *
+	 * @Title: schInfoFineTune
+	 * @Description: TODO(发车信息微调)
+	 * @param @param map
+	 * @throws
+	 */
+	@RequestMapping(value = "/schInfoFineTune", method = RequestMethod.POST)
+	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
+		return scheduleRealInfoService.schInfoFineTune(map);
+	}
+
+	/**
+	 *
+	 * @Title: outgoAdjustAll
+	 * @Description: TODO(批量待发调整)
+	 * @param @param list
+	 * @throws
+	 */
+	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
+		//反转义
+		params = StringEscapeUtils.unescapeHtml4(params);
+		return scheduleRealInfoService.outgoAdjustAll(params);
+	}
+
+	/**
+	 *
+	 * @Title: findByLineAndUpDown
+	 * @Description: TODO(根据线路和走向获取班次)
+	 * @param @param line
+	 * @param @param upDown
+	 */
+	@RequestMapping(value = "/findByLineAndUpDown")
+	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
+		return dayOfSchedule.findByLineAndUpDown(line, upDown);
+	}
+
+	/**
+	 *
+	 * @Title: findRouteByLine
+	 * @Description: TODO(获取线路的站点，路段路由)
+	 * @param @param lineCode
+	 * @throws
+	 */
+	@RequestMapping(value = "/findRouteByLine")
+	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
+		return scheduleRealInfoService.findRouteByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: removeChildTask
+	 * @Description: TODO(删除子任务)
+	 * @param @param taskId 子任务ID
+	 * @throws
+	 */
+	@RequestMapping(value = "/childTask/{taskId}", method = RequestMethod.DELETE)
+	public Map<String, Object> removeChildTask(@PathVariable("taskId") Long taskId){
+		return scheduleRealInfoService.removeChildTask(taskId);
+	}
+
+	/**
+	 *
+	 * @Title: findByLineCode
+	 * @Description: TODO(根据线路获取班次信息)
+	 * @param @param lineCode
+	 */
+	@RequestMapping(value = "/lineCode/{lineCode}")
+	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
+		return dayOfSchedule.findByLineCode(lineCode);
+	}
+
+	@RequestMapping(value = "/queryUserInfo")
+	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
+												@RequestParam String date,@RequestParam String state) {
+		return scheduleRealInfoService.queryUserInfo(line, date,state);
+	}
+
+	@RequestMapping(value = "/queryUserInfoPx")
+	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
+												  @RequestParam String date,@RequestParam String state,@RequestParam String type) {
+		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
+	}
+
+	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName,@RequestParam String jGh, @RequestParam String clZbh,
+												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybill(jName,jGh, clZbh, lpName,date,line);
+	}
+
+	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
+	}
+
+
+	@RequestMapping(value = "/dailyInfo")
+	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
+		return scheduleRealInfoService.dailyInfo(line, date, type);
+	}
+
+	@RequestMapping(value = "/historyMessage")
+	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
+										 @RequestParam String code, @RequestParam String type) {
+		return scheduleRealInfoService.historyMessage(line, date, code, type);
+	}
+
+	@RequestMapping(value="/findLine")
+	public List<Map<String,String>> findLine(@RequestParam String line){
+		return scheduleRealInfoService.findLine(line);
+	}
+
+	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
+	}
+
+	/**
+	 * 路单公里统计 （闵行审计专用）
+	 * @param jGh
+	 * @param clZbh
+	 * @param lpName
+	 * @param date
+	 * @param line
+	 * @return
+	 */
+	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
+	}
+
+	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
+	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
+	}
+
+	@RequestMapping(value="/findLpName")
+	public List<Map<String,String>> findLpName(@RequestParam String lpName){
+		return scheduleRealInfoService.findLpName(lpName);
+	}
+
+	@RequestMapping(value = "/account")
+	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
+		return scheduleRealInfoService.account(line, date, code, xlName, type);
+	}
+	
+	@RequestMapping(value = "/accountPx")
+	public List<Map<String,Object>> accountPx(@RequestParam String line, @RequestParam String date,
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String px) {
+		return scheduleRealInfoService.accountPx(line, date, code, xlName, px);
+	}
+
+	@RequestMapping(value = "/correctForm")
+	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
+											@RequestParam String endDate,
+											 @RequestParam String lpName, @RequestParam String code, 
+											 @RequestParam String type,@RequestParam String changType) {
+		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type,changType);
+	}
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表
+	 * @param jGh 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill(jGh, clZbh,lpName,date,line);
+	}
+
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表（闵行审计专用路单）
+	 * @param jName 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
+	}
+
+	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
+													 @RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
+	}
+
+	@RequestMapping(value="/statisticsDaily")
+	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
+	}
+
+	@RequestMapping(value="/statisticsDaily_mh_2")
+	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
+	}
+
+	@RequestMapping(value="/dispatchDailySum")
+	public List<Map<String,Object>> dispatchDailySum(@RequestParam Map<String, Object> map){
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		return scheduleRealInfoService.dispatchDailySum(date, date2, nature, type);
+	}
+
+	@RequestMapping(value="/statisticsDailyTj")
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
+	}
+	
+	/*
+	 * 公里修正报表
+	 */
+	@RequestMapping(value="/mileageReportTj")
+	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
+	}
+	
+	/*
+	 * 班次修正报表
+	 */
+	@RequestMapping(value="/scheduleCorrectionReport")
+	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
+	}
+
+	@RequestMapping(value="/MapById",method = RequestMethod.GET)
+	public Map<String, Object> MapById(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapById(id);
+	}
+	
+	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
+	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapByIdQp(id);
+	}
+
+	/**
+	 * @Title: scheduleDaily
+	 * @Description: TODO(调度日报表)
+	 * @param line 线路
+	 * @param date 时间
+	 * @return
+	 */
+	@RequestMapping(value="/scheduleDaily")
+	public Map<String,Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.scheduleDaily(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleList")
+	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleList_zrw")
+	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_zrw(line,date);
+	}
+	
+	@RequestMapping(value="/realScheduleList_mh_2")
+	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleListQp")
+	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleListQp(line,date);
+	}
+
+	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
+	public synchronized Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
+		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
+		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
+		return scheduleRealInfoService.multi_tzrc(cpcs, null);
+	}
+
+	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
+	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
+		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
+		List<DfsjChange> dfsjcs = JSONArray.parseArray(dcsJson, DfsjChange.class);
+		return scheduleRealInfoService.multi_dftz(dfsjcs);
+	}
+
+	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
+	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
+		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
+	}
+
+	@RequestMapping(value="/history", method=RequestMethod.POST)
+	public Map<String,Object> historySave(ScheduleRealInfo sch){
+		return scheduleRealInfoService.historySave(sch);
+	}
+
+
+	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+	private final static long ONE_DAY = 1000 * 60 * 60 * 24;
+	/**
+	 * 获取可编辑的历史班次日期
+	 * @return
+	 */
+	@RequestMapping("dateArray")
+	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
+		List<String> rs = new ArrayList<>();
+
+		long t = System.currentTimeMillis();
+		if(c != 1)
+			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
+		for(int i = 0; i < 3; i ++){
+			rs.add(fmtyyyyMMdd.print(t));
+			t -= ONE_DAY;
+		}
+		return rs;
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
+	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
+		return scheduleRealInfoService.svgAttr(jsonStr);
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
+	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
+		return scheduleRealInfoService.findSvgAttr(idx);
+	}
+
+	@RequestMapping(value = "addRemarks", method = RequestMethod.POST)
+	public Map<String, Object> addRemarks(@RequestParam Long id, @RequestParam String remarks){
+		return scheduleRealInfoService.addRemarks(id, remarks);
+	}
+
+	@RequestMapping(value = "scheduleDailyQp", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.scheduleDailyQp(line,date);
+	}
+
+	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.scheduleDailyExport(map);
+	}
+
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
+	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.exportWaybillMore(map);
+	}
+
+	/**
+	 * 获取当日计划排班 ， 从计划表抓取数据
+	 * @return
+	 */
+	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
+	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
+		return scheduleRealInfoService.currentSchedulePlan(lineCode);
+	}
+
+	@RequestMapping(value = "lpChangeMulti", method = RequestMethod.POST)
+	public Map<String, Object> lpChangeMulti(@RequestParam String leftIdx, @RequestParam String rightIdx,@RequestParam int type){
+		return scheduleRealInfoService.lpChangeMulti(leftIdx, rightIdx, type);
+	}
+
+	/**
+	 * 删除当日实际排班
+	 * @return
+	 */
+	@RequestMapping(value = "deleteRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> deleteRealSchedule(@RequestParam String lineCode){
+		return dayOfSchedule.deleteRealSchedule(lineCode);
+	}
+
+	/**
+	 * 从计划表重新加载当日排班
+	 * @param lineCode
+	 * @return
+	 */
+	@RequestMapping(value = "reLoadRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> reLoadRealSchedule(@RequestParam String lineCode){
+		Map<String, Object> rs = new HashMap<>();
+		List<ScheduleRealInfo> list = dayOfSchedule.findByLineCode(lineCode);
+		if(list != null && list.size() > 0){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", "失败，" + list.get(0).getXlName() + "当日存在实际排班，无法重新加载。");
+			return rs;
+		}
+
+		int code = dayOfSchedule.reloadSch(lineCode);
+
+		//重新按公司编码索引数据
+		dayOfSchedule.groupByGsbm();
+		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
+		return rs;
+	}
+
+	/**
+	 * 误点调整
+	 * @param idx
+	 * @param minute
+	 * @return
+	 */
+	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
+	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
+		return scheduleRealInfoService.lateAdjust(idx, minute);
+	}
+
+	/**
+	 * 获取所有应发未到的班次
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping(value = "allLate2")
+	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
+		return scheduleRealInfoService.allLate2(idx);
+	}
+
+	/**
+	 * 添加一个临加到历史库
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "history/add", method = RequestMethod.POST)
+	public Map<String, Object> addToHistory(ScheduleRealInfo sch){
+		return scheduleRealInfoService.addToHistory(sch);
+	}
+
+	/**
+	 * 从历史库里删除临加班次
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "history/{id}", method = RequestMethod.DELETE)
+	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
+		return scheduleRealInfoService.deleteToHistory(id);
+	}
+
+    @RequestMapping(value = "isCircleQdz", method = RequestMethod.POST)
+    public Map<String, Object> isCircleQdz(@RequestParam String line,  String nbbm, String ts, String qdzCode){
+        Map<String, Object> map =new HashMap<>();
+        map.put("isExist",scheduleRealInfoService.isCircleQdz(nbbm, ts, line, qdzCode));
+	    return map;
+    }
+	
+	/**
+	 * 从历史库里删除临加班次
+	 * @param param
+	 * @return
+	 */
+	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
+	public Map<String, Object> repairReport(@RequestParam Map<String, Object> param){
+		return scheduleRealInfoService.repairReport(param, true);
+	}
+	
+	@RequestMapping(value = "wxsb", method = RequestMethod.GET)
+	public List<RepairReport> repairReportList(@RequestParam String line, @RequestParam String date, @RequestParam String code, @RequestParam String type){
+		return scheduleRealInfoService.repairReportList(line, date, code, type);
+	}
+	
+	@RequestMapping(value = "lineLevel", method = RequestMethod.GET)
+	public Map<String, String> lineLevel(@RequestParam String idx){
+		return scheduleRealInfoService.getLevelsByLines(Arrays.asList(idx.split(",")));
+	}
+
+	/**
+	 * 反馈安全驾驶系统
+	 * @param param
+	 * @return
+	 */
+	@RequestMapping(value = "ackDsm", method = RequestMethod.POST)
+	public Map<String, Object> ackDsm(@RequestParam Map<String, Object> param){
+		Map<String, Object> res = new HashMap<>();
+		InputStream in = null;
+		SysUser user = SecurityUtils.getCurrentUser();
+		DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+		StringBuilder url = new StringBuilder(dsmUrl), uri = new StringBuilder();
+		HttpURLConnection con = null;
+		try {
+			uri.append("ddyName=").append(URLEncoder.encode(user == null ? "admin" : user.getUserName(), "UTF-8"));
+			uri.append("&checkTime=").append(URLEncoder.encode(fmt.print(System.currentTimeMillis()), "UTF-8"));
+			uri.append("&nbbm=").append(URLEncoder.encode(param.get("nbbm").toString(), "UTF-8"));
+			uri.append("&starttime=").append(URLEncoder.encode(fmt.print(Long.parseLong(param.get("ts").toString())), "UTF-8"));
+			url.append(uri);
+			con = (HttpURLConnection)new URL(url.toString()).openConnection();
+			con.setDoInput(true);
+			con.setRequestMethod("POST");
+			con.setConnectTimeout(5000);
+			con.setReadTimeout(5000);
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "*/*");
+			con.setRequestProperty("content-type", "application/x-www-form-urlencoded");
+			con.connect();
+
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout);
+				Map<String, Object> map = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				System.out.println(map);
+			}
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			if (con != null) {
+				con.disconnect();
+			}
+		}
+
+		return res;
+	}
+
+	/**
+	 * 反馈应急预案系统
+	 * @param param
+	 * @return
+	 */
+	@RequestMapping(value = "ackCp", method = RequestMethod.POST)
+	public Map<String, Object> ackCp(@RequestParam Map<String, Object> param){
+		Map<String, Object> res = new HashMap<>();
+		InputStream in = null;
+		SysUser user = SecurityUtils.getCurrentUser();
+		DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+		StringBuilder url = new StringBuilder(cpUrl);
+		HttpURLConnection con = null;
+		try {
+			con = (HttpURLConnection)new URL(url.append(param.get("id")).toString()).openConnection();
+			con.setDoInput(true);
+			con.setRequestMethod("GET");
+			con.setConnectTimeout(5000);
+			con.setReadTimeout(5000);
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "*/*");
+
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout);
+				Map<String, Object> map = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				System.out.println(map);
+			}
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			if (con != null) {
+				con.disconnect();
+			}
+		}
+
+		return res;
+	}
+
+	@RequestMapping(value = "exportPlan", method = RequestMethod.GET)
+	public Map<String, Object> exportPlan(@RequestParam String date){
+		Map<String, Object> res = new HashMap<>();
+		DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm");
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+
+		List<Map<String, Object>> list = new ArrayList<>();
+		String sql = "select xl_name,xl_dir,schedule_date,fcsj,cl_zbh,j_name,bcsj from bsth_c_s_sp_info where schedule_date = ? and xl_bm in (22205, 202104, 202105, 202106, 202107, 210415) and bc_type = 'normal'";
+		try{
+			conn = DBUtils_control.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setString(1, date);
+			rs = ps.executeQuery();
+			ObjectMapper mapper = new ObjectMapper();
+
+			while (rs.next()) {
+				SchedulePlan schedulePlan = new SchedulePlan();
+				schedulePlan.setXlName(rs.getString("xl_name"));
+				schedulePlan.setXlDir(rs.getInt("xl_dir"));
+				Date scheduleDate = rs.getDate("schedule_date");
+				schedulePlan.setScheduleDate(new DateTime(scheduleDate.getTime()).toString("yyyy-MM-dd"));
+				String fcsj = rs.getString("fcsj");
+				int bcsj = rs.getInt("bcsj");
+				DateTime fcsjDt = dateTimeFormatter.parseDateTime(schedulePlan.getScheduleDate() + " " + fcsj);
+				schedulePlan.setFcsj(fcsjDt.toString("HH:mm:00"));
+				DateTime ddsjDt = fcsjDt.plusMinutes(bcsj);
+				schedulePlan.setDdsj(ddsjDt.toString("HH:mm:00"));
+				schedulePlan.setSjdStart(fcsjDt.toString("HH:00:00"));
+				DateTime endDt = fcsjDt.plusHours(1);
+				schedulePlan.setSjdEnd(endDt.toString("HH:00:00"));
+				schedulePlan.setClZbh(rs.getString("cl_zbh"));
+				schedulePlan.setJsy(rs.getString("j_name"));
+				schedulePlan.setBcsj(bcsj);
+
+				list.add(mapper.readValue(mapper.writeValueAsString(schedulePlan), HashMap.class));
+			}
+			List<Iterator<?>> iterators = new ArrayList<Iterator<?>>();
+			iterators.add(list.iterator());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			String sourcePath = path + "mould/schedulePlan.xls";
+
+			new ReportUtils().excelReplace(iterators, new Object[]{}, sourcePath, path + "export/" + date + "-花博会专线班次.xls");
+
+			res.put("status", ResponseCode.SUCCESS);
+			res.put("msg", "成功");
+		} catch (Exception e) {
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", e.getMessage());
+		} finally {
+			DBUtils_control.close(rs, ps, conn);
+		}
+
+		return res;
+	}
+
+	public final static class SchedulePlan {
+		private String company = "浦东公司[46]";
+
+		private String xlName = "";
+
+		private int xlDir;
+
+		private String xlDirStr = "";
+
+		private String scheduleDate = "";
+
+		private String sjdStart = "";
+
+		private String sjdEnd = "";
+
+		private String fcsj = "";
+
+		private int bcsj;
+
+		private String ddsj = "";
+
+		private int yys = 25;
+
+		private String clZbh = "";
+
+		private String cph = "";
+
+		private String color = "绿牌";
+
+		private String jsy = "";
+
+		private String jsydh = "";
+
+		private int pj = 10;
+
+		public String getCompany() {
+			return company;
+		}
+
+		public void setCompany(String company) {
+			this.company = company;
+		}
+
+		public String getXlName() {
+			return xlName;
+		}
+
+		public void setXlName(String xlName) {
+			this.xlName = xlName;
+		}
+
+		public int getXlDir() {
+			return xlDir;
+		}
+
+		public void setXlDir(int xlDir) {
+			this.xlDir = xlDir;
+		}
+
+		public String getXlDirStr() {
+			xlDirStr = "";
+			if (xlDir == 0) {
+				xlDirStr = "上行";
+			} else if (xlDir == 1) {
+				xlDirStr = "下行";
+			}
+			return xlDirStr;
+		}
+
+		public void setXlDirStr(String xlDirStr) {
+			this.xlDirStr = xlDirStr;
+		}
+
+		public String getScheduleDate() {
+			return scheduleDate;
+		}
+
+		public void setScheduleDate(String scheduleDate) {
+			this.scheduleDate = scheduleDate;
+		}
+
+		public String getSjdStart() {
+			return sjdStart;
+		}
+
+		public void setSjdStart(String sjdStart) {
+			this.sjdStart = sjdStart;
+		}
+
+		public String getSjdEnd() {
+			return sjdEnd;
+		}
+
+		public void setSjdEnd(String sjdEnd) {
+			this.sjdEnd = sjdEnd;
+		}
+
+		public String getFcsj() {
+			return fcsj;
+		}
+
+		public void setFcsj(String fcsj) {
+			this.fcsj = fcsj;
+		}
+
+		public int getBcsj() {
+			return bcsj;
+		}
+
+		public void setBcsj(int bcsj) {
+			this.bcsj = bcsj;
+		}
+
+		public String getDdsj() {
+			return ddsj;
+		}
+
+		public void setDdsj(String ddsj) {
+			this.ddsj = ddsj;
+		}
+
+		public int getYys() {
+			return yys;
+		}
+
+		public void setYys(int yys) {
+			this.yys = yys;
+		}
+
+		public String getClZbh() {
+			return clZbh;
+		}
+
+		public void setClZbh(String clZbh) {
+			this.clZbh = clZbh;
+		}
+
+		public String getCph() {
+			cph = BasicData.nbbmCompanyPlateMap.get(clZbh);
+			if (cph == null) {
+				cph = "";
+			}
+			return cph;
+		}
+
+		public void setCph(String cph) {
+			this.cph = cph;
+		}
+
+		public String getColor() {
+			return color;
+		}
+
+		public void setColor(String color) {
+			this.color = color;
+		}
+
+		public String getJsy() {
+			return jsy;
+		}
+
+		public void setJsy(String jsy) {
+			this.jsy = jsy;
+		}
+
+		public String getJsydh() {
+			return jsydh;
+		}
+
+		public void setJsydh(String jsydh) {
+			this.jsydh = jsydh;
+		}
+
+		public int getPj() {
+			return pj;
+		}
+
+		public void setPj(int pj) {
+			this.pj = pj;
+		}
+	}
+}
-package com.bsth.controller.realcontrol;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.controller.realcontrol.dto.ChangePersonCar;
-import com.bsth.controller.realcontrol.dto.DftzAndDestroy;
-import com.bsth.data.BasicData;
-import com.bsth.data.directive.DayOfDirectives;
-import com.bsth.data.directive.DirectiveCreator;
-import com.bsth.data.directive.GatewayHttpUtils;
-import com.bsth.data.gpsdata_v2.GpsRealData;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.external.TccExternalService;
-import com.bsth.entity.directive.D60;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.repository.directive.D60Repository;
-import com.google.common.base.Splitter;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-/**
- * 对外的营运数据接口
- * Created by panzhao on 2017/3/15.
- */
-@RestController
-@RequestMapping("/companyService")
-public class ServiceDataInterface {
-
-    private final static String SECRE_KEY = "dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki";
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    DayOfDirectives dayOfDirectives;
-
-    @Autowired
-    D60Repository d60Repository;
-
-    @Autowired
-    GpsRealData gpsRealData;
-
-    @Autowired
-    TccExternalService tccExternalService;
-
-    /**
-     * 获取车辆 和 当前执行班次对照信息
-     *
-     * @return
-     */
-    @RequestMapping("/execSchList")
-    public List<Map<String, Object>> execSchList(@RequestParam String secretKey) {
-        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
-            return null;
-
-        List<Map<String, Object>> rs = new ArrayList<>();
-        Collection<ScheduleRealInfo> list = dayOfSchedule.execPlanMap().values();
-
-        Map<String, Object> map;
-        for (ScheduleRealInfo sch : list) {
-            if (null == sch)
-                continue;
-            map = new HashMap<>();
-            map.put("clZbh", sch.getClZbh());
-            map.put("jGh", sch.getjGh());
-            map.put("jName", sch.getjName());
-            map.put("sGh", sch.getsGh());
-            map.put("sName", sch.getsName());
-            map.put("lpName", sch.getLpName());
-            map.put("xlBm", sch.getXlBm());
-            map.put("xlName", sch.getXlName());
-            map.put("xlDir", sch.getXlDir());
-            map.put("qdzName", sch.getQdzName());
-            map.put("zdzName", sch.getZdzName());
-            map.put("fcsj", sch.getFcsj());
-            map.put("dfsj", sch.getDfsj());
-            map.put("zdsj", sch.getZdsj());
-            map.put("bcType", sch.getBcType());
-            map.put("remarks", sch.getRemark());
-            map.put("status", sch.getStatus());
-
-            //放站班次，放到的站点
-            map.put("majorStationName", sch.getMajorStationName());
-            rs.add(map);
-        }
-        return rs;
-    }
-
-    @RequestMapping("/getCurrentDayPlan")
-    public List<ScheduleRealInfo> getCurrentDayPlan(
-            @RequestParam String companyId,
-            @RequestParam String workId,
-            @RequestParam String secretKey) {
-
-        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
-            return null;
-
-        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findByGsbm(companyId)), rs = new ArrayList<>();
-        for (ScheduleRealInfo sch : all) {
-            if (sch.getGsBm() != null
-                    && sch.getGsBm().equals(companyId)
-                    && sch.getjGh().equals(workId)) {
-                rs.add(sch);
-            }
-        }
-        return rs;
-    }
-
-    @RequestMapping("/returnCCInfo")
-    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
-        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
-            return null;
-
-
-        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
-        for (ScheduleRealInfo sch : all) {
-
-            if (sch.getBcType().equals("out")
-                    && sch.getGsBm() != null
-                    && sch.getGsBm().equals(companyId)) {
-                rs.add(sch);
-            }
-        }
-        return rs;
-    }
-
-    @RequestMapping("/returnJCInfo")
-    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
-        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
-            return null;
-
-
-        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
-        for (ScheduleRealInfo sch : all) {
-            if (sch.getBcType().equals("in")
-                    && sch.getGsBm() != null
-                    && sch.getGsBm().equals(companyId)) {
-                rs.add(sch);
-            }
-        }
-        return rs;
-    }
-
-    /**
-     * 获取全量的进出场数据， 仅供接口项目调用。 由接口项目负责对外所有场站输出
-     *
-     * @return
-     */
-    @RequestMapping("/findCurrInAndOut")
-    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey) {
-        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
-            return null;
-
-
-        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
-        for (ScheduleRealInfo sch : all) {
-            if (sch.getBcType().equals("in")
-                    || sch.getBcType().equals("out")) {
-                rs.add(sch);
-            }
-        }
-        return rs;
-    }
-
-    /**
-     * 向指定的车辆下发消息短语
-     *
-     * @return
-     */
-    @RequestMapping(value = "/send60Phrase", method = RequestMethod.POST)
-    public int send60Phrase(@RequestBody Map<String, String> map, @RequestParam String secretKey) {
-        try {
-            String nbbm = map.get("nbbm");
-            String txt = map.get("txt");
-            String sender = map.get("sender");
-            if (txt.length() > 50)
-                txt = txt.substring(0, 50);
-            if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
-                return -500;
-
-            //车辆和设备号对照
-            String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-            if (StringUtils.isEmpty(deviceId))
-                return -404;
-
-            //检查设备是否在线
-            long t = System.currentTimeMillis();
-            GpsEntity gps = gpsRealData.get(deviceId);
-            if (null == gps || (t - gps.getServerTimestamp()) > 1000 * 60 * 5)
-                return -405;
-
-            Short dispatchInstruct = 0;//消息短语
-            D60 d60 = new DirectiveCreator().createD60(nbbm, txt, dispatchInstruct, gps.getUpDown(), gps.getState(), gps.getLineId());
-            d60.setSender(sender);
-            // 发送指令
-            int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
-            d60.setHttpCode(code);
-
-            if (code != 0)
-                d60.setErrorText("网关通讯失败, code: " + code);
-
-            dayOfDirectives.put60(d60);
-            return d60.getMsgId();
-        } catch (Exception e) {
-            logger.error("", e);
-            return -500;
-        }
-    }
-
-    /**
-     * 根据msg id 查询指令响应情况
-     *
-     * @param msgIds
-     * @return
-     */
-    @RequestMapping("/findD60Reply")
-    public List<Map<String, Object>> findD60Reply(@RequestParam String msgIds) {
-        List<Map<String, Object>> rs = new ArrayList<>();
-        try {
-            Map<String, Object> map = new HashMap();
-
-            List<String> ids = Splitter.on(",").splitToList(msgIds);
-            D60 d60;
-            for (String id : ids) {
-                if (StringUtils.isEmpty(id))
-                    continue;
-
-                d60 = dayOfDirectives.get(Integer.parseInt(id));
-                if (null == d60)
-                    continue;
-
-                map.put("msgId", d60.getMsgId());
-                map.put("deviceReplyTime", d60.getReply46Time());
-                map.put("jsyReplyTime", d60.getReply47Time());
-                rs.add(map);
-            }
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-        return rs;
-    }
-
-    /**
-     * 获取路牌下所有班次
-     *
-     * @param lineCode
-     * @param lpName
-     * @return
-     */
-    @RequestMapping("/findByLpName")
-    public List<ScheduleRealInfo> findByLpName(@RequestParam String lineCode, @RequestParam String lpName, @RequestParam String secretKey) {
-        try {
-            if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
-                return null;
-
-            List<ScheduleRealInfo> list = dayOfSchedule.getLpScheduleMap().get(lineCode + "_" + lpName);
-            return list;
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-        return null;
-    }
-
-    /**
-     * 调整出场班次待发，并烂掉后续班次（调派用）
-     *
-     * @param dad
-     * @return
-     */
-    @RequestMapping(value = "/dftzAndDestroy", method = RequestMethod.POST)
-    public Map<String, Object> dftzAndDestroy(@RequestBody DftzAndDestroy dad, @RequestParam String secretKey) {
-        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
-            return null;
-        return tccExternalService.dftz(dad);
-    }
-
-    /**
-     * 换人换车，（调派用）
-     * @return
-     */
-    @RequestMapping(value = "/tccHrhc", method = RequestMethod.POST)
-    public Map<String, Object> hrhc(@RequestBody String jsonStr, @RequestParam String secretKey){
-
-        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
-            return null;
-
-        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
-        JSONObject rootObj = JSON.parseObject(jsonStr);
-
-        List<ChangePersonCar> cpcs = JSONArray.parseArray(rootObj.getString("cpcs"), ChangePersonCar.class);
-        return tccExternalService.hrhc(cpcs, rootObj.getString("tccCode"), rootObj.getString("userId"));
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DftzAndDestroy;
+import com.bsth.data.BasicData;
+import com.bsth.data.directive.DayOfDirectives;
+import com.bsth.data.directive.DirectiveCreator;
+import com.bsth.data.directive.GatewayHttpUtils;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.external.TccExternalService;
+import com.bsth.entity.directive.D60;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.directive.D60Repository;
+import com.bsth.websocket.handler.SendUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * 对外的营运数据接口
+ * Created by panzhao on 2017/3/15.
+ */
+@RestController
+@RequestMapping("/companyService")
+public class ServiceDataInterface {
+
+    private final static String SECRE_KEY = "dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki";
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
+    @Autowired
+    D60Repository d60Repository;
+
+    @Autowired
+    GpsRealData gpsRealData;
+
+    @Autowired
+    TccExternalService tccExternalService;
+
+    @Autowired
+    private SendUtils sendUtils;
+
+    /**
+     * 获取车辆 和 当前执行班次对照信息
+     *
+     * @return
+     */
+    @RequestMapping("/execSchList")
+    public List<Map<String, Object>> execSchList(@RequestParam String secretKey) {
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        List<Map<String, Object>> rs = new ArrayList<>();
+        Collection<ScheduleRealInfo> list = dayOfSchedule.execPlanMap().values();
+
+        Map<String, Object> map;
+        for (ScheduleRealInfo sch : list) {
+            if (null == sch)
+                continue;
+            map = new HashMap<>();
+            map.put("clZbh", sch.getClZbh());
+            map.put("jGh", sch.getjGh());
+            map.put("jName", sch.getjName());
+            map.put("sGh", sch.getsGh());
+            map.put("sName", sch.getsName());
+            map.put("lpName", sch.getLpName());
+            map.put("xlBm", sch.getXlBm());
+            map.put("xlName", sch.getXlName());
+            map.put("xlDir", sch.getXlDir());
+            map.put("qdzName", sch.getQdzName());
+            map.put("zdzName", sch.getZdzName());
+            map.put("fcsj", sch.getFcsj());
+            map.put("dfsj", sch.getDfsj());
+            map.put("zdsj", sch.getZdsj());
+            map.put("bcType", sch.getBcType());
+            map.put("remarks", sch.getRemark());
+            map.put("status", sch.getStatus());
+
+            //放站班次，放到的站点
+            map.put("majorStationName", sch.getMajorStationName());
+            rs.add(map);
+        }
+        return rs;
+    }
+
+    @RequestMapping("/getCurrentDayPlan")
+    public List<ScheduleRealInfo> getCurrentDayPlan(
+            @RequestParam String companyId,
+            @RequestParam String workId,
+            @RequestParam String secretKey) {
+
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findByGsbm(companyId)), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)
+                    && sch.getjGh().equals(workId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    @RequestMapping("/returnCCInfo")
+    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+
+            if (sch.getBcType().equals("out")
+                    && sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    @RequestMapping("/returnJCInfo")
+    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals("in")
+                    && sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    /**
+     * 获取全量的进出场数据， 仅供接口项目调用。 由接口项目负责对外所有场站输出
+     *
+     * @return
+     */
+    @RequestMapping("/findCurrInAndOut")
+    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey) {
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals("in")
+                    || sch.getBcType().equals("out")) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    /**
+     * 向指定的车辆下发消息短语
+     *
+     * @return
+     */
+    @RequestMapping(value = "/send60Phrase", method = RequestMethod.POST)
+    public int send60Phrase(@RequestBody Map<String, String> map, @RequestParam String secretKey) {
+        try {
+            String nbbm = map.get("nbbm");
+            String txt = map.get("txt");
+            String sender = map.get("sender");
+            if (txt.length() > 50)
+                txt = txt.substring(0, 50);
+            if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+                return -500;
+
+            //车辆和设备号对照
+            String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+            if (StringUtils.isEmpty(deviceId))
+                return -404;
+
+            //检查设备是否在线
+            long t = System.currentTimeMillis();
+            GpsEntity gps = gpsRealData.get(deviceId);
+            if (null == gps || (t - gps.getServerTimestamp()) > 1000 * 60 * 5)
+                return -405;
+
+            Short dispatchInstruct = 0;//消息短语
+            D60 d60 = new DirectiveCreator().createD60(nbbm, txt, dispatchInstruct, gps.getUpDown(), gps.getState(), gps.getLineId());
+            d60.setSender(sender);
+            // 发送指令
+            int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
+            d60.setHttpCode(code);
+
+            if (code != 0)
+                d60.setErrorText("网关通讯失败, code: " + code);
+
+            dayOfDirectives.put60(d60);
+            return d60.getMsgId();
+        } catch (Exception e) {
+            logger.error("", e);
+            return -500;
+        }
+    }
+
+    /**
+     * 根据msg id 查询指令响应情况
+     *
+     * @param msgIds
+     * @return
+     */
+    @RequestMapping("/findD60Reply")
+    public List<Map<String, Object>> findD60Reply(@RequestParam String msgIds) {
+        List<Map<String, Object>> rs = new ArrayList<>();
+        try {
+            Map<String, Object> map = new HashMap();
+
+            List<String> ids = Splitter.on(",").splitToList(msgIds);
+            D60 d60;
+            for (String id : ids) {
+                if (StringUtils.isEmpty(id))
+                    continue;
+
+                d60 = dayOfDirectives.get(Integer.parseInt(id));
+                if (null == d60)
+                    continue;
+
+                map.put("msgId", d60.getMsgId());
+                map.put("deviceReplyTime", d60.getReply46Time());
+                map.put("jsyReplyTime", d60.getReply47Time());
+                rs.add(map);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+    /**
+     * 获取路牌下所有班次
+     *
+     * @param lineCode
+     * @param lpName
+     * @return
+     */
+    @RequestMapping("/findByLpName")
+    public List<ScheduleRealInfo> findByLpName(@RequestParam String lineCode, @RequestParam String lpName, @RequestParam String secretKey) {
+        try {
+            if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+                return null;
+
+            List<ScheduleRealInfo> list = dayOfSchedule.getLpScheduleMap().get(lineCode + "_" + lpName);
+            return list;
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return null;
+    }
+
+    /**
+     * 调整出场班次待发，并烂掉后续班次（调派用）
+     *
+     * @param dad
+     * @return
+     */
+    @RequestMapping(value = "/dftzAndDestroy", method = RequestMethod.POST)
+    public Map<String, Object> dftzAndDestroy(@RequestBody DftzAndDestroy dad, @RequestParam String secretKey) {
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+        return tccExternalService.dftz(dad);
+    }
+
+    /**
+     * 换人换车，（调派用）
+     * @return
+     */
+    @RequestMapping(value = "/tccHrhc", method = RequestMethod.POST)
+    public Map<String, Object> hrhc(@RequestBody String jsonStr, @RequestParam String secretKey){
+
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
+        JSONObject rootObj = JSON.parseObject(jsonStr);
+
+        List<ChangePersonCar> cpcs = JSONArray.parseArray(rootObj.getString("cpcs"), ChangePersonCar.class);
+        return tccExternalService.hrhc(cpcs, rootObj.getString("tccCode"), rootObj.getString("userId"));
+    }
+
+    /**
+     * 接收应急预案信息
+     * @return
+     */
+    @RequestMapping(value = "/contingencyPlan", method = RequestMethod.POST)
+    public Map<String, Object> contingencyPlan(@RequestBody String jsonStr, @RequestParam String secretKey){
+        Map<String, Object> result = new HashMap<>();
+        result.put("errCode", 0);
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY)) {
+            result.put("errCode", 501);
+            result.put("msg", "无效的key");
+
+            return result;
+        }
+
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            List<Map> maps = mapper.readValue(jsonStr,mapper.getTypeFactory().constructParametricType(List.class, Map.class));
+            for (Map map : maps) {
+                sendUtils.sendContingencyPlan(map);
+            }
+        } catch (IOException e) {
+            result.put("errCode", 502);
+            result.put("msg", "json数据格式异常");
+            logger.info("", e);
+        }
+
+        return result;
+    }
+}
@@ -22,7 +22,7 @@ import javax.persistence.*;
  
 @Entity
 @Table(name = "bsth_c_personnel")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler","createBy","updateBy"})
 public class Personnel extends BEntity {
  
     /** 主键Id */
-package com.bsth.entity.schedule;
-
-import com.bsth.entity.sys.SysUser;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * Created by xu on 16/12/14.
- */
-@MappedSuperclass
-public class BEntity {
-
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
-    @JsonIgnore
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
-    @JsonIgnore
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date")
-    private Date updateDate;
-
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-}
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.sys.SysUser;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * Created by xu on 16/12/14.
+ */
+@MappedSuperclass
+public class BEntity {
+
+    /** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
+    private SysUser updateBy;
+
+    /** 创建日期 */
+    @Column(updatable = false, name = "create_date")
+    private Date createDate;
+    /** 修改日期 */
+    @Column(name = "update_date")
+    private Date updateDate;
+
+    public SysUser getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
+
+    public SysUser getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
-package com.bsth.websocket.handler;
-
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.data.BasicData;
-import com.bsth.data.msg_queue.WebSocketPushQueue;
-import com.google.common.base.Splitter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.socket.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * @author PanZhao
- */
-@Component
-public class RealControlSocketHandler implements WebSocketHandler {
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	private static ArrayList<WebSocketSession> users;
-	private static ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSession>> listenMap;
-
-	static {
-		users = new ArrayList<WebSocketSession>();
-		listenMap = new ConcurrentHashMap();
-	}
-
-	@Override
-	public void afterConnectionClosed(WebSocketSession session, CloseStatus arg1)
-			throws Exception {
-		users.remove(session);
-		//清理监听
-		int vsCount=0;
-		Collection<CopyOnWriteArrayList<WebSocketSession>> vs = listenMap.values();
-		for(CopyOnWriteArrayList<WebSocketSession> list : vs){
-			list.remove(session);
-
-			vsCount += list.size();
-		}
-		logger.info("listen values size: " + vsCount + " -CloseStatus:" + arg1 + "conn: " + users.size());
-	}
-
-	@Override
-	public void afterConnectionEstablished(WebSocketSession session)
-			throws Exception {
-		session.setBinaryMessageSizeLimit(52768);
-		session.setTextMessageSizeLimit(52768);
-		users.add(session);
-	}
-
-	@Override
-	public void handleMessage(WebSocketSession session, WebSocketMessage<?> msg)
-			throws Exception {
-		JSONObject jsonObj = JSONObject.parseObject(msg.getPayload().toString());
-		switch (jsonObj.getString("operCode")) {
-			case "register_line":
-				//注册线路监听
-				List<String> idx = Splitter.on(",").splitToList(jsonObj.getString("idx"));
-				for(String lineCode : idx){
-					if(BasicData.lineCode2NameMap.containsKey(lineCode)){
-						if(!listenMap.containsKey(lineCode)){
-							listenMap.put(lineCode, new CopyOnWriteArrayList<WebSocketSession>());
-						}
-						listenMap.get(lineCode).add(session);
-					}
-				}
-				break;
-
-			default:
-				break;
-		}
-		logger.info(msg.getPayload().toString());
-	}
-
-	@Override
-	public void handleTransportError(WebSocketSession session, Throwable arg1)
-			throws Exception {
-		if(session.isOpen()){
-			session.close();
-		}
-		users.remove(session);
-	}
-
-	@Override
-	public boolean supportsPartialMessages() {
-		return false;
-	}
-
-
-	/**
-	 * 根据线路推送消息
-	 */
-	public void sendMessageToLine(String lineCode, String msg) {
-
-		TextMessage message = new TextMessage(msg.getBytes());
-		List<WebSocketSession> list = listenMap.get(lineCode);
-		if(list == null || list.size() == 0)
-			return;
-
-		for(WebSocketSession user : list){
-			WebSocketPushQueue.put(user, message);
-			/*try {
-				if (user.isOpen()) {
-					user.sendMessage(message);
-				}
-			} catch (Exception e) {
-				try{
-					logger.error("error user...."+user.getAttributes().get(Constants.SESSION_USERNAME));
-				}
-				catch(Exception e2){}
-				logger.error("sendMessageToLine error ...."+msg);
-				logger.error("sendMessageToLine error ....", e);
-			}*/
-		}
-	}
-
-
-
-	/**
-	 * 全局推送
-	 */
-	public void sendMessage(String msg) {
-
-		TextMessage message = new TextMessage(msg.getBytes());
-
-		Iterator<WebSocketSession> iterator = users.iterator();
-
-		WebSocketSession user;
-		while(iterator.hasNext()){
-			user = iterator.next();
-			WebSocketPushQueue.put(user, message);
-			/*try {
-				if (user.isOpen()) {
-					user.sendMessage(message);
-				}
-			} catch (Exception e) {
-				logger.error("sendMessage error ...."+msg);
-			}*/
-		}
-	}
-}
+package com.bsth.websocket.handler;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.google.common.base.Splitter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * @author PanZhao
+ */
+@Component
+public class RealControlSocketHandler implements WebSocketHandler {
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	private static ArrayList<WebSocketSession> users;
+	private static ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSession>> listenMap;
+
+	static {
+		users = new ArrayList<WebSocketSession>();
+		listenMap = new ConcurrentHashMap();
+	}
+
+	@Override
+	public void afterConnectionClosed(WebSocketSession session, CloseStatus arg1)
+			throws Exception {
+		users.remove(session);
+		//清理监听
+		int vsCount=0;
+		Collection<CopyOnWriteArrayList<WebSocketSession>> vs = listenMap.values();
+		for(CopyOnWriteArrayList<WebSocketSession> list : vs){
+			list.remove(session);
+
+			vsCount += list.size();
+		}
+		logger.info("listen values size: " + vsCount + " -CloseStatus:" + arg1 + "conn: " + users.size());
+	}
+
+	@Override
+	public void afterConnectionEstablished(WebSocketSession session)
+			throws Exception {
+		session.setBinaryMessageSizeLimit(52768);
+		session.setTextMessageSizeLimit(52768);
+		users.add(session);
+	}
+
+	@Override
+	public void handleMessage(WebSocketSession session, WebSocketMessage<?> msg)
+			throws Exception {
+		JSONObject jsonObj = JSONObject.parseObject(msg.getPayload().toString());
+		switch (jsonObj.getString("operCode")) {
+			case "register_line":
+				//注册线路监听
+				List<String> idx = Splitter.on(",").splitToList(jsonObj.getString("idx"));
+				for(String lineCode : idx){
+					if(BasicData.lineCode2NameMap.containsKey(lineCode)){
+						if(!listenMap.containsKey(lineCode)){
+							listenMap.put(lineCode, new CopyOnWriteArrayList<WebSocketSession>());
+						}
+						listenMap.get(lineCode).add(session);
+					}
+				}
+				break;
+
+			default:
+				break;
+		}
+		logger.info(msg.getPayload().toString());
+	}
+
+	@Override
+	public void handleTransportError(WebSocketSession session, Throwable arg1)
+			throws Exception {
+		if(session.isOpen()){
+			session.close();
+		}
+		users.remove(session);
+	}
+
+	@Override
+	public boolean supportsPartialMessages() {
+		return false;
+	}
+
+
+	/**
+	 * 根据线路推送消息
+	 */
+	public void sendMessageToLine(String lineCode, String msg) {
+
+		TextMessage message = new TextMessage(msg.getBytes());
+		List<WebSocketSession> list = listenMap.get(lineCode);
+		if(list == null || list.size() == 0)
+			return;
+
+		for(WebSocketSession user : list){
+			WebSocketPushQueue.put(user, message);
+			/*try {
+				if (user.isOpen()) {
+					user.sendMessage(message);
+				}
+			} catch (Exception e) {
+				try{
+					logger.error("error user...."+user.getAttributes().get(Constants.SESSION_USERNAME));
+				}
+				catch(Exception e2){}
+				logger.error("sendMessageToLine error ...."+msg);
+				logger.error("sendMessageToLine error ....", e);
+			}*/
+		}
+	}
+
+
+
+	/**
+	 * 全局推送
+	 */
+	public void sendMessage(String msg) {
+
+		TextMessage message = new TextMessage(msg.getBytes());
+
+		Iterator<WebSocketSession> iterator = users.iterator();
+
+		WebSocketSession user;
+		while(iterator.hasNext()){
+			user = iterator.next();
+			WebSocketPushQueue.put(user, message);
+			/*try {
+				if (user.isOpen()) {
+					user.sendMessage(message);
+				}
+			} catch (Exception e) {
+				logger.error("sendMessage error ...."+msg);
+			}*/
+		}
+	}
+
+	/**
+	 * 根据线路推送消息
+	 */
+	public void sendMessageToUser(String userName, String msg) {
+
+		TextMessage message = new TextMessage(msg.getBytes());
+
+		for(WebSocketSession user : users){
+			if (userName.equals(user.getPrincipal().getName())) {
+				WebSocketPushQueue.put(user, message);
+			}
+		}
+	}
+}
@@ -230,7 +230,23 @@ public class SendUtils{
 		try {
 			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
 		} catch (JsonProcessingException e) {
-			logger.error("", e);
+			logger.error("sendRfid", e);
+		}
+	}
+
+	/**
+	 * 将应急预案发送至线调页面
+	 */
+	public void sendContingencyPlan(Map<String, Object> cp) {
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "contingencyPlan");
+		map.put("data", cp);
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToUser((String)cp.get("instructionsPeopleCode"), mapper.writeValueAsString(map));
+		} catch (JsonProcessingException e) {
+			logger.error("sendContingencyPlan", e);
 		}
 	}
 }
-server.port=9088
-
-# dubbo服务化使用开关flag
-dubbo.use=false
-
-#JPA
-spring.jpa.hibernate.ddl-auto= none
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
-spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-spring.jpa.database= MYSQL
-spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= true
-
-#DATABASE
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-#spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-##spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.username= root
-#spring.datasource.password=
-spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password= root
-#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.username= root
-#spring.datasource.password= root
-spring.datasource.type= com.zaxxer.hikari.HikariDataSource
-
-#DATASOURCE SETTING
-spring.datasource.hikari.minimum-idle= 8
-spring.datasource.hikari.maximum-pool-size= 100
-#spring.datasource.hikari.auto-commit= true
-spring.datasource.hikari.idle-timeout= 60000
-#spring.datasource.hikari.pool-name= HikariPool
-spring.datasource.hikari.max-lifetime= 1800000
-spring.datasource.hikari.connection-timeout= 3000
-spring.datasource.hikari.connection-test-query= SELECT 1
-spring.datasource.hikari.validation-timeout= 3000
-spring.datasource.hikari.register-mbeans=true
-
-## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
-## gateway real data
-http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
-## gateway send directive
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
-## rfid data
-http.rfid.url= http://114.80.178.12:29000/rfid
-## http ticketing interface
-http.ticketing.interface= http://112.64.187.3:1080/gjService/request
-## first last generate
-ms.fl.generate=true
 \ No newline at end of file
+server.port=9088
+
+# dubbo服务化使用开关flag
+dubbo.use=false
+
+#JPA
+spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
+spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+spring.jpa.database= MYSQL
+spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
+spring.jpa.show-sql= true
+
+#DATABASE
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+#spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+##spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.username= root
+#spring.datasource.password=
+spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root
+#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.username= root
+#spring.datasource.password= root
+spring.datasource.type= com.zaxxer.hikari.HikariDataSource
+
+#DATASOURCE SETTING
+spring.datasource.hikari.minimum-idle= 8
+spring.datasource.hikari.maximum-pool-size= 100
+#spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 60000
+#spring.datasource.hikari.pool-name= HikariPool
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 3000
+spring.datasource.hikari.connection-test-query= SELECT 1
+spring.datasource.hikari.validation-timeout= 3000
+spring.datasource.hikari.register-mbeans=true
+
+## gps client data
+http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
+## gateway real data
+http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
+## gateway send directive
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
+## rfid data
+http.rfid.url= http://114.80.178.12:29000/rfid
+## http ticketing interface
+http.ticketing.interface= http://112.64.187.3:1080/gjService/request
+## first last generate
+ms.fl.generate=true
+## dsm ack interface
+dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
+## cp ack interface
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
-server.port=9088
-
-# dubbo����ʹ�ÿ���flag
-dubbo.use=false
-
-#JPA
-spring.jpa.hibernate.ddl-auto= none
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
-spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-spring.jpa.database= MYSQL
-spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= true
-
-#DATABASE
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-spring.datasource.username= root
-spring.datasource.password= root2jsp
-spring.datasource.type= com.zaxxer.hikari.HikariDataSource
-
-#DATASOURCE SETTING
-spring.datasource.hikari.minimum-idle= 8
-spring.datasource.hikari.maximum-pool-size= 100
-#spring.datasource.hikari.auto-commit= true
-spring.datasource.hikari.idle-timeout= 60000
-#spring.datasource.hikari.pool-name= HikariPool
-spring.datasource.hikari.max-lifetime= 1800000
-spring.datasource.hikari.connection-timeout= 3000
-spring.datasource.hikari.connection-test-query= SELECT 1
-spring.datasource.hikari.validation-timeout= 3000
-spring.datasource.hikari.register-mbeans=true
-
-## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
-## gateway real data
-http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
-## gateway send directive
-http.send.directive= http://10.10.200.79:8080/transport_server/message/
-## rfid data
-http.rfid.url= http://10.10.200.82:9000/rfid
-## wxsb
-#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
-## http ticketing interface
-http.ticketing.interface= http://112.64.187.3:1080/gjService/request
-## first last generate
-ms.fl.generate=true
 \ No newline at end of file
+server.port=9088
+
+# dubbo����ʹ�ÿ���flag
+dubbo.use=false
+
+#JPA
+spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
+spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+spring.jpa.database= MYSQL
+spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
+spring.jpa.show-sql= true
+
+#DATABASE
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.username= root
+spring.datasource.password= root2jsp
+spring.datasource.type= com.zaxxer.hikari.HikariDataSource
+
+#DATASOURCE SETTING
+spring.datasource.hikari.minimum-idle= 8
+spring.datasource.hikari.maximum-pool-size= 100
+#spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 60000
+#spring.datasource.hikari.pool-name= HikariPool
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 3000
+spring.datasource.hikari.connection-test-query= SELECT 1
+spring.datasource.hikari.validation-timeout= 3000
+spring.datasource.hikari.register-mbeans=true
+
+## gps client data
+http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
+## gateway real data
+http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
+## gateway send directive
+http.send.directive= http://10.10.200.79:8080/transport_server/message/
+## rfid data
+http.rfid.url= http://10.10.200.82:9000/rfid
+## wxsb
+#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
+#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
+#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
+#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
+http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
+http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
+http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
+http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
+## http ticketing interface
+http.ticketing.interface= http://112.64.187.3:1080/gjService/request
+## first last generate
+ms.fl.generate=true
+## dsm ack interface
+dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
+## cp ack interface
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
-server.port=9088
-
-# dubbo����ʹ�ÿ���flag
-dubbo.use=false
-
-#JPA
-spring.jpa.hibernate.ddl-auto= none
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
-spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-spring.jpa.database= MYSQL
-spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= false
-
-#DATABASE
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.200.148:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password= root
-spring.datasource.type= com.zaxxer.hikari.HikariDataSource
-
-#DATASOURCE SETTING
-spring.datasource.hikari.minimum-idle= 8
-spring.datasource.hikari.maximum-pool-size= 100
-#spring.datasource.hikari.auto-commit= true
-spring.datasource.hikari.idle-timeout= 60000
-#spring.datasource.hikari.pool-name= HikariPool
-spring.datasource.hikari.max-lifetime= 1800000
-spring.datasource.hikari.connection-timeout= 3000
-spring.datasource.hikari.connection-test-query= SELECT 1
-spring.datasource.hikari.validation-timeout= 3000
-spring.datasource.hikari.register-mbeans=true
-
-## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
-## gateway real data
-http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
-## gateway send directive
-#http.send.directive = http://10.10.200.79:8080/transport_server/message/
-## rfid data
-http.rfid.url= http://10.10.200.82:9000/rfid
-## http ticketing interface
-http.ticketing.interface= http://112.64.187.3:1080/gjService/request
-## first last generate
-ms.fl.generate=false
 \ No newline at end of file
+server.port=9088
+
+# dubbo����ʹ�ÿ���flag
+dubbo.use=false
+
+#JPA
+spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
+spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+spring.jpa.database= MYSQL
+spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
+spring.jpa.show-sql= false
+
+#DATABASE
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://10.10.200.148:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root
+spring.datasource.type= com.zaxxer.hikari.HikariDataSource
+
+#DATASOURCE SETTING
+spring.datasource.hikari.minimum-idle= 8
+spring.datasource.hikari.maximum-pool-size= 100
+#spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 60000
+#spring.datasource.hikari.pool-name= HikariPool
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 3000
+spring.datasource.hikari.connection-test-query= SELECT 1
+spring.datasource.hikari.validation-timeout= 3000
+spring.datasource.hikari.register-mbeans=true
+
+## gps client data
+http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
+## gateway real data
+http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
+## gateway send directive
+#http.send.directive = http://10.10.200.79:8080/transport_server/message/
+## rfid data
+http.rfid.url= http://10.10.200.82:9000/rfid
+## http ticketing interface
+http.ticketing.interface= http://112.64.187.3:1080/gjService/request
+## first last generate
+ms.fl.generate=false
+## dsm ack interface
+dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
+## cp ack interface
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
@@ -11,12 +11,12 @@
     <parameters>
         <parameter>
             <name>erroroutputdir</name>
-            <default_value>&#x2f;Users&#x2f;xu&#x2f;resource&#x2f;project_code&#x2f;bsth_project&#x2f;bsth_control_etl&#x2f;&#x5bfc;&#x5165;&#x5bfc;&#x51fa;1</default_value>
+            <default_value>&#x2f;Users&#x2f;xu&#x2f;resource&#x2f;project_code&#x2f;runtime_temp&#x2f;bsth_control_u_d_files&#x2f;erroroutput</default_value>
             <description>ktr step&#x914d;&#x7f6e;&#x7684;&#x9519;&#x8bef;&#x8f93;&#x51fa;&#x76ee;&#x5f55;</description>
         </parameter>
         <parameter>
             <name>filepath</name>
-            <default_value>&#x2f;Users&#x2f;xu&#x2f;resource&#x2f;project_code&#x2f;bsth_project&#x2f;bsth_control_etl&#x2f;&#x5bfc;&#x5165;&#x5bfc;&#x51fa;1&#x2f;&#x6392;&#x7248;&#x89c4;&#x5219;&#x4fe1;&#x606f;.xls</default_value>
+            <default_value>&#x2f;Users&#x2f;xu&#x2f;resource&#x2f;project_code&#x2f;runtime_temp&#x2f;bsth_control_u_d_files&#x2f;&#x6392;&#x7248;&#x89c4;&#x5219;&#x4fe1;&#x606f;-167-&#x526f;&#x672c;.xls</default_value>
             <description>&#x5f85;&#x5904;&#x7406;&#x5bfc;&#x5165;&#x7684;excel&#x6587;&#x4ef6;</description>
         </parameter>
     </parameters>
@@ -84,6 +84,27 @@
     <is_key_private>N</is_key_private>
   </info>
   <notepads>
+    <notepad>
+      <note>&#x4e1a;&#x52a1;&#x4fe1;&#x606f;&#x66f4;&#x65b0;&#xff1a;&#xa;1&#x3001;&#x4eba;&#x5458;&#x5982;&#x679c;&#x4f5c;&#x5e9f;&#x4e86;&#xff0c;&#x5ffd;&#x7565;&#x5173;&#x8054;&#x7684;&#x642d;&#x73ed;&#x7f16;&#x7801;&#xa;2&#x3001;&#x6240;&#x6709;&#x7684;&#x6570;&#x636e;&#x5e93; join step&#x7684;outer join&#x4e0d;&#x8981;&#x52fe;&#x9009;&#xff0c;&#xa;  &#x4e0d;&#x52fe;&#x9009;&#x7684;&#x60c5;&#x51b5;&#x4e0b;&#xff0c;&#x5982;&#x679c;&#x5f53;&#x524d;input&#x884c;&#x6570;&#x636e;&#x53c2;&#x4e0e;&#x7684;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x6ca1;&#x627e;&#x5230;&#x6570;&#x636e;&#xff0c;&#x5219;output&#x884c;&#x5c31;&#x6ca1;&#x6709;&#x6570;&#x636e;&#x4e86;&#xff0c;&#xa;  &#xff08;&#x4e4b;&#x524d;outer join&#x9009;&#x4e2d;&#xff0c;&#x9020;&#x6210;output&#x884c;&#x4e00;&#x76f4;&#x6709;&#x6570;&#x636e;&#xff0c;&#x540e;&#x9762;&#x8fd8;&#x8981;&#x4f7f;&#x7528;&#x8fc7;&#x6ee4;step&#x8fc7;&#x6ee4;&#x6570;&#x636e;&#xff09;</note>
+      <xloc>161</xloc>
+      <yloc>362</yloc>
+      <width>557</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
   </notepads>
   <connection>
     <name>192.168.168.1_jwgl_dw</name>
@@ -593,35 +614,36 @@
     </attributes>
   </connection>
   <order>
-  <hop> <from>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</from><to>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</from><to>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;</from><to>&#x8def;&#x724c;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</from><to>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x8def;&#x724c;id</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x8def;&#x724c;id</from><to>&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;</from><to>&#x62c6;&#x5206;&#x5206;&#x73ed;&#x642d;&#x73ed;&#x7f16;&#x7801;&#x5b57;&#x6bb5;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x62c6;&#x5206;&#x5206;&#x73ed;&#x642d;&#x73ed;&#x7f16;&#x7801;&#x5b57;&#x6bb5;</from><to>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</from><to>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2; 2</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</from><to>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</from><to>&#x8fc7;&#x6ee4;&#x7ebf;&#x8def;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x8fc7;&#x6ee4;&#x7ebf;&#x8def;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</from><to>&#x8fc7;&#x6ee4;&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x8fc7;&#x6ee4;&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x8def;&#x724c;id&#x67e5;&#x8be2;</from><to>&#x8fc7;&#x6ee4;&#x8def;&#x724c;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x8fc7;&#x6ee4;&#x8def;&#x724c;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2; 2</from><to>&#x8fc7;&#x6ee4;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x8fc7;&#x6ee4;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</from><to>&#x5408;&#x5e76;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5408;&#x5e76;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55; 2</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x6392;&#x5e8f;&#x8bb0;&#x5f55; 2</from><to>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</from><to>&#x542f;&#x7528;&#x65e5;&#x671f;&#x8f6c;&#x6362;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5220;&#x9664;</from><to>&#x963b;&#x585e;&#x6570;&#x636e;&#x76f4;&#x5230;&#x6b65;&#x9aa4;&#x90fd;&#x5b8c;&#x6210;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x963b;&#x585e;&#x6570;&#x636e;&#x76f4;&#x5230;&#x6b65;&#x9aa4;&#x90fd;&#x5b8c;&#x6210;</from><to>&#x89c4;&#x5219;&#x8868;&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x89c4;&#x5219;&#x8868;&#x8f93;&#x51fa;</from><to>&#x9519;&#x8bef;&#x8f93;&#x51fa; 2</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x542f;&#x7528;&#x65e5;&#x671f;&#x8f6c;&#x6362;</from><to>&#x9ed8;&#x8ba4;&#x7ffb;&#x73ed;&#x7c7b;&#x578b;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x9ed8;&#x8ba4;&#x7ffb;&#x73ed;&#x7c7b;&#x578b;</from><to>&#x5220;&#x9664;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</from><to>&#x7ebf;&#x8def;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7ebf;&#x8def;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</from><to>&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</from><to>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;&#x4fe1;&#x606f;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;&#x4fe1;&#x606f;</from><to>&#x8def;&#x724c;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x8def;&#x724c;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</from><to>&#x6392;&#x5e8f;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6392;&#x5e8f;&#x6570;&#x636e;</from><to>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x8def;&#x724c;&#x4fe1;&#x606f;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x8def;&#x724c;&#x4fe1;&#x606f;</from><to>&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;&#x4fe1;&#x606f;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;&#x4fe1;&#x606f;</from><to>&#x7ee7;&#x7eed;&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;&#xff08;&#x5206;&#x73ed;&#xff09;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;2</from><to>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;</from><to>&#x542f;&#x7528;&#x65e5;&#x671f;&#x8f6c;&#x6362;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7ee7;&#x7eed;&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;&#xff08;&#x5206;&#x73ed;&#xff09;</from><to>&#x5224;&#x65ad;&#x662f;&#x5426;&#x5206;&#x73ed;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5224;&#x65ad;&#x662f;&#x5426;&#x5206;&#x73ed;</from><to>&#x65e0;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x67e5;&#x8be2; </to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;1&#x4fe1;&#x606f;&#x67e5;&#x8be2;</from><to>&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;2&#x4fe1;&#x606f;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5224;&#x65ad;&#x662f;&#x5426;&#x5206;&#x73ed;</from><to>&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;1&#x4fe1;&#x606f;&#x67e5;&#x8be2;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x65e0;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x67e5;&#x8be2; </from><to>&#x5904;&#x7406;&#x65e0;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4fe1;&#x606f;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;2&#x4fe1;&#x606f;&#x67e5;&#x8be2;</from><to>&#x5408;&#x5e76;&#x5904;&#x7406;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4fe1;&#x606f;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5904;&#x7406;&#x65e0;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4fe1;&#x606f;</from><to>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5408;&#x5e76;&#x5904;&#x7406;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4fe1;&#x606f;</from><to>&#x5b57;&#x6bb5;&#x9009;&#x62e9; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9; 2</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</from><to>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</to><enabled>Y</enabled> </hop>
   </order>
   <step>
-    <name>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</name>
-    <type>DBLookup</type>
+    <name>&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;1&#x4fe1;&#x606f;&#x67e5;&#x8be2;</name>
+    <type>DBJoin</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -631,51 +653,31 @@
            <schema_name/>
            </partitioning>
     <connection>control_jndi</connection>
-    <cache>N</cache>
-    <cache_load_all>Y</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_s_ecinfo</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
+    <rowlimit>1</rowlimit>
+    <sql>select id as rycid1 from bsth_c_s_ecinfo employeeco0_ &#xa;where xl &#x3d; &#x3f; &#xa;and dbbm &#x3d; &#x3f; &#xa;and is_cancel &#x3d; 0&#xa;and &#x28;&#xa;&#x28;&#xa;    select IFNULL&#x28;t2.destroy, 0&#x29; &#xa;    from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.jsy &#x3d; t2.id &#xa;    where t1.id &#x3d; employeeco0_.id&#xa;&#x29; &#x2b; &#xa;&#x28;&#xa;    select IFNULL&#x28;t2.destroy, 0&#x29; &#xa;    from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.spy &#x3d; t2.id &#xa;    where t1.id &#x3d; employeeco0_.id&#xa;&#x29;&#xa;&#x29; &#x3d; 0</sql>
+    <outer_join>N</outer_join>
+    <replace_vars>N</replace_vars>
+    <parameter>
+      <field>
         <name>xlid</name>
-        <field>xl</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>dbbm1</name>
-        <field>dbbm</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>isCancel</name>
-        <field>is_cancel</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>id</name>
-        <rename>rycid1</rename>
-        <default/>
         <type>Integer</type>
-      </value>
-    </lookup>
+      </field>
+      <field>
+        <name>dbbm1</name>
+        <type>String</type>
+      </field>
+    </parameter>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>904</xloc>
-      <yloc>101</yloc>
+      <xloc>950</xloc>
+      <yloc>113</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x67e5;&#x8be2; 2</name>
-    <type>DBLookup</type>
+    <name>&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;2&#x4fe1;&#x606f;&#x67e5;&#x8be2;</name>
+    <type>DBJoin</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -685,50 +687,30 @@
            <schema_name/>
            </partitioning>
     <connection>control_jndi</connection>
-    <cache>N</cache>
-    <cache_load_all>Y</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_s_ecinfo</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
+    <rowlimit>1</rowlimit>
+    <sql>select id as rycid2 from bsth_c_s_ecinfo employeeco0_ &#xa;where xl &#x3d; &#x3f; &#xa;and dbbm &#x3d; &#x3f; &#xa;and is_cancel &#x3d; 0&#xa;and &#x28;&#xa;&#x28;&#xa;    select IFNULL&#x28;t2.destroy, 0&#x29; &#xa;    from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.jsy &#x3d; t2.id &#xa;    where t1.id &#x3d; employeeco0_.id&#xa;&#x29; &#x2b; &#xa;&#x28;&#xa;    select IFNULL&#x28;t2.destroy, 0&#x29; &#xa;    from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.spy &#x3d; t2.id &#xa;    where t1.id &#x3d; employeeco0_.id&#xa;&#x29;&#xa;&#x29; &#x3d; 0</sql>
+    <outer_join>N</outer_join>
+    <replace_vars>N</replace_vars>
+    <parameter>
+      <field>
         <name>xlid</name>
-        <field>xl</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>dbbm2</name>
-        <field>dbbm</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>isCancel</name>
-        <field>is_cancel</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>id</name>
-        <rename>rycid2</rename>
-        <default/>
         <type>Integer</type>
-      </value>
-    </lookup>
+      </field>
+      <field>
+        <name>dbbm2</name>
+        <type>String</type>
+      </field>
+    </parameter>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>778</xloc>
-      <yloc>103</yloc>
+      <xloc>952</xloc>
+      <yloc>200</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</name>
+    <name>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;</name>
     <type>GroupBy</type>
     <description/>
     <distribute>Y</distribute>
@@ -774,9 +756,6 @@
         <field>
           <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
         </field>
-        <field>
-          <name>isCancel</name>
-        </field>
       </group>
       <fields>
         <field>
@@ -794,14 +773,14 @@
       </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>780</xloc>
-      <yloc>291</yloc>
+      <xloc>765</xloc>
+      <yloc>476</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x8def;&#x724c;id</name>
+    <name>&#x5206;&#x7ec4;&#x5408;&#x5e76;&#x8def;&#x724c;&#x4fe1;&#x606f;</name>
     <type>GroupBy</type>
     <description/>
     <distribute>Y</distribute>
@@ -841,9 +820,6 @@
         <field>
           <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
         </field>
-        <field>
-          <name>isCancel</name>
-        </field>
       </group>
       <fields>
         <field>
@@ -861,8 +837,8 @@
       </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>653</xloc>
-      <yloc>119</yloc>
+      <xloc>370</xloc>
+      <yloc>293</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -892,8 +868,8 @@
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>508</xloc>
-      <yloc>381</yloc>
+      <xloc>371</xloc>
+      <yloc>479</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -1063,7 +1039,7 @@
     </step>
  
   <step>
-    <name>&#x5408;&#x5e76;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id</name>
+    <name>&#x5408;&#x5e76;&#x5904;&#x7406;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4fe1;&#x606f;</name>
     <type>ScriptValueMod</type>
     <description/>
     <distribute>Y</distribute>
@@ -1077,7 +1053,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var rycid&#x3b;&#xa;var rybm&#x3b;&#xa;&#xa;if &#x28;rycid2 &#x3d;&#x3d; null&#x29; &#x7b;&#xa;	rycid &#x3d; rycid1&#x3b;&#xa;	rybm &#x3d; dbbm1&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	rycid &#x3d; rycid1 &#x2b; &#x22;-&#x22; &#x2b; rycid2&#x3b;&#xa;	rybm &#x3d; dbbm1 &#x2b; &#x22;-&#x22; &#x2b; dbbm2&#x3b;&#xa;&#x7d;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var rycid&#x3b;&#xa;var rybm&#x3b;&#xa;&#xa;rycid &#x3d; rycid1 &#x2b; &#x22;-&#x22; &#x2b; rycid2&#x3b;&#xa;rybm &#x3d; dbbm1 &#x2b; &#x22;-&#x22; &#x2b; dbbm2&#x3b;&#xa;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>rycid</name>
         <rename>rycid</rename>
         <type>String</type>
@@ -1092,8 +1068,8 @@
         <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>917</xloc>
-      <yloc>201</yloc>
+      <xloc>953</xloc>
+      <yloc>288</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -1127,47 +1103,14 @@
         <storage_type/>
       </meta>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>777</xloc>
-      <yloc>368</yloc>
+      <xloc>615</xloc>
+      <yloc>480</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</name>
-    <type>Constant</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <fields>
-      <field>
-        <name>isCancel</name>
-        <type>Integer</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>0</nullif>
-        <length>-1</length>
-        <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-    </fields>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>361</xloc>
-      <yloc>22</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+    <name>&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;&#x4fe1;&#x606f;</name>
     <type>SplitFieldToRows3</type>
     <description/>
     <distribute>Y</distribute>
@@ -1186,62 +1129,14 @@
    <delimiter_is_regex>N</delimiter_is_regex>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>777</xloc>
-      <yloc>22</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x62c6;&#x5206;&#x5206;&#x73ed;&#x642d;&#x73ed;&#x7f16;&#x7801;&#x5b57;&#x6bb5;</name>
-    <type>FieldSplitter</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-   <splitfield>dbbm</splitfield>
-   <delimiter>-</delimiter>
-   <enclosure/>
-    <fields>      <field>        <name>dbbm1</name>
-        <id/>
-        <idrem>N</idrem>
-        <type>String</type>
-        <format/>
-        <group/>
-        <decimal/>
-        <currency/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <nullif/>
-        <ifnull/>
-        <trimtype>none</trimtype>
-      </field>      <field>        <name>dbbm2</name>
-        <id/>
-        <idrem>N</idrem>
-        <type>String</type>
-        <format/>
-        <group/>
-        <decimal/>
-        <currency/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <nullif/>
-        <ifnull/>
-        <trimtype>none</trimtype>
-      </field>    </fields>     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>901</xloc>
-      <yloc>22</yloc>
+      <xloc>552</xloc>
+      <yloc>21</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;</name>
+    <name>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;&#x4fe1;&#x606f;</name>
     <type>SplitFieldToRows3</type>
     <description/>
     <distribute>Y</distribute>
@@ -1260,14 +1155,14 @@
    <delimiter_is_regex>N</delimiter_is_regex>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>364</xloc>
-      <yloc>259</yloc>
+      <xloc>367</xloc>
+      <yloc>20</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
+    <name>&#x6392;&#x5e8f;&#x6570;&#x636e;</name>
     <type>SortRows</type>
     <description/>
     <distribute>Y</distribute>
@@ -1327,23 +1222,17 @@
         <case_sensitive>N</case_sensitive>
         <presorted>N</presorted>
       </field>
-      <field>
-        <name>isCancel</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
     </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>516</xloc>
-      <yloc>119</yloc>
+      <xloc>369</xloc>
+      <yloc>205</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55; 2</name>
+    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;2</name>
     <type>SortRows</type>
     <description/>
     <distribute>Y</distribute>
@@ -1415,24 +1304,18 @@
         <case_sensitive>N</case_sensitive>
         <presorted>N</presorted>
       </field>
-      <field>
-        <name>isCancel</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
     </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>919</xloc>
-      <yloc>289</yloc>
+      <xloc>862</xloc>
+      <yloc>474</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x7ebf;&#x8def;id&#x67e5;&#x8be2;</name>
-    <type>DBLookup</type>
+    <name>&#x7ebf;&#x8def;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</name>
+    <type>DBJoin</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -1442,43 +1325,73 @@
            <schema_name/>
            </partitioning>
     <connection>control_jndi</connection>
-    <cache>N</cache>
-    <cache_load_all>Y</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_line</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
+    <rowlimit>1</rowlimit>
+    <sql>select id as xlid from bsth_c_line&#xa;where name &#x3d; &#x3f; &#xa;and destroy &#x3d; 0 </sql>
+    <outer_join>N</outer_join>
+    <replace_vars>N</replace_vars>
+    <parameter>
+      <field>
         <name>&#x7ebf;&#x8def;</name>
-        <field>name</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>isCancel</name>
-        <field>destroy</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>id</name>
-        <rename>xlid</rename>
-        <default/>
-        <type>Integer</type>
-      </value>
-    </lookup>
+        <type>String</type>
+      </field>
+    </parameter>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>359</xloc>
+      <xloc>208</xloc>
       <yloc>110</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
+    <name>&#x7ee7;&#x7eed;&#x62c6;&#x5206;&#x4eba;&#x5458;&#x8303;&#x56f4;&#xff08;&#x5206;&#x73ed;&#xff09;</name>
+    <type>FieldSplitter</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+   <splitfield>dbbm</splitfield>
+   <delimiter>-</delimiter>
+   <enclosure/>
+    <fields>      <field>        <name>dbbm1</name>
+        <id/>
+        <idrem>N</idrem>
+        <type>String</type>
+        <format/>
+        <group/>
+        <decimal/>
+        <currency/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <nullif/>
+        <ifnull/>
+        <trimtype>none</trimtype>
+      </field>      <field>        <name>dbbm2</name>
+        <id/>
+        <idrem>N</idrem>
+        <type>String</type>
+        <format/>
+        <group/>
+        <decimal/>
+        <currency/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <nullif/>
+        <ifnull/>
+        <trimtype>none</trimtype>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>711</xloc>
+      <yloc>23</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</name>
     <type>GetVariable</type>
     <description/>
@@ -1599,15 +1512,15 @@
     </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>148</xloc>
-      <yloc>380</yloc>
+      <xloc>65</xloc>
+      <yloc>481</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x8def;&#x724c;id&#x67e5;&#x8be2;</name>
-    <type>DBLookup</type>
+    <name>&#x8def;&#x724c;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</name>
+    <type>DBJoin</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -1617,50 +1530,30 @@
            <schema_name/>
            </partitioning>
     <connection>control_jndi</connection>
-    <cache>N</cache>
-    <cache_load_all>Y</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_s_gbi</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
+    <rowlimit>1</rowlimit>
+    <sql>select id as lpid from bsth_c_s_gbi&#xa;where xl &#x3d; &#x3f; &#xa;and lp_name &#x3d; &#x3f; &#xa;and is_cancel &#x3d; 0</sql>
+    <outer_join>N</outer_join>
+    <replace_vars>N</replace_vars>
+    <parameter>
+      <field>
         <name>xlid</name>
-        <field>xl</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>lpname</name>
-        <field>lp_name</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <key>
-        <name>isCancel</name>
-        <field>is_cancel</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>id</name>
-        <rename>lpid</rename>
-        <default/>
         <type>Integer</type>
-      </value>
-    </lookup>
+      </field>
+      <field>
+        <name>lpname</name>
+        <type>String</type>
+      </field>
+    </parameter>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>516</xloc>
-      <yloc>21</yloc>
+      <xloc>366</xloc>
+      <yloc>111</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</name>
+    <name>&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x67e5;&#x8be2;</name>
     <type>DBJoin</type>
     <description/>
     <distribute>Y</distribute>
@@ -1672,8 +1565,8 @@
            </partitioning>
     <connection>control_jndi</connection>
     <rowlimit>1</rowlimit>
-    <sql>select t1.id as cid from bsth_c_s_ccinfo t1 left join bsth_c_cars t2 on t1.cl &#x3d; t2.id&#xa;where t1.xl &#x3d; &#x3f; and t2.inside_code &#x3d; &#x3f; and t1.is_cancel &#x3d; &#x3f;</sql>
-    <outer_join>Y</outer_join>
+    <sql>select t1.id as cid &#xa;from bsth_c_s_ccinfo t1 left join bsth_c_cars t2 on t1.cl &#x3d; t2.id&#xa;where t1.xl &#x3d; &#x3f; &#xa;and t2.inside_code &#x3d; &#x3f; &#xa;and t1.is_cancel &#x3d; 0 </sql>
+    <outer_join>N</outer_join>
     <replace_vars>N</replace_vars>
     <parameter>
       <field>
@@ -1684,143 +1577,11 @@
         <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
         <type>String</type>
       </field>
-      <field>
-        <name>isCancel</name>
-        <type>Integer</type>
-      </field>
     </parameter>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>360</xloc>
-      <yloc>184</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x8fc7;&#x6ee4;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-<send_true_to/>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <conditions>
-  <condition>
-   <negated>N</negated>
-   <leftvalue>rycid1</leftvalue>
-   <function>IS NOT NULL</function>
-   <rightvalue/>
-   </condition>
-  <condition>
-   <negated>N</negated>
-   <operator>OR</operator>
-   <leftvalue>rycid2</leftvalue>
-   <function>IS NOT NULL</function>
-   <rightvalue/>
-   </condition>
-  </conditions>
- </condition>
-    </compare>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>776</xloc>
-      <yloc>204</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x8fc7;&#x6ee4;&#x7ebf;&#x8def;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-<send_true_to>&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x67e5;&#x8be2;</send_true_to>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <leftvalue>xlid</leftvalue>
- <function>IS NOT NULL</function>
- <rightvalue/>
- </condition>
-    </compare>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>203</xloc>
-      <yloc>110</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x8fc7;&#x6ee4;&#x8def;&#x724c;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-<send_true_to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</send_true_to>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <leftvalue>lpid</leftvalue>
- <function>IS NOT NULL</function>
- <rightvalue/>
- </condition>
-    </compare>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>653</xloc>
-      <yloc>23</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x8fc7;&#x6ee4;&#x8f66;&#x8f86;&#x914d;&#x7f6e;id&#x4e3a;&#x7a7a;&#x8bb0;&#x5f55;</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-<send_true_to>&#x62c6;&#x5206;&#x8def;&#x724c;&#x8303;&#x56f4;</send_true_to>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <leftvalue>cid</leftvalue>
- <function>IS NOT NULL</function>
- <rightvalue/>
- </condition>
-    </compare>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>208</xloc>
-      <yloc>182</yloc>
+      <xloc>209</xloc>
+      <yloc>207</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -1966,8 +1727,8 @@
       </custom>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>142</xloc>
-      <yloc>512</yloc>
+      <xloc>64</xloc>
+      <yloc>380</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -1991,8 +1752,8 @@
       </steps>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>339</xloc>
-      <yloc>381</yloc>
+      <xloc>216</xloc>
+      <yloc>480</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -2024,8 +1785,235 @@
     </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>643</xloc>
-      <yloc>368</yloc>
+      <xloc>485</xloc>
+      <yloc>481</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5224;&#x65ad;&#x662f;&#x5426;&#x5206;&#x73ed;</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+<send_true_to>&#x65e0;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x67e5;&#x8be2; </send_true_to>
+<send_false_to>&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;1&#x4fe1;&#x606f;&#x67e5;&#x8be2;</send_false_to>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue>dbbm2</leftvalue>
+ <function>IS NULL</function>
+ <rightvalue/>
+ </condition>
+    </compare>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>856</xloc>
+      <yloc>24</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x65e0;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x67e5;&#x8be2; </name>
+    <type>DBJoin</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>control_jndi</connection>
+    <rowlimit>1</rowlimit>
+    <sql>select id as rycid1 from bsth_c_s_ecinfo employeeco0_ &#xa;where xl &#x3d; &#x3f; &#xa;and dbbm &#x3d; &#x3f; &#xa;and is_cancel &#x3d; 0&#xa;and &#x28;&#xa;&#x28;&#xa;    select IFNULL&#x28;t2.destroy, 0&#x29; &#xa;    from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.jsy &#x3d; t2.id &#xa;    where t1.id &#x3d; employeeco0_.id&#xa;&#x29; &#x2b; &#xa;&#x28;&#xa;    select IFNULL&#x28;t2.destroy, 0&#x29; &#xa;    from bsth_c_s_ecinfo t1 left join bsth_c_personnel t2 on t1.spy &#x3d; t2.id &#xa;    where t1.id &#x3d; employeeco0_.id&#xa;&#x29;&#xa;&#x29; &#x3d; 0</sql>
+    <outer_join>N</outer_join>
+    <replace_vars>N</replace_vars>
+    <parameter>
+      <field>
+        <name>xlid</name>
+        <type>Integer</type>
+      </field>
+      <field>
+        <name>dbbm1</name>
+        <type>String</type>
+      </field>
+    </parameter>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>769</xloc>
+      <yloc>115</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5904;&#x7406;&#x65e0;&#x5206;&#x73ed;&#x4eba;&#x5458;&#x914d;&#x7f6e;id&#x4fe1;&#x606f;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var rycid&#x3b;&#xa;var rybm&#x3b;&#xa;&#xa;rycid &#x3d; rycid1&#x3b;&#xa;rybm &#x3d; dbbm1&#x3b;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>rycid</name>
+        <rename>rycid</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>rybm</name>
+        <rename>rybm</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>763</xloc>
+      <yloc>197</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>      <field>        <name>xlid</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>cid</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>lpnames</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>lpids</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x8d77;&#x59cb;&#x8def;&#x724c;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x8d77;&#x59cb;&#x4eba;&#x5458;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>rycid</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>rybm</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>        <select_unspecified>N</select_unspecified>
+    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>764</xloc>
+      <yloc>386</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9; 2</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>      <field>        <name>xlid</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>cid</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>lpnames</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>lpids</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x8d77;&#x59cb;&#x8def;&#x724c;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x8d77;&#x59cb;&#x4eba;&#x5458;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x4eba;&#x5458;&#x8303;&#x56f4;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>&#x7ffb;&#x73ed;&#x683c;&#x5f0f;</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>rycid</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>rybm</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>        <select_unspecified>N</select_unspecified>
+    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>956</xloc>
+      <yloc>385</yloc>
       <draw>Y</draw>
       </GUI>
     </step>