PSM-8

徐烜
2 parents fda49142 3da89284
Showing 12 changed files with 691 additions and 164 deletions
src/main/java/com/bsth/controller/schedule/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanInfoController.java
src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java
src/main/java/com/bsth/repository/schedule/EmployeeConfigInfoRepository.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/repository/schedule/SchedulePlanRepository.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoService.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/SchedulePlanService.java
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
@@ -51,4 +51,9 @@ public class CarConfigInfoController extends BaseController&lt;CarConfigInfo, Long&gt;
     public List<Map<String, Object>> findCarConfigCars() {
         return carConfigInfoRepository.findCarConfigCars();
     }
+
+    @RequestMapping(value = "/cars2", method = RequestMethod.GET)
+    public List<Map<String, Object>> findCarsFromConfig() {
+        return carConfigInfoRepository.findCarsFromConfig();
+    }
 }
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.web.bind.annotation.*;
+import java.util.List;
 import java.util.Map;
 /**
@@ -45,4 +46,14 @@ public class EmployeeConfigInfoController extends BaseController&lt;EmployeeConfigI
     public Map<String, Object> save(@RequestBody EmployeeConfigInfo t){
         return baseService.save(t);
     }
+
+    @RequestMapping(value = "/jsy", method = RequestMethod.GET)
+    public List<Map<String, Object>> findJsyFromConfig() {
+        return employeeConfigInfoRepository.findJsyFromConfig();
+    }
+
+    @RequestMapping(value = "/spy", method = RequestMethod.GET)
+    public List<Map<String, Object>> findSpyFromConfig() {
+        return employeeConfigInfoRepository.findSpyFromConfig();
+    }
 }
@@ -4,10 +4,11 @@ import com.bsth.controller.BaseController;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.schedule.SchedulePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 /**
@@ -34,21 +35,18 @@ public class SchedulePlanController extends BaseController&lt;SchedulePlan, Long&gt; {
         return baseService.save(t);
     }
-    // TODO:
-//    @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
-//    public List<Map<String, Object>> findGroupInfo(
-//            Integer xlid, Date scheduleDate) {
-//
-//    }
-
-    @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
-    public List<Map<String, Object>> findGroupInfo(
-            @PathVariable(value = "xlid") Integer xlid,
-            @PathVariable(value = "date") Date scheduleDate) {
-        return schedulePlanService.findGroupInfo(xlid, scheduleDate);
+    /**
+     * 获取明天的一歌排班计划。
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tommorw", method = RequestMethod.GET)
+    public SchedulePlan getTommorwPlan() throws Exception {
+        try {
+            return schedulePlanService.findSchedulePlanTommorw();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
     }
-//    public int updateGroupInfo
-
-
 }
 package com.bsth.controller.schedule;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.bsth.service.schedule.SchedulePlanInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * Created by xu on 16/6/16.
@@ -11,5 +18,30 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("spic")
 public class SchedulePlanInfoController extends BaseController<SchedulePlanInfo, Long> {
+    @Autowired
+    private SchedulePlanInfoService schedulePlanInfoService;
+
+    @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
+    public List<SchedulePlanInfoService.GroupInfo> findGroupInfo(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "date") Date scheduleDate) {
+        return schedulePlanInfoService.findGroupInfo(xlid, scheduleDate);
+    }
+
+    @RequestMapping(value = "/groupinfos/update", method = RequestMethod.POST)
+    public Map<String, Object> updateGroupInfo(@RequestBody SchedulePlanInfoService.GroupInfoUpdate groupInfoUpdate) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            schedulePlanInfoService.updateGroupInfo(groupInfoUpdate);
+
+            resultMap.put("status", ResponseCode.SUCCESS);
+            resultMap.put("msg", "更新成功");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            resultMap.put("status", ResponseCode.ERROR);
+            resultMap.put("msg", exp.getLocalizedMessage());
+        }
+        return resultMap;
+    }
 }
@@ -42,4 +42,7 @@ public interface CarConfigInfoRepository extends BaseRepository&lt;CarConfigInfo, L
     @Query("select new map(cc.cl.insideCode as nbbm, cc.id as id) from CarConfigInfo cc")
     List<Map<String, Object>> findCarConfigCars();
+
+    @Query("select new map(cc.cl.id as id, cc.cl.insideCode as insideCode) from CarConfigInfo cc")
+    List<Map<String, Object>> findCarsFromConfig();
 }
 \ No newline at end of file
@@ -5,6 +5,7 @@ import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.repository.BaseRepository;
 import java.util.List;
+import java.util.Map;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -34,4 +35,18 @@ public interface EmployeeConfigInfoRepository extends BaseRepository&lt;EmployeeCon
     @EntityGraph(value = "employeeConfigInfo_jsy_spy_xl", type = EntityGraph.EntityGraphType.FETCH)
     @Query("select cc from EmployeeConfigInfo cc where cc.id=?1")
     EmployeeConfigInfo findOneExtend(Long aLong);
+
+    @Query("select new map(" +
+            "ec.jsy.id as jsyId, " +
+            "ec.jsy.jobCode as jsyGh, " +
+            "ec.jsy.personnelName as jsyName) " +
+            "from EmployeeConfigInfo ec ")
+    List<Map<String, Object>> findJsyFromConfig();
+
+    @Query("select new map(" +
+            "ec.spy.id as spyId, " +
+            "ec.spy.jobCode as spyGh, " +
+            "ec.spy.personnelName as spyName) " +
+            "from EmployeeConfigInfo ec ")
+    List<Map<String, Object>> findSpyFromConfig();
 }
@@ -9,7 +9,9 @@ import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 /**
@@ -23,4 +25,97 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
     Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
+
+    @Query(value = " select " +
+            "xl as xlId, " +
+            "xl_name as xlName, " +
+            "schedule_date as scheduleDate, " +
+            "lp_name as lpName, " +
+            "cl as clId, " +
+            "cl_zbh as clZbh, " +
+            "group_concat(distinct fcsj) ccsj, " +
+            "group_concat(distinct j) jsyId, " +
+            "group_concat(distinct j_gh) jsyGh, " +
+            "group_concat(distinct j_name) jsyName, " +
+            "group_concat(distinct s) spyId, " +
+            "group_concat(distinct s_gh) spyGh, " +
+            "group_concat(distinct s_name) spyName, " +
+            "max(create_date) as createDate " +
+            "from bsth_c_s_sp_info " +
+            "where bc_type = 'out' and " +
+            "xl = ?1 and " +
+            "schedule_date = ?2 " +
+            "group by xl_name, schedule_date, lp_name " +
+            "order by xl_name, schedule_date, lp ", nativeQuery = true)
+    List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.cl = :p1, scpinfo.clZbh = :p2 " +
+            "where scpinfo.xl = :p3 and " +
+            "scpinfo.scheduleDate = :p4 and " +
+            "scpinfo.lpName = :p5 ")
+    int updateGroupInfo_type_1(
+            @Param("p1") Integer clid,
+            @Param("p2") String clZbh,
+            @Param("p3") Integer xlid,
+            @Param("p4") Date scheduleDate,
+            @Param("p5") String lpName);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.fcsj = :p1 " +
+            "where scpinfo.xl = :p2 and " +
+            "scpinfo.scheduleDate = :p3 and " +
+            "scpinfo.lpName = :p4 and " +
+            "scpinfo.fcsj = :p5 and " +
+            "scpinfo.bcType = :p6 ")
+    int updateGroupInfo_type_2_4(
+            @Param("p1") String fcsj,
+            @Param("p2") Integer xlid,
+            @Param("p3") Date scheduleDate,
+            @Param("p4") String lpName,
+            @Param("p5") String fcsj_src,
+            @Param("p6") String bcType);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.j = :p1, " +
+            "scpinfo.jGh = :p2, " +
+            "scpinfo.jName = :p3  " +
+            "where scpinfo.xl = :p4 and " +
+            "scpinfo.scheduleDate = :p5 and " +
+            "scpinfo.lpName = :p6 and " +
+            "scpinfo.j = :p7 ")
+    int updateGroupInfo_type_3_5_jsy(
+            @Param("p1") Integer jsyId,
+            @Param("p2") String jsyGh,
+            @Param("p3") String jsyName,
+            @Param("p4") Integer xlId,
+            @Param("p5") Date scheduleDate,
+            @Param("p6") String lpName,
+            @Param("p7") Integer jsyId_src);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.s = :p1, " +
+            "scpinfo.sGh = :p2, " +
+            "scpinfo.sName = :p3  " +
+            "where scpinfo.xl = :p4 and " +
+            "scpinfo.scheduleDate = :p5 and " +
+            "scpinfo.lpName = :p6 and " +
+            "scpinfo.s = :p7 ")
+    int updateGroupInfo_type_3_5_spy(
+            @Param("p1") Integer spyId,
+            @Param("p2") String spyGh,
+            @Param("p3") String spyName,
+            @Param("p4") Integer xlId,
+            @Param("p5") Date scheduleDate,
+            @Param("p6") String lpName,
+            @Param("p7") Integer spyId_src);
+
 }
@@ -6,15 +6,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import javax.persistence.SqlResultSetMapping;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by xu on 16/6/16.
  */
@@ -24,37 +17,4 @@ public interface SchedulePlanRepository extends BaseRepository&lt;SchedulePlan, Lon
     @Override
     Page<SchedulePlan> findAll(Specification<SchedulePlan> spec, Pageable pageable);
-    @Query(value = " select " +
-            "xl_name as xlName, " +
-            "schedule_date as scheduleDate, " +
-            "lp_name as lpName, " +
-            "cl_zbh as clZbh, " +
-            "group_concat(distinct fcsj) ccsj, " +
-            "group_concat(distinct j_gh) jsyGh, " +
-            "group_concat(distinct j_name) jsyName, " +
-            "group_concat(distinct s_gh) spyGh, " +
-            "group_concat(distinct s_name) spyName, " +
-            "max(create_date) as createDate " +
-            "from bsth_c_s_sp_info " +
-            "where bc_type = 'out' and " +
-            "xl = ?1 and " +
-            "schedule_date = ?2 " +
-            "group by xl_name, schedule_date, lp_name " +
-            "order by xl_name, schedule_date, lp ", nativeQuery = true)
-    List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
-
-    @Query(value = "update " +
-            "bsth_c_s_sp_info " +
-            "set cl = :p1, cl_zbh = :p2 " +
-            "where xl = :p3 and " +
-            "schedule_date = :p4 and " +
-            "lp_name = :p5 ",
-            nativeQuery = true)
-    int updateGroupInfo_clinfo(
-            @Param("p1") Integer clid,
-            @Param("p2") String clZbh,
-            @Param("p3") Integer xlid,
-            @Param("p4") Date scheduleDate,
-            @Param("p5") String lpName);
-
 }
@@ -2,9 +2,387 @@ package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+import java.util.List;
 /**
  * Created by xu on 16/6/16.
  */
 public interface SchedulePlanInfoService extends BaseService<SchedulePlanInfo, Long> {
+    /**
+     * 查找分组排班信息。
+     * @param xlid 线路Id
+     * @param scheduleDate 排班日期
+     * @return
+     */
+    List<GroupInfo> findGroupInfo(Integer xlid, Date scheduleDate);
+
+    /**
+     * 更新分组信息。
+     * type=1，替换车辆
+     * type=2，修改出场班次1时间（首班车时间）
+     * type=3，替换分组人员（驾驶员1和售票员1）
+     * type=4，如果分班，修改出场班次2时间（分班后的第一个出场班次时间）
+     * type=5，如果分班，修改分组人员（驾驶员2和售票员2）
+     * @param groupInfoUpdate 分组更新信息，包含类型，更新前的信息，更新后的信息
+     * @return
+     */
+    int updateGroupInfo(GroupInfoUpdate groupInfoUpdate);
+
+    /**
+     * 分组更新信息。
+     */
+    static class GroupInfoUpdate {
+        /** 类型 */
+        private int type;
+        /** 原始分组值 */
+        private GroupInfo src;
+        /** 更新分组值 */
+        private GroupInfo update;
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public GroupInfo getSrc() {
+            return src;
+        }
+
+        public void setSrc(GroupInfo src) {
+            this.src = src;
+        }
+
+        public GroupInfo getUpdate() {
+            return update;
+        }
+
+        public void setUpdate(GroupInfo update) {
+            this.update = update;
+        }
+    }
+
+    /**
+     * 分组信息。
+     */
+    static class GroupInfo {
+        /** 线路Id */
+        private Integer xlId;
+        /** 线路名称 */
+        private String xlName;
+        /** 排班时间 */
+        private Date scheduleDate;
+        /** 路牌名字 */
+        private String lpName;
+        /** 车辆Id */
+        private Integer clId;
+        /** 车辆自编号 */
+        private String clZbh;
+        /** 出场班次1时间 */
+        private String ccsj1;
+        /** 出场班次2时间 */
+        private String ccsj2;
+
+        /** 驾驶员1id */
+        private Integer jsy1Id;
+        /** 驾驶员1工号 */
+        private String jsy1Gh;
+        /** 驾驶员1姓名 */
+        private String jsy1Name;
+        /** 驾驶员1id */
+        private Integer jsy2Id;
+        /** 驾驶员1工号 */
+        private String jsy2Gh;
+        /** 驾驶员1姓名 */
+        private String jsy2Name;
+
+        /** 售票员1id */
+        private Integer spy1Id;
+        /** 售票员1工号 */
+        private String spy1Gh;
+        /** 售票员1姓名 */
+        private String spy1Name;
+        /** 售票员1id */
+        private Integer spy2Id;
+        /** 售票员1工号 */
+        private String spy2Gh;
+        /** 售票员1姓名 */
+        private String spy2Name;
+
+        /** 创建时间 */
+        private Date createDate;
+
+        public GroupInfo() {}
+
+        public GroupInfo(Object[] datas) {
+            // 线路Id
+            this.xlId = Integer.valueOf(String.valueOf(datas[0]));
+            // 线路名称
+            this.xlName = String.valueOf(datas[1]);
+            // 排班时间
+            this.scheduleDate = new DateTime(datas[2]).toDate();
+            // 路牌名字
+            this.lpName = String.valueOf(datas[3]);
+            // 车辆id
+            this.clId = Integer.valueOf(String.valueOf(datas[4]));
+            // 车辆自编号
+            this.clZbh = String.valueOf(datas[5]);
+            // 出场时间，如果有多个，需要分开
+            Object ccsj = datas[6];
+            if (ccsj != null) {
+                String[] ccsj_array = ((String) ccsj).split(",");
+                if (ccsj_array.length > 1) {
+                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                    this.ccsj2 = String.valueOf(ccsj_array[1]);
+                } else {
+                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                }
+            }
+            // 驾驶员id，如果有多个，需要分开
+            Object jsyId = datas[7];
+            if (jsyId != null) {
+                String[] jsyId_array = ((String) jsyId).split(",");
+                if (jsyId_array.length > 1) {
+                    this.jsy1Id = Integer.valueOf(String.valueOf(jsyId_array[0]));
+                    this.jsy2Id = Integer.valueOf(String.valueOf(jsyId_array[1]));
+                } else {
+                    this.jsy1Id = Integer.valueOf(String.valueOf(jsyId_array[0]));
+                }
+            }
+            // 驾驶员工号，如果有多个，需要分开
+            Object jsyGh = datas[8];
+            if (jsyGh != null) {
+                String[] jsyGh_array = ((String) jsyGh).split(",");
+                if (jsyGh_array.length > 1) {
+                    this.jsy1Gh = String.valueOf(jsyGh_array[0]);
+                    this.jsy2Gh = String.valueOf(jsyGh_array[1]);
+                } else {
+                    this.jsy1Gh = String.valueOf(jsyGh_array[0]);
+                }
+            }
+            // 驾驶员名字，如果有多个，需要分开
+            Object jsyName = datas[9];
+            if (jsyName != null) {
+                String[] jsyName_array = ((String) jsyName).split(",");
+                if (jsyName_array.length > 1) {
+                    this.jsy1Name = String.valueOf(jsyName_array[0]);
+                    this.jsy2Name = String.valueOf(jsyName_array[1]);
+                } else {
+                    this.jsy1Name = String.valueOf(jsyName_array[0]);
+                }
+            }
+
+            // 售票员id，如果有多个，需要分开
+            Object spyId = datas[10];
+            if (spyId != null) {
+                String[] spyId_array = ((String) spyId).split(",");
+                if (spyId_array.length > 1) {
+                    this.spy1Id = Integer.valueOf(String.valueOf(spyId_array[0]));
+                    this.spy2Id = Integer.valueOf(String.valueOf(spyId_array[1]));
+                } else {
+                    this.spy1Id = Integer.valueOf(String.valueOf(spyId_array[0]));
+                }
+            }
+
+            // 售票员工号，如果有多个，需要分开
+            Object spyGh = datas[11];
+            if (spyGh != null) {
+                String[] spyGh_array = ((String) spyGh).split(",");
+                if (spyGh_array.length > 1) {
+                    this.spy1Gh = String.valueOf(spyGh_array[0]);
+                    this.spy2Gh = String.valueOf(spyGh_array[1]);
+                } else {
+                    this.spy1Gh = String.valueOf(spyGh_array[0]);
+                }
+            }
+            // 售票员名字，如果有多个，需要分开
+            Object spyName = datas[12];
+            if (spyName != null) {
+                String[] spyName_array = ((String) spyName).split(",");
+                if (spyName_array.length > 1) {
+                    this.spy1Name = String.valueOf(spyName_array[0]);
+                    this.spy2Name = String.valueOf(spyName_array[1]);
+                } else {
+                    this.spy1Name = String.valueOf(spyName_array[0]);
+                }
+            }
+            // 创建时间
+            this.createDate = new DateTime(datas[13]).toDate();
+
+            // TODO：可能还有其他字段
+        }
+
+        public String getXlName() {
+            return xlName;
+        }
+
+        public void setXlName(String xlName) {
+            this.xlName = xlName;
+        }
+
+        public Date getScheduleDate() {
+            return scheduleDate;
+        }
+
+        public void setScheduleDate(Date scheduleDate) {
+            this.scheduleDate = scheduleDate;
+        }
+
+        public String getLpName() {
+            return lpName;
+        }
+
+        public void setLpName(String lpName) {
+            this.lpName = lpName;
+        }
+
+        public Integer getClId() {
+            return clId;
+        }
+
+        public void setClId(Integer clId) {
+            this.clId = clId;
+        }
+
+        public String getClZbh() {
+            return clZbh;
+        }
+
+        public void setClZbh(String clZbh) {
+            this.clZbh = clZbh;
+        }
+
+        public String getCcsj1() {
+            return ccsj1;
+        }
+
+        public void setCcsj1(String ccsj1) {
+            this.ccsj1 = ccsj1;
+        }
+
+        public String getCcsj2() {
+            return ccsj2;
+        }
+
+        public void setCcsj2(String ccsj2) {
+            this.ccsj2 = ccsj2;
+        }
+
+        public Integer getJsy1Id() {
+            return jsy1Id;
+        }
+
+        public void setJsy1Id(Integer jsy1Id) {
+            this.jsy1Id = jsy1Id;
+        }
+
+        public String getJsy1Gh() {
+            return jsy1Gh;
+        }
+
+        public void setJsy1Gh(String jsy1Gh) {
+            this.jsy1Gh = jsy1Gh;
+        }
+
+        public String getJsy1Name() {
+            return jsy1Name;
+        }
+
+        public void setJsy1Name(String jsy1Name) {
+            this.jsy1Name = jsy1Name;
+        }
+
+        public Integer getJsy2Id() {
+            return jsy2Id;
+        }
+
+        public void setJsy2Id(Integer jsy2Id) {
+            this.jsy2Id = jsy2Id;
+        }
+
+        public String getJsy2Gh() {
+            return jsy2Gh;
+        }
+
+        public void setJsy2Gh(String jsy2Gh) {
+            this.jsy2Gh = jsy2Gh;
+        }
+
+        public String getJsy2Name() {
+            return jsy2Name;
+        }
+
+        public void setJsy2Name(String jsy2Name) {
+            this.jsy2Name = jsy2Name;
+        }
+
+        public Integer getSpy1Id() {
+            return spy1Id;
+        }
+
+        public void setSpy1Id(Integer spy1Id) {
+            this.spy1Id = spy1Id;
+        }
+
+        public String getSpy1Gh() {
+            return spy1Gh;
+        }
+
+        public void setSpy1Gh(String spy1Gh) {
+            this.spy1Gh = spy1Gh;
+        }
+
+        public String getSpy1Name() {
+            return spy1Name;
+        }
+
+        public void setSpy1Name(String spy1Name) {
+            this.spy1Name = spy1Name;
+        }
+
+        public Integer getSpy2Id() {
+            return spy2Id;
+        }
+
+        public void setSpy2Id(Integer spy2Id) {
+            this.spy2Id = spy2Id;
+        }
+
+        public String getSpy2Gh() {
+            return spy2Gh;
+        }
+
+        public void setSpy2Gh(String spy2Gh) {
+            this.spy2Gh = spy2Gh;
+        }
+
+        public String getSpy2Name() {
+            return spy2Name;
+        }
+
+        public void setSpy2Name(String spy2Name) {
+            this.spy2Name = spy2Name;
+        }
+
+        public Date getCreateDate() {
+            return createDate;
+        }
+
+        public void setCreateDate(Date createDate) {
+            this.createDate = createDate;
+        }
+
+        public Integer getXlId() {
+            return xlId;
+        }
+
+        public void setXlId(Integer xlId) {
+            this.xlId = xlId;
+        }
+    }
 }
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 /**
  * Created by xu on 16/6/16.
  */
 @Service
 public class SchedulePlanInfoServiceImpl extends BaseServiceImpl<SchedulePlanInfo, Long> implements SchedulePlanInfoService {
+    @Autowired
+    private SchedulePlanInfoRepository schedulePlanInfoRepository;
+
+    @Override
+    public List<GroupInfo> findGroupInfo(Integer xlid, Date scheduleDate) {
+        List<Object[]> groupInfos = schedulePlanInfoRepository.findGroupInfo(xlid, scheduleDate);
+        List<GroupInfo> groupInfoList = new ArrayList<>();
+        for (Object[] groupInfo : groupInfos) {
+            groupInfoList.add(new GroupInfo(groupInfo));
+        }
+        return groupInfoList;
+    }
+
+    @Override
+    @Transactional
+    public int updateGroupInfo(GroupInfoUpdate groupInfoUpdate) {
+        int type = groupInfoUpdate.getType();
+        int result;
+        if (type == 1) {
+            // 换车
+            if (groupInfoUpdate.getUpdate().getClId() != groupInfoUpdate.getSrc().getClId()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_1(
+                        groupInfoUpdate.getUpdate().getClId(),
+                        groupInfoUpdate.getUpdate().getClZbh(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName()
+                );
+            }
+
+        } else if (type == 2) {
+            // 更改出场班次1的时间
+            if (!groupInfoUpdate.getUpdate().getCcsj1().equals(groupInfoUpdate.getSrc().getCcsj1())) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_2_4(
+                        groupInfoUpdate.getUpdate().getCcsj1(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getUpdate().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getCcsj1(),
+                        "out"
+                );
+            }
+
+        } else if (type == 3) {
+            // 更改驾驶员1
+            if (groupInfoUpdate.getUpdate().getJsy1Id() != groupInfoUpdate.getSrc().getJsy1Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_jsy(
+                        groupInfoUpdate.getUpdate().getJsy1Id(),
+                        groupInfoUpdate.getUpdate().getJsy1Gh(),
+                        groupInfoUpdate.getUpdate().getJsy1Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getJsy1Id()
+                );
+            }
+            // 更改售票员1
+            if (groupInfoUpdate.getUpdate().getSpy1Id() != groupInfoUpdate.getSrc().getSpy1Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_spy(
+                        groupInfoUpdate.getUpdate().getSpy1Id(),
+                        groupInfoUpdate.getUpdate().getSpy1Gh(),
+                        groupInfoUpdate.getUpdate().getSpy1Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getSpy1Id()
+                );
+            }
+
+        } else if (type == 4) {
+            // 更改出场班次2的时间
+            if (!groupInfoUpdate.getUpdate().getCcsj2().equals(groupInfoUpdate.getSrc().getCcsj2())) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_2_4(
+                        groupInfoUpdate.getUpdate().getCcsj2(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getUpdate().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getCcsj2(),
+                        "out"
+                );
+            }
+
+        } else if (type == 5) {
+            // 更改驾驶员2
+            if (groupInfoUpdate.getUpdate().getJsy2Id() != groupInfoUpdate.getSrc().getJsy2Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_jsy(
+                        groupInfoUpdate.getUpdate().getJsy2Id(),
+                        groupInfoUpdate.getUpdate().getJsy2Gh(),
+                        groupInfoUpdate.getUpdate().getJsy2Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getJsy2Id()
+                );
+            }
+            // 更改售票员2
+            if (groupInfoUpdate.getUpdate().getSpy2Id() != groupInfoUpdate.getSrc().getSpy2Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_spy(
+                        groupInfoUpdate.getUpdate().getSpy2Id(),
+                        groupInfoUpdate.getUpdate().getSpy2Gh(),
+                        groupInfoUpdate.getUpdate().getSpy2Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getSpy2Id()
+                );
+            }
+
+        } else {
+            throw new RuntimeException("未知的更新类型，type=" + type);
+        }
+
+        return 0;
+    }
 }
@@ -3,31 +3,13 @@ package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.BaseService;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by xu on 16/6/16.
  */
 public interface SchedulePlanService extends BaseService<SchedulePlan, Long> {
-
-    /**
-     * 查找分组排班信息。
-     * @param xlid 线路Id
-     * @param scheduleDate 排班日期
-     * @return
-     */
-    List<Map<String, Object>> findGroupInfo(Integer xlid, Date scheduleDate);
-
     /**
-     * 更新分组排班信息。
-     * @param clid 车辆id
-     * @param clZbh 车辆自编号
-     * @param xlid 线路id
-     * @param scheduleDate 排班日期
-     * @param lpName 路牌名字
+     * 获取有明日排班的计划。
      * @return
      */
-    int updateGroupInfo_clinfo(Integer clid, String clZbh, Integer xlid, Date scheduleDate, String lpName);
+    SchedulePlan findSchedulePlanTommorw();
 }
@@ -12,6 +12,7 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.strategy.IStrategy;
 import com.google.common.collect.Multimap;
+import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,90 +123,16 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
     }
     @Override
-    public List<Map<String, Object>> findGroupInfo(Integer xlid, Date scheduleDate) {
-        List<Object[]> groupInfos = schedulePlanRepository.findGroupInfo(xlid, scheduleDate);
-        List<Map<String, Object>> ret = new ArrayList<>();
-        for (Object[] datas : groupInfos) {
-            // TODO：貌似springdata没有优雅的方式把List<Object[]>转换成List<Map<String, Object>>方法，
-            // TODO：可能jpa有相关标注，以后找到，此方法就作废
-
-            Map<String, Object> map = new HashMap<>();
-
-            // 线路名称
-            map.put("xlName", datas[0]);
-            // 排班时间
-            map.put("scheduleDate", datas[1]);
-            // 路牌名字
-            map.put("lpName", datas[2]);
-            // 车辆自编号
-            map.put("clZbh", datas[3]);
-            // 出场时间，如果有多个，需要分开
-            Object ccsj = datas[4];
-            if (ccsj != null) {
-                String[] ccsj_array = ((String) ccsj).split(",");
-                if (ccsj_array.length > 1) {
-                    map.put("ccsj1", ccsj_array[0]);
-                    map.put("ccsj2", ccsj_array[1]);
-                } else {
-                    map.put("ccsj1", ccsj_array[0]);
-                }
-            }
-            // 驾驶员工号，如果有多个，需要分开
-            Object jsyGh = datas[5];
-            if (jsyGh != null) {
-                String[] jsyGh_array = ((String) jsyGh).split(",");
-                if (jsyGh_array.length > 1) {
-                    map.put("jsy1Gh", jsyGh_array[0]);
-                    map.put("jsy2Gh", jsyGh_array[1]);
-                } else {
-                    map.put("jsy1Gh", jsyGh_array[0]);
-                }
-            }
-            // 驾驶员名字，如果有多个，需要分开
-            Object jsyName = datas[6];
-            if (jsyName != null) {
-                String[] jsyName_array = ((String) jsyName).split(",");
-                if (jsyName_array.length > 1) {
-                    map.put("jsy1Name", jsyName_array[0]);
-                    map.put("jsy2Name", jsyName_array[1]);
-                } else {
-                    map.put("jsy1Name", jsyName_array[0]);
-                }
-            }
-            // 售票员工号，如果有多个，需要分开
-            Object spyGh = datas[7];
-            if (spyGh != null) {
-                String[] spyGh_array = ((String) spyGh).split(",");
-                if (spyGh_array.length > 1) {
-                    map.put("spy1Gh", spyGh_array[0]);
-                    map.put("spy2Gh", spyGh_array[1]);
-                } else {
-                    map.put("spy1Gh", spyGh_array[0]);
-                }
-            }
-            // 售票员名字，如果有多个，需要分开
-            Object spyName = datas[8];
-            if (spyName != null) {
-                String[] spyName_array = ((String) spyName).split(",");
-                if (spyName_array.length > 1) {
-                    map.put("spy1Name", spyName_array[0]);
-                    map.put("spy2Name", spyName_array[1]);
-                } else {
-                    map.put("spy1Name", spyName_array[0]);
-                }
-            }
-            // 创建时间
-            map.put("createDate", datas[9]);
-
-            // TODO：可能还有其他字段
-
-            ret.add(map);
+    public SchedulePlan findSchedulePlanTommorw() {
+        DateTime today = new DateTime(new Date());
+        DateTime tommorw = new DateTime(today.getYear(), today.getMonthOfYear(), today.getDayOfMonth(), 0, 0).plusDays(1);
+        Map<String, Object> param = new HashMap<>();
+        param.put("scheduleFromTime_le", tommorw);
+        param.put("scheduleToTime_ge", tommorw);
+        Iterator<SchedulePlan> schedulePlanIterator = this.list(param).iterator();
+        if (schedulePlanIterator.hasNext()) {
+            return schedulePlanIterator.next();
         }
-        return ret;
-    }
-
-    @Override
-    public int updateGroupInfo_clinfo(Integer clid, String clZbh, Integer xlid, Date scheduleDate, String lpName) {
-        return schedulePlanRepository.updateGroupInfo_clinfo(clid, clZbh, xlid, scheduleDate, lpName);
+        return null;
     }
 }