Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into

minhang

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into
minhang
廖磊
2 parents b22667d3 22cdb082
Showing 10 changed files with 194 additions and 189 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/AbnormalStateHandle.java
src/main/java/com/bsth/service/forms/impl/ExportServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/forms/mould/operationservice.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
@@ -34,6 +34,7 @@ import com.bsth.util.ReportUtils;
 @RequestMapping("mcy_export")
 public class ExportController {
+	
 	@Autowired
 	FormsService formsService;
@@ -71,9 +72,9 @@ public class ExportController {
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepasswengerflow.xls",
-					path + "export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/linepasswengerflow.xls",
+					path + "export/线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -111,9 +112,9 @@ public class ExportController {
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\shifday.xls",
-					path + "export\\班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/shifday.xls",
+					path + "export/班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -148,9 +149,9 @@ public class ExportController {
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\shiftuehiclemanth.xls", path
-					+ "export\\班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/shiftuehiclemanth.xls", path
+					+ "export/班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -177,6 +178,9 @@ public class ExportController {
 			m.put("clzbh", l.getClzbh());
 			m.put("jsy", l.getJsy());
 			m.put("jName", l.getjName());
+			
+			
+			
 			m.put("sgh", l.getSgh());
 			m.put("sName", l.getsName());
 			m.put("jhlc", l.getJhlc());
@@ -186,14 +190,15 @@ public class ExportController {
 			m.put("unyyyl", l.getUnyyyl());
 			m.put("jhjl", l.getJhjl());
 			resList.add(m);
+			
 			i++;
 		}
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\singledata.xls",
-					path + "export\\路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls",
+					path + "export/路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -231,9 +236,9 @@ public class ExportController {
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\vehicleloading.xls",
-					path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("data").toString())) + ".xls");
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/vehicleloading.xls",
+					path + "export/车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("data").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -264,8 +269,8 @@ public class ExportController {
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\operationservice.xls", path + "export\\运营服务阶段报表"
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/operationservice.xls", path + "export/运营服务阶段报表"
 					+ sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -303,8 +308,8 @@ public class ExportController {
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\changetochange.xls", path + "export\\换人换车情况日统计"
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path + "mould/changetochange.xls", path + "export/换人换车情况日统计"
 					+ sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -383,8 +388,8 @@ public class ExportController {
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map1 }, path + "mould\\turnoutrate.xls", path + "export\\营运线路出车率统计表"
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map1 }, path + "mould/turnoutrate.xls", path + "export/营运线路出车率统计表"
 					+ sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -458,8 +463,8 @@ public class ExportController {
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map1 }, path + "mould\\executionrate.xls", path + "export\\班次执行率统计表"
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map1 }, path + "mould/executionrate.xls", path + "export/班次执行率统计表"
 					+ sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -527,8 +532,8 @@ public class ExportController {
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map1 }, path + "mould\\allline.xls", path + "export\\营运线路名称统计表"
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map1 }, path + "mould/allline.xls", path + "export/营运线路名称统计表"
 					+ sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -579,8 +584,8 @@ public class ExportController {
 		m.put("date", map.get("date").toString());
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { m }, path + "mould\\daily.xls", path + "export\\班次日报表"
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { m }, path + "mould/daily.xls", path + "export/班次日报表"
 					+ sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -186,9 +186,9 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		}
 		try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path+"mould\\list.xls",
-				path+"export\\进出场存油量" + sdfSimple.format(sdfMonth.parse(map.get("rq").toString())) + ".xls");
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
+				path+"export/进出场存油量" + sdfSimple.format(sdfMonth.parse(map.get("rq").toString())) + ".xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}	
-package com.bsth.data.gpsdata.arrival.handlers;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GeoCacheData;
-import com.bsth.data.gpsdata.arrival.SignalHandle;
-import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
-import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Point;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * GPS异常状态判定 （越界/超速）
- * Created by panzhao on 2017/1/10.
- */
-@Component
-public class AbnormalStateHandle extends SignalHandle{
-
-    //默认限速
-    private static final double DEFAULT_SPEED_LIMIT = 60;
-    //越界阈值
-    private static final double OUT_BOUNDS_THRESHOLD = 100;
-
-    GeometryFactory geometryFactory = new GeometryFactory();
-
-    @Override
-    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-
-        if(overspeed(gps))
-            return true;
-
-        if(outOfBounds((gps)))
-            return true;
-
-        return false;
-    }
-
-    /**
-     * 是否超速
-     * @param gps
-     * @return
-     */
-    public boolean overspeed(GpsEntity gps){
-        double maxSpeed = DEFAULT_SPEED_LIMIT;
-        if(GeoCacheData.speedLimit(gps.getLineId()) != null)
-            maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
-
-        if(gps.getSpeed() > maxSpeed){
-            gps.setAbnormalStatus("overspeed");
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * 是否越界
-     * @param gps
-     * @return
-     */
-    public boolean outOfBounds(GpsEntity gps){
-        //场内的车不处理
-        if(gps.getInstation() == 2){
-            return false;
-        }
-
-        List<LineString> list = GeoCacheData.getLineStringList(gps);
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-
-        double min = -1, distance;
-
-        for(LineString lineString : list){
-            distance = GeoUtils.getDistanceFromLine(lineString, point);
-
-            if(min == -1 || min > distance)
-                min = distance;
-        }
-
-        gps.setOutOfBoundDistance(min);
-        if(min > OUT_BOUNDS_THRESHOLD){
-            gps.setAbnormalStatus("outBounds");
-            return true;
-        }
-        return false;
-    }
-}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Point;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * GPS异常状态判定 （越界/超速）
+ * Created by panzhao on 2017/1/10.
+ */
+@Component
+public class AbnormalStateHandle extends SignalHandle{
+
+    //默认限速
+    private static final double DEFAULT_SPEED_LIMIT = 60;
+    //越界阈值
+    private static final double OUT_BOUNDS_THRESHOLD = 100;
+
+    GeometryFactory geometryFactory = new GeometryFactory();
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+
+        if(overspeed(gps))
+            return true;
+
+        if(outOfBounds((gps)))
+            return true;
+
+        return false;
+    }
+
+    /**
+     * 是否超速
+     * @param gps
+     * @return
+     */
+    public boolean overspeed(GpsEntity gps){
+        double maxSpeed = DEFAULT_SPEED_LIMIT;
+        if(GeoCacheData.speedLimit(gps.getLineId()) != null)
+            maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
+
+        if(gps.getSpeed() > maxSpeed){
+            gps.setAbnormalStatus("overspeed");
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 是否越界
+     * @param gps
+     * @return
+     */
+    public boolean outOfBounds(GpsEntity gps){
+        //场内的车不处理
+        if(gps.getInstation() == 2){
+            return false;
+        }
+
+        List<LineString> list = GeoCacheData.getLineStringList(gps);
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        double min = -1, distance;
+
+        for(LineString lineString : list){
+            distance = GeoUtils.getDistanceFromLine(lineString, point);
+
+            if(min == -1 || min > distance)
+                min = distance;
+        }
+
+        gps.setOutOfBoundDistance(min);
+        if(min > OUT_BOUNDS_THRESHOLD){
+            gps.setAbnormalStatus("outBounds");
+            return true;
+        }
+        return false;
+    }
+}
@@ -46,9 +46,9 @@ public class ExportServiceImpl implements ExportService{
 			try {
 				listI.add(resList.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { map }, path+"mould\\waybillday.xls",
-						path+"export\\行车路单日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { map }, path+"mould/waybillday.xls",
+						path+"export/行车路单日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -72,9 +72,9 @@ public class ExportServiceImpl implements ExportService{
 			try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path+"mould\\linepasswengerflow.xls",
-				path+"export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/linepasswengerflow.xls",
+				path+"export/线路客流量报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -115,9 +115,9 @@ public class ExportServiceImpl implements ExportService{
 			try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path+"mould\\shifday.xls",
-				path+"export\\班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/shifday.xls",
+				path+"export/班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -151,9 +151,9 @@ public class ExportServiceImpl implements ExportService{
 			try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path+"mould\\shiftuehiclemanth.xls",
-				path+"export\\班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/shiftuehiclemanth.xls",
+				path+"export/班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -191,9 +191,9 @@ public class ExportServiceImpl implements ExportService{
 			try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path+"mould\\singledata.xls",
-				path+"export\\路单日报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/singledata.xls",
+				path+"export/路单日报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}	
@@ -230,9 +230,9 @@ public class ExportServiceImpl implements ExportService{
 			try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path+"mould\\vehicleloading.xls",
-				path+"export\\车辆加注" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/vehicleloading.xls",
+				path+"export/车辆加注" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}	
@@ -261,9 +261,9 @@ public class ExportServiceImpl implements ExportService{
 			try {
 			listI.add(resList.iterator());
-			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path+"mould\\operationservice.xls",
-				path+"export\\运营服务阶段报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/operationservice.xls",
+				path+"export/运营服务阶段报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}	
@@ -526,9 +526,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			ReportUtils ee = new ReportUtils();
 			try {
 				listI.add(resList.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\busInterval"+statu+".xls",
-						path+"export\\班次间隔统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/busInterval"+statu+".xls",
+						path+"export/班次间隔统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 
 						+ "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
@@ -1076,9 +1076,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				modelMap.put("lpType", "路牌名");
 			try {
 				listI.add(((List<Map<String, Object>>)modelMap.get("dataList")).iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { modelMap }, path+"mould\\timeAndSpeed.xls",
-						path+"export\\行驶时间及车速统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { modelMap }, path+"mould/timeAndSpeed.xls",
+						path+"export/行驶时间及车速统计表" + sdfSimple.format(sdfMonth.parse(startDate)) 
 						+ "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
@@ -538,11 +538,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("ljbc", ljbc);
 		map.put("sjbc", jhbc-cjbc+ljbc);
-		String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+		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");
+		ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould/waybill_minhang.xls",
+				path+"export/" + date+"-"+jName+"-"+clZbh+"-"+lpName+"-行车路单.xls");
 		return scheduleRealInfos;
 	}
@@ -575,12 +575,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             map.put("totalYH", totalYH);
             map.put("totalBCS", totalBCS);
-            String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
+            String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
             listI.add(list.iterator());
             try {
-                ee.excelReplace(listI, new Object[]{map}, path + "mould\\daily.xls",
-                        path + "export\\班次日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+                ee.excelReplace(listI, new Object[]{map}, path + "mould/daily.xls",
+                        path + "export/班次日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -632,9 +632,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             try {
                 listI.add(newList.iterator());
-                String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould\\historyMessage.xls",
-                        path + "export\\调度历史消息" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/historyMessage.xls",
+                        path + "export/调度历史消息" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
             } catch (Exception e) {
                 // TODO: handle exception
                 e.printStackTrace();
@@ -661,9 +661,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             try {
                 listI.add(newList.iterator());
-                String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould\\message.xls",
-                        path + "export\\调度消息分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls",
+                        path + "export/调度消息分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
             } catch (Exception e) {
                 // TODO: handle exception
                 e.printStackTrace();
@@ -1261,9 +1261,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             try {
                 listI.add(listMap.iterator());
-                String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould\\account.xls",
-                        path + "export\\驾驶员请求台账" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/account.xls",
+                        path + "export/驾驶员请求台账" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
             } catch (Exception e) {
                 // TODO: handle exception
                 e.printStackTrace();
@@ -1316,9 +1316,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             try {
                 listI.add(tempList.iterator());
-                String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould\\correctForm.xls",
-                        path + "export\\修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
+                        path + "export/修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
             } catch (Exception e) {
                 // TODO: handle exception
                 e.printStackTrace();
@@ -1749,9 +1749,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			ReportUtils ee = new ReportUtils();
 			try {
 				listI.add(lMap.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\statisticsDaily_.xls",
-						path+"export\\统计日报" + sdfSimple.format(sdfMonth.parse(date))+".xls");
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/statisticsDaily_.xls",
+						path+"export/统计日报" + sdfSimple.format(sdfMonth.parse(date))+".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -259,9 +259,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			ReportUtils ee = new ReportUtils();
 			try {
 				listI.add(resList.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\peoCarPlan.xls",
-						path+"export\\计划车辆班次人员" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/peoCarPlan.xls",
+						path+"export/计划车辆班次人员" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -463,9 +463,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			ReportUtils ee = new ReportUtils();
 			try {
 				listI.add(resList.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\workDaily.xls",
-						path+"export\\营运服务日报表"+ sdfSimple.format(sdfMonth.parse(date))+".xls");
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/workDaily.xls",
+						path+"export/营运服务日报表"+ sdfSimple.format(sdfMonth.parse(date))+".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -735,9 +735,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			ReportUtils ee = new ReportUtils();
 			try {
 				listI.add(resList.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\scheduleAnaly.xls",
-						path+"export\\时刻表分析" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/scheduleAnaly.xls",
+						path+"export/时刻表分析" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -989,9 +989,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			ReportUtils ee = new ReportUtils();
 			try {
 				listI.add(resList.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\firstAndLastBus.xls",
-						path+"export\\线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus.xls",
+						path+"export/线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -1146,9 +1146,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			ReportUtils ee = new ReportUtils();
 			try {
 				listI.add(resList.iterator());
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState.xls",
-						path+"export\\指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState.xls",
+						path+"export/指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -1172,9 +1172,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 								+ "  车辆：" + map1.get("clZbh") + "  人员：" + map1.get("jsy"));
 					}
 				}
-				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState1.xls",
-						path+"export\\指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState1.xls",
+						path+"export/指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -342,8 +342,8 @@ public class ReportUtils {
 			dataList.add(sr);
 			list.add(dataList.iterator());
-			ee.excelReplace(list, new Object[] { srr }, "D:\\waybill.xls",
-					"D:\\22.xls");
+			ee.excelReplace(list, new Object[] { srr }, "D:/waybill.xls",
+					"D:/22.xls");
 			System.out.println("ok");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -281,12 +281,12 @@
 				var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
 			});
-			$.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
+			$.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);
 			});
-			$.get('/realSchedule/realScheduleList',{line:line,date:date},function(result){
+			$.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
 				var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
 				$('#forms .scheduleDaily_3').html(scheduleDaily_3);
 			});