Merge branch 'minhang' into pudong

潘钊
2 parents 01898ae5 d7124004
Showing 36 changed files with 1149 additions and 686 deletions
pom.xml
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/DataManagerController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/entity/realcontrol/OilStationSociety.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
src/main/java/com/bsth/service/excep/impl/OutboundServiceImpl.java
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
src/main/java/com/bsth/service/forms/FormsService.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bsth</groupId>
@@ -237,27 +237,33 @@
 			<version>1.13</version>
 		</dependency>
  
-        <dependency>
-            <groupId>org.dbunit</groupId>
-            <artifactId>dbunit</artifactId>
-            <version>2.4.9</version>
-            <scope>test</scope>
+		<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>
+			<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>
  
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.2.132</version>
-            <scope>test</scope>
-        </dependency>
  
+		<dependency>
+			<groupId>ojdbc</groupId>
+			<artifactId>ojdbc</artifactId>
+			<version>14</version>
+		</dependency>
 	</dependencies>
  
 	<dependencyManagement>
@@ -28,6 +28,7 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.service.forms.ExportService;
 import com.bsth.service.forms.FormsService;
+import com.bsth.util.Arith;
 import com.bsth.util.ReportUtils;
  
 @RestController
@@ -167,7 +168,7 @@ public class ExportController {
 	}
  
 	// 路单数据报表
-	@RequestMapping(value = "/singledataExport", method = RequestMethod.POST)
+	@RequestMapping(value = "/singledataExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> singledataExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
@@ -213,12 +214,12 @@ public class ExportController {
 	}
  
 	// 车辆加注
-	@RequestMapping(value = "/vehicleloadingExport", method = RequestMethod.POST)
+	@RequestMapping(value = "/vehicleloadingExport", method = RequestMethod.GET)
 	public List<Map<String, Object>> vehicleloadingExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-		List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),map.get("line").toString(),
+		List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("line").toString(),
 				map.get("data").toString());
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		int i = 1;
@@ -558,17 +559,13 @@ public class ExportController {
 		List<Daily> allline = formsService.daily(map);
  
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		Float zgl=0f;
-		Float ks=0f;
-		Float yh=0f;
-		Float bc=0f;
+		double zgl=0.0;
+		double ks=0.0;
+		double yh=0.0;
+		int bc=0;
 		Map<String, Object> m ;
 		for (Daily d : allline) {
 			m = new HashMap<String, Object>();
-			zgl +=d.getZlc()==""?0f:Float.valueOf(d.getZlc());
-			ks +=d.getJzl1()==""?0f:Float.valueOf(d.getJzl1());
-			yh +=d.getYh()==""?0f:Float.valueOf(d.getYh());
-			bc +=d.getBc()==""?0f:Float.valueOf(d.getBc());
 			m.put("zbh", d.getZbh());
 			m.put("jgh",d.getJgh());
 			m.put("jName", d.getjName());
@@ -576,9 +573,13 @@ public class ExportController {
 			m.put("jzl1", d.getJzl1());
 			m.put("yh", d.getYh());
 			m.put("bc", d.getBc());
+			zgl =Arith.add(zgl, d.getZlc());
+			ks =Arith.add(ks, d.getJzl1());
+			yh =Arith.add(yh, d.getYh());
+			bc +=Integer.parseInt(d.getBc());
  
 			resList.add(m);
-			}
+		}
  
 		m=new HashMap<String,Object>();
 		m.put("total_zgl", zgl);
@@ -73,17 +73,16 @@ public class MCY_FormsController {
 	}
  
 	// 路单数据
-	@RequestMapping(value = "/singledata", method = RequestMethod.POST)
+	@RequestMapping(value = "/singledata", method = RequestMethod.GET)
 	public List<Singledata> singledata(@RequestParam Map<String, Object> map) {
  
 		return formsService.singledata(map);
 	}
  
 	// 车辆加注
-	@RequestMapping(value = "/vehicleloading", method = RequestMethod.POST)
-	public List<Vehicleloading> vehicleloading(@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,
-			@RequestParam String line, @RequestParam String data) {
-		return formsService.vehicleloading(gsdmVehic, fgsdmVehic, line, data);
+	@RequestMapping(value = "/vehicleloading", method = RequestMethod.GET)
+	public List<Vehicleloading> vehicleloading(@RequestParam String line, @RequestParam String data) {
+		return formsService.vehicleloading(line, data);
 	}
  
 	// 运营服务阶段报表
@@ -238,9 +238,11 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("rq", y.getRq());
 			m.put("gsname",y.getGsname() );
+			m.put("fgsname", y.getFgsname());
 			m.put("xlname", y.getXlname());
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
+			m.put("name", y.getName());
 			m.put("jzl", y.getJzl());
 			m.put("czlc", y.getCzlc());
 			m.put("jzlc", y.getJzlc());
-package com.bsth.controller.realcontrol;
-
-import com.bsth.service.realcontrol.DataManagerService;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * 数据管理，包括从老系统的数据迁移。新系统的数据校验等
- * Created by panzhao on 2017/4/17.
- */
-@RestController
-@RequestMapping("dataManager")
-public class DataManagerController {
-
-    @Autowired
-    DataManagerService dataManagerService;
-
-    @RequestMapping("cars/old_now")
-    public Map<String, Object> carInfos(@RequestParam Integer lineId){
-        return dataManagerService.carInfos(lineId);
-    }
-
-    @RequestMapping("car/updateDevices")
-    public Map<String, Object> updateDevices(@RequestParam String jsonStr){
-        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
-        return dataManagerService.updateDevices(jsonStr);
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.service.realcontrol.DataManagerService;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 数据管理，包括从老系统的数据迁移。新系统的数据校验等
+ * Created by panzhao on 2017/4/17.
+ */
+@RestController
+@RequestMapping("dataManager")
+public class DataManagerController {
+
+    @Autowired
+    DataManagerService dataManagerService;
+
+    @RequestMapping("cars/old_now")
+    public Map<String, Object> carInfos(@RequestParam Integer lineId){
+        return dataManagerService.carInfos(lineId);
+    }
+
+    @RequestMapping("car/updateDevices")
+    public Map<String, Object> updateDevices(@RequestParam String jsonStr){
+        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
+        return dataManagerService.updateDevices(jsonStr);
+    }
+}
@@ -543,4 +543,25 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
 		return rs;
 	}
+
+	/**
+	 * 误点调整
+	 * @param idx
+	 * @param minute
+	 * @return
+	 */
+	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
+	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
+		return scheduleRealInfoService.lateAdjust(idx, minute);
+	}
+
+	/**
+	 * 获取所有应发未到的班次
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping(value = "allLate2")
+	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
+		return scheduleRealInfoService.allLate2(idx);
+	}
 }
@@ -332,7 +332,8 @@ public class BasicData implements CommandLineRunner {
                 }
  
                 perTempMap.put(jobCode, p);
-                allPersonMap.put(jobCode, p.getPersonnelName());
+                
+                allPersonMap.put(jobCode.substring(jobCode.indexOf("-")+1), p.getPersonnelName());
             }
  
             jsyMap = jsyTempMap;
@@ -8,6 +8,7 @@ import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
@@ -145,6 +146,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
  
+            //清理应发未发标记
+            LateAdjustHandle.remove(sch);
+
             if(sch.getBcType().equals("out")){
                 //出场时，切换成营运状态
                 directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
@@ -242,6 +246,10 @@ public class InOutStationSignalHandle extends SignalHandle{
             long rsT = lineConfigData.applyIn(sch, gps.getTimestamp());
  
             sch.setZdsjActualAll(rsT);
+
+            //通知误点停靠程序，有车辆到站
+            LateAdjustHandle.carArrive(gps);
+
             //已完成班次数
             int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
             ScheduleRealInfo next = dayOfSchedule.next(sch);
@@ -154,10 +154,10 @@ public class DayOfSchedule implements CommandLineRunner {
             diff += (1000 * 60 * 60 * 24);
  
         logger.info(diff / 1000 / 60 + "分钟之后提交到运管处");
-        //Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleAtFixedRate(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
  
         //计算油、公里加注
-        Application.mainServices.scheduleWithFixedDelay(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        Application.mainServices.scheduleAtFixedRate(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
  
         //指令持久化线程
         Application.mainServices.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
  
 package com.bsth.data.schedule.late_adjust;
  
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
  
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
  
 /**
- * 误点调整处理程序
+ * 误点自动调整待发 处理程序
+ *
+ * 注意 ：这里的误点是指应发未到
  * Created by panzhao on 2017/4/16.
  */
-public class LateAdjustHandle {
+@Component
+public class LateAdjustHandle implements ApplicationContextAware{
+
+    static LineConfigData lineConfigData;
+    static SendUtils sendUtils;
+
+    static Logger logger = LoggerFactory.getLogger(LateAdjustHandle.class);
  
     /**
-     * 误点的车辆 和 班次
+     * 应发未到车辆 和 班次
      */
     private static Map<String, ScheduleRealInfo> lateSchMap;
  
  
+    static {
+        lateSchMap = new HashMap<>();
+    }
+
     /**
-     * 误点的班次ID 和 停靠时间（秒）
+     * 新增一个误点班次
+     * @param sch
      */
-    private static Map<Long, Integer> stopTimeMap;
+    public static void putLate(ScheduleRealInfo sch){
+        try {
+            //线路配置
+            LineConfig config = lineConfigData.get(sch.getXlBm());
+            if(sch.getLateMinute() == 0){
+                if(config.isEnableYjtk()){
+                    sch.setLateMinute(sch.getXlDir().equals("0")?config.getUpStopMinute():config.getDownStopMinute());
+                }
+                else
+                    return;
+            }
+
+            if(sch.getDfsj().compareTo(config.getYjtkStart()) > 0
+                    && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0){
+
+                ScheduleRealInfo cancel = null;
+                //之前存在误点班次没有发出
+                ScheduleRealInfo old = lateSchMap.get(sch.getClZbh());
+                if(old != null && old.getDfsjT() < sch.getDfsjT()){
+                    remove(old);
+                    cancel = old;
+                    logger.info("【应发未到】old 班次 " + old.getId() + " -被覆盖！");
+                }
+
+                lateSchMap.put(sch.getClZbh(), sch);
+                //通知客户端
+                sch.setLate2(true);
+                sendUtils.sendAutoWdtz(sch, cancel);
+
+                logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
  
  
     /**
-     * 班次误点（考虑停靠时间）
-     * @param sch
+     * 获取所有应发未到的班次
+     * @return
      */
-    public static void schLate(ScheduleRealInfo sch){
+    public static Collection<ScheduleRealInfo> allLateSch(){
+        return lateSchMap.values();
+    }
+
+    public static void remove(ScheduleRealInfo sch){
+        try {
+            if(lateSchMap.get(sch.getClZbh()) == sch){
+                lateSchMap.remove(sch.getClZbh());
+                sch.setLate2(false);
+                sch.setLateMinute(0);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 车辆到站
+     * @param gps
+     */
+    public static void carArrive(GpsEntity gps){
+        try{
+            if(gps.getInstation() != 1)
+                return;
+
+            ScheduleRealInfo sch = lateSchMap.get(gps.getNbbm());
+            if(sch == null)
+                return;
+
+            //进的是班次起点
+            if(gps.getStopNo().equals(sch.getQdzCode())
+                    && sch.getLateMinute() > 0){
+                //自动调整待发 到达时间 + 停靠时间
+                long dt = gps.getTimestamp() + (Long.parseLong(String.valueOf(sch.getLateMinute() * 60 * 1000)));
+                sch.setDfsjAll(dt);
+                sch.setDfAuto(true);
+
+                lateSchMap.remove(sch.getClZbh());
+                logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
  
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        lineConfigData = applicationContext.getBean(LineConfigData.class);
+        sendUtils = applicationContext.getBean(SendUtils.class);
     }
 -}
+}
 \ No newline at end of file
@@ -5,6 +5,7 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
@@ -14,10 +15,10 @@ import java.util.Comparator;
 import java.util.List;
  
 /**
- * 
- * @ClassName: ScheduleLateThread 
- * @Description: TODO(班次误点扫描线程) 
- * @author PanZhao 
+ *
+ * @ClassName: ScheduleLateThread
+ * @Description: TODO(班次误点扫描线程)
+ * @author PanZhao
  * @date 2016年8月31日 下午3:09:02 
  *
  */
@@ -26,29 +27,39 @@ public class ScheduleLateThread extends Thread{
  
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	
+
 	@Autowired
 	SendUtils sendUtils;
-	
+
 	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
-	
+
 	@Override
 	public void run() {
 		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
 		Collections.sort(all, cpm);
-		
+
 		long t = System.currentTimeMillis();
 		int size = all.size();
-		
+
 		ScheduleRealInfo sch;
 		for(int i = 0; i < size; i ++){
 			sch = all.get(i);
-			if(sch.getDfsjT() > t)
+			if(sch.getDfsjT() > t || sch.isLate())
 				break;
-			
-			if(sch.isLate() == false 
-					&& sch.getStatus() == 0 
+
+			if(sch.getStatus() == 0
 					&& sch.getFcsjActual() == null){
+
+				//检查应发未到 当前班次无起点到达时间
+				if(StringUtils.isEmpty(sch.getQdzArrDateSJ())){
+					ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+					//上一个班次也没有实际终点到达时间
+					if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){
+						//进入误点调整程序
+						LateAdjustHandle.putLate(sch);
+					}
+				}
+
 				//应发未发
 				sch.setLate(true);
 				//通知客户端
@@ -56,4 +67,4 @@ public class ScheduleLateThread extends Thread{
 			}
 		}
 	}
 -}
+}
 \ No newline at end of file
@@ -63,6 +63,11 @@ public class Ylb {
 	@Transient
 	private String gsname;
  
+	@Transient
+	private String fgsname;
+	
+	@Transient
+	private String name;
  
 	public Integer getId() {
 		return id;
@@ -299,6 +304,22 @@ public class Ylb {
 	}
  
  
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+
+	public String getName() {
+		return BasicData.allPerson.get(this.jsy);
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
  
  
  
@@ -82,7 +82,9 @@ public class LineConfig {
 	 * 应急停靠
 	 */
 	private boolean enableYjtk;
+	/** HH:mm */
 	private String yjtkStart;
+	/** HH:mm */
 	private String yjtkEnd;
 	private int upStopMinute;
 	private int downStopMinute;
@@ -21,6 +21,11 @@ public class OilStationSociety {
     private String stationName;
  
     /**
+     * 加油站编码（为空则默认社会加油站）
+     */
+    private String stationCode;
+
+    /**
      * 上行进场距离
      */
     private Double upInMile;
@@ -137,4 +142,12 @@ public class OilStationSociety {
     public void setDownOutTime(int downOutTime) {
         this.downOutTime = downOutTime;
     }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
 }
@@ -139,10 +139,17 @@ public class ScheduleRealInfo {
 	/** 是否是临加班次 */
 	private boolean sflj;
  
-	/** 是否误点*/
+	/** 是否误点  （应发未发）*/
 	@Transient
 	private boolean late;
  
+	/** 是否误点 （应发未到） */
+	@Transient
+	private boolean late2;
+	/** 误点停靠时间 */
+	@Transient
+	private float lateMinute;
+
 	/** 备注*/
 	private String remarks;
  
@@ -887,4 +894,20 @@ public class ScheduleRealInfo {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
+
+	public float getLateMinute() {
+		return lateMinute;
+	}
+
+	public void setLateMinute(float lateMinute) {
+		this.lateMinute = lateMinute;
+	}
+
+	public boolean isLate2() {
+		return late2;
+	}
+
+	public void setLate2(boolean late2) {
+		this.late2 = late2;
+	}
 }
@@ -56,7 +56,7 @@ public class OfflineServiceImpl implements OfflineService {
 		Object date=map.get("date");
  
 		if(line!=null){
-			sql +=" and line like'%"+line.toString()+"%'";
+			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
  
 		if(nbbm!=null){
@@ -131,6 +131,7 @@ public class OfflineServiceImpl implements OfflineService {
 	@SuppressWarnings("unchecked")
 	public PageObject <Offline> Pagequery(Map<String, Object> map) {
 		// TODO Auto-generated method stub
+
 		String sql="select count(*) record  from bsth_c_offline where 1=1 ";
  
 		Object line=map.get("line");
@@ -140,7 +141,7 @@ public class OfflineServiceImpl implements OfflineService {
 		Object date=map.get("date");
  
 		if(line!=null){
-			sql +=" and line like'%"+line.toString()+"%'";
+			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
  
 		if(nbbm!=null){
@@ -194,10 +195,9 @@ public class OfflineServiceImpl implements OfflineService {
 			Date datess = new Date(d1);
 			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
 			String sk=new SimpleDateFormat("HH:mm").format(datess);
-			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
-					+ "   real_exec_date='"+dates+"' ";
-//							+ "and fcsj_actual > '"+sk+"' ";
-//							+ "and '"+sk+"' <dfsj";
+			String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
+					+ "  from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
 			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
 			        new RowMapper<ScheduleRealInfo>(){  
 			            @Override  
@@ -208,20 +208,15 @@ public class OfflineServiceImpl implements OfflineService {
 			            	s.setLpName(rs.getString("lp_name"));
 			                return s;  
 			            }  
-					});  
-			if(pbb.size()>0){
-				list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
-				list.get(i).setLpname(pbb.get(0).getLpName());
-				
-			}
-			
+					});
+		if(pbb.size()>0){
+					list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
+					list.get(i).setLpname(pbb.get(0).getLpName());
+				}
 		}
+         
 		PageObject<Offline> pageObject = pageHelper.getPageObject();
-//		for (int i = 0; i < list.size(); i++) {
-//			if(list.get(i).getLpname()!=null){
 				pageObject.setDataList(list);
-//			}
-//		}
  
 		return pageObject;
 	}
@@ -43,7 +43,7 @@ public class OutboundServiceImpl implements OutboundService{
 		Object updown=map.get("updown");
 		Object date=map.get("date");
 		if(line!=null){
-				 sql +=" and line like'%"+line.toString()+"%'";
+				 sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
  
 		if(nbbm!=null){
@@ -105,7 +105,7 @@ public class OutboundServiceImpl implements OutboundService{
 			outbound.setTimestampDate(sdf.format(new Date(outbound.getTimestamp())));
 			outbound.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
 			outbound.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
-			outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
+//			outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
 			list.add(outbound);
 		}
 		return list;
@@ -120,7 +120,7 @@ public class OutboundServiceImpl implements OutboundService{
 		Object updown=map.get("updown");
 		Object date=map.get("date");
 		if(line!=null){
-				 sql +=" and line like '%"+line.toString()+"%'";
+				 sql +=" and line like '%"+line.toString().trim()+"%'";
  
 		}
  
@@ -174,10 +174,9 @@ public class OutboundServiceImpl implements OutboundService{
 			Date datess = new Date(d1);
 			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
 			String sk=new SimpleDateFormat("HH:mm").format(datess);
-			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
-					+ "   real_exec_date='"+dates+"' ";
-//							+ "and fcsj_actual > '"+sk+"' ";
-//							+ "and '"+sk+"' <dfsj";
+			String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
+					+ "  from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
 			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
 			        new RowMapper<ScheduleRealInfo>(){  
 			            @Override  
@@ -46,7 +46,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 		Object date=map.get("date");
  
 		if(line!=null){
-			sql +=" and line like'%"+line.toString()+"%'";
+			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
  
 		if(nbbm!=null){
@@ -125,7 +125,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 		Object date=map.get("date");
  
 		if(line!=null){
-			sql +=" and line like'%"+line.toString()+"%'";
+			sql +=" and line like'%"+line.toString().trim()+"%'";
 		}
  
 		if(nbbm!=null){
@@ -177,10 +177,9 @@ public class SpeedingServiceImpl implements SpeedingService {
 			Date datess = new Date(d1);
 			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
 			String sk=new SimpleDateFormat("HH:mm").format(datess);
-			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
-					+ "   real_exec_date='"+dates+"' ";
-//							+ "and fcsj_actual > '"+sk+"' ";
-//							+ "and '"+sk+"' <dfsj";
+			String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
+					+ "  from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
 			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
 			        new RowMapper<ScheduleRealInfo>(){  
 			            @Override  
@@ -31,7 +31,7 @@ public interface FormsService {
  
 	public List<Singledata> singledata(Map<String, Object> map);
  
-	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line,String data);
+	public List<Vehicleloading> vehicleloading(String line,String data);
  
 	public List<Operationservice> operationservice(Map<String, Object> map);
  
@@ -25,7 +25,9 @@ import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.mcy_forms.Turnoutrate;
 import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.data.BasicData;
 import com.bsth.entity.mcy_forms.Allline;
@@ -55,6 +57,9 @@ public class FormsServiceImpl implements FormsService {
  
 	@Autowired
 	CulateMileageService culateMileageService;
+	
+	@Autowired
+	YlbRepository ylbRepository; 
  
 	// 行车路单日报表
 	@Override
@@ -417,7 +422,19 @@ public class FormsServiceImpl implements FormsService {
 	// 路单数据
 	@Override
 	public List<Singledata> singledata(Map<String, Object> map) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		
+		String gsdm="";
+		if(map.get("gsdmSing")!=null){
+			gsdm=map.get("gsdmSing").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdmSing")!=null){
+			fgsdm=map.get("fgsdmSing").toString();
+		}
+		
+		String xlbm=map.get("line").toString().trim();
+		
+		/*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		Date d = null;
 		Date d1 = null;
@@ -429,60 +446,92 @@ public class FormsServiceImpl implements FormsService {
 			e.printStackTrace();
 		}
 		String rq2 = sdf1.format(d);
-		String rq3 = sdf1.format(d1);
+		String rq3 = sdf1.format(d1);*/
  
-		rq = rq2 + "-" + rq3;
+//		rq = rq2 + "-" + rq3;
 		startDate = map.get("startDate").toString();
-		endDate = map.get("endDate").toString();
-		String sql = "select t.*,y.yh,y.jzl from ("
-				+ " select r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
-				+ " from bsth_c_s_sp_info_real r  where r.schedule_date_str "
-				+ " BETWEEN '"+startDate+"'  and '"+endDate+"'  and r.xl_bm='"+map.get("line").toString()+"'  "
-				+ " AND r.gs_bm is not null and r.gs_bm='"+map.get("gsdmSing").toString()+"' "
-				+ " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'  "
-				+ " group by r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm) t "
-				+ " LEFT JOIN (select a.nbbm,a.jsy,SUM(a.yh) as yh,SUM(a.jzl) as jzl "
-				+ " from bsth_c_ylb a where  a.rq BETWEEN '"+startDate+"'  and '"+endDate+"'and "
-				+ " a.ssgsdm='"+map.get("gsdmSing").toString()+"' and a.fgsdm='"+map.get("fgsdmSing").toString()+"' "
-				+ "group by  a.nbbm,a.jsy) y"
-				+ " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
+//		endDate = map.get("endDate").toString();
+//		String sql = "select t.*,y.yh,y.jzl from ("
+//				+ " select r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+//				+ " from bsth_c_s_sp_info_real r  where r.schedule_date_str "
+//				+ " BETWEEN '"+startDate+"'  and '"+endDate+"'  and r.xl_bm='"+map.get("line").toString()+"'  "
+//				+ " AND r.gs_bm is not null and r.gs_bm='"+map.get("gsdmSing").toString()+"' "
+//				+ " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'  "
+//				+ " group by r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm) t "
+//				+ " LEFT JOIN (select a.nbbm,a.jsy,SUM(a.yh) as yh,SUM(a.jzl) as jzl "
+//				+ " from bsth_c_ylb a where  a.rq BETWEEN '"+startDate+"'  and '"+endDate+"'and "
+//				+ " a.ssgsdm='"+map.get("gsdmSing").toString()+"' and a.fgsdm='"+map.get("fgsdmSing").toString()+"' "
+//				+ "group by  a.nbbm,a.jsy) y"
+//				+ " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
  
+		String sql="select r.s_gh,r.s_name, "
+				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
+		if(xlbm.equals("")){
+			sql +="and r.gs_bm='"+gsdm+"' "
+					+ " and r.fgs_bm='"+fgsdm+"'";
+		}else{
+			sql += " and r.xl_bm = '"+xlbm+"'";
+		}
+	       sql += " group  by  r.s_gh,r.s_name,"
+	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
+	
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			@Override
 			public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Singledata sin = new Singledata();
-				sin.setrQ(rq);
-				sin.setgS(arg0.getString("gs_bm"));
+				sin.setrQ(startDate);
 				sin.setxL(arg0.getString("xl_name"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
 				sin.setjName(arg0.getString("j_name"));
-				sin.setHyl(arg0.getString("YH"));
-				sin.setJzl(arg0.getString("JZL"));
-				// sin.setJzl(arg0.getString(""));//非营业性用油
-				sin.setJhjl(arg0.getString("JZL"));
+				sin.setSgh(arg0.getString("s_gh"));
+				sin.setsName(arg0.getString("s_name"));
+				sin.setgS(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs_bm")+"_"+arg0.getString("gs_bm")));
  
 				return sin;
 			}
 		});
-		DecimalFormat df = new DecimalFormat("0.00");
-			for(int i=0;i<list.size();i++){
-				
-				Singledata si=list.get(i);
-				si.setgS(BasicData.businessCodeNameMap.get(si.getgS()));
-				si.setJzl(df.format(Double.parseDouble(si.getJzl())));
-				si.setHyl(df.format(Double.parseDouble(si.getHyl())));
-				Map<String, Object> maps = new HashMap<>();
-				maps = commonService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
-						endDate);
-				//sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
-				si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
-				si.setsName(maps.get("s_name") == null ? "" : maps.get("s_name").toString());
-				si.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
-				si.setEmptMileage(maps.get("ksgl") == null ? "" : maps.get("ksgl").toString());
-				si.setJhjl(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
  
+		List<Ylb> listYlb= ylbRepository.obtainYl(startDate, gsdm, fgsdm, xlbm, "", "xlbm");
+		List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, startDate);
+		for (int i = 0; i < list.size(); i++) {
+			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+			Singledata sin=list.get(i);
+			String jsy=sin.getJsy();
+			String clzbh=sin.getClzbh();
+			for (int j = 0; j < listReal.size(); j++) {
+				ScheduleRealInfo s=listReal.get(j);
+				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)){
+					newList.add(s);
+				}
+			}
+			
+			double jhgl=culateMileageService.culateJhgl(newList);
+			double yygl=culateMileageService.culateSjgl(newList);
+			double ljgl=culateMileageService.culateLjgl(newList);
+			double ksgl=culateMileageService.culateKsgl(newList);
+			double jcgl=culateMileageService.culateJccgl(newList);
+			double zyygl=Arith.add(yygl, ljgl);
+			double zksgl=Arith.add(ksgl, jcgl);
+			sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+			sin.setEmptMileage(String.valueOf(zksgl));
+			sin.setJhjl(String.valueOf(jhgl));
+			double yhl=0.0;
+			double jzl=0.0;
+			double fyy=0.0;
+			for (int j = 0; j < listYlb.size(); j++) {
+				Ylb y=listYlb.get(j);
+				if(y.getJsy().equals(jsy) && y.getNbbm().equals(clzbh)){
+					yhl=Arith.add(yhl, y.getYh()==null?0:y.getYh());
+					jzl=Arith.add(jzl, y.getJzl()==null?0:y.getJzl());
+					fyy=Arith.add(fyy, y.getSh()==null?0:y.getSh());
+				}
+			}
+			sin.setHyl(String.valueOf(yhl));
+			sin.setJzl(String.valueOf(jzl));
+			sin.setUnyyyl(String.valueOf(fyy));
 		}
 		return list;
 	}
@@ -545,50 +594,72 @@ public class FormsServiceImpl implements FormsService {
  
 	// 车辆加注
 	@Override
-	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line, String date) {
+	public List<Vehicleloading> vehicleloading(String line, String date) {
  
-		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type  " 
-		        + "  FROM bsth_c_s_sp_info_real r "
-		        + " INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y "
-		        + " where to_days(y.RQ)=to_days('" + date + "')  and y.XLBM= '" + line + "'  GROUP BY  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH) y "
-		        + " on r.cl_zbh=y.nbbm "
-				+ "  where to_days(r.schedule_date_str)=to_days('" + date + "')" 
-		        + "  and r.xl_bm='" + line + "' "
-		        + " AND r.gs_bm is not null"
-		        + " and r.bc_type not in('in','out')";
-		if(gsdmVehic.toString()!=""){
-			sql+=" and r.gs_bm='"+gsdmVehic+"'";
-		}
-		if(fgsdmVehic.toString()!=""){
-			sql+=" and r.fgs_bm='"+fgsdmVehic +"'";
-		}
-			sql	+= "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
+		String sql="select r.s_gh,r.s_name, "
+				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+date+"' "
+						+ " and r.xl_bm = '"+line+"' group  by  r.s_gh,r.s_name,"
+	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
+	
 		List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
 			@Override
 			public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Vehicleloading ve = new Vehicleloading();
-				ve.setrQ(arg0.getString("schedule_date_str"));
-				ve.setgS(arg0.getString("gs_name"));
+				ve.setgS(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs_bm")+"_"+arg0.getString("gs_bm")));
 				ve.setxL(arg0.getString("xl_name"));
 				ve.setClzbh(arg0.getString("cl_zbh"));
-				ve.setJzl(arg0.getString("JZL"));
-				ve.setHyl(arg0.getString("YH"));
-				// ve.setLs(arg0.getString("").toString());//尿素
 				ve.setJgh(arg0.getString("j_gh").toString());
 				return ve;
 			}
 		});
  
-		for(int i=0;i<list.size();i++){
-			Vehicleloading v=list.get(i);
-			Map<String, Object> maps = new HashMap<>();
-			maps = commonService.findKMBC2(v.getJgh(), v.getClzbh(),
-					v.getrQ());
-			v.setJhlc(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
-			v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
-			v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
-		}
  
+		List<Ylb> listYlb= ylbRepository.obtainYl(startDate, "", "", line, "", "xlbm");
+		List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+		for (int i = 0; i < list.size(); i++) {
+			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+			Vehicleloading sin=list.get(i);
+			sin.setrQ(date);
+			String jsy=sin.getJgh();
+			String clzbh=sin.getClzbh();
+			for (int j = 0; j < listReal.size(); j++) {
+				ScheduleRealInfo s=listReal.get(j);
+				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)){
+					newList.add(s);
+				}
+			}
+			
+			int jhbc=culateMileageService.culateJhbc(newList, "");
+			int sjbc=culateMileageService.culateSjbc(newList, "");
+			int ljbc=culateMileageService.culateLjbc(newList, "");
+			double yygl=culateMileageService.culateSjgl(newList);
+			double ljgl=culateMileageService.culateLjgl(newList);
+			double ksgl=culateMileageService.culateKsgl(newList);
+			double jcgl=culateMileageService.culateJccgl(newList);
+			double zyygl=Arith.add(yygl, ljgl);
+			double zksgl=Arith.add(ksgl, jcgl);
+			sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+			sin.setJhbc(String.valueOf(jhbc));
+			sin.setSjbc(String.valueOf(sjbc+ljbc));
+			double yhl=0.0;
+			double jzl=0.0;
+			double fyy=0.0;
+			double ns=0.0;
+			for (int j = 0; j < listYlb.size(); j++) {
+				Ylb y=listYlb.get(j);
+				if(y.getJsy().equals(jsy) && y.getNbbm().equals(clzbh)){
+					yhl=Arith.add(yhl, y.getYh()==null?0:y.getYh());
+					jzl=Arith.add(jzl, y.getJzl()==null?0:y.getJzl());
+					fyy=Arith.add(fyy, y.getSh()==null?0:y.getSh());
+					ns =Arith.add(ns, y.getNs()==null?0:y.getNs());
+				}
+			}
+			sin.setHyl(String.valueOf(yhl));
+			sin.setJzl(String.valueOf(jzl));
+			sin.setUnyyyl(String.valueOf(fyy));
+			sin.setLs(String.valueOf(ns));
+		}
 		return list;
 	}
  
@@ -816,7 +887,7 @@ public class FormsServiceImpl implements FormsService {
 		}
  
 		String fgsbm="";
-		if(map.get("fgsdmDaily").toString()!=null){
+		if(map.get("fgsdmDaily")!=null){
 			fgsbm=map.get("fgsdmDaily").toString();
 		}
  
@@ -853,6 +924,12 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			sList =new ArrayList<ScheduleRealInfo>();
 			Daily d=list.get(i);
+			if(d.getYh()==null){
+				d.setYh("0");
+			}else{
+				if(d.getYh().equals(""))
+					d.setYh("0");
+			}
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
 				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
-package com.bsth.service.realcontrol;
-
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/4/18.
- */
-public interface DataManagerService {
-
-    Map<String, Object> carInfos(Integer lineId);
-
-    Map<String,Object> updateDevices(String jsonStr);
-}
+package com.bsth.service.realcontrol;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/4/18.
+ */
+public interface DataManagerService {
+
+    Map<String, Object> carInfos(Integer lineId);
+
+    Map<String,Object> updateDevices(String jsonStr);
+}
@@ -161,4 +161,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	void lpChange(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type);
  
     Map<String,Object> revokeRealArrive(Long id);
+
+    Map<String,Object> lateAdjust(String idx, float minute);
+
+    List<ScheduleRealInfo> allLate2(String idx);
 }
-package com.bsth.service.realcontrol.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
-import com.bsth.entity.Cars;
-import com.bsth.repository.CarsRepository;
-import com.bsth.service.realcontrol.DataManagerService;
-import com.bsth.util.db.DBUtils_oldSystem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/4/18.
- */
-@Service
-public class DataManagerServiceImpl implements DataManagerService{
-
-    @Autowired
-    CarsRepository carsRepository;
-
-    @Autowired
-    JdbcTemplate controlJdbcTemp;
-
-    @Autowired
-    BasicData.BasicDataLoader dataLoader;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public Map<String, Object> carInfos(Integer lineId) {
-
-        Map<String, Object> rs = new HashMap<>();
-        try {
-            List<Map<String, String>> nowData = new ArrayList<>();
-            List<Map<String, String>> oldData = new ArrayList<>();
-            Map<String, String> map;
-
-            //查询新系统车辆信息
-            List<Cars> list = carsRepository.findCarsByLineId(lineId);
-            for(Cars c : list){
-                map = new HashMap<>();
-                map.put("nbbm", c.getInsideCode());
-                map.put("device", c.getEquipmentCode());
-                nowData.add(map);
-            }
-
-            //获取老系统数据
-            JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
-            List<Map<String, Object>> oyList = jdbcTemplate.queryForList("select NBBM,SBBH from JJWGPS_T_CLXXB t where xlbm=?", BasicData.lineId2CodeMap.get(lineId));
-            for(Map<String, Object> tempMap : oyList){
-                map = new HashMap<>();
-                map.put("nbbm", tempMap.get("NBBM").toString());
-                map.put("device", tempMap.get("SBBH").toString());
-                oldData.add(map);
-            }
-
-            rs.put("status", ResponseCode.SUCCESS);
-            rs.put("nows", nowData);
-            rs.put("olds", oldData);
-        }catch (Exception e){
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-            rs.put("msg", e.getMessage());
-        }
-
-        return rs;
-    }
-
-    /**
-     * 更新设备号
-     * @param jsonStr
-     * @return
-     */
-    @Override
-    public Map<String, Object> updateDevices(String jsonStr) {
-        Map<String, Object> rs = new HashMap<>();
-        try {
-            int count=0;
-            JSONArray array = JSONArray.parseArray(jsonStr);
-            JSONObject jObj;
-            for(int i = 0; i < array.size(); i ++){
-                jObj = array.getJSONObject(i);
-                count += controlJdbcTemp.update("update bsth_c_cars set equipment_code=? where inside_code=?"
-                        , jObj.getString("device"), jObj.getString("nbbm"));
-            }
-
-            //刷新缓存
-            dataLoader.loadDeviceInfo();
-            rs.put("status", ResponseCode.SUCCESS);
-            rs.put("count", count);
-        }catch (Exception e){
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-            rs.put("msg", e.getMessage());
-        }
-        return rs;
-    }
-}
+package com.bsth.service.realcontrol.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
+import com.bsth.entity.Cars;
+import com.bsth.repository.CarsRepository;
+import com.bsth.service.realcontrol.DataManagerService;
+import com.bsth.util.db.DBUtils_oldSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/4/18.
+ */
+@Service
+public class DataManagerServiceImpl implements DataManagerService{
+
+    @Autowired
+    CarsRepository carsRepository;
+
+    @Autowired
+    JdbcTemplate controlJdbcTemp;
+
+    @Autowired
+    BasicData.BasicDataLoader dataLoader;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public Map<String, Object> carInfos(Integer lineId) {
+
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            List<Map<String, String>> nowData = new ArrayList<>();
+            List<Map<String, String>> oldData = new ArrayList<>();
+            Map<String, String> map;
+
+            //查询新系统车辆信息
+            List<Cars> list = carsRepository.findCarsByLineId(lineId);
+            for(Cars c : list){
+                map = new HashMap<>();
+                map.put("nbbm", c.getInsideCode());
+                map.put("device", c.getEquipmentCode());
+                nowData.add(map);
+            }
+
+            //获取老系统数据
+            JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
+            List<Map<String, Object>> oyList = jdbcTemplate.queryForList("select NBBM,SBBH from JJWGPS_T_CLXXB t where xlbm=?", BasicData.lineId2CodeMap.get(lineId));
+            for(Map<String, Object> tempMap : oyList){
+                map = new HashMap<>();
+                map.put("nbbm", tempMap.get("NBBM").toString());
+                map.put("device", tempMap.get("SBBH").toString());
+                oldData.add(map);
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("nows", nowData);
+            rs.put("olds", oldData);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+
+        return rs;
+    }
+
+    /**
+     * 更新设备号
+     * @param jsonStr
+     * @return
+     */
+    @Override
+    public Map<String, Object> updateDevices(String jsonStr) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            int count=0;
+            JSONArray array = JSONArray.parseArray(jsonStr);
+            JSONObject jObj;
+            for(int i = 0; i < array.size(); i ++){
+                jObj = array.getJSONObject(i);
+                count += controlJdbcTemp.update("update bsth_c_cars set equipment_code=? where inside_code=?"
+                        , jObj.getString("device"), jObj.getString("nbbm"));
+            }
+
+            //刷新缓存
+            dataLoader.loadDeviceInfo();
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("count", count);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
+}
@@ -13,6 +13,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
@@ -176,6 +177,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             schedule.setDfsjAll(dfsj);
             schedule.addRemarks(remarks);
  
+            //取消应发未到标记
+            if(schedule.isLate2()){
+                schedule.setLate2(false);
+                LateAdjustHandle.remove(schedule);
+            }
+
             List<ScheduleRealInfo> ts = new ArrayList<>();
             ts.add(schedule);
             //调整终点时间和下一个班次的应到时间
@@ -826,9 +833,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             sch.setFcsjActualAll(fcsjActual);
             sch.addRemarks(remarks);
             sch.calcStatus();
+            if(sch.isLate2()){
+                //取消应发未到标记
+                sch.setLate2(false);
+                LateAdjustHandle.remove(sch);
+            }
  
             dayOfSchedule.save(sch);
-            //scheduleRealInfoRepository.save(sch);
  
             ts.add(sch);
  
@@ -1015,8 +1026,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         t = fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + fcsjActual);
  
                     //调整实发
-                    if (!fcsjActual.equals(sch.getFcsjActual()))
+                    if (!fcsjActual.equals(sch.getFcsjActual())){
                         sch.setFcsjActualAll(t);
+
+                        //取消应发未到标记
+                        if(sch.isLate2()){
+                            sch.setLate2(false);
+                            LateAdjustHandle.remove(sch);
+                        }
+                    }
                 } else {
                     //撤销实发
                     if (sch.getFcsjActual() != null)
@@ -1107,6 +1125,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 //重新计算是否误点
                 schedule.reCalcLate();
  
+                //取消应发未到标记
+                if(schedule.isLate2()){
+                    schedule.setLate2(false);
+                    LateAdjustHandle.remove(schedule);
+                }
                 dayOfSchedule.save(schedule);
             }
  
@@ -4093,4 +4116,53 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> lateAdjust(String idx, float minute) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            int count = 0;
+            List<ScheduleRealInfo> list = new ArrayList<>();
+            List<String> ids = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(idx);
+
+            ScheduleRealInfo sch;
+            for(String id : ids){
+                sch = dayOfSchedule.get(Long.parseLong(id));
+                if(sch != null && sch.getStatus() == 0){
+                    if(minute > 0){
+                        sch.setLateMinute(minute);
+                    }
+                    else if(minute == 0){
+                        LateAdjustHandle.remove(sch);
+                    }
+                    count ++;
+                    list.add(sch);
+                }
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("count", count);
+            rs.put("ts", list);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+
+        return rs;
+    }
+
+    @Override
+    public List<ScheduleRealInfo> allLate2(String idx) {
+        List<ScheduleRealInfo> rs = new ArrayList<>();
+        List<String> ids = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(idx);
+
+        Collection<ScheduleRealInfo> all = LateAdjustHandle.allLateSch();
+        for(ScheduleRealInfo sch : all){
+            if(ids.indexOf(sch.getXlBm()) != -1){
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
 }
 \ No newline at end of file
-package com.bsth.util.db;
-
-import com.mchange.v2.c3p0.DataSources;
-import org.apache.log4j.Logger;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 老系统数据库连接池（保持少量的连接，不会对老系统有什么影响）
- * @author PanZhao
- *
- */
-//@Component
-public class DBUtils_oldSystem {
-
-	private static String url = null;
-
-	private static String username = null;
-
-	private static String pwd = null;
-
-	private static DataSource ds_pooled;
-
-	static Logger logger = Logger.getLogger(DBUtils_oldSystem.class);
-	
-	static {
-
-		try {
-			// 1. 加载驱动类
-			Class.forName("oracle.jdbc.driver.OracleDriver");
-
-			url = "jdbc:oracle:thin:@10.10.200.225:1521:orcl";
-			username = "jjwgps";
-			pwd = "jjwgps";
-
-			// 设置连接数据库的配置信息
-			DataSource ds_unpooled = DataSources.unpooledDataSource(url,
-					username, pwd);
-
-			Map<String, Object> pool_conf = new HashMap<String, Object>();
-			// 设置最大连接数
-			pool_conf.put("maxPoolSize", 5);
-			
-			pool_conf.put("testConnectionOnCheckout", false);
-			//异步检测连接的有效性
-			pool_conf.put("testConnectionOnCheckin", true);
-			//10分钟检测一次
-			pool_conf.put("idleConnectionTestPeriod", 60 * 10);
-			ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
-		}  catch (ClassNotFoundException e) {
-			logger.error(e.toString());
-			e.printStackTrace();
-		} catch (SQLException e) {
-			logger.error("初始化老系统连接池失败，非正式环境请忽略这个问题！");
-			logger.error(e.toString());
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 获取连接对象
-	 */
-	public static Connection getConnection() throws SQLException {
-		return ds_pooled.getConnection();
-	}
-
-	/**
-	 * 释放连接池资源
-	 */
-	public static void clearup() {
-		if (ds_pooled != null) {
-			try {
-				DataSources.destroy(ds_pooled);
-			} catch (SQLException e) {
-				logger.error(e.toString());
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * 资源关闭
-	 * 
-	 * @param rs
-	 * @param stmt
-	 * @param conn
-	 */
-	public static void close(ResultSet rs, Statement stmt, Connection conn) {
-		if (rs != null) {
-			try {
-				rs.close();
-			} catch (SQLException e) {
-				logger.error(e.toString());
-				e.printStackTrace();
-			}
-		}
-
-		if (stmt != null) {
-			try {
-				stmt.close();
-			} catch (SQLException e) {
-				logger.error(e.toString());
-				e.printStackTrace();
-			}
-		}
-
-		if (conn != null) {
-			try {
-				conn.close();
-			} catch (SQLException e) {
-				logger.error(e.toString());
-				e.printStackTrace();
-			}
-		}
-	}
-
-	public static DataSource getDataSource(){
-		return ds_pooled;
-	}
-}
+package com.bsth.util.db;
+
+import com.mchange.v2.c3p0.DataSources;
+import org.apache.log4j.Logger;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 老系统数据库连接池（保持少量的连接，不会对老系统有什么影响）
+ * @author PanZhao
+ *
+ */
+//@Component
+public class DBUtils_oldSystem {
+
+	private static String url = null;
+
+	private static String username = null;
+
+	private static String pwd = null;
+
+	private static DataSource ds_pooled;
+
+	static Logger logger = Logger.getLogger(DBUtils_oldSystem.class);
+	
+	static {
+
+		try {
+			// 1. 加载驱动类
+			Class.forName("oracle.jdbc.driver.OracleDriver");
+
+			url = "jdbc:oracle:thin:@10.10.200.225:1521:orcl";
+			username = "jjwgps";
+			pwd = "jjwgps";
+
+			// 设置连接数据库的配置信息
+			DataSource ds_unpooled = DataSources.unpooledDataSource(url,
+					username, pwd);
+
+			Map<String, Object> pool_conf = new HashMap<String, Object>();
+			// 设置最大连接数
+			pool_conf.put("maxPoolSize", 5);
+			
+			pool_conf.put("testConnectionOnCheckout", false);
+			//异步检测连接的有效性
+			pool_conf.put("testConnectionOnCheckin", true);
+			//10分钟检测一次
+			pool_conf.put("idleConnectionTestPeriod", 60 * 10);
+			ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
+		}  catch (ClassNotFoundException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (SQLException e) {
+			logger.error("初始化老系统连接池失败，非正式环境请忽略这个问题！");
+			logger.error(e.toString());
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 获取连接对象
+	 */
+	public static Connection getConnection() throws SQLException {
+		return ds_pooled.getConnection();
+	}
+
+	/**
+	 * 释放连接池资源
+	 */
+	public static void clearup() {
+		if (ds_pooled != null) {
+			try {
+				DataSources.destroy(ds_pooled);
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * 资源关闭
+	 * 
+	 * @param rs
+	 * @param stmt
+	 * @param conn
+	 */
+	public static void close(ResultSet rs, Statement stmt, Connection conn) {
+		if (rs != null) {
+			try {
+				rs.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (stmt != null) {
+			try {
+				stmt.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (conn != null) {
+			try {
+				conn.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public static DataSource getDataSource(){
+		return ds_pooled;
+	}
+}
@@ -176,7 +176,7 @@ public class SendUtils{
 	public void deviceOffline(GpsEntity gps){
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "deviceOffline");
-		map.put("gps", gps);;
+		map.put("gps", gps);
 		ObjectMapper mapper = new ObjectMapper();
  
 		try {
@@ -199,4 +199,26 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
+
+	/**
+	 * 通知客户端，开始进行误点调整
+	 * @param sch
+	 */
+	public void sendAutoWdtz(ScheduleRealInfo sch, ScheduleRealInfo cancel){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "auto_wdtz");
+		map.put("id", sch.getId());
+		if(cancel != null)
+			map.put("cancelId", cancel.getId());
+		map.put("lineCode", sch.getXlBm());
+		map.put("minute", sch.getLateMinute());
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToLine(sch.getXlBm() ,mapper.writeValueAsString(map));
+
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
+	}
 }
@@ -204,6 +204,6 @@ function createVehSearch($e){
 				return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
 		   }
 		}
-	})
+	});
 	return $e;
 }
@@ -92,8 +92,7 @@
  
 <script>
 	$(function(){
-		var reqCodeMap = {"0xA1": '请求恢复运营', "0xA2": '申请调档', "0xA3": '出场请求', "0xA5": '进场请求', "0xA7": '加油请求', "0x50": '车辆故障', "0x70": '路阻报告', "0x60": '事故报告', "0x11": '扣证纠纷', "0x12" : '报警'};
-		var fage=false;
+		
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -102,6 +101,7 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		var fage=false;
 		var xlList;
 		var obj = [];
  
@@ -551,7 +551,7 @@ letter-spacing: 20px;
 				<td>{{obj.fast}}</td>
 				<td>{{obj.slow}}</td>
 				<td>{{obj.fcsj}}</td>
-				<td style="word-break: keep-all;white-space:nowrap;">{{obj.fcsjActual}}
+				<td>{{obj.fcsjActual}}
 				{{if obj.bcType== "in"}}
 						(进)
 					{{/if}}
@@ -42,19 +42,20 @@
 							class="form-control" name="subCompany" id="fgsdmOperat"
 							style="width: 140px;"></select>
 					</div>  
-					<div style="display: inline-block;">
+					<div style="margin-top: 2px"></div>
+					<div style="display: inline-block;margin-left: 33px;">
 						<span class="item-label" style="width: 80px;">线路: </span> <select
-							class="form-control" name="line" id="line" style="width: 180px;"></select>
+							class="form-control" name="line" id="line" style="width: 140px;"></select>
 					</div>
 					<div style="display: inline-block; margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span> <input
 							class="form-control" type="text" id="startDate"
-							style="width: 120px;" />
+							style="width: 140px;" />
 					</div>
 					<div style="display: inline-block; margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">结束时间: </span> <input
 							class="form-control" type="text" id="endDate"
-							style="width: 120px;" />
+							style="width: 140px;" />
 					</div>
 					<div style="display: inline-block; margin-left: 15px">
 						<span class="item-label" style="width: 150px;">统计： </span>
@@ -102,69 +103,94 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#startDate").val(year + "-" + month + "-" + day);
+		$("#endDate").val(year + "-" + month + "-" + day);
  
-		$.get('/basic/lineCode2Name', function(result) {
-			var data = [];
-
-			for ( var code in result) {
-				data.push({
-					id : code,
-					text : result[code]
-				});
-			}
-			initPinYinSelect2('#line', data, '');
-
-		})
-
+		var fage=false;
+		var xlList;
 		var obj = [];
-		$.get('/user/companyData', function(result) {
-			obj = result;
-			var options = '';
-			for (var i = 0; i < obj.length; i++) {
-				options += '<option value="'+obj[i].companyCode+'">'
-						+ obj[i].companyName + '</option>';
-			}
-
-			if (obj.length == 0) {
-				$("#gsdmDiv_operat").css('display', 'none');
-				$('#fgsdmDiv_operat').css('display', 'none');
-			} else if (obj.length == 1) {
-				$("#gsdmDiv_operat").css('display', 'none');
-				if (obj[0].children.length == 1 || obj[0].children.length == 0)
-					$('#fgsdmDiv_operat').css('display', 'none');
-			}
-			$('#gsdmOperat').html(options);
-			updateCompany();
-		});
-
-		$("#gsdmOperat").on("change", updateCompany);
-		function updateCompany() {
+		
+		 
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv_operat").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv_operat").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv_operat').css('display','none');
+				}
+				$('#gsdmOperat').html(options);
+				updateCompany();
+			});
+		})
+		$("#gsdmOperat").on("change",updateCompany);
+		function updateCompany(){
 			var company = $('#gsdmOperat').val();
 			var options = '';
-			for (var i = 0; i < obj.length; i++) {
-				if (obj[i].companyCode == company) {
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
 					var children = obj[i].children;
-					for (var j = 0; j < children.length; j++) {
-						options += '<option value="'+children[j].code+'">'
-								+ children[j].name + '</option>';
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
 					}
 				}
 			}
 			$('#fgsdmOperat').html(options);
+			initXl();
 		}
  
-		$.get('/basic/lineCode2Name', function(result) {
-			var data = [];
-
-			for ( var code in result) {
-				data.push({
-					id : code,
-					text : result[code]
-				});
+		/* $.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
 			}
-			initPinYinSelect2('#line', data, '');
-
-		})
+			initPinYinSelect2('#line',data,'');
+			
+		}) */
+		
+		$("#fgsdmOperat").on("change",initXl);
+		function initXl(){
+			var data=[];
+			if(fage){
+				$("#line").select2("destroy").html('');
+			}
+			var fgs=$('#fgsdmOperat').val();
+			var gs=$('#gsdmOperat').val();
+			for(var i=0;i<xlList.length;i++){
+				if(gs!=""){
+					if(fgs!=""){
+						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}else{
+						if(xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#line',data,'');
+			fage=true;
+		}
+		
  
 		$("#query").on(
 				"click",
@@ -37,18 +37,14 @@
 						<select class="form-control" name="subCompany" id="fgsdmSing" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;">线路: </span>
-                        <select class="form-control" name="line" id="line" style="width: 136px;"></select>
+                        <span class="item-label" style="width: 80px;">&nbsp;线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
-                    <div style="margin-top: 10px"></div>
                     <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">开始时间: </span>
-                        <input class="form-control" type="text" id="startDate" style="width: 120px;"/>
-                    </div>
-                    <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">结束时间: </span>
-                        <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
+                        <span class="item-label" style="width: 140px;">时间: </span>
+                        <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
                     </div>
+                    
                     <div style="display: inline-block;margin-left: 15px">
                         <span class="item-label" style="width: 150px;">统计： </span>
                     </div>
@@ -101,26 +97,31 @@
 			locale : 'zh-cn'
 		});
  
+		var fage=false;
+		var xlList;
 		var obj = [];
-		$.get('/user/companyData', function(result){
-			obj = result;
-			var options = '';
-			for(var i = 0; i < obj.length; i++){
-				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-			}
-			
-			if(obj.length ==0){
-				 $("#gsdmDiv_sing").css('display','none');
-				 $('#fgsdmDiv_sing').css('display','none');
-			}else if(obj.length ==1){
-				 $("#gsdmDiv_sing").css('display','none');
-				if(obj[0].children.length == 1  || obj[0].children.length ==0)
-					$('#fgsdmDiv_sing').css('display','none');
-			}
-			$('#gsdmSing').html(options);
-			updateCompany();
-		});
-
+		
+		 
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv_sing").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv_sing").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv_sing').css('display','none');
+				}
+				$('#gsdmSing').html(options);
+				updateCompany();
+			});
+		})
 		$("#gsdmSing").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdmSing').val();
@@ -134,10 +135,10 @@
 				}
 			}
 			$('#fgsdmSing').html(options);
+			initXl();
 		}
  
-		
-		$.get('/basic/lineCode2Name',function(result){
+		/* $.get('/basic/lineCode2Name',function(result){
 			var data=[];
  
 			for(var code in result){
@@ -145,19 +146,41 @@
 			}
 			initPinYinSelect2('#line',data,'');
  
-		})
+		}) */
+		
+		$("#fgsdmSing").on("change",initXl);
+		function initXl(){
+			var data=[];
+			if(fage){
+				$("#line").select2("destroy").html('');
+			}
+			var fgs=$('#fgsdmSing').val();
+			var gs=$('#gsdmSing').val();
+			for(var i=0;i<xlList.length;i++){
+				if(gs!=""){
+					if(fgs!=""){
+						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}else{
+						if(xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#line',data,'');
+			fage=true;
+		}
  
  
 		$("#query").on("click",function(){
 		    var line = $("#line").val();
 		    var startDate = $("#startDate").val();
-		    var endDate = $("#endDate").val();
 		    var lpName = $("#lpName").val(); 
 		    var gsdmSing = $("#gsdmSing").val();
-		    var fgsdmSing = $("#fgsdmSing").val(); 
-		   	$post("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){		        
-		   		$("#sDate").text(startDate);
-		        $("#eDate").text(endDate);
+		    var fgsdmSing = $("#fgsdmSing").val(); var params = {};
+		   	$get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName},function(result){		        
 		        var temp = {};
 		        var today_account = 0;
 		        temp["line"] = $("#line").text(); 	        
@@ -181,7 +204,7 @@
 			    var lpName = $("#lpName").val(); 
 			    var gsdmSing = $("#gsdmSing").val();
 			    var fgsdmSing = $("#fgsdmSing").val(); 
-			$post('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+			$get('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
 				window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
 			});
 		});
@@ -203,7 +226,7 @@
 			<td>{{obj.emptMileage}}</td>
  			<td>{{obj.hyl}}</td>
 			<td>{{obj.jzl}}</td>
-			<td>   </td>
+			<td>{{obj.unyyyl}}</td>
 			<td>{{obj.jhjl}}</td>
 		</tr>
 	{{/each}}
@@ -64,7 +64,7 @@
 								<th>耗油量(不含非营业性用油)</th>
 								<th>尿素</th>
 								<th>实际公里(含空放公里)</th>
-								<th>非商业性用油</th>
+								<th>非营业性用油</th>
 								<th>计划班次</th>
 								<th>实际班次</th>	
 							</tr>
@@ -89,26 +89,31 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		var fage=false;
+		var xlList;
+		var obj = [];
  
-		$.get('/user/companyData', function(result){
-			obj = result;
-			var options = '';
-			for(var i = 0; i < obj.length; i++){
-				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-			}
-			
-			if(obj.length ==0){
-				 $("#gsdmDiv_vehic").css('display','none');
-				 $('#fgsdmDiv_vehic').css('display','none');
-			}else if(obj.length ==1){
-				 $("#gsdmDiv_vehic").css('display','none');
-				if(obj[0].children.length == 1  || obj[0].children.length ==0)
-					$('#fgsdmDiv_vehic').css('display','none');
-			}
-			$('#gsdmVehic').html(options);
-			updateCompany();
-		});
-
+		 
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv_vehic").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv_vehic").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv_vehic').css('display','none');
+				}
+				$('#gsdmVehic').html(options);
+				updateCompany();
+			});
+		})
 		$("#gsdmVehic").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdmVehic').val();
@@ -122,9 +127,10 @@
 				}
 			}
 			$('#fgsdmVehic').html(options);
+			initXl();
 		}
- 
-		$.get('/basic/lineCode2Name',function(result){
+
+		/* $.get('/basic/lineCode2Name',function(result){
 			var data=[];
  
 			for(var code in result){
@@ -132,9 +138,33 @@
 			}
 			initPinYinSelect2('#line',data,'');
  
-		})
+		}) */
+		
+		$("#fgsdmVehic").on("change",initXl);
+		function initXl(){
+			var data=[];
+			if(fage){
+				$("#line").select2("destroy").html('');
+			}
+			var fgs=$('#fgsdmVehic').val();
+			var gs=$('#gsdmVehic').val();
+			for(var i=0;i<xlList.length;i++){
+				if(gs!=""){
+					if(fgs!=""){
+						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}else{
+						if(xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#line',data,'');
+			fage=true;
+		}
  
-
 		var line ;
 		var date ;
 	    var gsdmVehic ;
@@ -142,9 +172,9 @@
 		$("#query").on("click",function(){
 			line = $("#line").val();
 			date = $("#date").val();
-		    gsdmVehic = $("#gsdmVehic").val();
-			fgsdmVehic = $("#fgsdmVehic").val(); 
-			$post('/mcy_forms/vehicleloading',{line:line,data:date, gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic},function(result){
+// 		    gsdmVehic = $("#gsdmVehic").val();
+// 			fgsdmVehic = $("#fgsdmVehic").val(); 
+			$get('/mcy_forms/vehicleloading',{line:line,data:date},function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('vehicleloading',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -157,7 +187,7 @@
 			date = $("#date").val();
 		    gsdmVehic = $("#gsdmVehic").val();
 			fgsdmVehic = $("#fgsdmVehic").val();
-			$post('/mcy_export/vehicleloadingExport',{line:line,data:date,gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic,type:'export'},function(result){
+			$get('/mcy_export/vehicleloadingExport',{line:line,data:date,gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic,type:'export'},function(result){
 				window.open("/downloadFile/download?fileName=车辆加注"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -173,9 +203,9 @@
 			<td>{{obj.clzbh}}</td>
             <td>{{obj.jzl}}</td>
 			<td>{{obj.hyl}}</td>
-			<td>  </td>
+			<td>{{obj.ls}}</td>
 			<td>{{obj.jhlc}}</td>
-			<td>  </td>
+			<td>{{obj.unyyyl}}</td>
 			<td>{{obj.jhbc}}</td>
 			<td>{{obj.sjbc}}</td>
 		</tr>
@@ -199,7 +199,7 @@
             {{obj.rq}}
         </td>
         <td>
-            {{obj.gsname}}
+            {{obj.fgsname}}
         </td>
         <td>
             {{obj.xlname}}
-/* perfect-scrollbar v0.6.16 */
-.ps-container {
-  -ms-touch-action: auto;
-  touch-action: auto;
-  overflow: hidden !important;
-  -ms-overflow-style: none; }
-  @supports (-ms-overflow-style: none) {
-    .ps-container {
-      overflow: auto !important; } }
-  @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-    .ps-container {
-      overflow: auto !important; } }
-  .ps-container.ps-active-x > .ps-scrollbar-x-rail,
-  .ps-container.ps-active-y > .ps-scrollbar-y-rail {
-    display: block;
-    background-color: transparent; }
-  .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
-    background-color: #eee;
-    opacity: 0.9; }
-    .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
-      background-color: #999;
-      height: 11px; }
-  .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
-    background-color: #eee;
-    opacity: 0.9; }
-    .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
-      background-color: #999;
-      width: 11px; }
-  .ps-container > .ps-scrollbar-x-rail {
-    display: none;
-    position: absolute;
-    /* please don't change 'position' */
-    opacity: 0;
-    -webkit-transition: background-color .2s linear, opacity .2s linear;
-    -o-transition: background-color .2s linear, opacity .2s linear;
-    -moz-transition: background-color .2s linear, opacity .2s linear;
-    transition: background-color .2s linear, opacity .2s linear;
-    bottom: 0px;
-    /* there must be 'bottom' for ps-scrollbar-x-rail */
-    height: 15px; }
-    .ps-container > .ps-scrollbar-x-rail > .ps-scrollbar-x {
-      position: absolute;
-      /* please don't change 'position' */
-      background-color: #aaa;
-      -webkit-border-radius: 6px;
-      -moz-border-radius: 6px;
-      border-radius: 6px;
-      -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
-      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
-      -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
-      -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
-      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
-      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
-      bottom: 2px;
-      /* there must be 'bottom' for ps-scrollbar-x */
-      height: 6px; }
-    .ps-container > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x, .ps-container > .ps-scrollbar-x-rail:active > .ps-scrollbar-x {
-      height: 11px; }
-  .ps-container > .ps-scrollbar-y-rail {
-    display: none;
-    position: absolute;
-    /* please don't change 'position' */
-    opacity: 0;
-    -webkit-transition: background-color .2s linear, opacity .2s linear;
-    -o-transition: background-color .2s linear, opacity .2s linear;
-    -moz-transition: background-color .2s linear, opacity .2s linear;
-    transition: background-color .2s linear, opacity .2s linear;
-    right: 0;
-    /* there must be 'right' for ps-scrollbar-y-rail */
-    width: 15px; }
-    .ps-container > .ps-scrollbar-y-rail > .ps-scrollbar-y {
-      position: absolute;
-      /* please don't change 'position' */
-      background-color: #aaa;
-      -webkit-border-radius: 6px;
-      -moz-border-radius: 6px;
-      border-radius: 6px;
-      -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
-      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
-      -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
-      -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
-      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
-      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
-      right: 2px;
-      /* there must be 'right' for ps-scrollbar-y */
-      width: 6px; }
-    .ps-container > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y, .ps-container > .ps-scrollbar-y-rail:active > .ps-scrollbar-y {
-      width: 11px; }
-  .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
-    background-color: #eee;
-    opacity: 0.9; }
-    .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
-      background-color: #999;
-      height: 11px; }
-  .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
-    background-color: #eee;
-    opacity: 0.9; }
-    .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
-      background-color: #999;
-      width: 11px; }
-  .ps-container:hover > .ps-scrollbar-x-rail,
-  .ps-container:hover > .ps-scrollbar-y-rail {
-    opacity: 0.6; }
-  .ps-container:hover > .ps-scrollbar-x-rail:hover {
-    background-color: #eee;
-    opacity: 0.9; }
-    .ps-container:hover > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x {
-      background-color: #999; }
-  .ps-container:hover > .ps-scrollbar-y-rail:hover {
-    background-color: #eee;
-    opacity: 0.9; }
-    .ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y {
-      background-color: #999; }
+/* perfect-scrollbar v0.6.16 */
+.ps-container {
+  -ms-touch-action: auto;
+  touch-action: auto;
+  overflow: hidden !important;
+  -ms-overflow-style: none; }
+  @supports (-ms-overflow-style: none) {
+    .ps-container {
+      overflow: auto !important; } }
+  @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+    .ps-container {
+      overflow: auto !important; } }
+  .ps-container.ps-active-x > .ps-scrollbar-x-rail,
+  .ps-container.ps-active-y > .ps-scrollbar-y-rail {
+    display: block;
+    background-color: transparent; }
+  .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
+      background-color: #999;
+      height: 11px; }
+  .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
+      background-color: #999;
+      width: 11px; }
+  .ps-container > .ps-scrollbar-x-rail {
+    display: none;
+    position: absolute;
+    /* please don't change 'position' */
+    opacity: 0;
+    -webkit-transition: background-color .2s linear, opacity .2s linear;
+    -o-transition: background-color .2s linear, opacity .2s linear;
+    -moz-transition: background-color .2s linear, opacity .2s linear;
+    transition: background-color .2s linear, opacity .2s linear;
+    bottom: 0px;
+    /* there must be 'bottom' for ps-scrollbar-x-rail */
+    height: 15px; }
+    .ps-container > .ps-scrollbar-x-rail > .ps-scrollbar-x {
+      position: absolute;
+      /* please don't change 'position' */
+      background-color: #aaa;
+      -webkit-border-radius: 6px;
+      -moz-border-radius: 6px;
+      border-radius: 6px;
+      -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      bottom: 2px;
+      /* there must be 'bottom' for ps-scrollbar-x */
+      height: 6px; }
+    .ps-container > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x, .ps-container > .ps-scrollbar-x-rail:active > .ps-scrollbar-x {
+      height: 11px; }
+  .ps-container > .ps-scrollbar-y-rail {
+    display: none;
+    position: absolute;
+    /* please don't change 'position' */
+    opacity: 0;
+    -webkit-transition: background-color .2s linear, opacity .2s linear;
+    -o-transition: background-color .2s linear, opacity .2s linear;
+    -moz-transition: background-color .2s linear, opacity .2s linear;
+    transition: background-color .2s linear, opacity .2s linear;
+    right: 0;
+    /* there must be 'right' for ps-scrollbar-y-rail */
+    width: 15px; }
+    .ps-container > .ps-scrollbar-y-rail > .ps-scrollbar-y {
+      position: absolute;
+      /* please don't change 'position' */
+      background-color: #aaa;
+      -webkit-border-radius: 6px;
+      -moz-border-radius: 6px;
+      border-radius: 6px;
+      -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      right: 2px;
+      /* there must be 'right' for ps-scrollbar-y */
+      width: 6px; }
+    .ps-container > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y, .ps-container > .ps-scrollbar-y-rail:active > .ps-scrollbar-y {
+      width: 11px; }
+  .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
+      background-color: #999;
+      height: 11px; }
+  .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
+      background-color: #999;
+      width: 11px; }
+  .ps-container:hover > .ps-scrollbar-x-rail,
+  .ps-container:hover > .ps-scrollbar-y-rail {
+    opacity: 0.6; }
+  .ps-container:hover > .ps-scrollbar-x-rail:hover {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x {
+      background-color: #999; }
+  .ps-container:hover > .ps-scrollbar-y-rail:hover {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y {
+      background-color: #999; }