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

# Conflicts: # src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
# Conflicts: # src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
潘钊
2 parents 3684c9fb e367d1c5
Showing 25 changed files with 1153 additions and 669 deletions
pom.xml
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/service/oil/DlbService.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/datatools/ktrs/guideboardDataInput.ktr
src/main/resources/static/pages/base/timesmodel/js/raty/lib/jquery.raty.min.js
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.min.js
src/main/resources/static/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css
src/main/resources/static/real_control_v2/fragments/north/nav/safeDriving.html
src/test/java/com/bsth/service/schedule/BaseTest.java
src/test/java/com/bsth/service/schedule/ScheduleTestApp.java
src/test/java/com/bsth/service/schedule/rules/DroolsRulesTest.java
src/test/java/com/bsth/service/schedule/rules/DroolsRulesTest2.java
src/test/java/com/bsth/service/schedule/rules/RuleTest1.java
@@ -237,6 +237,27 @@
 			<version>1.13</version>
 		</dependency>
  
+        <dependency>
+            <groupId>org.dbunit</groupId>
+            <artifactId>dbunit</artifactId>
+            <version>2.4.9</version>
+            <scope>test</scope>
+
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.2.132</version>
+            <scope>test</scope>
+        </dependency>
+
 	</dependencies>
  
 	<dependencyManagement>
@@ -369,8 +369,35 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
  
 	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam String gsdm,@RequestParam String fgsdm, @RequestParam String line, @RequestParam String date,
-			@RequestParam String date2,@RequestParam String xlName, @RequestParam String type){
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
 		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
  
 package com.bsth.data.schedule.thread;
  
+import com.bsth.service.oil.DlbService;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
 import org.slf4j.Logger;
@@ -16,7 +17,8 @@ public class CalcOilThread extends Thread{
  
     @Autowired
     YlbService ylbService;
-
+    @Autowired
+    DlbService dlbService;
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
     @Override
@@ -24,6 +26,7 @@ public class CalcOilThread extends Thread{
         try{
             logger.info("开始计算路单里程加注量....");
             ylbService.obtainDsq();
+            dlbService.obtainDsq();
             logger.info("计算路单里程加注量结束！");
  
             //清除安全驾驶数据 先临时蹭这个线程
@@ -18,4 +18,6 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
  
 	Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception;
+	
+	String obtainDsq() throws Exception;
 }
@@ -6,6 +6,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -70,8 +71,144 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	JdbcTemplate jdbcTemplate;
  
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Transactional  
+	@Override
+	public String obtainDsq() throws Exception{
+		String result = "failure";
+		List<Cars> carsList=carsRepository.findCars();
+		 Map<String, Boolean> carsMap=new HashMap<String, Boolean>();
+		 for (int i = 0; i < carsList.size(); i++) {
+			 Cars c=carsList.get(i);
+			 carsMap.put(c.getInsideCode(), c.getSfdc());
+		}
+		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			Date dNow = new Date();   //当前时间
+			Date dBefore = new Date();
+			Calendar calendar = Calendar.getInstance(); //得到日历
+			calendar.setTime(dNow);//把当前时间赋给日历
+			calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
+			dBefore = calendar.getTime();   //得到前一天的时间
+			String rq=sdf.format(dBefore);
+		String line="";
+		//保留两位小数
+		DecimalFormat df = new DecimalFormat("#.00");
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		//当天DLB信息
+		List<Dlb> dlList=repository.obtainDl(rq, "", "", line, "", "nbbm");
+		//当天YLXXB信息
+		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,"");
+		//当天加电信息表
+		List<Jdl> jdlList=jdlRepository.JdlList(rq);
+		//前一天所有车辆最后进场班次信息
+		List<Dlb> dlListBe=repository.obtainYlbefore(rq, "", "", "", "");
+		List<Cdl> cdyList=cdlRepository.obtainCdl();
+		//从排班表中计算出行驶的总里程
+		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
+		List<Ylb> addList=new ArrayList<Ylb>();
+		List<Ylb> updateList=new ArrayList<Ylb>();
+		for(int x=0;x<listpb.size();x++){
+			String type="add";
+			boolean sfdc=false;
+			Map<String, Object> map=listpb.get(x);
+			if (carsMap.get(map.get("clZbh").toString())!=null) {
+				 sfdc= carsMap.get(map.get("clZbh").toString());
+			}else{
+				sfdc=false;
+			}
+			if(sfdc){
+				//判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+				Dlb t=new Dlb();
+				for(int k=0;k<dlList.size();k++){
+					Dlb t1=dlList.get(k);
+					if(t1.getNbbm().equals(map.get("clZbh").toString())
+							&&t1.getJsy().equals(map.get("jGh").toString())
+							&&t1.getXlbm().equals(map.get("xlBm").toString()))
+					{
+						t=t1;
+						type="update";
+					}
+				}
+				try {
+					//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+					Double jzl=0.0;
+					if(map.get("seqNumber").toString().equals("1")){
+						boolean fage=true;
+						for (int i = 0; i < dlListBe.size(); i++) {
+							Dlb dlb=dlListBe.get(i);
+							if(map.get("clZbh").toString().equals(dlb.getNbbm())){
+								t.setCzcd(dlb.getJzcd());
+								fage=false;
+								break;
+							}
+						}
+						if(fage){
+							for (int y = 0; y < cdyList.size(); y++) {
+								Cdl cdl=cdyList.get(y);
+								if(map.get("clZbh").toString().equals(cdl.getNbbm())){
+									t.setCzcd(cdl.getClcd()==null?0:cdl.getClcd());
+									fage=false;
+									break;
+								}
+							}
+						}
+						if(fage){
+							t.setCzcd(0.0);
+						}
+						
+						//手动导入没有驾驶员工号
+						for (int i = 0; i < jdlList.size(); i++) {
+							Jdl jdl=jdlList.get(i);
+							if(map.get("clZbh").toString().equals(jdl.getNbbm()) ){
+								jzl+=jdl.getJdl();
+							}
+						}
+					}
+					
+					
+					//把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+					for(int j=0;j<ylxxList.size();j++){
+						Ylxxb ylxxb= ylxxList.get(j);
+						if(map.get("clZbh").toString().equals(ylxxb.getNbbm()) &&map.get("jGh").toString().equals(ylxxb.getJsy())){
+							jzl+=ylxxb.getJzl();
+						}
+					}
+					
+					t.setCdl(jzl);
+					if(type.equals("add")){
+						t.setHd(jzl);
+						t.setJzcd(t.getCzcd());
+					}
+					
+					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()))));
+					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());
+					t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+					t.setRq(sdf.parse(rq));
+					t.setCreatetime(new Date());
+					/*if(type.equals("add")){
+						addList.add(t);
+					}else{
+						updateList.add(t);
+					}*/
+					repository.save(t);
+					newMap.put("status", ResponseCode.SUCCESS);
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					newMap.put("status", ResponseCode.ERROR);
+					e.printStackTrace();
+				}
+			}
+		}
+		return result;
+	}
 	/**
-	 * 获取进存油信息
+	 * 获取进存电信息
 	 * @Transactional 回滚事物
 	 */
 	@Transactional  
@@ -172,7 +172,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJzl(jzl);*/
 						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()))));
+						t.setZlc(map.get("totalKilometers")==null?0.0: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());
@@ -581,62 +581,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Iterator<?>> list = new ArrayList<Iterator<?>>();
         List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
-
+//        List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+    	for (int i = 0; i < scheduleRealInfos.size(); i++) {
+    		ScheduleRealInfo s=scheduleRealInfos.get(i);
+    		if(s.getZdsjActual()!=null){
+    			lists.add(s);
+    		}
+		}
         DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-        int jhbc = 0, cjbc = 0, ljbc = 0;
-        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0;
-        float addMileage = 0l, remMileage = 0l;
  
         Map<String, Object> map;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
-            if (scheduleRealInfo != null) {
-                //计算计划里程（主任务过滤掉临加班次），烂班里程，临加里程，计划班次，烂班班次，增加班次
-                if (scheduleRealInfo != null) {
-                    //计划里程（主任务过滤掉临加班次），
-                    //烂班里程（主任务烂班），
-                    //临加里程（主任务临加），
-                    //计划班次，烂班班次，增加班次
-                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
-                    if (scheduleRealInfo.isSflj()) {
-                        ljbc++;
-                    } else {
-                        jhlc += tempJhlc;
-                        jhbc++;
-                        if (scheduleRealInfo.getStatus() == -1) {
-                            remMileage += tempJhlc;
-                            cjbc++;
-                        }
-                    }
-                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-                    //计算营运里程，空驶里程
-                    if (childTaskPlans.isEmpty()) {
-                        if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-                                ) {
-                            ksgl += tempJhlc;
-                        } else {
-                            yygl += tempJhlc;
-                        }
-                    } else {
-                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                        while (it.hasNext()) {
-                            ChildTaskPlan childTaskPlan = it.next();
-                            if (childTaskPlan.getMileageType().equals("empty")) {
-                                if (scheduleRealInfo.isSflj()) {
-                                    addMileage += tempJhlc;
-                                }
-                                ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            } else {
-                                if (scheduleRealInfo.isSflj()) {
-                                    addMileage += tempJhlc;
-                                }
-                                yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            }
-                        }
-                    }
-                }
-
                 map = new HashMap<String, Object>();
                 try {
                     scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
@@ -661,21 +619,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-            }
         }
  
         //计算里程和班次数，并放入Map里
         map = new HashMap<String, Object>();
-        map.put("jhlc", format.format(jhlc));
-        map.put("remMileage", format.format(remMileage));
-        map.put("addMileage", format.format(addMileage));
-        map.put("yygl", format.format(yygl));
-        map.put("ksgl", format.format(ksgl));
-        map.put("realMileage", format.format(yygl + ksgl));
-        map.put("jhbc", jhbc);
-        map.put("cjbc", cjbc);
-        map.put("ljbc", ljbc);
-        map.put("sjbc", jhbc - cjbc + ljbc);
+        map.put("jhlc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
  
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  
@@ -1414,19 +1374,27 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public Map<String, Object> findKMBC(String jGh, String clZbh,
             String lpName, String date, String line) {
     	Map<String, Object> map = new HashMap<String, Object>();
-    	List<ScheduleRealInfo> lists=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+    	for (int i = 0; i < list.size(); i++) {
+    		ScheduleRealInfo s=list.get(i);
+    		if(s.getZdsjActual()!=null){
+    			lists.add(s);
+    		}
+		}
     	double ksgl=culateService.culateKsgl(lists);
     	double sjgl=culateService.culateSjgl(lists);
     	double jccgl=culateService.culateJccgl(lists);
     	double ljgl=culateService.culateLjgl(lists);
-    	 map.put("jhlc", culateService.culateJhgl(lists)); //计划里程
+    	
+    	 map.put("jhlc", culateService.culateJhgl(list)); //计划里程
          map.put("remMileage", culateService.culateLbgl(lists)); //烂班公里
          map.put("addMileage", ljgl); //临加公里
          map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
          map.put("ksgl", ksgl);//空驶公里
          map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
 //         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
-         map.put("jhbc", culateService.culateJhbc(lists,""));
+         map.put("jhbc", culateService.culateJhbc(list,""));
          map.put("cjbc", culateService.culateLbbc(lists));
          map.put("ljbc", culateService.culateLjbc(lists,""));
          map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
@@ -1670,7 +1638,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          map.put("ssgl_kx", culateService.culateCJLC(lists, "客稀"));
          map.put("ssgl_qh", culateService.culateCJLC(lists, "气候"));
          map.put("ssgl_yw", culateService.culateCJLC(lists, "援外"));
-         map.put("ssgl_other", culateService.culateCJLC(lists, "其他"));
+         double ssgl_pc=culateService.culateCJLC(lists, "配车");
+         double ssgl_by=culateService.culateCJLC(lists, "保养");
+         double ssgl_cj=culateService.culateCJLC(lists, "抽减");
+         double ssgl_qt=culateService.culateCJLC(lists, "其他");
+         map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
          map.put("ssbc", culateService.culateLbbc(lists));
          map.put("ljgl", culateService.culateLjgl(lists));
          map.put("jhbc", culateService.culateJhbc(lists,""));
@@ -3793,6 +3765,76 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return new ArrayList<Map<String, Object>>();
     }
  
+    public  List<ScheduleRealInfo> exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
+        ReportUtils ee = new ReportUtils();
+        ReportRelatedUtils rru = new ReportRelatedUtils();
+        List<Iterator<?>> list = new ArrayList<Iterator<?>>();
+        List<ScheduleRealInfo> scheduleRealInfos = listpl;
+        List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+//        List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+    	for (int i = 0; i < scheduleRealInfos.size(); i++) {
+    		ScheduleRealInfo s=scheduleRealInfos.get(i);
+    		if(s.getZdsjActual()!=null){
+    			lists.add(s);
+    		}
+		}
+        DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+
+        Map<String, Object> map;
+        for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
+                map = new HashMap<String, Object>();
+                try {
+                    scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
+                    scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
+                    map = rru.getMapValue(scheduleRealInfo);
+                    String zdsj = scheduleRealInfo.getZdsj();
+                    String zdsjActual = scheduleRealInfo.getZdsjActual();
+                    if (zdsj != null && zdsjActual != null &&
+                            !zdsj.equals(zdsjActual)) {
+                        if (zdsj.compareTo(zdsjActual) > 0) {
+                            map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                            map.put("slow", "");
+                        } else {
+                            map.put("fast", "");
+                            map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                        }
+                    } else {
+                        map.put("fast", "");
+                        map.put("slow", "");
+                    }
+                    listMap.add(map);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+        }
+
+        //计算里程和班次数，并放入Map里
+        map = new HashMap<String, Object>();
+        map.put("jhlc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
+
+        String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+
+        list.add(listMap.iterator());
+        ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/waybill_minhang.xls",
+                path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
+        return scheduleRealInfos;
+    }
+    
     @Override
     public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
         String date = map.get("date").toString();
@@ -3814,12 +3856,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
             file.mkdirs();
-
+            List<ScheduleRealInfo> lists_line=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
             for (List<String> list : lists) {
+            	List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
                 String jName = list.get(0);
                 String clZbh = list.get(1);
                 String lpName = list.get(2);
-                this.exportWaybill(jName, clZbh, lpName, date, line);
+                for (int i = 0; i < lists_line.size(); i++) {
+					ScheduleRealInfo s=lists_line.get(i);
+					if(s.getjName().equals(jName) && s.getClZbh().equals(clZbh) && s.getLpName().equals(lpName)){
+						newList.add(s);
+					}
+				}
+                this.exportWaybill_pl(newList, date, jName, clZbh, lpName);
                 File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
                 String fileName = file.getName();
                 temp.renameTo(new File(path + fileName + "/" + temp.getName()));
@@ -276,6 +276,155 @@
   <hop> <from>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_gbi</to><enabled>Y</enabled> </hop>
   </order>
   <step>
+    <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
+    <type>ExcelInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <noempty>Y</noempty>
+    <stoponempty>N</stoponempty>
+    <filefield/>
+    <sheetfield/>
+    <sheetrownumfield/>
+    <rownumfield/>
+    <sheetfield/>
+    <filefield/>
+    <limit>0</limit>
+    <encoding/>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <accept_filenames>Y</accept_filenames>
+    <accept_field>filepath_</accept_field>
+    <accept_stepname>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</accept_stepname>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>&#x7ebf;&#x8def;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x7f16;&#x53f7;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x540d;&#x79f0;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x7c7b;&#x578b;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+    </fields>
+    <sheets>
+      <sheet>
+        <name>&#x5de5;&#x4f5c;&#x8868;1</name>
+        <startrow>0</startrow>
+        <startcol>0</startcol>
+        </sheet>
+    </sheets>
+    <strict_types>N</strict_types>
+    <error_ignored>N</error_ignored>
+    <error_line_skipped>N</error_line_skipped>
+    <bad_line_files_destination_directory/>
+    <bad_line_files_extension>warning</bad_line_files_extension>
+    <error_line_files_destination_directory/>
+    <error_line_files_extension>error</error_line_files_extension>
+    <line_number_files_destination_directory/>
+    <line_number_files_extension>line</line_number_files_extension>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <spreadsheet_type>JXL</spreadsheet_type>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>150</xloc>
+      <yloc>68</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</name>
+    <type>Constant</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>
+      <field>
+        <name>isCancel</name>
+        <type>Integer</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>0</nullif>
+        <length>-1</length>
+        <precision>-1</precision>
+        <set_empty_string>N</set_empty_string>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>544</xloc>
+      <yloc>70</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x5b57;&#x6bb5;&#x6539;&#x540d;</name>
     <type>SelectValues</type>
     <description/>
@@ -393,27 +542,27 @@
       <value>
         <name>xl</name>
         <rename>xlid</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>lp_no</name>
         <rename>lpno</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>lp_name</name>
         <rename>lpname</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>lp_type</name>
         <rename>lptype</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>is_cancel</name>
         <rename>isCancel</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
     </lookup>
      <cluster_schema/>
@@ -512,122 +661,6 @@
     </step>
  
   <step>
-    <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
-    <type>ExcelInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <header>Y</header>
-    <noempty>Y</noempty>
-    <stoponempty>N</stoponempty>
-    <filefield/>
-    <sheetfield/>
-    <sheetrownumfield/>
-    <rownumfield/>
-    <sheetfield/>
-    <filefield/>
-    <limit>0</limit>
-    <encoding/>
-    <add_to_result_filenames>Y</add_to_result_filenames>
-    <accept_filenames>Y</accept_filenames>
-    <accept_field>filepath_</accept_field>
-    <accept_stepname>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</accept_stepname>
-    <file>
-      <name/>
-      <filemask/>
-      <exclude_filemask/>
-      <file_required>N</file_required>
-      <include_subfolders>N</include_subfolders>
-    </file>
-    <fields>
-      <field>
-        <name>&#x7ebf;&#x8def;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8def;&#x724c;&#x7f16;&#x53f7;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format>&#x23;</format>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8def;&#x724c;&#x540d;&#x79f0;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format>&#x23;</format>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8def;&#x724c;&#x7c7b;&#x578b;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-    </fields>
-    <sheets>
-      <sheet>
-        <name>&#x5de5;&#x4f5c;&#x8868;1</name>
-        <startrow>0</startrow>
-        <startcol>0</startcol>
-        </sheet>
-    </sheets>
-    <strict_types>N</strict_types>
-    <error_ignored>N</error_ignored>
-    <error_line_skipped>N</error_line_skipped>
-    <bad_line_files_destination_directory/>
-    <bad_line_files_extension>warning</bad_line_files_extension>
-    <error_line_files_destination_directory/>
-    <error_line_files_extension>error</error_line_files_extension>
-    <line_number_files_destination_directory/>
-    <line_number_files_extension>line</line_number_files_extension>
-    <shortFileFieldName/>
-    <pathFieldName/>
-    <hiddenFieldName/>
-    <lastModificationTimeFieldName/>
-    <uriNameFieldName/>
-    <rootUriNameFieldName/>
-    <extensionFieldName/>
-    <sizeFieldName/>
-    <spreadsheet_type>JXL</spreadsheet_type>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>150</xloc>
-      <yloc>68</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
     <name>&#x9519;&#x8bef;&#x8f93;&#x51fa;</name>
     <type>ExcelOutput</type>
     <description/>
@@ -754,39 +787,6 @@
       </GUI>
     </step>
  
-  <step>
-    <name>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</name>
-    <type>Constant</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <fields>
-      <field>
-        <name>isCancel</name>
-        <type>Integer</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>0</nullif>
-        <length>-1</length>
-        <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-    </fields>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>544</xloc>
-      <yloc>70</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
   <step_error_handling>
       <error>
         <source_step>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_gbi</source_step>
-/*!
- * jQuery Raty - A Star Rating Plugin
- *
- * Licensed under The MIT License
- *
- * @version        2.5.2
- * @author         Washington Botelho
- * @documentation  wbotelhos.com/raty
- *
- */
-
-;(function(b){var a={init:function(c){return this.each(function(){a.destroy.call(this);this.opt=b.extend(true,{},b.fn.raty.defaults,c);var e=b(this),g=["number","readOnly","score","scoreName"];a._callback.call(this,g);if(this.opt.precision){a._adjustPrecision.call(this);}this.opt.number=a._between(this.opt.number,0,this.opt.numberMax);this.opt.path=this.opt.path||"";if(this.opt.path&&this.opt.path.slice(this.opt.path.length-1,this.opt.path.length)!=="/"){this.opt.path+="/";}this.stars=a._createStars.call(this);this.score=a._createScore.call(this);a._apply.call(this,this.opt.score);var f=this.opt.space?4:0,d=this.opt.width||(this.opt.number*this.opt.size+this.opt.number*f);if(this.opt.cancel){this.cancel=a._createCancel.call(this);d+=(this.opt.size+f);}if(this.opt.readOnly){a._lock.call(this);}else{e.css("cursor","pointer");a._binds.call(this);}if(this.opt.width!==false){e.css("width",d);}a._target.call(this,this.opt.score);e.data({settings:this.opt,raty:true});});},_adjustPrecision:function(){this.opt.targetType="score";this.opt.half=true;},_apply:function(c){if(c&&c>0){c=a._between(c,0,this.opt.number);this.score.val(c);}a._fill.call(this,c);if(c){a._roundStars.call(this,c);}},_between:function(e,d,c){return Math.min(Math.max(parseFloat(e),d),c);},_binds:function(){if(this.cancel){a._bindCancel.call(this);}a._bindClick.call(this);a._bindOut.call(this);a._bindOver.call(this);},_bindCancel:function(){a._bindClickCancel.call(this);a._bindOutCancel.call(this);a._bindOverCancel.call(this);},_bindClick:function(){var c=this,d=b(c);c.stars.on("click.raty",function(e){c.score.val((c.opt.half||c.opt.precision)?d.data("score"):this.alt);if(c.opt.click){c.opt.click.call(c,parseFloat(c.score.val()),e);}});},_bindClickCancel:function(){var c=this;c.cancel.on("click.raty",function(d){c.score.removeAttr("value");if(c.opt.click){c.opt.click.call(c,null,d);}});},_bindOut:function(){var c=this;b(this).on("mouseleave.raty",function(d){var e=parseFloat(c.score.val())||undefined;a._apply.call(c,e);a._target.call(c,e,d);if(c.opt.mouseout){c.opt.mouseout.call(c,e,d);}});},_bindOutCancel:function(){var c=this;c.cancel.on("mouseleave.raty",function(d){b(this).attr("src",c.opt.path+c.opt.cancelOff);if(c.opt.mouseout){c.opt.mouseout.call(c,c.score.val()||null,d);}});},_bindOverCancel:function(){var c=this;c.cancel.on("mouseover.raty",function(d){b(this).attr("src",c.opt.path+c.opt.cancelOn);c.stars.attr("src",c.opt.path+c.opt.starOff);a._target.call(c,null,d);if(c.opt.mouseover){c.opt.mouseover.call(c,null);}});},_bindOver:function(){var c=this,d=b(c),e=c.opt.half?"mousemove.raty":"mouseover.raty";c.stars.on(e,function(g){var h=parseInt(this.alt,10);if(c.opt.half){var f=parseFloat((g.pageX-b(this).offset().left)/c.opt.size),j=(f>0.5)?1:0.5;h=h-1+j;a._fill.call(c,h);if(c.opt.precision){h=h-j+f;}a._roundStars.call(c,h);d.data("score",h);}else{a._fill.call(c,h);}a._target.call(c,h,g);if(c.opt.mouseover){c.opt.mouseover.call(c,h,g);}});},_callback:function(c){for(i in c){if(typeof this.opt[c[i]]==="function"){this.opt[c[i]]=this.opt[c[i]].call(this);}}},_createCancel:function(){var e=b(this),c=this.opt.path+this.opt.cancelOff,d=b("<img />",{src:c,alt:"x",title:this.opt.cancelHint,"class":"raty-cancel"});if(this.opt.cancelPlace=="left"){e.prepend("&#160;").prepend(d);}else{e.append("&#160;").append(d);}return d;},_createScore:function(){return b("<input />",{type:"hidden",name:this.opt.scoreName}).appendTo(this);},_createStars:function(){var e=b(this);for(var c=1;c<=this.opt.number;c++){var f=a._getHint.call(this,c),d=(this.opt.score&&this.opt.score>=c)?"starOn":"starOff";d=this.opt.path+this.opt[d];b("<img />",{src:d,alt:c,title:f}).appendTo(this);if(this.opt.space){e.append((c<this.opt.number)?"&#160;":"");}}return e.children("img");},_error:function(c){b(this).html(c);b.error(c);},_fill:function(d){var m=this,e=0;for(var f=1;f<=m.stars.length;f++){var g=m.stars.eq(f-1),l=m.opt.single?(f==d):(f<=d);if(m.opt.iconRange&&m.opt.iconRange.length>e){var j=m.opt.iconRange[e],h=j.on||m.opt.starOn,c=j.off||m.opt.starOff,k=l?h:c;if(f<=j.range){g.attr("src",m.opt.path+k);}if(f==j.range){e++;}}else{var k=l?"starOn":"starOff";g.attr("src",this.opt.path+this.opt[k]);}}},_getHint:function(d){var c=this.opt.hints[d-1];return(c==="")?"":(c||d);},_lock:function(){var d=parseInt(this.score.val(),10),c=d?a._getHint.call(this,d):this.opt.noRatedMsg;b(this).data("readonly",true).css("cursor","").attr("title",c);this.score.attr("readonly","readonly");this.stars.attr("title",c);if(this.cancel){this.cancel.hide();}},_roundStars:function(e){var d=(e-Math.floor(e)).toFixed(2);if(d>this.opt.round.down){var c="starOn";if(this.opt.halfShow&&d<this.opt.round.up){c="starHalf";}else{if(d<this.opt.round.full){c="starOff";}}this.stars.eq(Math.ceil(e)-1).attr("src",this.opt.path+this.opt[c]);}},_target:function(f,d){if(this.opt.target){var e=b(this.opt.target);if(e.length===0){a._error.call(this,"Target selector invalid or missing!");}if(this.opt.targetFormat.indexOf("{score}")<0){a._error.call(this,'Template "{score}" missing!');}var c=d&&d.type=="mouseover";if(f===undefined){f=this.opt.targetText;}else{if(f===null){f=c?this.opt.cancelHint:this.opt.targetText;}else{if(this.opt.targetType=="hint"){f=a._getHint.call(this,Math.ceil(f));}else{if(this.opt.precision){f=parseFloat(f).toFixed(1);}}if(!c&&!this.opt.targetKeep){f=this.opt.targetText;}}}if(f){f=this.opt.targetFormat.toString().replace("{score}",f);}if(e.is(":input")){e.val(f);}else{e.html(f);}}},_unlock:function(){b(this).data("readonly",false).css("cursor","pointer").removeAttr("title");this.score.removeAttr("readonly","readonly");for(var c=0;c<this.opt.number;c++){this.stars.eq(c).attr("title",a._getHint.call(this,c+1));}if(this.cancel){this.cancel.css("display","");}},cancel:function(c){return this.each(function(){if(b(this).data("readonly")!==true){a[c?"click":"score"].call(this,null);this.score.removeAttr("value");}});},click:function(c){return b(this).each(function(){if(b(this).data("readonly")!==true){a._apply.call(this,c);if(!this.opt.click){a._error.call(this,'You must add the "click: function(score, evt) { }" callback.');}this.opt.click.call(this,c,{type:"click"});a._target.call(this,c);}});},destroy:function(){return b(this).each(function(){var d=b(this),c=d.data("raw");if(c){d.off(".raty").empty().css({cursor:c.style.cursor,width:c.style.width}).removeData("readonly");}else{d.data("raw",d.clone()[0]);}});},getScore:function(){var d=[],c;b(this).each(function(){c=this.score.val();d.push(c?parseFloat(c):undefined);});return(d.length>1)?d:d[0];},readOnly:function(c){return this.each(function(){var d=b(this);if(d.data("readonly")!==c){if(c){d.off(".raty").children("img").off(".raty");a._lock.call(this);}else{a._binds.call(this);a._unlock.call(this);}d.data("readonly",c);}});},reload:function(){return a.set.call(this,{});},score:function(){return arguments.length?a.setScore.apply(this,arguments):a.getScore.call(this);},set:function(c){return this.each(function(){var e=b(this),f=e.data("settings"),d=b.extend({},f,c);e.raty(d);});},setScore:function(c){return b(this).each(function(){if(b(this).data("readonly")!==true){a._apply.call(this,c);a._target.call(this,c);}});}};b.fn.raty=function(c){if(a[c]){return a[c].apply(this,Array.prototype.slice.call(arguments,1));}else{if(typeof c==="object"||!c){return a.init.apply(this,arguments);}else{b.error("Method "+c+" does not exist!");}}};b.fn.raty.defaults={cancel:false,cancelHint:"Cancel this rating!",cancelOff:"cancel-off.png",cancelOn:"cancel-on.png",cancelPlace:"left",click:undefined,half:false,halfShow:true,hints:["bad","poor","regular","good","gorgeous"],iconRange:undefined,mouseout:undefined,mouseover:undefined,noRatedMsg:"Not rated yet!",number:5,numberMax:20,path:"",precision:false,readOnly:false,round:{down:0.25,full:0.6,up:0.76},score:undefined,scoreName:"score",single:false,size:16,space:true,starHalf:"star-half.png",starOff:"star-off.png",starOn:"star-on.png",target:undefined,targetFormat:"{score}",targetKeep:false,targetText:"",targetType:"hint",width:undefined};})(jQuery);
+/*!
+ * jQuery Raty - A Star Rating Plugin
+ *
+ * Licensed under The MIT License
+ *
+ * @version        2.5.2
+ * @author         Washington Botelho
+ * @documentation  wbotelhos.com/raty
+ *
+ */
+
+;(function(b){var a={init:function(c){return this.each(function(){a.destroy.call(this);this.opt=b.extend(true,{},b.fn.raty.defaults,c);var e=b(this),g=["number","readOnly","score","scoreName"];a._callback.call(this,g);if(this.opt.precision){a._adjustPrecision.call(this);}this.opt.number=a._between(this.opt.number,0,this.opt.numberMax);this.opt.path=this.opt.path||"";if(this.opt.path&&this.opt.path.slice(this.opt.path.length-1,this.opt.path.length)!=="/"){this.opt.path+="/";}this.stars=a._createStars.call(this);this.score=a._createScore.call(this);a._apply.call(this,this.opt.score);var f=this.opt.space?4:0,d=this.opt.width||(this.opt.number*this.opt.size+this.opt.number*f);if(this.opt.cancel){this.cancel=a._createCancel.call(this);d+=(this.opt.size+f);}if(this.opt.readOnly){a._lock.call(this);}else{e.css("cursor","pointer");a._binds.call(this);}if(this.opt.width!==false){e.css("width",d);}a._target.call(this,this.opt.score);e.data({settings:this.opt,raty:true});});},_adjustPrecision:function(){this.opt.targetType="score";this.opt.half=true;},_apply:function(c){if(c&&c>0){c=a._between(c,0,this.opt.number);this.score.val(c);}a._fill.call(this,c);if(c){a._roundStars.call(this,c);}},_between:function(e,d,c){return Math.min(Math.max(parseFloat(e),d),c);},_binds:function(){if(this.cancel){a._bindCancel.call(this);}a._bindClick.call(this);a._bindOut.call(this);a._bindOver.call(this);},_bindCancel:function(){a._bindClickCancel.call(this);a._bindOutCancel.call(this);a._bindOverCancel.call(this);},_bindClick:function(){var c=this,d=b(c);c.stars.on("click.raty",function(e){c.score.val((c.opt.half||c.opt.precision)?d.data("score"):this.alt);if(c.opt.click){c.opt.click.call(c,parseFloat(c.score.val()),e);}});},_bindClickCancel:function(){var c=this;c.cancel.on("click.raty",function(d){c.score.removeAttr("value");if(c.opt.click){c.opt.click.call(c,null,d);}});},_bindOut:function(){var c=this;b(this).on("mouseleave.raty",function(d){var e=parseFloat(c.score.val())||undefined;a._apply.call(c,e);a._target.call(c,e,d);if(c.opt.mouseout){c.opt.mouseout.call(c,e,d);}});},_bindOutCancel:function(){var c=this;c.cancel.on("mouseleave.raty",function(d){b(this).attr("src",c.opt.path+c.opt.cancelOff);if(c.opt.mouseout){c.opt.mouseout.call(c,c.score.val()||null,d);}});},_bindOverCancel:function(){var c=this;c.cancel.on("mouseover.raty",function(d){b(this).attr("src",c.opt.path+c.opt.cancelOn);c.stars.attr("src",c.opt.path+c.opt.starOff);a._target.call(c,null,d);if(c.opt.mouseover){c.opt.mouseover.call(c,null);}});},_bindOver:function(){var c=this,d=b(c),e=c.opt.half?"mousemove.raty":"mouseover.raty";c.stars.on(e,function(g){var h=parseInt(this.alt,10);if(c.opt.half){var f=parseFloat((g.pageX-b(this).offset().left)/c.opt.size),j=(f>0.5)?1:0.5;h=h-1+j;a._fill.call(c,h);if(c.opt.precision){h=h-j+f;}a._roundStars.call(c,h);d.data("score",h);}else{a._fill.call(c,h);}a._target.call(c,h,g);if(c.opt.mouseover){c.opt.mouseover.call(c,h,g);}});},_callback:function(c){for(i in c){if(typeof this.opt[c[i]]==="function"){this.opt[c[i]]=this.opt[c[i]].call(this);}}},_createCancel:function(){var e=b(this),c=this.opt.path+this.opt.cancelOff,d=b("<img />",{src:c,alt:"x",title:this.opt.cancelHint,"class":"raty-cancel"});if(this.opt.cancelPlace=="left"){e.prepend("&#160;").prepend(d);}else{e.append("&#160;").append(d);}return d;},_createScore:function(){return b("<input />",{type:"hidden",name:this.opt.scoreName}).appendTo(this);},_createStars:function(){var e=b(this);for(var c=1;c<=this.opt.number;c++){var f=a._getHint.call(this,c),d=(this.opt.score&&this.opt.score>=c)?"starOn":"starOff";d=this.opt.path+this.opt[d];b("<img />",{src:d,alt:c,title:f}).appendTo(this);if(this.opt.space){e.append((c<this.opt.number)?"&#160;":"");}}return e.children("img");},_error:function(c){b(this).html(c);b.error(c);},_fill:function(d){var m=this,e=0;for(var f=1;f<=m.stars.length;f++){var g=m.stars.eq(f-1),l=m.opt.single?(f==d):(f<=d);if(m.opt.iconRange&&m.opt.iconRange.length>e){var j=m.opt.iconRange[e],h=j.on||m.opt.starOn,c=j.off||m.opt.starOff,k=l?h:c;if(f<=j.range){g.attr("src",m.opt.path+k);}if(f==j.range){e++;}}else{var k=l?"starOn":"starOff";g.attr("src",this.opt.path+this.opt[k]);}}},_getHint:function(d){var c=this.opt.hints[d-1];return(c==="")?"":(c||d);},_lock:function(){var d=parseInt(this.score.val(),10),c=d?a._getHint.call(this,d):this.opt.noRatedMsg;b(this).data("readonly",true).css("cursor","").attr("title",c);this.score.attr("readonly","readonly");this.stars.attr("title",c);if(this.cancel){this.cancel.hide();}},_roundStars:function(e){var d=(e-Math.floor(e)).toFixed(2);if(d>this.opt.round.down){var c="starOn";if(this.opt.halfShow&&d<this.opt.round.up){c="starHalf";}else{if(d<this.opt.round.full){c="starOff";}}this.stars.eq(Math.ceil(e)-1).attr("src",this.opt.path+this.opt[c]);}},_target:function(f,d){if(this.opt.target){var e=b(this.opt.target);if(e.length===0){a._error.call(this,"Target selector invalid or missing!");}if(this.opt.targetFormat.indexOf("{score}")<0){a._error.call(this,'Template "{score}" missing!');}var c=d&&d.type=="mouseover";if(f===undefined){f=this.opt.targetText;}else{if(f===null){f=c?this.opt.cancelHint:this.opt.targetText;}else{if(this.opt.targetType=="hint"){f=a._getHint.call(this,Math.ceil(f));}else{if(this.opt.precision){f=parseFloat(f).toFixed(1);}}if(!c&&!this.opt.targetKeep){f=this.opt.targetText;}}}if(f){f=this.opt.targetFormat.toString().replace("{score}",f);}if(e.is(":input")){e.val(f);}else{e.html(f);}}},_unlock:function(){b(this).data("readonly",false).css("cursor","pointer").removeAttr("title");this.score.removeAttr("readonly","readonly");for(var c=0;c<this.opt.number;c++){this.stars.eq(c).attr("title",a._getHint.call(this,c+1));}if(this.cancel){this.cancel.css("display","");}},cancel:function(c){return this.each(function(){if(b(this).data("readonly")!==true){a[c?"click":"score"].call(this,null);this.score.removeAttr("value");}});},click:function(c){return b(this).each(function(){if(b(this).data("readonly")!==true){a._apply.call(this,c);if(!this.opt.click){a._error.call(this,'You must add the "click: function(score, evt) { }" callback.');}this.opt.click.call(this,c,{type:"click"});a._target.call(this,c);}});},destroy:function(){return b(this).each(function(){var d=b(this),c=d.data("raw");if(c){d.off(".raty").empty().css({cursor:c.style.cursor,width:c.style.width}).removeData("readonly");}else{d.data("raw",d.clone()[0]);}});},getScore:function(){var d=[],c;b(this).each(function(){c=this.score.val();d.push(c?parseFloat(c):undefined);});return(d.length>1)?d:d[0];},readOnly:function(c){return this.each(function(){var d=b(this);if(d.data("readonly")!==c){if(c){d.off(".raty").children("img").off(".raty");a._lock.call(this);}else{a._binds.call(this);a._unlock.call(this);}d.data("readonly",c);}});},reload:function(){return a.set.call(this,{});},score:function(){return arguments.length?a.setScore.apply(this,arguments):a.getScore.call(this);},set:function(c){return this.each(function(){var e=b(this),f=e.data("settings"),d=b.extend({},f,c);e.raty(d);});},setScore:function(c){return b(this).each(function(){if(b(this).data("readonly")!==true){a._apply.call(this,c);a._target.call(this,c);}});}};b.fn.raty=function(c){if(a[c]){return a[c].apply(this,Array.prototype.slice.call(arguments,1));}else{if(typeof c==="object"||!c){return a.init.apply(this,arguments);}else{b.error("Method "+c+" does not exist!");}}};b.fn.raty.defaults={cancel:false,cancelHint:"Cancel this rating!",cancelOff:"cancel-off.png",cancelOn:"cancel-on.png",cancelPlace:"left",click:undefined,half:false,halfShow:true,hints:["bad","poor","regular","good","gorgeous"],iconRange:undefined,mouseout:undefined,mouseover:undefined,noRatedMsg:"Not rated yet!",number:5,numberMax:20,path:"",precision:false,readOnly:false,round:{down:0.25,full:0.6,up:0.76},score:undefined,scoreName:"score",single:false,size:16,space:true,starHalf:"star-half.png",starOff:"star-off.png",starOn:"star-on.png",target:undefined,targetFormat:"{score}",targetKeep:false,targetText:"",targetType:"hint",width:undefined};})(jQuery);
@@ -401,7 +401,6 @@
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
 			});
 			$.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
-				console.log(result);
 				var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
 				$('#forms .scheduleDaily_2').html(scheduleDaily_2);
 			});
@@ -541,9 +540,18 @@
 				<td>{{obj.fast}}</td>
 				<td>{{obj.slow}}</td>
 				<td>{{obj.fcsj}}</td>
-				<td>{{obj.fcsjActual}}</td>
+				<td>{{obj.fcsjActual}}
+				{{if obj.bcType== "in"}}
+						(进)
+					{{/if}}
+					{{if obj.bcType== "out"}}
+						(出)
+					{{/if}}
+			</td>
 				<td>{{obj.fast0}}</td>
-				<td>{{obj.slow0}}</td>
+				<td>{{obj.slow0}}
+					
+				</td>
 				<td colspan="2">{{obj.remarks}}</td>
 		{{if (i+1)%3 == 0}}
 				<td>&nbsp;</td>
@@ -247,8 +247,15 @@
 			if(date==null || date =="" ||date2==null || date2 ==""){
 				 layer.msg('请选择时间段.');
 			}else{
-				
-				$get('/realSchedule/statisticsDailyTj',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,xlName:xlName,type:"query"},function(result){
+				 var params = {};
+				 params['gsdm'] = gsdm;
+				 params['fgsdm'] =fgsdm ;
+				 params['line'] = line;
+				 params['date'] = date;
+				 params['date2'] = date2;
+				 params['xlName'] = xlName;
+				 params['type'] = "query";
+				$get('/realSchedule/statisticsDailyTj',params,function(result){
 					// 把数据填充到模版中
 					var tbodyHtml = template('statisticsDaily',{list:result});
 					// 把渲染好的模版html文本追加到表格中
@@ -264,7 +271,15 @@
 		});
  
 		$("#export").on("click",function(){
-			$get('/realSchedule/statisticsDailyTj',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,xlName:xlName,type:"export"},function(result){
+			 var params = {};
+			 params['gsdm'] = gsdm;
+			 params['fgsdm'] =fgsdm ;
+			 params['line'] = line;
+			 params['date'] = date;
+			 params['date2'] = date2;
+			 params['xlName'] = xlName;
+			 params['type'] = "export";
+			$get('/realSchedule/statisticsDailyTj',params,function(result){
 				window.open("/downloadFile/download?fileName=统计日报"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -307,7 +307,7 @@
 					param[index][i] = $(this).text().split("\\")[0];
 				});
 			});
-			$post('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
+			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
 				window.open("/downloadFile/downloadList?fileName="+result.fileName);
 			});
 		});
@@ -435,7 +435,7 @@
 			<td>{{obj.fast}}</td>
 			<td>{{obj.slow}}</td>
 			<td>
-			{{if obj.fcsjActual !=null || obj.zdsjActual!=null}}
+			{{if obj.zdsjActual!=null}}
 				{{obj.jhlc}}
 			{{/if}}
 			</td>
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(i){var t;window.UIkit&&(t=i(UIkit)),"function"==typeof define&&define.amd&&define("uikit-lightbox",["uikit"],function(){return t||i(UIkit)})}(function(i){"use strict";function t(t){if(e)return e.lightbox=t,e;e=i.$(['<div class="uk-modal">','<div class="uk-modal-dialog uk-modal-dialog-lightbox uk-slidenav-position" style="margin-left:auto;margin-right:auto;width:200px;height:200px;top:'+Math.abs(window.innerHeight/2-200)+'px;">','<a href="#" class="uk-modal-close uk-close uk-close-alt"></a>','<div class="uk-lightbox-content"></div>','<div class="uk-modal-spinner uk-hidden"></div>',"</div>","</div>"].join("")).appendTo("body"),e.dialog=e.find(".uk-modal-dialog:first"),e.content=e.find(".uk-lightbox-content:first"),e.loader=e.find(".uk-modal-spinner:first"),e.closer=e.find(".uk-close.uk-close-alt"),e.modal=i.modal(e,{modal:!1}),e.on("swipeRight swipeLeft",function(i){e.lightbox["swipeLeft"==i.type?"next":"previous"]()}).on("click","[data-lightbox-previous], [data-lightbox-next]",function(t){t.preventDefault(),e.lightbox[i.$(this).is("[data-lightbox-next]")?"next":"previous"]()}),e.on("hide.uk.modal",function(){e.content.html("")});var o={w:window.innerWidth,h:window.innerHeight};return i.$win.on("load resize orientationchange",i.Utils.debounce(function(){o.w!==window.innerWidth&&e.is(":visible")&&!i.Utils.isFullscreen()&&e.lightbox.fitSize(),o={w:window.innerWidth,h:window.innerHeight}},100)),e.lightbox=t,e}var e,o={};return i.component("lightbox",{defaults:{allowfullscreen:!0,duration:400,group:!1,keyboard:!0},index:0,items:!1,boot:function(){i.$html.on("click","[data-uk-lightbox]",function(t){t.preventDefault();var e=i.$(this);e.data("lightbox")||i.lightbox(e,i.Utils.options(e.attr("data-uk-lightbox"))),e.data("lightbox").show(e)}),i.$doc.on("keyup",function(i){if(e&&e.is(":visible")&&e.lightbox.options.keyboard)switch(i.preventDefault(),i.keyCode){case 37:e.lightbox.previous();break;case 39:e.lightbox.next()}})},init:function(){var t=[];if(this.index=0,this.siblings=[],this.element&&this.element.length){var e=this.options.group?i.$(['[data-uk-lightbox*="'+this.options.group+'"]',"[data-uk-lightbox*='"+this.options.group+"']"].join(",")):this.element;e.each(function(){var e=i.$(this);t.push({source:e.attr("href"),title:e.attr("data-title")||e.attr("title"),type:e.attr("data-lightbox-type")||"auto",link:e})}),this.index=e.index(this.element),this.siblings=t}else this.options.group&&this.options.group.length&&(this.siblings=this.options.group);this.trigger("lightbox-init",[this])},show:function(e){this.modal=t(this),this.modal.dialog.stop(),this.modal.content.stop();var o,n,s=this,h=i.$.Deferred();e=e||0,"object"==typeof e&&this.siblings.forEach(function(i,t){e[0]===i.link[0]&&(e=t)}),0>e?e=this.siblings.length-e:this.siblings[e]||(e=0),n=this.siblings[e],o={lightbox:s,source:n.source,type:n.type,index:e,promise:h,title:n.title,item:n,meta:{content:"",width:null,height:null}},this.index=e,this.modal.content.empty(),this.modal.is(":visible")||(this.modal.content.css({width:"",height:""}).empty(),this.modal.modal.show()),this.modal.loader.removeClass("uk-hidden"),h.promise().done(function(){s.data=o,s.fitSize(o)}).fail(function(){o.meta.content='<div class="uk-position-cover uk-flex uk-flex-middle uk-flex-center"><strong>Loading resource failed!</strong></div>',o.meta.width=400,o.meta.height=300,s.data=o,s.fitSize(o)}),s.trigger("showitem.uk.lightbox",[o])},fitSize:function(){var t=this,e=this.data,o=this.modal.dialog.outerWidth()-this.modal.dialog.width(),n=parseInt(this.modal.dialog.css("margin-top"),10),s=parseInt(this.modal.dialog.css("margin-bottom"),10),h=n+s,a=e.meta.content,l=t.options.duration;this.siblings.length>1&&(a=[a,'<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-previous uk-hidden-touch" data-lightbox-previous></a>','<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-next uk-hidden-touch" data-lightbox-next></a>'].join(""));var d,r,u=i.$("<div>&nbsp;</div>").css({opacity:0,position:"absolute",top:0,left:0,width:"100%","max-width":t.modal.dialog.css("max-width"),padding:t.modal.dialog.css("padding"),margin:t.modal.dialog.css("margin")}),c=e.meta.width,g=e.meta.height;u.appendTo("body").width(),d=u.width(),r=window.innerHeight-h,u.remove(),this.modal.dialog.find(".uk-modal-caption").remove(),e.title&&(this.modal.dialog.append('<div class="uk-modal-caption">'+e.title+"</div>"),r-=this.modal.dialog.find(".uk-modal-caption").outerHeight()),d<e.meta.width&&(g=Math.floor(g*(d/c)),c=d),g>r&&(g=Math.floor(r),c=Math.ceil(e.meta.width*(r/e.meta.height))),this.modal.content.css("opacity",0).width(c).html(a),"iframe"==e.type&&this.modal.content.find("iframe:first").height(g);var m=g+o,p=Math.floor(window.innerHeight/2-m/2)-h;0>p&&(p=0),this.modal.closer.addClass("uk-hidden"),t.modal.data("mwidth")==c&&t.modal.data("mheight")==g&&(l=0),this.modal.dialog.animate({width:c+o,height:g+o,top:p},l,"swing",function(){t.modal.loader.addClass("uk-hidden"),t.modal.content.css({width:""}).animate({opacity:1},function(){t.modal.closer.removeClass("uk-hidden")}),t.modal.data({mwidth:c,mheight:g})})},next:function(){this.show(this.siblings[this.index+1]?this.index+1:0)},previous:function(){this.show(this.siblings[this.index-1]?this.index-1:this.siblings.length-1)}}),i.plugin("lightbox","image",{init:function(i){i.on("showitem.uk.lightbox",function(i,t){if("image"==t.type||t.source&&t.source.match(/\.(jpg|jpeg|png|gif|svg)$/i)){var e=function(i,e,o){t.meta={content:'<img class="uk-responsive-width" width="'+e+'" height="'+o+'" src ="'+i+'">',width:e,height:o},t.type="image",t.promise.resolve()};if(o[t.source])e(t.source,o[t.source].width,o[t.source].height);else{var n=new Image;n.onerror=function(){t.promise.reject("Loading image failed")},n.onload=function(){o[t.source]={width:n.width,height:n.height},e(t.source,o[t.source].width,o[t.source].height)},n.src=t.source}}})}}),i.plugin("lightbox","youtube",{init:function(i){var t=/(\/\/.*?youtube\.[a-z]+)\/watch\?v=([^&]+)&?(.*)/,n=/youtu\.be\/(.*)/;i.on("showitem.uk.lightbox",function(i,s){var h,a,l=function(i,t,o){s.meta={content:'<iframe src="//www.youtube.com/embed/'+i+'" width="'+t+'" height="'+o+'" style="max-width:100%;"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:o},s.type="iframe",s.promise.resolve()};if((a=s.source.match(t))&&(h=a[2]),(a=s.source.match(n))&&(h=a[1]),h){if(o[h])l(h,o[h].width,o[h].height);else{var d=new Image,r=!1;d.onerror=function(){o[h]={width:640,height:320},l(h,o[h].width,o[h].height)},d.onload=function(){120==d.width&&90==d.height?r?(o[h]={width:640,height:320},l(h,o[h].width,o[h].height)):(r=!0,d.src="//img.youtube.com/vi/"+h+"/0.jpg"):(o[h]={width:d.width,height:d.height},l(h,d.width,d.height))},d.src="//img.youtube.com/vi/"+h+"/maxresdefault.jpg"}i.stopImmediatePropagation()}})}}),i.plugin("lightbox","vimeo",{init:function(t){var n,s=/(\/\/.*?)vimeo\.[a-z]+\/([0-9]+).*?/;t.on("showitem.uk.lightbox",function(t,h){var a,l=function(i,t,o){h.meta={content:'<iframe src="//player.vimeo.com/video/'+i+'" width="'+t+'" height="'+o+'" style="width:100%;box-sizing:border-box;"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:o},h.type="iframe",h.promise.resolve()};(n=h.source.match(s))&&(a=n[2],o[a]?l(a,o[a].width,o[a].height):i.$.ajax({type:"GET",url:"//vimeo.com/api/oembed.json?url="+encodeURI(h.source),jsonp:"callback",dataType:"jsonp",success:function(i){o[a]={width:i.width,height:i.height},l(a,o[a].width,o[a].height)}}),t.stopImmediatePropagation())})}}),i.plugin("lightbox","video",{init:function(t){t.on("showitem.uk.lightbox",function(t,e){var n=function(i,t,o){e.meta={content:'<video class="uk-responsive-width" src="'+i+'" width="'+t+'" height="'+o+'" controls></video>',width:t,height:o},e.type="video",e.promise.resolve()};if("video"==e.type||e.source.match(/\.(mp4|webm|ogv)$/i))if(o[e.source])n(e.source,o[e.source].width,o[e.source].height);else var s=i.$('<video style="position:fixed;visibility:hidden;top:-10000px;"></video>').attr("src",e.source).appendTo("body"),h=setInterval(function(){s[0].videoWidth&&(clearInterval(h),o[e.source]={width:s[0].videoWidth,height:s[0].videoHeight},n(e.source,o[e.source].width,o[e.source].height),s.remove())},20)})}}),UIkit.plugin("lightbox","iframe",{init:function(i){i.on("showitem.uk.lightbox",function(t,o){var n=function(i,t,n){o.meta={content:'<iframe class="uk-responsive-width" src="'+i+'" width="'+t+'" height="'+n+'"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:n},o.type="iframe",o.promise.resolve()};("iframe"===o.type||o.source.match(/\.(html|php)$/))&&n(o.source,i.options.width||800,i.options.height||600)})}}),i.lightbox.create=function(t,e){if(t){var o,n=[];return t.forEach(function(t){n.push(i.$.extend({source:"",title:"",type:"auto",link:!1},"string"==typeof t?{source:t}:t))}),o=i.lightbox(i.$.extend({},e,{group:n}))}},i.lightbox});
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-slidenav{display:inline-block;box-sizing:border-box;width:60px;height:60px;line-height:60px;color:rgba(50,50,50,.4);font-size:60px;text-align:center}.uk-slidenav:focus,.uk-slidenav:hover{outline:0;text-decoration:none;color:rgba(50,50,50,.7);cursor:pointer}.uk-slidenav:active{color:rgba(50,50,50,.9)}.uk-slidenav-previous:before{content:"\f104";font-family:FontAwesome}.uk-slidenav-next:before{content:"\f105";font-family:FontAwesome}.uk-slidenav-position{position:relative}.uk-slidenav-position .uk-slidenav{display:none;position:absolute;top:50%;z-index:1;margin-top:-30px}.uk-slidenav-position:hover .uk-slidenav{display:block}.uk-slidenav-position .uk-slidenav-previous{left:20px}.uk-slidenav-position .uk-slidenav-next{right:20px}.uk-slidenav-contrast{color:rgba(255,255,255,.5)}.uk-slidenav-contrast:focus,.uk-slidenav-contrast:hover{color:rgba(255,255,255,.7)}.uk-slidenav-contrast:active{color:rgba(255,255,255,.9)}
 \ No newline at end of file
-<div class="uk-modal ct_move_modal" id="safe_dring_list-modal" style="z-index: 99;">
-    <div class="uk-modal-dialog" style="width: 1100px;">
-        <a href="" class="uk-modal-close uk-close"></a>
-        <div class="uk-modal-header">
-            <h2>安全驾驶图像信息（当日）</h2></div>
-
-            <div class="uk-panel uk-panel-box uk-panel-box-primary">
-                <form class="uk-form search-form">
-                    <fieldset data-uk-margin>
-                        <legend>
-                            数据检索
-                        </legend>
-                        <span class="horizontal-field">车辆</span>
-                        <div class="uk-autocomplete uk-form autocomplete-cars" >
-                            <input type="text" name="clzbh" placeholder="车辆自编号">
-                        </div>
-                        <span class="horizontal-field">异常类型</span>
-                        <select name="yczltype">
-                            <option value="">全部</option>
-                            <option value="A1">手部离开方向盘</option>
-                            <option value="A2">摄像头异常</option>
-                            <option value="A3">未戴安全带</option>
-                            <option value="A4">未戴袖章</option>
-                            <option value="A5">眨眼/疲劳驾驶</option>
-                            <option value="A6">打哈欠/打瞌睡</option>
-                            <option value="A7">行驶中与人交谈</option>
-                        </select>
-                        <button class="uk-button">检索</button>
-                    </fieldset>
-                </form>
-            </div>
-        <div style="height: 495px;margin:5px 0 -18px;">
-            <table class="ct-fixed-table uk-table uk-table-hover">
-                <thead>
-                <tr>
-                    <th style="width: 12%;">线路</th>
-                    <th style="width: 13%;">车辆自编号</th>
-                    <th style="width: 13%;">设备</th>
-                    <th style="width: 13%;">异常类型</th>
-                    <th style="width: 17%;">时间</th>
-                    <th style="width: 11%;">检查属性</th>
-                    <th style="width: 11%;">图像</th>
-                    <th>视频</th>
-                </tr>
-                </thead>
-                <tbody data-uk-observe>
-                </tbody>
-            </table>
-        </div>
-
-        <div class="uk-modal-footer uk-text-right pagination-wrap">
-        </div>
-    </div>
-
-    <script id="all-safe_dring-table-temp" type="text/html">
-        {{each array as sd i}}
-        <tr>
-            <td style="width: 14%;">{{sd.xlmc}}</td>
-            <td style="width: 14%;">{{sd.clzbh}}</td>
-            <td style="width: 13%;">{{sd.sbbh}}</td>
-            <td style="width: 13%;">{{sd.yczlText}}</td>
-            <td style="width: 10%;">{{sd.timeStr}}</td>
-            <td style="width: 10%;">
-                {{if sd.yczltype=='A1'}}
-                    {{if sd.jctype==0}}
-                        双脱手
-                    {{else if sd.jctype==1}}
-                        单脱手
-                    {{/if}}
-                {{/if}}
-            </td>
-            <td style="width: 10%;">
-                <a class="image_link" href="{{sd.url}}.jpg" data-uk-lightbox="{group:'jpg_group1'}" title="{{sd.title}}">JPG</a>
-            </td>
-            <td>
-                <a class="image_link" href="{{sd.url}}.gif" data-uk-lightbox="{group:'gif_group2'}" title="{{sd.title}}">查看视频</a>
-            </td>
-        </tr>
-        {{/each}}
-    </script>
-
-    <script>
-        (function() {
-            var modal = '#safe_dring_list-modal';
-            var form = $('.search-form', modal);
-            var page = 0;
-            var pageSize = 12;
-
-            $(modal).on('init', function(e, data) {
-                e.stopPropagation();
-
-                query();
-            });
-
-            //sumit event
-            form.on('submit', function(e) {
-                e.preventDefault();
-                resetPagination = true;
-                page=0;
-                query();
-            });
-
-            var query = function() {
-                scanFlag = false;
-                var data = form.serializeJSON();
-                data.page = page;
-                data.size = pageSize;
-
-                gb_common.$get('/gps/safeDriv', data, function (rs) {
-                    //数据转换
-                    var code2Name=gb_data_basic.lineCode2NameAll(), url,stm, p;
-                    $.each(rs.list, function(){
-                        if(this.xlbm)
-                            this.xlmc=code2Name[this.xlbm];
-                        else
-                            this.xlmc='';
-                        stm = moment(this.ts);
-                        this.timeStr = stm.format('YYYY-MM-DD HH:mm:ss');
-                        this.yczlText= gb_safe_driv.safeCode[this.yczltype];
-                        //拼接图片地址
-                        p = (this.sbbh+'_'+this.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
-                        url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
-                        this.url = gb_safe_driv.urlPath + url;
-                        //title
-                        this.title = this.clzbh+' '+stm.format('HH时mm分ss秒')+' '+this.yczlText;
-                    });
-
-                    var bodyHtml = template('all-safe_dring-table-temp', {
-                        array: rs.list
-                    });
-                    $('table tbody', modal).html(bodyHtml);
-                    if (resetPagination)
-                        pagination(rs.totalPages + 1, rs.page);
-
-                    //扫描图片是否存在
-                    scanFlag = true;
-                    scanImgIsExist();
-                });
-            };
-
-            var scanFlag;
-            var scanImgIsExist = function () {
-                var array = $('table tbody a.image_link', modal);
-                var i = 0;
-                //匿名函数递归
-                (function () {
-                    //计数
-                    if(i >= array.length || !scanFlag){
-                        console.log('扫描图片结束');
-                        return;
-                    }
-                    var f = arguments.callee;
-                    var $a = $(array[i]);
-                    i ++;
-                    var img = new Image();
-                    img.onerror = function(){
-                        $a.removeAttr('href').removeAttr('data-uk-lightbox').text('无').css('color', '#b8b8b8');
-                        f();
-                    };
-                    img.onload = function(){
-                        f();
-                    };
-                    img.src=$a.attr('href');
-                })();
-            };
-
-            var resetPagination = true;
-            var pagination = function(pages, currentPage) {
-                var wrap = $('.pagination-wrap', modal).empty()
-                        ,e = $('<ul class="uk-pagination"></ul>').appendTo(wrap);
-
-                var pagination = UIkit.pagination(e, {
-                    pages: pages,
-                    currentPage: currentPage
-                });
-
-                e.on('select.uk.pagination', function(e, pageIndex){
-                    page = pageIndex;
-                    query();
-                });
-
-                resetPagination = false;
-            };
-        })();
-    </script>
-</div>
+<div class="uk-modal ct_move_modal" id="safe_dring_list-modal" style="z-index: 99;">
+    <div class="uk-modal-dialog" style="width: 1100px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>安全驾驶图像信息（当日）</h2></div>
+
+            <div class="uk-panel uk-panel-box uk-panel-box-primary">
+                <form class="uk-form search-form">
+                    <fieldset data-uk-margin>
+                        <legend>
+                            数据检索
+                        </legend>
+                        <span class="horizontal-field">车辆</span>
+                        <div class="uk-autocomplete uk-form autocomplete-cars" >
+                            <input type="text" name="clzbh" placeholder="车辆自编号">
+                        </div>
+                        <span class="horizontal-field">异常类型</span>
+                        <select name="yczltype">
+                            <option value="">全部</option>
+                            <option value="A1">手部离开方向盘</option>
+                            <option value="A2">摄像头异常</option>
+                            <option value="A3">未戴安全带</option>
+                            <option value="A4">未戴袖章</option>
+                            <option value="A5">眨眼/疲劳驾驶</option>
+                            <option value="A6">打哈欠/打瞌睡</option>
+                            <option value="A7">行驶中与人交谈</option>
+                        </select>
+                        <button class="uk-button">检索</button>
+                    </fieldset>
+                </form>
+            </div>
+        <div style="height: 495px;margin:5px 0 -18px;">
+            <table class="ct-fixed-table uk-table uk-table-hover">
+                <thead>
+                <tr>
+                    <th style="width: 12%;">线路</th>
+                    <th style="width: 13%;">车辆自编号</th>
+                    <th style="width: 13%;">设备</th>
+                    <th style="width: 13%;">异常类型</th>
+                    <th style="width: 17%;">时间</th>
+                    <th style="width: 11%;">检查属性</th>
+                    <th style="width: 11%;">图像</th>
+                    <th>视频</th>
+                </tr>
+                </thead>
+                <tbody data-uk-observe>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="uk-modal-footer uk-text-right pagination-wrap">
+        </div>
+    </div>
+
+    <script id="all-safe_dring-table-temp" type="text/html">
+        {{each array as sd i}}
+        <tr>
+            <td style="width: 14%;">{{sd.xlmc}}</td>
+            <td style="width: 14%;">{{sd.clzbh}}</td>
+            <td style="width: 13%;">{{sd.sbbh}}</td>
+            <td style="width: 13%;">{{sd.yczlText}}</td>
+            <td style="width: 10%;">{{sd.timeStr}}</td>
+            <td style="width: 10%;">
+                {{if sd.yczltype=='A1'}}
+                    {{if sd.jctype==0}}
+                        双脱手
+                    {{else if sd.jctype==1}}
+                        单脱手
+                    {{/if}}
+                {{/if}}
+            </td>
+            <td style="width: 10%;">
+                <a class="image_link" href="{{sd.url}}.jpg" data-uk-lightbox="{group:'jpg_group1'}" title="{{sd.title}}">JPG</a>
+            </td>
+            <td>
+                <a class="image_link" href="{{sd.url}}.gif" data-uk-lightbox="{group:'gif_group2'}" title="{{sd.title}}">查看视频</a>
+            </td>
+        </tr>
+        {{/each}}
+    </script>
+
+    <script>
+        (function() {
+            var modal = '#safe_dring_list-modal';
+            var form = $('.search-form', modal);
+            var page = 0;
+            var pageSize = 12;
+
+            $(modal).on('init', function(e, data) {
+                e.stopPropagation();
+
+                query();
+            });
+
+            //sumit event
+            form.on('submit', function(e) {
+                e.preventDefault();
+                resetPagination = true;
+                page=0;
+                query();
+            });
+
+            var query = function() {
+                scanFlag = false;
+                var data = form.serializeJSON();
+                data.page = page;
+                data.size = pageSize;
+
+                gb_common.$get('/gps/safeDriv', data, function (rs) {
+                    //数据转换
+                    var code2Name=gb_data_basic.lineCode2NameAll(), url,stm, p;
+                    $.each(rs.list, function(){
+                        if(this.xlbm)
+                            this.xlmc=code2Name[this.xlbm];
+                        else
+                            this.xlmc='';
+                        stm = moment(this.ts);
+                        this.timeStr = stm.format('YYYY-MM-DD HH:mm:ss');
+                        this.yczlText= gb_safe_driv.safeCode[this.yczltype];
+                        //拼接图片地址
+                        p = (this.sbbh+'_'+this.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+                        url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
+                        this.url = gb_safe_driv.urlPath + url;
+                        //title
+                        this.title = this.clzbh+' '+stm.format('HH时mm分ss秒')+' '+this.yczlText;
+                    });
+
+                    var bodyHtml = template('all-safe_dring-table-temp', {
+                        array: rs.list
+                    });
+                    $('table tbody', modal).html(bodyHtml);
+                    if (resetPagination)
+                        pagination(rs.totalPages + 1, rs.page);
+
+                    //扫描图片是否存在
+                    scanFlag = true;
+                    scanImgIsExist();
+                });
+            };
+
+            var scanFlag;
+            var scanImgIsExist = function () {
+                var array = $('table tbody a.image_link', modal);
+                var i = 0;
+                //匿名函数递归
+                (function () {
+                    //计数
+                    if(i >= array.length || !scanFlag){
+                        console.log('扫描图片结束');
+                        return;
+                    }
+                    var f = arguments.callee;
+                    var $a = $(array[i]);
+                    i ++;
+                    var img = new Image();
+                    img.onerror = function(){
+                        $a.removeAttr('href').removeAttr('data-uk-lightbox').text('无').css('color', '#b8b8b8');
+                        f();
+                    };
+                    img.onload = function(){
+                        f();
+                    };
+                    img.src=$a.attr('href');
+                })();
+            };
+
+            var resetPagination = true;
+            var pagination = function(pages, currentPage) {
+                var wrap = $('.pagination-wrap', modal).empty()
+                        ,e = $('<ul class="uk-pagination"></ul>').appendTo(wrap);
+
+                var pagination = UIkit.pagination(e, {
+                    pages: pages,
+                    currentPage: currentPage
+                });
+
+                e.on('select.uk.pagination', function(e, pageIndex){
+                    page = pageIndex;
+                    query();
+                });
+
+                resetPagination = false;
+            };
+        })();
+    </script>
+</div>
+package com.bsth.service.schedule;
+
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * 基础测试类。
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = ScheduleTestApp.class)
+@ActiveProfiles("scheduletest")
+//@WebIntegrationTest({"server.port=0","management.port=0"})
+public class BaseTest {
+}
+package com.bsth.service.schedule;
+
+import com.bsth.service.schedule.impl.SchedulePlanRuleResultServiceImpl;
+import com.bsth.service.schedule.impl.SchedulePlanServiceImpl;
+import com.bsth.service.schedule.rules.MyDroolsConfiguration;
+import com.bsth.service.schedule.utils.DataToolsServiceImpl;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.orm.jpa.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+/**
+ * 基础测试类（用于计划调度模块测试测试）。
+ * 配置计划调度的模块的用到的entity，repository，service
+ *
+ * 注意：测试环境下测试类 TestApp 和springdata的类不在统一级包里，必须指定EnableJpaRepositories
+ */
+@Configuration
+@EntityScan(
+        basePackages = {"com.bsth.entity"}
+)
+@ComponentScan(
+        basePackages = {"com.bsth.repository", "com.bsth.service"},
+        useDefaultFilters = false,
+        includeFilters = {
+                @ComponentScan.Filter(
+                        type = FilterType.ASSIGNABLE_TYPE,
+                        value = SchedulePlanRuleResultServiceImpl.class
+                ),
+                @ComponentScan.Filter(
+                        type = FilterType.ASSIGNABLE_TYPE,
+                        value = SchedulePlanServiceImpl.class
+                ),
+                @ComponentScan.Filter(
+                        type = FilterType.ASSIGNABLE_TYPE,
+                        value = MyDroolsConfiguration.class
+                ),
+                @ComponentScan.Filter(
+                        type = FilterType.ASSIGNABLE_TYPE,
+                        value = DataToolsServiceImpl.class
+                )
+        }
+)
+@EnableJpaRepositories(
+        basePackages = {"com.bsth.repository"}
+)
+@SpringBootApplication
+public class ScheduleTestApp {
+}
-package com.bsth.service.schedule.rules;
-
-import com.bsth.Application;
-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;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
-import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
-import org.joda.time.DateTime;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.api.KieBase;
-import org.kie.api.runtime.KieSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.Arrays;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {Application.class})
-public class DroolsRulesTest {
-
-    /** 日志记录器 */
-    private final static Logger logger = LoggerFactory.getLogger(DroolsRulesTest.class);
-
-    @Autowired
-    private KieBase kieBase;
-
-//    @Test
-//    public void helloWorldDrlTest() throws Exception {
-//        // 1、创建session，内部配置的是stateful
-//        KieSession session = kieBase.newKieSession();
-//
-//        // 1.1 设置gloable对象，在drl中通过别名使用
-//        List<String> gloableList = new ArrayList<String>();
-//        session.setGlobal("list", gloableList);
-//
-//        // 1.2 可以设置一些监听器，再议
-//
-//        // 2、创建fact对象
-//        Message message = new Message();
-//        message.setMessage("Hello World");
-//        message.setStatus(Message.HELLO);
-//        session.insert(message);
-//
-//        // 3、执行rule
-//        session.fireAllRules();
-//
-//        System.out.println(gloableList);
-//
-//        // 4、执行完毕销毁，有日志的也要关闭
-//        session.dispose();
-//    }
-
-//    @Test
-    public void ttinfoDrlTest() throws Exception {
-        logger.info("------------ttinfoDrlTest 测试---------------");
-
-        // 1、创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
-
-        // 1.1 设置gloable对象，在drl中通过别人使用
-        session.setGlobal("log", logger);
-        TTInfoResults_output ttInfoResults_output = new TTInfoResults_output();
-        session.setGlobal("results", ttInfoResults_output);
-
-        // 1.2 可以设置一些监听器，再议
-
-        // 2、创建fact对象
-        TTInfoCalcuParam_input ttInfoCalcuParam_input = new TTInfoCalcuParam_input(
-                new DateTime(2016, 8, 1, 0, 0),
-                new DateTime(2016, 8, 10, 0, 0),
-                "1"
-        );
-
-
-        TTInfo_input ttInfo_input1 = new TTInfo_input();
-        ttInfo_input1.setTtInfoId("1");
-        ttInfo_input1.setXlId("1");
-        ttInfo_input1.setWeekdays(Arrays.asList(true, true, true, true, true, false, false));
-        ttInfo_input1.getSpecialDays().add(new DateTime(2016, 8, 1, 0, 0));
-        ttInfo_input1.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
-        ttInfo_input1.setIsEnable(true);
-        ttInfo_input1.setQyDate(new DateTime(2016, 1, 1, 0, 0));
-
-        TTInfo_input ttInfo_input1_2 = new TTInfo_input();
-        ttInfo_input1_2.setTtInfoId("2");
-        ttInfo_input1_2.setXlId("1");
-        ttInfo_input1_2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
-        ttInfo_input1_2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
-        ttInfo_input1_2.setUpdateDate(new DateTime(2015, 2, 1, 0, 0));
-        ttInfo_input1_2.setIsEnable(true);
-        ttInfo_input1_2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
-
-
-        TTInfoCalcuParam_input ttInfoCalcuParam_inpu2 = new TTInfoCalcuParam_input(
-                new DateTime(2016, 8, 1, 0, 0),
-                new DateTime(2016, 8, 10, 0, 0),
-                "2"
-        );
-
-        TTInfo_input ttInfo_input2 = new TTInfo_input();
-        ttInfo_input2.setTtInfoId("2");
-        ttInfo_input2.setXlId("2");
-        ttInfo_input2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
-        ttInfo_input2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
-        ttInfo_input2.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
-        ttInfo_input2.setIsEnable(true);
-        ttInfo_input2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
-
-        session.insert(ttInfoCalcuParam_input);
-        session.insert(ttInfo_input1);
-        session.insert(ttInfo_input1_2);
-        session.insert(ttInfoCalcuParam_inpu2);
-        session.insert(ttInfo_input2);
-
-
-
-        // 3、执行rule
-        session.fireAllRules();
-
-        // 4、执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-        // 打印global结果
-        logger.info(ttInfoResults_output.showTTInfoDesc1());
-
-    }
-
-    @Test
-    public void shiftloopDrlTest() throws Exception {
-        // 1、创建session，内部配置的是stateful
-        KieSession session = kieBase.newKieSession();
-
-        // 1.1 设置gloable对象，在drl中通过别名使用
-        ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
-        session.setGlobal("scheduleResult", scheduleResults_output);
-
-        // 1.2 可以设置一些监听器，再议
-
-        // 2、创建fact对象
-
-        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input();
-        scheduleCalcuParam_input.setFromDate(new DateTime(2016, 8, 1, 0, 0));
-        scheduleCalcuParam_input.setToDate(new DateTime(2016, 8, 10, 0, 0));
-
-        ScheduleRule_input scheduleRule_input1 = new ScheduleRule_input();
-        scheduleRule_input1.setRuleId("1");
-        scheduleRule_input1.setQyrq(new DateTime(2016, 7, 22, 0, 0));
-        scheduleRule_input1.getGuideboardIds().addAll(Arrays.asList(
-                "9", "9" , "8" ,"8" ,"7" ,"7" ,"6" ,"6", "5", "5", "4", "4", "3", "3", "2", "2", "1", "1"));
-        scheduleRule_input1.setStartGbdIndex(3);
-        scheduleRule_input1.getEmployeeConfigIds().addAll(Arrays.asList("1", "2"));
-        scheduleRule_input1.setStartEIndex(1);
-        scheduleRule_input1.setCarConfigId("1");
-
-//        ScheduleRule_input scheduleRule_input2 = new ScheduleRule_input();
-//        scheduleRule_input2.setRuleId(2L);
-//        scheduleRule_input2.setQyrq(new DateTime(2016, 7, 22, 0, 0));
-//        scheduleRule_input2.getGuideboardIds().addAll(Arrays.asList(
-//                1L, 1L, 2L, 2L, 3L, 3L, 4L, 4L, 5L, 5L, 6L, 6L, 7L, 7L, 8L, 8L, 9L, 9L, 10L, 10L,
-//                11L, 11L, 12L, 12L, 13L, 13L));
-//        scheduleRule_input2.setStartGbdIndex(7);
-//        scheduleRule_input2.getEmployeeConfigIds().addAll(Arrays.asList(11L, 12L));
-//        scheduleRule_input2.setStartEIndex(1);
-//        scheduleRule_input2.setCarConfigId(2L);
-
-        session.insert(scheduleCalcuParam_input);
-        session.insert(scheduleRule_input1);
-//        session.insert(scheduleRule_input2);
-
-
-        // 3、执行rule
-        session.fireAllRules();
-
-        // 4、执行完毕销毁，有日志的也要关闭
-        session.dispose();
-
-        System.out.println(scheduleResults_output.showGuideboardDesc1());
-
-    }
-}
-package com.bsth.service.schedule.rules;
-
-import com.bsth.Application;
-import org.junit.runner.RunWith;
-import org.kie.api.KieBase;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * 测试类。
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {Application.class})
-@ComponentScan(basePackages = {"com.bsth.entity"})
-public class DroolsRulesTest2 {
-    @Autowired
-    private KieBase kieBase;
-
-    @org.junit.Test
-    public void test1() throws Exception {
-        System.out.println("dfdfdfdfd");
-    }
-
-}
+package com.bsth.service.schedule.rules;
+
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.sys.SysUserRepository;
+import com.bsth.service.schedule.BaseTest;
+import com.vividsolutions.jts.util.Assert;
+import org.dbunit.database.DatabaseConnection;
+import org.dbunit.database.IDatabaseConnection;
+import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
+import org.dbunit.operation.DatabaseOperation;
+import org.junit.After;
+import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+import javax.sql.DataSource;
+
+public class RuleTest1 extends BaseTest {
+    /** 日志记录器 */
+    private static final Logger logger = LoggerFactory.getLogger(RuleTest1.class);
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    private SysUserRepository sysUserRepository;
+
+    /**
+     * 初始化数据。
+     */
+    @Before
+    public void initData() throws Exception {
+        logger.info("载入数据......");
+
+        // 获取数据库连接
+        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
+        // 获取Dbunit数据源
+        Resource res = new ClassPathResource("testdata/d1.xml");
+        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
+        flatXmlDataSetBuilder.setColumnSensing(false);
+        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
+        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
+
+        // 载入数据
+        DatabaseOperation.CLEAN_INSERT.execute(iDatabaseConnection, iDataSet);
+    }
+
+    /**
+     * 清除数据。
+     */
+    @After
+    public void destoryData() throws Exception {
+        logger.info("清除数据......");
+        // 获取数据库连接
+        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
+        // 获取Dbunit数据源
+        Resource res = new ClassPathResource("testdata/d1.xml");
+        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
+        flatXmlDataSetBuilder.setColumnSensing(false);
+        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
+        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
+
+        // 清除数据
+        DatabaseOperation.DELETE_ALL.execute(iDatabaseConnection, iDataSet);
+    }
+
+    @org.junit.Test
+    public void t1() {
+        logger.info("t1()测试......");
+        SysUser sysUser = sysUserRepository.findOne(1);
+        Assert.equals("admin", sysUser.getUserName());
+    }
+}
+
+//
+//
+//package com.bsth.service.schedule.rules;
+//
+//        import com.bsth.Application;
+//        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;
+//        import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
+//        import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
+//        import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
+//        import org.joda.time.DateTime;
+//        import org.junit.Test;
+//        import org.junit.runner.RunWith;
+//        import org.kie.api.KieBase;
+//        import org.kie.api.runtime.KieSession;
+//        import org.slf4j.Logger;
+//        import org.slf4j.LoggerFactory;
+//        import org.springframework.beans.factory.annotation.Autowired;
+//        import org.springframework.boot.test.SpringApplicationConfiguration;
+//        import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//
+//        import java.util.Arrays;
+//
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@SpringApplicationConfiguration(classes = {Application.class})
+//public class DroolsRulesTest {
+//
+//    /** 日志记录器 */
+//    private final static Logger logger = LoggerFactory.getLogger(DroolsRulesTest.class);
+//
+//    @Autowired
+//    private KieBase kieBase;
+//
+////    @Test
+////    public void helloWorldDrlTest() throws Exception {
+////        // 1、创建session，内部配置的是stateful
+////        KieSession session = kieBase.newKieSession();
+////
+////        // 1.1 设置gloable对象，在drl中通过别名使用
+////        List<String> gloableList = new ArrayList<String>();
+////        session.setGlobal("list", gloableList);
+////
+////        // 1.2 可以设置一些监听器，再议
+////
+////        // 2、创建fact对象
+////        Message message = new Message();
+////        message.setMessage("Hello World");
+////        message.setStatus(Message.HELLO);
+////        session.insert(message);
+////
+////        // 3、执行rule
+////        session.fireAllRules();
+////
+////        System.out.println(gloableList);
+////
+////        // 4、执行完毕销毁，有日志的也要关闭
+////        session.dispose();
+////    }
+//
+//    //    @Test
+//    public void ttinfoDrlTest() throws Exception {
+//        logger.info("------------ttinfoDrlTest 测试---------------");
+//
+//        // 1、创建session，内部配置的是stateful
+//        KieSession session = kieBase.newKieSession();
+//
+//        // 1.1 设置gloable对象，在drl中通过别人使用
+//        session.setGlobal("log", logger);
+//        TTInfoResults_output ttInfoResults_output = new TTInfoResults_output();
+//        session.setGlobal("results", ttInfoResults_output);
+//
+//        // 1.2 可以设置一些监听器，再议
+//
+//        // 2、创建fact对象
+//        TTInfoCalcuParam_input ttInfoCalcuParam_input = new TTInfoCalcuParam_input(
+//                new DateTime(2016, 8, 1, 0, 0),
+//                new DateTime(2016, 8, 10, 0, 0),
+//                "1"
+//        );
+//
+//
+//        TTInfo_input ttInfo_input1 = new TTInfo_input();
+//        ttInfo_input1.setTtInfoId("1");
+//        ttInfo_input1.setXlId("1");
+//        ttInfo_input1.setWeekdays(Arrays.asList(true, true, true, true, true, false, false));
+//        ttInfo_input1.getSpecialDays().add(new DateTime(2016, 8, 1, 0, 0));
+//        ttInfo_input1.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
+//        ttInfo_input1.setIsEnable(true);
+//        ttInfo_input1.setQyDate(new DateTime(2016, 1, 1, 0, 0));
+//
+//        TTInfo_input ttInfo_input1_2 = new TTInfo_input();
+//        ttInfo_input1_2.setTtInfoId("2");
+//        ttInfo_input1_2.setXlId("1");
+//        ttInfo_input1_2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
+//        ttInfo_input1_2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
+//        ttInfo_input1_2.setUpdateDate(new DateTime(2015, 2, 1, 0, 0));
+//        ttInfo_input1_2.setIsEnable(true);
+//        ttInfo_input1_2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
+//
+//
+//        TTInfoCalcuParam_input ttInfoCalcuParam_inpu2 = new TTInfoCalcuParam_input(
+//                new DateTime(2016, 8, 1, 0, 0),
+//                new DateTime(2016, 8, 10, 0, 0),
+//                "2"
+//        );
+//
+//        TTInfo_input ttInfo_input2 = new TTInfo_input();
+//        ttInfo_input2.setTtInfoId("2");
+//        ttInfo_input2.setXlId("2");
+//        ttInfo_input2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
+//        ttInfo_input2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
+//        ttInfo_input2.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
+//        ttInfo_input2.setIsEnable(true);
+//        ttInfo_input2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
+//
+//        session.insert(ttInfoCalcuParam_input);
+//        session.insert(ttInfo_input1);
+//        session.insert(ttInfo_input1_2);
+//        session.insert(ttInfoCalcuParam_inpu2);
+//        session.insert(ttInfo_input2);
+//
+//
+//
+//        // 3、执行rule
+//        session.fireAllRules();
+//
+//        // 4、执行完毕销毁，有日志的也要关闭
+//        session.dispose();
+//
+//        // 打印global结果
+//        logger.info(ttInfoResults_output.showTTInfoDesc1());
+//
+//    }
+//
+//    @Test
+//    public void shiftloopDrlTest() throws Exception {
+//        // 1、创建session，内部配置的是stateful
+//        KieSession session = kieBase.newKieSession();
+//
+//        // 1.1 设置gloable对象，在drl中通过别名使用
+//        ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
+//        session.setGlobal("scheduleResult", scheduleResults_output);
+//
+//        // 1.2 可以设置一些监听器，再议
+//
+//        // 2、创建fact对象
+//
+//        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input();
+//        scheduleCalcuParam_input.setFromDate(new DateTime(2016, 8, 1, 0, 0));
+//        scheduleCalcuParam_input.setToDate(new DateTime(2016, 8, 10, 0, 0));
+//
+//        ScheduleRule_input scheduleRule_input1 = new ScheduleRule_input();
+//        scheduleRule_input1.setRuleId("1");
+//        scheduleRule_input1.setQyrq(new DateTime(2016, 7, 22, 0, 0));
+//        scheduleRule_input1.getGuideboardIds().addAll(Arrays.asList(
+//                "9", "9" , "8" ,"8" ,"7" ,"7" ,"6" ,"6", "5", "5", "4", "4", "3", "3", "2", "2", "1", "1"));
+//        scheduleRule_input1.setStartGbdIndex(3);
+//        scheduleRule_input1.getEmployeeConfigIds().addAll(Arrays.asList("1", "2"));
+//        scheduleRule_input1.setStartEIndex(1);
+//        scheduleRule_input1.setCarConfigId("1");
+//
+////        ScheduleRule_input scheduleRule_input2 = new ScheduleRule_input();
+////        scheduleRule_input2.setRuleId(2L);
+////        scheduleRule_input2.setQyrq(new DateTime(2016, 7, 22, 0, 0));
+////        scheduleRule_input2.getGuideboardIds().addAll(Arrays.asList(
+////                1L, 1L, 2L, 2L, 3L, 3L, 4L, 4L, 5L, 5L, 6L, 6L, 7L, 7L, 8L, 8L, 9L, 9L, 10L, 10L,
+////                11L, 11L, 12L, 12L, 13L, 13L));
+////        scheduleRule_input2.setStartGbdIndex(7);
+////        scheduleRule_input2.getEmployeeConfigIds().addAll(Arrays.asList(11L, 12L));
+////        scheduleRule_input2.setStartEIndex(1);
+////        scheduleRule_input2.setCarConfigId(2L);
+//
+//        session.insert(scheduleCalcuParam_input);
+//        session.insert(scheduleRule_input1);
+////        session.insert(scheduleRule_input2);
+//
+//
+//        // 3、执行rule
+//        session.fireAllRules();
+//
+//        // 4、执行完毕销毁，有日志的也要关闭
+//        session.dispose();
+//
+//        System.out.println(scheduleResults_output.showGuideboardDesc1());
+//
+//    }
+//}
+
-package com.bsth.service.schedule.rules;
-
-import org.apache.tika.Tika;
-
-import java.io.File;
-
-/**
- * Created by xu on 17/1/3.
- */
-public class Test {
-    public static void main(String[] args) throws Exception {
-        Tika tika = new Tika();
-        File file = new File("/Users/xu/Downloads/排班规则练习1.xls");
-
-        // application/vnd.ms-excel
-        // application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-
-        String detecttype = tika.detect(file);
-        System.out.println(detecttype);
-
-
-    }
-}
+#嵌入式tomcat配置
+#server.port=9088
+#management.port= 9001
+#management.address= 127.0.0.1
+
+#JPA配置
+spring.jpa.hibernate.ddl-auto= update
+spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
+spring.jpa.database= MYSQL
+spring.jpa.show-sql= true
+
+#数据库连接池配置
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://127.0.0.1/test_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password=
+
+#spring.datasource.driver-class-name= org.h2.Driver
+#spring.datasource.url= jdbc:h2:mem:bookstore;DB_CLOSE_ON_EXIT=FALSE
+#spring.datasource.username= sa
+#spring.datasource.password=
+
+spring.datasource.max-active=100
+spring.datasource.max-idle=8
+spring.datasource.min-idle=8
+spring.datasource.initial-size=5
+
+spring.datasource.test-on-borrow=true
+spring.datasource.test-on-connect=true
+spring.datasource.test-on-return=true
+spring.datasource.test-while-idle=true
+spring.datasource.validation-query=select 1
+
+# 配置数据导入导出用到的配置信息
+
+# 1、kettle配置文件路径（类路径）
+datatools.kettle_properties=/datatools/kettle.properties
+# 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
+#数据库ip地址
+datatools.kvars_dbip=127.0.0.1
+#数据库用户名
+datatools.kvars_dbuname=root
+#数据库密码
+datatools.kvars_dbpwd=
+#数据库库名
+datatools.kvars_dbdname=qp_control
+
+# 3、上传数据配置信息
+# 上传文件目录配置（根据不同的环境需要修正）
+datatools.fileupload_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
+# ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
+datatools.trans_errordir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/erroroutput
+# 临时输出文件目录
+datatools.trans_tempdir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/temp
+# 模版文件目录
+datatools.trans_templatedir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/template
+
+##---------------------------- 导入数据ktr ----------------------------##
+# 车辆信息导入ktr转换
+datatools.cars_datainputktr=/datatools/ktrs/carsDataInput.ktr
+# 人员信息导入
+datatools.employees_datainputktr=/datatools/ktrs/employeesDataInput.ktr
+# 路牌信息导入
+datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr
+# 时刻表基础信息导入
+datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr
+# 时刻表明细信息导入（元数据）
+datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
+# 时刻表明细编辑用数据
+datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
+# 时刻表明细信息导入
+datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
+# 时刻表明细信息导入2
+datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
+
+# 车辆配置信息导入
+datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr
+# 人员配置信息导入
+datatools.employeesconfig_datainputktr=/datatools/ktrs/employeesConfigDataInput.ktr
+
+# 排版规则信息导入
+datatools.schedulerule_datainputktr=/datatools/ktrs/scheduleRuleDataInput.ktr
+
+# 4、数据导出配置信息
+# 导出数据文件目录配置（根据不同的环境需要修正）
+datatools.fileoutput_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
+
+##---------------------------- 导出数据ktr -----------------------------##
+# 车辆信息导出ktr转换
+datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr
+# 人员信息导出ktr转换
+datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr
+# 时刻表导出元数据ktr转换
+datatools.ttinfodetail_metaoutput=/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
+# 时刻表导出数据ktr转换
+datatools.ttinfodetail_output=/datatools/ktrs/ttinfodetailDataOutput.ktr
+# 排版规则导出数据ktr转换
+datatools.schedulerule_output=/datatools/ktrs/scheduleRuleDataOutput.ktr
+
+# 车辆配置信息导出ktr转换
+datatools.carsconfig_dataoutputktr=/datatools/ktrs/carsConfigDataOutput.ktr
+# 人员配置信息导出ktr转换
+datatools.employeesconfig_dataoutputktr=/datatools/ktrs/employeesConfigDataOutput.ktr
+
+# 路牌信息导出
+datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
+
+
+# TODO：
+
+
+
+
+
+
+
+
+<?xml version='1.0' encoding='UTF-8'?>
+<dataset>
+    <!-- 用户数据 -->
+    <bsth_c_sys_user id="1" user_name="admin" name="系统管理员" create_date="2000-01-01" enabled="1" last_login_date="2000-01-01" />
+
+</dataset>
 \ No newline at end of file