1.上电科计划配车接口变更，加入自编号串，以','分割

王通
1 parent 586108c2
Showing 2 changed files with 138 additions and 80 deletions
src/main/java/com/bsth/server_rs/dks/DksRestService.java
src/main/java/com/bsth/server_rs/dks/LineServiceConfig.java
@@ -156,6 +156,7 @@ public class DksRestService {
         String oldLineCode = "";
         BusVo vo = null;
         int max = 0;
+        String maxCodes = "";
         for (int i = 0, len = configs.size();i < len;i++) {
             LineServiceConfig config = configs.get(i);
             if (i == 0) {
@@ -165,9 +166,12 @@ public class DksRestService {
                 vo.setLineName(config.getLineName());
                 vo.setMonth(month);
                 vo.setBusFirstCount(config.getCarCount());
+                vo.setBusFirstCodes(config.getCarCodes());
             } else if (!oldLineCode.equals(config.getLineCode())) {
                 oldLineCode = config.getLineCode();
                 vo.setBusMaxCount(max);
+                vo.setBusMaxCount(max);
+                vo.setBusMaxCodes(maxCodes);
                 result.add(vo);
                 max = 0;
                 vo = new BusVo();
@@ -175,13 +179,20 @@ public class DksRestService {
                 vo.setLineName(config.getLineName());
                 vo.setMonth(month);
                 vo.setBusFirstCount(config.getCarCount());
+                vo.setBusFirstCodes(config.getCarCodes());
+            }
+            if (max < config.getCarCount()) {
+                max = config.getCarCount();
+                maxCodes = config.getCarCodes();
+                log.error(maxCodes);
             }
-            max = Math.max(max, config.getCarCount());
             if (i == len - 1) {
                 vo.setBusMaxCount(max);
+                vo.setBusMaxCodes(maxCodes);
                 result.add(vo);
             }
             vo.setBusLastCount(config.getCarCount());
+            vo.setBusLastCodes(config.getCarCodes());
         }
  
         return result;
@@ -310,7 +321,13 @@ public class DksRestService {
             object.setScheduleDate(dateTime.toString("yyyy-MM-dd"));
             object.setConductorCount(line2conductors.get(lineCode).size());
             object.setDriverCount(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.setCarCodes(sb.toString());
  
             objects.add(object);
         }
@@ -323,7 +340,7 @@ public class DksRestService {
  
         try {
             jdbcTemplate.update("delete from control_interface.bsth_t_plan where schedule_date = ?", new Object[]{ dateTime.toString("yyyy-MM-dd") });
-            jdbcTemplate.batchUpdate("insert into control_interface.bsth_t_plan (line_code, line_name, schedule_date, conductor_count, driver_count, car_count) values (?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
+            jdbcTemplate.batchUpdate("insert into control_interface.bsth_t_plan (line_code, line_name, schedule_date, conductor_count, driver_count, car_count, car_codes) values (?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int i) throws SQLException {
                     LineServiceConfig object = objects.get(i);
@@ -333,6 +350,7 @@ public class DksRestService {
                     ps.setInt(4, object.getConductorCount());
                     ps.setInt(5, object.getDriverCount());
                     ps.setInt(6, object.getCarCount());
+                    ps.setString(7, object.getCarCodes());
                 }
  
                 @Override
@@ -692,6 +710,12 @@ public class DksRestService {
  
         private Integer busMaxCount;
  
+        private String busFirstCodes;
+
+        private String busLastCodes;
+
+        private String busMaxCodes;
+
         public String getLineCode() {
             return lineCode;
         }
@@ -739,6 +763,30 @@ public class DksRestService {
         public void setBusMaxCount(Integer busMaxCount) {
             this.busMaxCount = busMaxCount;
         }
+
+        public String getBusFirstCodes() {
+            return busFirstCodes;
+        }
+
+        public void setBusFirstCodes(String busFirstCodes) {
+            this.busFirstCodes = busFirstCodes;
+        }
+
+        public String getBusLastCodes() {
+            return busLastCodes;
+        }
+
+        public void setBusLastCodes(String busLastCodes) {
+            this.busLastCodes = busLastCodes;
+        }
+
+        public String getBusMaxCodes() {
+            return busMaxCodes;
+        }
+
+        public void setBusMaxCodes(String busMaxCodes) {
+            this.busMaxCodes = busMaxCodes;
+        }
     }
  
     /**
-package com.bsth.server_rs.dks;
-
-/**
- * 线路运营司、售、车辆配档信息
- * @author Hill
- */
-public class LineServiceConfig {
-
-    private String lineCode;
-
-    private String lineName;
-
-    private String month;
-
-    private String scheduleDate;
-
-    private int driverCount;
-
-    private int conductorCount;
-
-    private int carCount;
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-
-    public String getMonth() {
-        return month;
-    }
-
-    public void setMonth(String month) {
-        this.month = month;
-    }
-
-    public String getScheduleDate() {
-        return scheduleDate;
-    }
-
-    public void setScheduleDate(String scheduleDate) {
-        this.scheduleDate = scheduleDate;
-    }
-
-    public int getDriverCount() {
-        return driverCount;
-    }
-
-    public void setDriverCount(int driverCount) {
-        this.driverCount = driverCount;
-    }
-
-    public int getConductorCount() {
-        return conductorCount;
-    }
-
-    public void setConductorCount(int conductorCount) {
-        this.conductorCount = conductorCount;
-    }
-
-    public int getCarCount() {
-        return carCount;
-    }
-
-    public void setCarCount(int carCount) {
-        this.carCount = carCount;
-    }
-}
+package com.bsth.server_rs.dks;
+
+/**
+ * 线路运营司、售、车辆配档信息
+ * @author Hill
+ */
+public class LineServiceConfig {
+
+    private String lineCode;
+
+    private String lineName;
+
+    private String month;
+
+    private String scheduleDate;
+
+    private int driverCount;
+
+    private int conductorCount;
+
+    private int carCount;
+
+    private String carCodes;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
+    public String getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(String scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public int getDriverCount() {
+        return driverCount;
+    }
+
+    public void setDriverCount(int driverCount) {
+        this.driverCount = driverCount;
+    }
+
+    public int getConductorCount() {
+        return conductorCount;
+    }
+
+    public void setConductorCount(int conductorCount) {
+        this.conductorCount = conductorCount;
+    }
+
+    public int getCarCount() {
+        return carCount;
+    }
+
+    public void setCarCount(int carCount) {
+        this.carCount = carCount;
+    }
+
+    public String getCarCodes() {
+        return carCodes;
+    }
+
+    public void setCarCodes(String carCodes) {
+        this.carCodes = carCodes;
+    }
+}