潘钊 / control_service_data_Interface · Commits

Commit fdafafa6732e9f25f295bcabb0b3fc4c23d363c4

Authored by 王通
1 parent aeb4dbcb
build: skipped

1.

Inline Side-by-side
Showing 1 changed file with 25 additions and 17 deletions
src/main/java/com/bsth/server_rs/dks/DksRestService.java
  View file @fdafafa
... ... @@ -322,23 +322,28 @@ public class DksRestService {
322 322 drivers.add(schedulePlanInfo.getjGh());
323 323 cars.add(schedulePlanInfo.getClZbh());
324 324 }
325   - for (String lineCode : lineCodes) {
  325 + for (Line line : LineBufferData.findAll()) {
  326 + if (line == null) {
  327 + continue;
  328 + }
326 329 LineServiceConfig object = new LineServiceConfig();
327   - Line line = LineBufferData.findOne(lineCode);
  330 + String lineCode = line.getLineCode();
328 331 object.setLineCode(lineCode);
329   - object.setLineName(line == null ? "" : line.getName());
  332 + object.setLineName(line.getName());
330 333 object.setScheduleDate(dateTime.toString("yyyy-MM-dd"));
331   - object.setConductorCount(line2conductors.get(lineCode).size());
332   - object.setDriverCount(line2drivers.get(lineCode).size());
  334 + object.setConductorCount(line2conductors.get(lineCode) == null ? 0 : line2conductors.get(lineCode).size());
  335 + object.setDriverCount(line2drivers.get(lineCode) == null ? 0 : line2drivers.get(lineCode).size());
333 336 Set<String> cars = line2cars.get(lineCode);
334   - object.setCarCount(line2cars.get(lineCode).size());
335   - StringBuilder sb = new StringBuilder();
336   - for (String car : cars) {
337   - sb.append(car).append(",");
  337 + object.setCarCount(cars == null ? 0 : cars.size());
  338 + StringBuilder sb = new StringBuilder("");
  339 + if (cars != null) {
  340 + for (String car : cars) {
  341 + sb.append(car).append(",");
  342 + }
338 343 }
339 344 object.setCarCodes(sb.toString());
340   - object.setCompanyCode(line == null ? "" : line.getCompany());
341   - object.setCompanyName(line == null ? "" : line.getCompanyName());
  345 + object.setCompanyCode(line.getCompany());
  346 + object.setCompanyName(line.getCompanyName());
342 347  
343 348 objects.add(object);
344 349 }
... ... @@ -411,15 +416,18 @@ public class DksRestService {
411 416 drivers.add(scheduleRealInfo.getjGh());
412 417 cars.add(scheduleRealInfo.getClZbh());
413 418 }
414   - for (String lineCode : lineCodes) {
  419 + for (Line line : LineBufferData.findAll()) {
  420 + if (line == null) {
  421 + continue;
  422 + }
415 423 LineServiceConfig object = new LineServiceConfig();
416   - Line line = LineBufferData.findOne(lineCode);
  424 + String lineCode = line.getLineCode();
417 425 object.setLineCode(lineCode);
418   - object.setLineName(line == null ? "" : line.getName());
  426 + object.setLineName(line.getName());
419 427 object.setScheduleDate(dateTime.toString("yyyy-MM-dd"));
420   - object.setConductorCount(line2conductors.get(lineCode).size());
421   - object.setDriverCount(line2drivers.get(lineCode).size());
422   - object.setCarCount(line2cars.get(lineCode).size());
  428 + object.setConductorCount(line2conductors.get(lineCode) == null ? 0 : line2conductors.get(lineCode).size());
  429 + object.setDriverCount(line2drivers.get(lineCode) == null ? 0 : line2drivers.get(lineCode).size());
  430 + object.setCarCount(line2cars.get(lineCode) == null ? 0 : line2cars.get(lineCode).size());
423 431  
424 432 objects.add(object);
425 433 }
... ...