Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 45edec6e cc2b5ea9
Showing 19 changed files with 439 additions and 83 deletions
src/main/java/com/bsth/entity/schedule/rule/RerunRule.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleService.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/rerun/RerunRule_input.java
src/main/resources/application-dev.properties
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/rules/ttinfo.drl
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/edit.html
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/form.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail2.html
src/test/resources/testdata/problem.properties
@@ -73,10 +73,21 @@ public class RerunRule extends BEntity {
     /** 车辆配置 */
     @ManyToOne(cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     private CarConfigInfo useCarConfig;
+
+    private Integer cl; // 冗余字段（车辆id）
+    private String clZbh; // 冗余字段（车辆自编号）
+
     /** 人员配置 */
     @ManyToOne(cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     private EmployeeConfigInfo useEmployeeConfig;
+    private Integer j; // 冗余字段（驾驶员Id）
+    private String jGh; // 冗余字段（驾驶员工号）
+    private String jName; // 冗余字段（驾驶员姓名）
+    private Integer s; // 冗余字段（售票员Id）
+    private String sGh; // 冗余字段（售票员工号）
+    private String sName; // 冗余字段（售票员姓名）
+
     /** 是否删除（标记） */
     @Column(nullable = false)
     private Boolean isCancel = false;
@@ -176,4 +187,68 @@ public class RerunRule extends BEntity {
     public void setRerunTtinfodetailFcsjs(String rerunTtinfodetailFcsjs) {
         this.rerunTtinfodetailFcsjs = rerunTtinfodetailFcsjs;
     }
+
+    public Integer getCl() {
+        return cl;
+    }
+
+    public void setCl(Integer cl) {
+        this.cl = cl;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public Integer getJ() {
+        return j;
+    }
+
+    public void setJ(Integer j) {
+        this.j = j;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getjName() {
+        return jName;
+    }
+
+    public void setjName(String jName) {
+        this.jName = jName;
+    }
+
+    public Integer getS() {
+        return s;
+    }
+
+    public void setS(Integer s) {
+        this.s = s;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
 }
@@ -27,6 +27,29 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " xlbm like %?4% and nbbm like %?5% ",nativeQuery=true)
 	List<Ylb> obtainYlbefore(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	/**
+	 * 获取当天日期前的最大的日期中最大进出顺序的数据
+	 * 
+	 */
+	@Transactional
+	@Modifying
+	@Query(value="select y.* from (select max(d.id) as id ,d.nbbm from ("
+			+ " select b.rq,b.nbbm,max(b.jcsx) as jcsx from ("
+			+ " select max(t.rq) as rq ,t.nbbm   from bsth_c_ylb t "
+			+ " where to_days(t.rq)< to_days(?1) "
+			+ " and t.ssgsdm like %?2% and t.fgsdm like %?3%  "
+			+ " and t.xlbm like %?4%  and t.nbbm like %?5% group by nbbm ) a "
+			+ " left join bsth_c_ylb b on  a.rq=b.rq and a.nbbm=b.nbbm "
+			+ " where  b.ssgsdm like %?2% and  b.fgsdm like %?3%  and  "
+			+ " b.xlbm like %?4%  and  b.nbbm like %?5%  group by b.rq,b.nbbm) c"
+			+ " left join bsth_c_ylb d on c.rq=d.rq and c.nbbm=d.nbbm and c.jcsx=d.jcsx "
+			+ " where  d.ssgsdm like %?2% and  d.fgsdm like %?3%  and  d.xlbm like %?4% "
+			+ " and  d.nbbm like %?5%  group by d.nbbm) x left join  "
+			+ " bsth_c_ylb y on x.id=y.id where  y.ssgsdm like %?2% and y.fgsdm like %?3%  "
+			+ " and y.xlbm like %?4%  and y.nbbm like %?5%",nativeQuery=true)
+	List<Ylb> listMaxRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
+	
 	/**
 	 * 当天YLB信息
 	 * @param rq
@@ -164,8 +164,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY clZbh,fcsj")
-	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY clZbh,fcsj")
+	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 	List<ScheduleRealInfo> setLD(String date);
@@ -276,17 +276,22 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		// TODO Auto-generated method stub
 		String rq=map.get("rq").toString();
 		String nbbm=map.get("nbbh").toString();
+		String gsdm=map.get("gsdm_like").toString();
+		
+		String fgsdm=map.get("fgsdm_like").toString();
 		String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,"
 				+ "b.jyggh as jyggh,b.jzl as jzl ,b.stationid as stationid,b.jsy as jsy,"
 				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,b.id as id ,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
 				   " left  join ("
 				   + " select * from bsth_c_ylxxb b "
-				   + "where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1) b " +
+				   + "where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1  "
+				   		+ " and gsdm = '"+gsdm+"') b " +
 				  " on a.nbbm=b.nbbm "
 				  + "left join (select nbbm,group_concat(jsy) as jsy  "
-				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) group by nbbm "+
+				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) "
+				  		+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"'  group by nbbm "+
 				   " ) c on a.nbbm=c.nbbm  "
-				   + "where  a.nbbm like '%"+nbbm+"%'";
+				   + "where  a.nbbm like '%"+nbbm+"%' and a.gsdm='"+gsdm+"' and a.fgsdm ='"+fgsdm+"'";
 		List<Ylxxb> yList= jdbcTemplate.query(sql,
 				 new RowMapper<Ylxxb>(){
@@ -102,7 +102,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			//当天YLXXB信息
 	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 			//前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe=repository.obtainYlbefore(rq,"","","","");
+//			List<Ylb> ylListBe=repository.obtainYlbefore(rq,"","","","");
+			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, "", "", "", "");
 			List<Cyl> clyList=cylRepository.obtainCyl("","");
 			//从排班表中计算出行驶的总里程
 			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", rq, "", "", "", "");
@@ -240,7 +241,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
+//			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
+			List<Ylb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
 			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb = scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
@@ -325,7 +327,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setNbbm(map.get("clZbh").toString());
 					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
 					t.setZlc(map.get("totalKilometers") == null ? 0.0
-							: Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
+							: Double.parseDouble(map.get("totalKilometers").toString()));
 					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
 					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
@@ -451,13 +453,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()), t.getCzyl()),yh);
 								//把进场油量的小数和整数分别取出
 //								int ylxs=(int) nextJzyl; 10.6--11  10.3--10
-								long l=Math.round(nextJzyl);
-								double ylxs=l*100/100;
-//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-								t.setYh(yh);
-								t.setJzyl(ylxs);
-								nextJzyl=ylxs;
+								if(zlc>0){
+									long l=Math.round(nextJzyl);
+									double ylxs=l*100/100;
+//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
+								
+								
+								
 							} else {
 								t.setCzyl(nextJzyl);
 								Double yh=0.0;
@@ -465,16 +475,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 								}
 								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()),nextJzyl),yh);
-								long l=Math.round(nextJzyl);
-								double ylxs=l*100/100;
-//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-								t.setYh(yh);
-								t.setJzyl(ylxs);
-								nextJzyl= ylxs;
+								if(zlc>0){
+									long l=Math.round(nextJzyl);
+									double ylxs=l*100/100;
+//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+									t.setYh(yh);
+									t.setJzyl(ylxs);
+									nextJzyl=ylxs;
+								}else{
+									t.setYh(yh);
+									t.setJzyl(nextJzyl);
+								}
 							}
 							repository.save(t);
-							for (int z = 0; z < cylList.size(); z++) {
+							/*for (int z = 0; z < cylList.size(); z++) {
 								Cyl cyl = cylList.get(z);
 								if (t.getNbbm().equals(cyl.getNbbm())) {
 									cyl.setCyl(t.getJzyl());
@@ -482,7 +497,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									break;
 								}
 								cylRepository.save(cyl);
-							}
+							}*/
 						}
 						map2.put("status", ResponseCode.SUCCESS);
 					}
@@ -687,7 +702,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			if(map.get("nbbm_eq")!=null){
 				nbbm=map.get("nbbm_eq").toString();
 			}
-			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
+//			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
+			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
 			List<Cyl> cylList=cylRepository.obtainCyl(nbbm, gsbm);
 			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
@@ -751,11 +767,11 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setYh(0.0);
 					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						repository.save(t);
-						if(null!=cyl){
+						/*if(null!=cyl){
 							cyl.setCyl(Arith.add(t.getJzl(), t.getCzyl()));
 							cyl.setUpdatetime(y1.getYyrq());
 							cylRepository.save(cyl);
-						}
+						}*/
 					}
 				}
 			}
@@ -1048,7 +1064,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			t.setRylx(rylx);
 			t.setId(jsonObject.getInteger("id"));*/
 			repository.ylbUpdate(id, czyl, jzyl, yh, sh, shyy, ns, rylx,yhlx);
-			for (int z = 0; z < cylList.size(); z++) {
+			/*for (int z = 0; z < cylList.size(); z++) {
 				Cyl cyl = cylList.get(z);
 				if (nbbm.equals(cyl.getNbbm())) {
 					cyl.setCyl(jzyl);
@@ -1056,7 +1072,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					break;
 				}
 				cylRepository.save(cyl);
-			}
+			}*/
 		}
 //		List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
@@ -1139,13 +1155,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 						}
 						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
-						long l=Math.round(nextJzyl);
-						double ylxs=l*100/100;
-//						nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-						yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-						t.setJzyl(ylxs);
-						t.setYh(yh);
-						nextJzyl=ylxs;
+						if(zlc>0){
+							long l=Math.round(nextJzyl);
+							double ylxs=l*100/100;
+//							nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+							yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+							t.setYh(yh);
+							t.setJzyl(ylxs);
+							nextJzyl=ylxs;
+						}else{
+							t.setYh(yh);
+							t.setJzyl(nextJzyl);
+						}
 					} else {
 						if(t.getId()==id){
 							t.setSh(sh);
@@ -1157,16 +1178,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 							}
 							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
-							long l=Math.round(nextJzyl);
-							double ylxs=l*100/100;
-//							nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
-							yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
-							t.setJzyl(ylxs);
-							t.setYh(yh);
-							nextJzyl=ylxs;
+							if(zlc>0){
+								long l=Math.round(nextJzyl);
+								double ylxs=l*100/100;
+//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+								t.setYh(yh);
+								t.setJzyl(ylxs);
+								nextJzyl=ylxs;
+							}else{
+								t.setYh(yh);
+								t.setJzyl(nextJzyl);
+							}
 					}
 					repository.save(t);
-					for (int z = 0; z < cylList.size(); z++) {
+					/*for (int z = 0; z < cylList.size(); z++) {
 						Cyl cyl = cylList.get(z);
 						if (t.getNbbm().equals(cyl.getNbbm())) {
 							cyl.setCyl(t.getJzyl());
@@ -1174,7 +1200,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							break;
 						}
 						cylRepository.save(cyl);
-					}
+					}*/
 				}
 				newMap.put("status", ResponseCode.SUCCESS);
 			}
@@ -2728,12 +2728,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
 //		String date = "2016-09-20";
 //    	  System.out.println("shijian1:"+new Date());
-        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm);
+        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm);
 //        System.out.println("shijian2:"+new Date());
         //		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
 //        System.out.println("shijian3:"+new Date());
         for (int x = 0; x < yesterdayDataList.size(); x++) {
+        	
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
@@ -12,6 +12,7 @@ import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.rules.ScheduleRuleService;
 import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
 import com.bsth.service.schedule.rules.plan.PlanResult;
+import com.bsth.service.schedule.rules.rerun.RerunRule_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
@@ -101,7 +102,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 执行完毕销毁，有日志的也要关闭
         session.dispose();
-        logger.info("循环规则输出={}", scheduleResults_output.showGuideboardDesc1());
+//        logger.info("循环规则输出={}", scheduleResults_output.showGuideboardDesc1());
         return scheduleResults_output;
     }
@@ -258,6 +259,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         PlanResult planResult = SchedulePlanWithOutRerun(schedulePlan);
         // TODO 3、确定套跑规则
+        List<RerunRule_input> rerunRule_inputs = scheduleRuleService.findRerunrule(schedulePlan.getXl().getId());
+        logger.info("套跑数量 {} 组", rerunRule_inputs.size());
         // 4、保存数据（jdbcTemplate 批量插入）
         Date start4 = new Date();
@@ -98,10 +98,10 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     public List<Map<String, Object>> findZdAndTcc(int lineid, int xldir) {
         String sql = "select * from " +
                 "(" +
-                "select station_code as zcode, station_name as zname from bsth_c_stationroute " +
+                "select station_code as zcode, station_name as zname, concat(station_name, '(站点)') as aname from bsth_c_stationroute " +
                 "where destroy = 0 and line = ? and directions = ? " +
                 "union all " +
-                "select park_code as zcode, park_name as zname from bsth_c_car_park " +
+                "select park_code as zcode, park_name as zname, concat(park_name, '(停车场)') as aname from bsth_c_car_park " +
                 "where destroy = 0 " +
                 ") a ";
@@ -3,6 +3,7 @@ package com.bsth.service.schedule.rules;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+import com.bsth.service.schedule.rules.rerun.RerunRule_input;
 import java.util.Date;
 import java.util.List;
@@ -42,5 +43,13 @@ public interface ScheduleRuleService {
      * @param dateto 结束日期
      */
     void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto);
+
+    /**
+     * 查找线路的套跑规则，并封装成规则输入对象。
+     * @param xlid
+     * @return
+     */
+    List<RerunRule_input> findRerunrule(Integer xlid);
+
 }
@@ -3,13 +3,11 @@ package com.bsth.service.schedule.rules;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+import com.bsth.service.schedule.rules.rerun.RerunRule_input;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.PreparedStatementCreator;
-import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.*;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Service;
@@ -37,6 +35,75 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
     private JdbcTemplate jdbcTemplate;
     @Override
+    public List<RerunRule_input> findRerunrule(Integer xlid) {
+        String sql = "select " +
+                "rerun_type as type " +
+                ", rerun_xl as m_xl " +
+                ", rerun_ttinfo as m_ttinfo " +
+                ", rerun_lp as m_lp " +
+                ", rerun_ttinfodetail_fcsjs as m_fcsjs " +
+                ", use_xl as s_dylp_xl " +
+                ", use_lp as s_dylp_lp " +
+                ", cl as s_dybc_cl " +
+                ", cl_zbh as s_dybc_clzbh " +
+                ", j as s_dybc_j " +
+                ", j_gh as s_dybc_jgh " +
+                ", j_name as s_dybc_jname " +
+                ", s as s_dybc_s " +
+                ", s_gh as s_dybc_sgh " +
+                ", s_name as s_dybc_sname " +
+                "from bsth_c_s_rerun_rule " +
+                "where rerun_xl = ? ";
+
+        final List<RerunRule_input> rerunRule_inputs = new ArrayList<>();
+
+        jdbcTemplate.query(sql, new Object[]{xlid}, new RowCallbackHandler() {
+            @Override
+            public void processRow(ResultSet resultSet) throws SQLException {
+                // 发车时间
+                String[] fcsjs = resultSet.getString("m_fcsjs").split(",");
+                for (String fcsj: fcsjs) {
+                    RerunRule_input rerunRule_input = new RerunRule_input();
+                    rerunRule_input.setXl(String.valueOf(resultSet.getInt("m_xl")));
+                    rerunRule_input.setTtinfo(String.valueOf(resultSet.getLong("m_ttinfo")));
+                    rerunRule_input.setLp(String.valueOf(resultSet.getLong("m_lp")));
+                    rerunRule_input.setFcsj(fcsj);
+
+                    rerunRule_input.setType(resultSet.getString("type"));
+                    // 对应班次类型
+                    if ("dybc".equals(resultSet.getString("type"))) {
+                        rerunRule_input.setS_xl(String.valueOf(resultSet.getInt("s_dylp_xl")));
+                        rerunRule_input.setS_lp(String.valueOf(resultSet.getLong("s_dylp_lp")));
+                    } else if ("dylp".equals(resultSet.getString("type"))) {
+                        rerunRule_input.setCl(resultSet.getInt("s_dybc_cl"));
+                        rerunRule_input.setZbh(resultSet.getString("s_dybc_clzbh"));
+                        rerunRule_input.setJ(resultSet.getInt("s_dybc_j"));
+                        rerunRule_input.setJgh(resultSet.getString("s_dybc_jgh"));
+                        rerunRule_input.setJname(resultSet.getString("s_dybc_jname"));
+                        rerunRule_input.setS(resultSet.getInt("s_dybc_s"));
+                        rerunRule_input.setSgh(resultSet.getString("s_dybc_sgh"));
+                        rerunRule_input.setSname(resultSet.getString("s_dybc_sname"));
+                    }
+
+                    rerunRule_inputs.add(rerunRule_input);
+                }
+
+            }
+        });
+
+        return rerunRule_inputs;
+    }
+
+    public void test() {
+        jdbcTemplate.query("", new RowCallbackHandler() {
+            @Override
+            public void processRow(ResultSet resultSet) throws SQLException {
+
+            }
+        });
+    }
+
+    @Override
     public List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from) {
         String sql = "select * from bsth_c_s_sp_rule_rst a " +
                 "where exists (select 1 from " +
+package com.bsth.service.schedule.rules.rerun;
+
+/**
+ * Created by xu on 17/4/26.
+ */
+public class RerunRule_input {
+    private String xl; // 主线路Id
+    private String ttinfo; // 时刻表Id
+    private String lp; // 路牌
+    private String fcsj; // 发车时间
+
+    private String type; // 套跑类型（dylp-对应路牌, dybc-对应班车）
+    private String s_xl; // 对应路牌，线路Id
+    private String s_lp; // 对应路牌，路牌Id
+
+    private Integer cl; // 对应班车，车辆Id
+    private String zbh; // 对应班车，车辆自编号
+    private Integer j; // 对应班车，驾驶员Id
+    private String jgh; // 对应班车，驾驶员工号
+    private String jname; // 对应班车，驾驶员姓名
+    private Integer s; // 对应班车，售票员Id
+    private String sgh; // 对应班车，售票员工号
+    private String sname; // 对应班车，售票员姓名
+
+    public String getXl() {
+        return xl;
+    }
+
+    public void setXl(String xl) {
+        this.xl = xl;
+    }
+
+    public String getTtinfo() {
+        return ttinfo;
+    }
+
+    public void setTtinfo(String ttinfo) {
+        this.ttinfo = ttinfo;
+    }
+
+    public String getLp() {
+        return lp;
+    }
+
+    public void setLp(String lp) {
+        this.lp = lp;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getS_xl() {
+        return s_xl;
+    }
+
+    public void setS_xl(String s_xl) {
+        this.s_xl = s_xl;
+    }
+
+    public String getS_lp() {
+        return s_lp;
+    }
+
+    public void setS_lp(String s_lp) {
+        this.s_lp = s_lp;
+    }
+
+    public Integer getCl() {
+        return cl;
+    }
+
+    public void setCl(Integer cl) {
+        this.cl = cl;
+    }
+
+    public String getZbh() {
+        return zbh;
+    }
+
+    public void setZbh(String zbh) {
+        this.zbh = zbh;
+    }
+
+    public Integer getJ() {
+        return j;
+    }
+
+    public void setJ(Integer j) {
+        this.j = j;
+    }
+
+    public String getJgh() {
+        return jgh;
+    }
+
+    public void setJgh(String jgh) {
+        this.jgh = jgh;
+    }
+
+    public String getJname() {
+        return jname;
+    }
+
+    public void setJname(String jname) {
+        this.jname = jname;
+    }
+
+    public Integer getS() {
+        return s;
+    }
+
+    public void setS(Integer s) {
+        this.s = s;
+    }
+
+    public String getSgh() {
+        return sgh;
+    }
+
+    public void setSgh(String sgh) {
+        this.sgh = sgh;
+    }
+
+    public String getSname() {
+        return sname;
+    }
+
+    public void setSname(String sname) {
+        this.sname = sname;
+    }
+}
@@ -6,7 +6,7 @@ spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
-spring.jpa.show-sql= true
+spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
@@ -76,7 +76,7 @@ rule &quot;calcu_days_1_&quot;
         insert(cdrp);
-        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $fromDate, $toDate);
+//        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $fromDate, $toDate);
 end
@@ -108,7 +108,7 @@ rule &quot;calcu_days_2_&quot;
         insert(cdrp);
-        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $qyrq, $toDate);
+//        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $qyrq, $toDate);
 end
@@ -169,7 +169,7 @@ rule &quot;calcu_days_1_with_result&quot;
         )
     then
         // 修正排班数据
-        log.info("准备修正 ruleId={} historyDate={}", $ruleId, $scheduleDate);
+//        log.info("准备修正 ruleId={} historyDate={}", $ruleId, $scheduleDate);
         $cdrp.setCalcu_index_lp(Integer.valueOf($self.getGidindex()));
         $cdrp.setCalcu_index_ry(Integer.valueOf($self.getEcindex()));
@@ -211,8 +211,8 @@ rule &quot;Calcu_loop1_1_&quot; // 路牌在时刻表中存在，就翻
         $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
         $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
-        log.info("Calcu_loop1_1_ ruleId={}, calcu_index_lp/ry={}/{}",
-            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+//        log.info("Calcu_loop1_1_ ruleId={}, calcu_index_lp/ry={}/{}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
         update($cdrp);
 end
@@ -233,8 +233,8 @@ rule &quot;Calcu_loop1_2_&quot; // 路牌在时刻表中不存在，就不翻
     then
         $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
-        log.info("Calcu_loop1_2_ ruleId={}, calcu_index_lp/ry={}/{}",
-            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+//        log.info("Calcu_loop1_2_ ruleId={}, calcu_index_lp/ry={}/{}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
         update($cdrp);
 end
@@ -304,8 +304,8 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
-        log.info("Calcu_loop2_1_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
-            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+//        log.info("Calcu_loop2_1_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
         update($cdrp);
 end
@@ -359,8 +359,8 @@ rule &quot;Calcu_loop2_2_&quot; // 路牌在时刻表中不存在，就不翻
 //
 //        scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
-        log.info("Calcu_loop2_2_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
-            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+//        log.info("Calcu_loop2_2_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
         update($cdrp);
 end
@@ -82,7 +82,7 @@ rule &quot;calcu_days&quot;
         cdr.setCalcu_end_date(($toDate));
         cdr.setXlId($xlId);
-        log.info("总共需要计算的天数 calcu_days={} 之后的计算从第1天开始 ", p.getDays() + 1);
+//        log.info("总共需要计算的天数 calcu_days={} 之后的计算从第1天开始 ", p.getDays() + 1);
         insert(cdr); // 插入fact数据，进入下一个阶段
 end
@@ -107,7 +107,7 @@ rule &quot;calcu_ttinfo_enable&quot;
         cter.setTtInfo_input_list($ttInfo_input_list);
         cter.setCalcu_date($calcu_date);
-        log.info("启用的时刻表：xlId={} 时刻表个数={}", $xlId, $ttInfo_input_list.size());
+//        log.info("启用的时刻表：xlId={} 时刻表个数={}", $xlId, $ttInfo_input_list.size());
         insert (cter);
@@ -130,7 +130,7 @@ rule &quot;calcu_ttinfo_special_day&quot; // 特殊日期匹配
         $calcu_days_result.setCalcu_date(new_calcu_date);
         $calcu_days_result.setCalcu_weekday(new_calcu_date.getDayOfWeek());
-        log.info("启用特殊日期时刻表：xlId={} 时刻表个数={} 特殊日期={}", $xlId, $ttinfolist.size(), $calcu_date);
+//        log.info("启用特殊日期时刻表：xlId={} 时刻表个数={} 特殊日期={}", $xlId, $ttinfolist.size(), $calcu_date);
         // $ttinfolist按时间倒排序，result输出
         Collections.sort($ttinfolist);
@@ -161,7 +161,7 @@ rule &quot;calcu_ttinfo_normal_day&quot; // 平日匹配
         $calcu_days_result.setCalcu_date(new_calcu_date);
         $calcu_days_result.setCalcu_weekday(new_calcu_date.getDayOfWeek());
-        log.info("启用常规日期时刻表：xlId={} 时刻表个数={} 常规日期={} 星期几={} 路牌size={}", $xlId, $ttinfolist.size(), $calcu_date, $calcu_weekday, $lpInfoResults.size());
+//        log.info("启用常规日期时刻表：xlId={} 时刻表个数={} 常规日期={} 星期几={} 路牌size={}", $xlId, $ttinfolist.size(), $calcu_date, $calcu_weekday, $lpInfoResults.size());
         // $ttinfolist按时间倒排序，result输出
         Collections.sort($ttinfolist);
@@ -192,7 +192,7 @@ rule &quot;calcu_ttinfo_other_day&quot; // 都没有的情况下，匹配
         $calcu_days_result.setCalcu_date(new_calcu_date);
         $calcu_days_result.setCalcu_weekday(new_calcu_date.getDayOfWeek());
-        log.info("启用默认日期时刻表：xlId={} 时刻表个数={} 常规日期={} 星期几={}", $xlId, $ttinfolist.size(), $calcu_date, $calcu_weekday);
+//        log.info("启用默认日期时刻表：xlId={} 时刻表个数={} 常规日期={} 星期几={}", $xlId, $ttinfolist.size(), $calcu_date, $calcu_weekday);
         // $ttinfolist按时间倒排序，result输出
         Collections.sort($ttinfolist);
@@ -181,7 +181,7 @@
                     <div class="col-md-3">
                         <sa-Select5 name="useCarConfig"
                                     model="ctrl.rerunManageForSave"
-                                    cmaps="{'useCarConfig.id' : 'id'}"
+                                    cmaps="{'useCarConfig.id' : 'id', 'cl': 'cl.id', 'clZbh': 'cl.insideCode'}"
                                     dcname="useCarConfig.id"
                                     icname="id"
                                     dsparams="{{ {type: 'ajax', param:{'type': 'all', 'isCancel_eq': false}, atype:'cci2' } | json }}"
@@ -203,7 +203,7 @@
                     <div class="col-md-5">
                         <sa-Select5 name="useEmployeeConfig"
                                     model="ctrl.rerunManageForSave"
-                                    cmaps="{'useEmployeeConfig.id' : 'id'}"
+                                    cmaps="{'useEmployeeConfig.id' : 'id', 'j': 'jsy.id', 'jGh': 'jsy.jobCode', 'jName': 'jsy.personnelName', 's': 'spy.id', 'sGh': 'spy.jobCode', 'sName': 'spy.personnelName'}"
                                     dcname="useEmployeeConfig.id"
                                     icname="id"
                                     dsparams="{{ {type: 'ajax', param:{'type': 'all', 'isCancel_eq': false}, atype:'eci3' } | json }}"
@@ -181,7 +181,7 @@
                     <div class="col-md-3">
                         <sa-Select5 name="useCarConfig"
                                     model="ctrl.rerunManageForSave"
-                                    cmaps="{'useCarConfig.id' : 'id'}"
+                                    cmaps="{'useCarConfig.id' : 'id', 'cl': 'cl.id', 'clZbh': 'cl.insideCode'}"
                                     dcname="useCarConfig.id"
                                     icname="id"
                                     dsparams="{{ {type: 'ajax', param:{'type': 'all', 'isCancel_eq': false}, atype:'cci2' } | json }}"
@@ -203,7 +203,7 @@
                     <div class="col-md-5">
                         <sa-Select5 name="useEmployeeConfig"
                                     model="ctrl.rerunManageForSave"
-                                    cmaps="{'useEmployeeConfig.id' : 'id'}"
+                                    cmaps="{'useEmployeeConfig.id' : 'id', 'j': 'jsy.id', 'jGh': 'jsy.jobCode', 'jName': 'jsy.personnelName', 's': 'spy.id', 'sGh': 'spy.jobCode', 'sName': 'spy.personnelName'}"
                                     dcname="useEmployeeConfig.id"
                                     icname="id"
                                     dsparams="{{ {type: 'ajax', param:{'type': 'all', 'isCancel_eq': false}, atype:'eci3' } | json }}"
@@ -95,9 +95,9 @@
                                         icname="zcode"
                                         dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd_tcc' } | json }}"
                                         iterobjname="item"
-                                        iterobjexp="item.zname"
+                                        iterobjexp="item.aname"
                                         searchph="请输拼音..."
-                                        searchexp="this.zname"
+                                        searchexp="this.aname"
                                         required >
                             </sa-Select5>
                         </div>
@@ -116,9 +116,9 @@
                                         icname="zcode"
                                         dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd_tcc' } | json }}"
                                         iterobjname="item"
-                                        iterobjexp="item.zname"
+                                        iterobjexp="item.aname"
                                         searchph="请输拼音..."
-                                        searchexp="this.zname"
+                                        searchexp="this.aname"
                                         required >
                             </sa-Select5>
                         </div>
@@ -76,9 +76,9 @@
                                             icname="zcode"
                                             dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd_tcc' } | json }}"
                                             iterobjname="item"
-                                            iterobjexp="item.zname"
+                                            iterobjexp="item.aname"
                                             searchph="请输拼音..."
-                                            searchexp="this.zname"
+                                            searchexp="this.aname"
                                             required >
                                 </sa-Select5>
                             </div>
@@ -93,9 +93,9 @@
                                             icname="zcode"
                                             dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd_tcc' } | json }}"
                                             iterobjname="item"
-                                            iterobjexp="item.zname"
+                                            iterobjexp="item.aname"
                                             searchph="请输拼音..."
-                                            searchexp="this.zname"
+                                            searchexp="this.aname"
                                             required >
                                 </sa-Select5>
                             </div>
@@ -11,4 +11,7 @@
 ##11=人员基础信息导入问题，工号前要加公司代码
 12=套跑规则嵌入到主排班规则中
 13=导入数据功能，需要加用户名
-14=路牌编号自动生成
 \ No newline at end of file
+14=路牌编号自动生成
+15=时刻表导入的时候表头后面不需要加数字
+16=时间框中文
+