1.加入计划配车信息

王通
1 parent 6b1128b3
Showing 1 changed file with 51 additions and 3 deletions
src/main/java/com/bsth/server_rs/dks/DksRestService.java
@@ -140,6 +140,47 @@ public class DksRestService {
     }
     /**
+     * 计划配车数
+     * @param month
+     */
+    @GET
+    @Path("/bus/plan/{month}")
+    public List<BusVo> busPlan(@PathParam("month") String month) {
+        List<LineServiceConfig> configs = jdbcTemplate.query("select * from control_interface.bsth_t_plan where schedule_date like CONCAT(?, '%') order by line_code, schedule_date", new Object[]{ month }, BeanPropertyRowMapper.newInstance(LineServiceConfig.class));
+        List<BusVo> result = new ArrayList<>();
+        String oldLineCode = "";
+        BusVo vo = null;
+        int max = 0;
+        for (int i = 0, len = configs.size();i < len;i++) {
+            LineServiceConfig config = configs.get(i);
+            if (i == 0) {
+                oldLineCode = config.getLineCode();
+                vo = new BusVo();
+                vo.setLineName(config.getLineName());
+                vo.setMonth(month);
+                vo.setBusFirstCount(config.getCarCount());
+            } else if (!oldLineCode.equals(config.getLineCode())) {
+                oldLineCode = config.getLineCode();
+                vo.setBusMaxCount(max);
+                result.add(vo);
+                max = 0;
+                vo = new BusVo();
+                vo.setLineName(config.getLineName());
+                vo.setMonth(month);
+                vo.setBusFirstCount(config.getCarCount());
+            }
+            max = Math.max(max, config.getCarCount());
+            if (i == len - 1) {
+                vo.setBusMaxCount(max);
+                result.add(vo);
+            }
+            vo.setBusLastCount(config.getCarCount());
+        }
+
+        return result;
+    }
+
+    /**
      * 实际配车数
      * @param month
      */
@@ -226,12 +267,12 @@ public class DksRestService {
         // 记录实际线路司售配档情况
         List<SchedulePlanInfo> schedulePlanInfos = schedulePlanInfoRepository.findByDate(DateTimeFormat.forPattern("yyyy-MM-dd").parseDateTime(dateTime.toString("yyyy-MM-dd")).toDate());
         Set<String> lineCodes = new HashSet<>();
-        Map<String, Set<String>> line2conductors = new HashMap<>(), line2drivers = new HashMap<>();
+        Map<String, Set<String>> line2conductors = new HashMap<>(), line2drivers = new HashMap<>(), line2cars = new HashMap<>();
         final List<LineServiceConfig> objects = new ArrayList<>();
         for (SchedulePlanInfo schedulePlanInfo : schedulePlanInfos) {
             String lineCode = schedulePlanInfo.getXlBm();
             lineCodes.add(lineCode);
-            Set<String> conductors = line2conductors.get(lineCode), drivers = line2drivers.get(lineCode);
+            Set<String> conductors = line2conductors.get(lineCode), drivers = line2drivers.get(lineCode), cars = line2cars.get(lineCode);
             if (conductors == null) {
                 conductors = new HashSet<>();
                 line2conductors.put(lineCode, conductors);
@@ -240,10 +281,15 @@ public class DksRestService {
                 drivers = new HashSet<>();
                 line2drivers.put(lineCode, drivers);
             }
+            if (cars == null) {
+                cars = new HashSet<>();
+                line2cars.put(lineCode, cars);
+            }
             if (!StringUtils.isEmpty(schedulePlanInfo.getsGh())) {
                 conductors.add(schedulePlanInfo.getsGh());
             }
             drivers.add(schedulePlanInfo.getjGh());
+            cars.add(schedulePlanInfo.getClZbh());
         }
         for (String lineCode : lineCodes) {
             LineServiceConfig object = new LineServiceConfig();
@@ -253,6 +299,7 @@ public class DksRestService {
             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());
             objects.add(object);
         }
@@ -265,7 +312,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) values (?,?,?,?,?)", new BatchPreparedStatementSetter() {
+            jdbcTemplate.batchUpdate("insert into control_interface.bsth_t_plan (line_code, line_name, schedule_date, conductor_count, driver_count, car_count) values (?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int i) throws SQLException {
                     LineServiceConfig object = objects.get(i);
@@ -274,6 +321,7 @@ public class DksRestService {
                     ps.setString(3, object.getScheduleDate());
                     ps.setInt(4, object.getConductorCount());
                     ps.setInt(5, object.getDriverCount());
+                    ps.setInt(6, object.getCarCount());
                 }
                 @Override