1.

王通
1 parent aeb4dbcb
Showing 1 changed file with 25 additions and 17 deletions
src/main/java/com/bsth/server_rs/dks/DksRestService.java
@@ -322,23 +322,28 @@ public class DksRestService {
             drivers.add(schedulePlanInfo.getjGh());
             cars.add(schedulePlanInfo.getClZbh());
         }
-        for (String lineCode : lineCodes) {
+        for (Line line : LineBufferData.findAll()) {
+            if (line == null) {
+                continue;
+            }
             LineServiceConfig object = new LineServiceConfig();
-            Line line = LineBufferData.findOne(lineCode);
+            String lineCode = line.getLineCode();
             object.setLineCode(lineCode);
-            object.setLineName(line == null ? "" : line.getName());
+            object.setLineName(line.getName());
             object.setScheduleDate(dateTime.toString("yyyy-MM-dd"));
-            object.setConductorCount(line2conductors.get(lineCode).size());
-            object.setDriverCount(line2drivers.get(lineCode).size());
+            object.setConductorCount(line2conductors.get(lineCode) == null ? 0 : line2conductors.get(lineCode).size());
+            object.setDriverCount(line2drivers.get(lineCode) == null ? 0 : line2drivers.get(lineCode).size());
             Set<String> cars = line2cars.get(lineCode);
-            object.setCarCount(line2cars.get(lineCode).size());
-            StringBuilder sb = new StringBuilder();
-            for (String car : cars) {
-                sb.append(car).append(",");
+            object.setCarCount(cars == null ? 0 : cars.size());
+            StringBuilder sb = new StringBuilder("");
+            if (cars != null) {
+                for (String car : cars) {
+                    sb.append(car).append(",");
+                }
             }
             object.setCarCodes(sb.toString());
-            object.setCompanyCode(line == null ? "" : line.getCompany());
-            object.setCompanyName(line == null ? "" : line.getCompanyName());
+            object.setCompanyCode(line.getCompany());
+            object.setCompanyName(line.getCompanyName());
             objects.add(object);
         }
@@ -411,15 +416,18 @@ public class DksRestService {
             drivers.add(scheduleRealInfo.getjGh());
             cars.add(scheduleRealInfo.getClZbh());
         }
-        for (String lineCode : lineCodes) {
+        for (Line line : LineBufferData.findAll()) {
+            if (line == null) {
+                continue;
+            }
             LineServiceConfig object = new LineServiceConfig();
-            Line line = LineBufferData.findOne(lineCode);
+            String lineCode = line.getLineCode();
             object.setLineCode(lineCode);
-            object.setLineName(line == null ? "" : line.getName());
+            object.setLineName(line.getName());
             object.setScheduleDate(dateTime.toString("yyyy-MM-dd"));
-            object.setConductorCount(line2conductors.get(lineCode).size());
-            object.setDriverCount(line2drivers.get(lineCode).size());
-            object.setCarCount(line2cars.get(lineCode).size());
+            object.setConductorCount(line2conductors.get(lineCode) == null ? 0 : line2conductors.get(lineCode).size());
+            object.setDriverCount(line2drivers.get(lineCode) == null ? 0 : line2drivers.get(lineCode).size());
+            object.setCarCount(line2cars.get(lineCode) == null ? 0 : line2cars.get(lineCode).size());
             objects.add(object);
         }