update...

潘钊
1 parent 22f66c51
Showing 2 changed files with 81 additions and 81 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
@@ -24,10 +24,10 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	/*@Autowired
 	GetSchedulePlanThread getSchedulePlanThread;*/
-	
+
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
-	
+
 	@Autowired
 	DayOfSchedule dayOfSchedule;
@@ -42,29 +42,29 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @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 String dfsj,String bcType) {
 		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType);
 	}
 	/**
-	 * 
+	 *
 	 * @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*/) {
+									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
 		return scheduleRealInfoService.destroy(idsStr/*, spaceAdjust*/, remarks, adjustExps/*, spaceNum*/);
 	}
 	/**
-	 * 
+	 *
 	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
 	 */
 	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
@@ -73,7 +73,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
 	 * lineId @throws
 	 */
@@ -83,7 +83,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
 	 * lineId @throws
 	 */
@@ -93,7 +93,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
 	 * lineId @throws
 	 */
@@ -103,7 +103,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
 	 */
 	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
@@ -111,9 +111,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.sreachVehic(nbbm);
 	}
 	/**
-	 * 
-	 * @Title: realOutAdjust 
-	 * @Description: TODO(实发调整) 
+	 *
+	 * @Title: realOutAdjust
+	 * @Description: TODO(实发调整)
 	 * @param @param id 班次ID
 	 * @param @param fcsjActual 实际发车时间 HH:mm
 	 * @param @param remarks 备注
@@ -121,14 +121,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
 	public Map<String, Object> realOutAdjust(@RequestParam Long id, @RequestParam String fcsjActual,
-			@RequestParam String remarks) {
+											 @RequestParam String remarks) {
 		return scheduleRealInfoService.realOutAdjust(id, fcsjActual, remarks);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: revokeDestroy 
-	 * @Description: TODO(撤销烂班) 
+	 *
+	 * @Title: revokeDestroy
+	 * @Description: TODO(撤销烂班)
 	 * @param @param id
 	 * @throws
 	 */
@@ -136,11 +136,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> revokeDestroy(@RequestParam Long id){
 		return scheduleRealInfoService.revokeDestroy(id);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: revokeRealOutgo 
-	 * @Description: TODO(撤销实发) 
+	 *
+	 * @Title: revokeRealOutgo
+	 * @Description: TODO(撤销实发)
 	 * @param @param id
 	 * @throws
 	 */
@@ -160,9 +160,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
-	 * @Title: spaceAdjust 
-	 * @Description: TODO(间隔调整) 
+	 *
+	 * @Title: spaceAdjust
+	 * @Description: TODO(间隔调整)
 	 * @param @param ids 要调整的班次数组ID
 	 * @param @param space 间隔
 	 * @throws
@@ -171,11 +171,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
 		return scheduleRealInfoService.spaceAdjust(ids, space);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: schInfoFineTune 
-	 * @Description: TODO(发车信息微调) 
+	 *
+	 * @Title: schInfoFineTune
+	 * @Description: TODO(发车信息微调)
 	 * @param @param map
 	 * @throws
 	 */
@@ -183,11 +183,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
 		return scheduleRealInfoService.schInfoFineTune(map);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: outgoAdjustAll 
-	 * @Description: TODO(批量待发调整) 
+	 *
+	 * @Title: outgoAdjustAll
+	 * @Description: TODO(批量待发调整)
 	 * @param @param list
 	 * @throws
 	 */
@@ -197,11 +197,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		params = StringEscapeUtils.unescapeHtml4(params);
 		return scheduleRealInfoService.outgoAdjustAll(params);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: findByLineAndUpDown 
-	 * @Description: TODO(根据线路和走向获取班次) 
+	 *
+	 * @Title: findByLineAndUpDown
+	 * @Description: TODO(根据线路和走向获取班次)
 	 * @param @param line
 	 * @param @param upDown
 	 */
@@ -209,11 +209,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
 		return dayOfSchedule.findByLineAndUpDown(line, upDown);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: findRouteByLine 
-	 * @Description: TODO(获取线路的站点，路段路由) 
+	 *
+	 * @Title: findRouteByLine
+	 * @Description: TODO(获取线路的站点，路段路由)
 	 * @param @param lineCode
 	 * @throws
 	 */
@@ -221,11 +221,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
 		return scheduleRealInfoService.findRouteByLine(lineCode);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: removeChildTask 
-	 * @Description: TODO(删除子任务) 
+	 *
+	 * @Title: removeChildTask
+	 * @Description: TODO(删除子任务)
 	 * @param @param taskId 子任务ID
 	 * @throws
 	 */
@@ -235,9 +235,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
-	 * @Title: findByLineCode 
-	 * @Description: TODO(根据线路获取班次信息) 
+	 *
+	 * @Title: findByLineCode
+	 * @Description: TODO(根据线路获取班次信息)
 	 * @param @param lineCode
 	 */
 	@RequestMapping(value = "/lineCode/{lineCode}")
@@ -247,29 +247,29 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/queryUserInfo")
 	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
-			@RequestParam String date,@RequestParam String state) {
+												@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) {
+												  @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 clZbh,
-			@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
+												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
 		return scheduleRealInfoService.exportWaybill(jName, 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);
@@ -277,41 +277,41 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/historyMessage")
 	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
-			@RequestParam String code, @RequestParam String type) {
+										 @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);
 	}
-	
+
 	@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) {
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
 		return scheduleRealInfoService.account(line, date, code, xlName, type);
 	}
-	
+
 	@RequestMapping(value = "/correctForm")
 	public List<ScheduleRealInfo> correctForm(@RequestParam String line, @RequestParam String startDate,
-			@RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
+											  @RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
 		return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code, type);
 	}
 	/**
@@ -327,19 +327,19 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
 	}
-	
+
 	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
-			@RequestParam String date,@RequestParam String line){
+													 @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){
+													@RequestParam String xlName, @RequestParam String type){
 		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
 	}
-	
+
 	@RequestMapping(value="/statisticsDailyTj")
 	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
 		String gsdm="";
@@ -372,41 +372,41 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
-	
+
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
 		return scheduleRealInfoService.MapById(id);
 	}
-	
+
 	/**
-	 * @Title: scheduleDaily 
-	 * @Description: TODO(调度日报表) 
+	 * @Title: scheduleDaily
+	 * @Description: TODO(调度日报表)
 	 * @param line 线路
 	 * @param date 时间
-	 * @return 
+	 * @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="/realScheduleListQp")
 	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.realScheduleListQp(line,date);
 	}
-	
+
 	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
 	public 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);
 	}
-	
+
 	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
 	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
 		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
@@ -436,7 +436,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		List<String> rs = new ArrayList<>();
 		long t = new Date().getTime() - ONE_DAY - (1000 * 60 * 60 * 2);
-		for(int i = 0; i < 5; i ++){
+		for(int i = 0; i < 10; i ++){
 			rs.add(fmtyyyyMMdd.print(t));
 			t -= ONE_DAY;
 		}
@@ -467,7 +467,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	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);
@@ -74,7 +74,7 @@ public class PilotReport {
 		switch (d80.getData().getRequestCode()) {
 		case 0xA3:
 			//出场请求
-			ScheduleRealInfo outSch = dayOfSchedule.nextByBcType(nbbm, "out");
+			ScheduleRealInfo outSch = dayOfSchedule.searchNearByBcType(nbbm, "out");
 			//如果有对应出场班次
 			if(outSch != null){
 				//没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令