潘钊 / bsth_control · Commits

Commit d9cd62fc2663d06dff2c3454d8aa3f42b64b2cf2

Authored by 潘钊
1 parent 22f66c51

update...

Inline Side-by-side
Showing 2 changed files with 81 additions and 81 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @d9cd62f
... ... @@ -24,10 +24,10 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
24 24  
25 25 /*@Autowired
26 26 GetSchedulePlanThread getSchedulePlanThread;*/
27   -
  27 +
28 28 @Autowired
29 29 ScheduleRealInfoService scheduleRealInfoService;
30   -
  30 +
31 31 @Autowired
32 32 DayOfSchedule dayOfSchedule;
33 33  
... ... @@ -42,29 +42,29 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
42 42 }
43 43  
44 44 /**
45   - *
  45 + *
46 46 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
47 47 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
48 48 */
49 49 @RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
50 50 public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
51   - @RequestParam String dfsj,String bcType) {
  51 + @RequestParam String dfsj,String bcType) {
52 52 return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType);
53 53 }
54 54  
55 55 /**
56   - *
  56 + *
57 57 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔
58 58 */
59 59 @RequestMapping(value = "/destroy", method = RequestMethod.POST)
60 60 public Map<String, Object> destroy(@RequestParam String idsStr
61 61 /*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
62   - @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
  62 + @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
63 63 return scheduleRealInfoService.destroy(idsStr/*, spaceAdjust*/, remarks, adjustExps/*, spaceNum*/);
64 64 }
65 65  
66 66 /**
67   - *
  67 + *
68 68 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
69 69 */
70 70 @RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
... ... @@ -73,7 +73,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
73 73 }
74 74  
75 75 /**
76   - *
  76 + *
77 77 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
78 78 * lineId @throws
79 79 */
... ... @@ -83,7 +83,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
83 83 }
84 84  
85 85 /**
86   - *
  86 + *
87 87 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
88 88 * lineId @throws
89 89 */
... ... @@ -93,7 +93,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
93 93 }
94 94  
95 95 /**
96   - *
  96 + *
97 97 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
98 98 * lineId @throws
99 99 */
... ... @@ -103,7 +103,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
103 103 }
104 104  
105 105 /**
106   - *
  106 + *
107 107 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
108 108 */
109 109 @RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
... ... @@ -111,9 +111,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
111 111 return scheduleRealInfoService.sreachVehic(nbbm);
112 112 }
113 113 /**
114   - *
115   - * @Title: realOutAdjust
116   - * @Description: TODO(实发调整)
  114 + *
  115 + * @Title: realOutAdjust
  116 + * @Description: TODO(实发调整)
117 117 * @param @param id 班次ID
118 118 * @param @param fcsjActual 实际发车时间 HH:mm
119 119 * @param @param remarks 备注
... ... @@ -121,14 +121,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
121 121 */
122 122 @RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
123 123 public Map<String, Object> realOutAdjust(@RequestParam Long id, @RequestParam String fcsjActual,
124   - @RequestParam String remarks) {
  124 + @RequestParam String remarks) {
125 125 return scheduleRealInfoService.realOutAdjust(id, fcsjActual, remarks);
126 126 }
127   -
  127 +
128 128 /**
129   - *
130   - * @Title: revokeDestroy
131   - * @Description: TODO(撤销烂班)
  129 + *
  130 + * @Title: revokeDestroy
  131 + * @Description: TODO(撤销烂班)
132 132 * @param @param id
133 133 * @throws
134 134 */
... ... @@ -136,11 +136,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
136 136 public Map<String, Object> revokeDestroy(@RequestParam Long id){
137 137 return scheduleRealInfoService.revokeDestroy(id);
138 138 }
139   -
  139 +
140 140 /**
141   - *
142   - * @Title: revokeRealOutgo
143   - * @Description: TODO(撤销实发)
  141 + *
  142 + * @Title: revokeRealOutgo
  143 + * @Description: TODO(撤销实发)
144 144 * @param @param id
145 145 * @throws
146 146 */
... ... @@ -160,9 +160,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
160 160 }
161 161  
162 162 /**
163   - *
164   - * @Title: spaceAdjust
165   - * @Description: TODO(间隔调整)
  163 + *
  164 + * @Title: spaceAdjust
  165 + * @Description: TODO(间隔调整)
166 166 * @param @param ids 要调整的班次数组ID
167 167 * @param @param space 间隔
168 168 * @throws
... ... @@ -171,11 +171,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
171 171 public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
172 172 return scheduleRealInfoService.spaceAdjust(ids, space);
173 173 }
174   -
  174 +
175 175 /**
176   - *
177   - * @Title: schInfoFineTune
178   - * @Description: TODO(发车信息微调)
  176 + *
  177 + * @Title: schInfoFineTune
  178 + * @Description: TODO(发车信息微调)
179 179 * @param @param map
180 180 * @throws
181 181 */
... ... @@ -183,11 +183,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
183 183 public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
184 184 return scheduleRealInfoService.schInfoFineTune(map);
185 185 }
186   -
  186 +
187 187 /**
188   - *
189   - * @Title: outgoAdjustAll
190   - * @Description: TODO(批量待发调整)
  188 + *
  189 + * @Title: outgoAdjustAll
  190 + * @Description: TODO(批量待发调整)
191 191 * @param @param list
192 192 * @throws
193 193 */
... ... @@ -197,11 +197,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
197 197 params = StringEscapeUtils.unescapeHtml4(params);
198 198 return scheduleRealInfoService.outgoAdjustAll(params);
199 199 }
200   -
  200 +
201 201 /**
202   - *
203   - * @Title: findByLineAndUpDown
204   - * @Description: TODO(根据线路和走向获取班次)
  202 + *
  203 + * @Title: findByLineAndUpDown
  204 + * @Description: TODO(根据线路和走向获取班次)
205 205 * @param @param line
206 206 * @param @param upDown
207 207 */
... ... @@ -209,11 +209,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
209 209 public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
210 210 return dayOfSchedule.findByLineAndUpDown(line, upDown);
211 211 }
212   -
  212 +
213 213 /**
214   - *
215   - * @Title: findRouteByLine
216   - * @Description: TODO(获取线路的站点，路段路由)
  214 + *
  215 + * @Title: findRouteByLine
  216 + * @Description: TODO(获取线路的站点，路段路由)
217 217 * @param @param lineCode
218 218 * @throws
219 219 */
... ... @@ -221,11 +221,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
221 221 public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
222 222 return scheduleRealInfoService.findRouteByLine(lineCode);
223 223 }
224   -
  224 +
225 225 /**
226   - *
227   - * @Title: removeChildTask
228   - * @Description: TODO(删除子任务)
  226 + *
  227 + * @Title: removeChildTask
  228 + * @Description: TODO(删除子任务)
229 229 * @param @param taskId 子任务ID
230 230 * @throws
231 231 */
... ... @@ -235,9 +235,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
235 235 }
236 236  
237 237 /**
238   - *
239   - * @Title: findByLineCode
240   - * @Description: TODO(根据线路获取班次信息)
  238 + *
  239 + * @Title: findByLineCode
  240 + * @Description: TODO(根据线路获取班次信息)
241 241 * @param @param lineCode
242 242 */
243 243 @RequestMapping(value = "/lineCode/{lineCode}")
... ... @@ -247,29 +247,29 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
247 247  
248 248 @RequestMapping(value = "/queryUserInfo")
249 249 public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
250   - @RequestParam String date,@RequestParam String state) {
  250 + @RequestParam String date,@RequestParam String state) {
251 251 return scheduleRealInfoService.queryUserInfo(line, date,state);
252 252 }
253   -
  253 +
254 254 @RequestMapping(value = "/queryUserInfoPx")
255 255 public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
256   - @RequestParam String date,@RequestParam String state,@RequestParam String type) {
  256 + @RequestParam String date,@RequestParam String state,@RequestParam String type) {
257 257 return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
258 258 }
259 259  
260 260 @RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
261 261 public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
262   - @RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
  262 + @RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
263 263 return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
264 264 }
265   -
  265 +
266 266 @RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
267 267 public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
268 268 ,@RequestParam String date,@RequestParam String line) {
269 269 return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
270 270 }
271 271  
272   -
  272 +
273 273 @RequestMapping(value = "/dailyInfo")
274 274 public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
275 275 return scheduleRealInfoService.dailyInfo(line, date, type);
... ... @@ -277,41 +277,41 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
277 277  
278 278 @RequestMapping(value = "/historyMessage")
279 279 public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
280   - @RequestParam String code, @RequestParam String type) {
  280 + @RequestParam String code, @RequestParam String type) {
281 281 return scheduleRealInfoService.historyMessage(line, date, code, type);
282 282 }
283   -
  283 +
284 284 @RequestMapping(value="/findLine")
285 285 public List<Map<String,String>> findLine(@RequestParam String line){
286 286 return scheduleRealInfoService.findLine(line);
287 287 }
288   -
  288 +
289 289 @RequestMapping(value="/findKMBC",method = RequestMethod.GET)
290 290 public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
291 291 ,@RequestParam String date,@RequestParam String line){
292 292 return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
293 293 }
294   -
  294 +
295 295 @RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
296 296 public Map<String,Object> findKMBCQp(@RequestParam String clZbh
297 297 ,@RequestParam String date,@RequestParam String line){
298 298 return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
299 299 }
300   -
  300 +
301 301 @RequestMapping(value="/findLpName")
302 302 public List<Map<String,String>> findLpName(@RequestParam String lpName){
303 303 return scheduleRealInfoService.findLpName(lpName);
304 304 }
305   -
  305 +
306 306 @RequestMapping(value = "/account")
307 307 public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
308   - @RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
  308 + @RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
309 309 return scheduleRealInfoService.account(line, date, code, xlName, type);
310 310 }
311   -
  311 +
312 312 @RequestMapping(value = "/correctForm")
313 313 public List<ScheduleRealInfo> correctForm(@RequestParam String line, @RequestParam String startDate,
314   - @RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
  314 + @RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
315 315 return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code, type);
316 316 }
317 317 /**
... ... @@ -327,19 +327,19 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
327 327 ,@RequestParam String date,@RequestParam String line){
328 328 return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
329 329 }
330   -
  330 +
331 331 @RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
332 332 public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
333   - @RequestParam String date,@RequestParam String line){
  333 + @RequestParam String date,@RequestParam String line){
334 334 return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
335 335 }
336   -
  336 +
337 337 @RequestMapping(value="/statisticsDaily")
338 338 public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
339   - @RequestParam String xlName, @RequestParam String type){
  339 + @RequestParam String xlName, @RequestParam String type){
340 340 return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
341 341 }
342   -
  342 +
343 343 @RequestMapping(value="/statisticsDailyTj")
344 344 public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
345 345 String gsdm="";
... ... @@ -372,41 +372,41 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
372 372 }
373 373 return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
374 374 }
375   -
  375 +
376 376 @RequestMapping(value="/MapById",method = RequestMethod.GET)
377 377 public Map<String, Object> MapById(@RequestParam("id") Long id){
378 378 return scheduleRealInfoService.MapById(id);
379 379 }
380   -
  380 +
381 381 /**
382   - * @Title: scheduleDaily
383   - * @Description: TODO(调度日报表)
  382 + * @Title: scheduleDaily
  383 + * @Description: TODO(调度日报表)
384 384 * @param line 线路
385 385 * @param date 时间
386   - * @return
  386 + * @return
387 387 */
388 388 @RequestMapping(value="/scheduleDaily")
389 389 public Map<String,Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
390 390 return scheduleRealInfoService.scheduleDaily(line,date);
391 391 }
392   -
  392 +
393 393 @RequestMapping(value="/realScheduleList")
394 394 public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
395 395 return scheduleRealInfoService.realScheduleList(line,date);
396 396 }
397   -
  397 +
398 398 @RequestMapping(value="/realScheduleListQp")
399 399 public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
400 400 return scheduleRealInfoService.realScheduleListQp(line,date);
401 401 }
402   -
  402 +
403 403 @RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
404 404 public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
405 405 cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
406 406 List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
407 407 return scheduleRealInfoService.multi_tzrc(cpcs);
408 408 }
409   -
  409 +
410 410 @RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
411 411 public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
412 412 dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
... ... @@ -436,7 +436,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
436 436 List<String> rs = new ArrayList<>();
437 437  
438 438 long t = new Date().getTime() - ONE_DAY - (1000 * 60 * 60 * 2);
439   - for(int i = 0; i < 5; i ++){
  439 + for(int i = 0; i < 10; i ++){
440 440 rs.add(fmtyyyyMMdd.print(t));
441 441 t -= ONE_DAY;
442 442 }
... ... @@ -467,7 +467,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
467 467 public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
468 468 return scheduleRealInfoService.scheduleDailyExport(map);
469 469 }
470   -
  470 +
471 471 @RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
472 472 public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
473 473 return scheduleRealInfoService.exportWaybillMore(map);
... ...
src/main/java/com/bsth/data/pilot80/PilotReport.java
  View file @d9cd62f
... ... @@ -74,7 +74,7 @@ public class PilotReport {
74 74 switch (d80.getData().getRequestCode()) {
75 75 case 0xA3:
76 76 //出场请求
77   - ScheduleRealInfo outSch = dayOfSchedule.nextByBcType(nbbm, "out");
  77 + ScheduleRealInfo outSch = dayOfSchedule.searchNearByBcType(nbbm, "out");
78 78 //如果有对应出场班次
79 79 if(outSch != null){
80 80 //没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令
... ...