1.线路自动执行+偏移值逻辑完善

2.GPS里程计算及展示

1.线路自动执行+偏移值逻辑完善
2.GPS里程计算及展示
王通
1 parent e3a50445
Showing 20 changed files with 1203 additions and 959 deletions
pom.xml
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/auto_exec/AfterServiceScheduler.java
src/main/java/com/bsth/entity/realcontrol/GpsMileage.java
src/main/java/com/bsth/filter/AuthorityFilter.java
src/main/java/com/bsth/repository/realcontrol/GpsMileageRepository.java
src/main/java/com/bsth/service/gps/entity/GpsOutbound_DTO.java
src/main/java/com/bsth/service/gps/entity/GpsSpeed_DTO.java
src/main/java/com/bsth/service/realcontrol/GpsMileageService.java
src/main/java/com/bsth/service/realcontrol/impl/GpsMileageServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/application-cloud.properties
src/main/resources/application-dev.properties
src/main/resources/application-test.properties
src/main/resources/control-jdbc.properties
src/main/resources/logback.xml
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/traffic-jdbc.properties
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.38</version>
+			<version>8.0.33</version>
 		</dependency>
  
 		<dependency>
@@ -5,6 +5,7 @@ import java.lang.reflect.Modifier;
 import java.util.*;
  
 import com.bsth.data.BasicData;
+import com.bsth.data.schedule.auto_exec.AfterServiceScheduler;
 import com.bsth.security.SsoConfig;
 import com.bsth.service.SectionService;
 import com.bsth.service.StationService;
@@ -100,6 +101,9 @@ public class AdminUtilsController {
     @Autowired
     private SsoConfig ssoConfig;
  
+    @Autowired
+    private AfterServiceScheduler afterServiceScheduler;
+
     /**
      * 出现重复班次的车辆
      *
@@ -401,4 +405,19 @@ public class AdminUtilsController {
  
         return "error";
     }
+
+    @RequestMapping("/afterService")
+    public String afterService(@RequestParam String lineCode, @RequestParam String schDate) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            afterServiceScheduler.compute(lineCode, schDate);
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
+
+
 }
 \ No newline at end of file
@@ -63,6 +63,8 @@ public class SchAttrCalculator {
                 sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + sch.getFcsjActual()) + DAY_TIME);
             }*/
  
+            sch.setZdsjT(getTime(rq, sch.getZdsj(), conf));
+
             //实际终点時間
             sch.setZdsjActualAll(getTime(rq, sch.getZdsjActual(), conf));
             /*if (StringUtils.isNotEmpty(sch.getZdsjActual()) &&
@@ -6,8 +6,13 @@ import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.entity.StationRoute;
 import com.bsth.data.gpsdata_v2.utils.GeoUtils;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.SchAttrCalculator;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.GpsMileage;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.realcontrol.GpsMileageService;
 import com.bsth.util.Geo.Point;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
@@ -15,6 +20,7 @@ import com.google.common.collect.Multimap;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.pentaho.di.core.util.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +31,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
  
+import java.math.BigDecimal;
 import java.util.*;
  
 @Component
@@ -43,6 +50,15 @@ public class AfterServiceScheduler {
     @Qualifier("msJdbcTemplate")
     private JdbcTemplate msJdbcTemplate;
  
+    @Autowired
+    private GpsMileageService gpsMileageService;
+
+    @Autowired
+    private ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+    @Autowired
+    private SchAttrCalculator schAttrCalculator;
+
     private Map<String, String> complete = new HashMap<>();
  
     private DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
@@ -79,15 +95,23 @@ public class AfterServiceScheduler {
                     }
                     // 末班过后一个小时
                     if (lastTime + MAX_DIFF < System.currentTimeMillis()) {
+                        log.warn("线路: {}, 末班车时间: {}, 当前时间: {}", lineCode, lastTime, System.currentTimeMillis());
                         BiMap<String, String> inside2device = BasicData.deviceId2NbbmMap.inverse();
                         for (String key : multimap.keySet()) {
                             String deviceId = inside2device.get(key);
                             Collection<ScheduleRealInfo> infos = multimap.get(key);
                             List<ScheduleRealInfo> list = new ArrayList<>(infos);
-                            List<GpsInfo> gpsInfos = msJdbcTemplate.query("SELECT device_id,line_id,lon,lat,service_state,ts FROM bsth_c_gps_info_" + dateTime.getYear() + " WHERE days_year = ? AND device_id = ? AND service_state & 0x80000000 = 0 ORDER BY ts", new Object[]{dateTime.getDayOfYear(), deviceId}, BeanPropertyRowMapper.newInstance(GpsInfo.class));
+                            List<GpsInfo> gpsInfos = msJdbcTemplate.query("SELECT device_id,line_id,lon,lat,service_state,ts FROM bsth_c_gps_info_" + dateTime.getYear() + " WHERE days_year = ? AND device_id = ? AND line_id = ? AND service_state & 0x80000000 = 0 ORDER BY ts", new Object[]{dateTime.getDayOfYear(), deviceId, lineCode}, BeanPropertyRowMapper.newInstance(GpsInfo.class));
+                            GpsMileage gpsMileage = new GpsMileage();
+                            gpsMileage.setRq(schDate);
+                            gpsMileage.setLineCode(lineCode);
+                            gpsMileage.setClZbh(key);
+                            gpsMileage.setDeviceId(deviceId);
+                            gpsMileage.setMileage(calcMileage(gpsInfos));
+                            gpsMileageService.save(gpsMileage);
                             for (ScheduleRealInfo schedule : list) {
                                 if (schedule.getFcsjActual() == null || schedule.getZdsjActual() == null) {
-                                    matchTime(schedule, gpsInfos);
+                                    matchTime(schedule, gpsInfos, lineConfig.getAutoExecOffset());
                                     dayOfSchedule.save(schedule);
                                 }
                             }
@@ -99,7 +123,81 @@ public class AfterServiceScheduler {
         }
     }
  
-    private void matchTime(ScheduleRealInfo schedule, List<GpsInfo> gpsInfos) {
+    public void compute(String lineCode, String schDate) {
+        log.warn("自动执行线路手动计算开始");
+        Collection<LineConfig> lineConfigs = lineConfigData.getAll();
+        if (lineConfigs == null || lineConfigs.isEmpty()) {
+            return;
+        }
+        for (LineConfig lineConfig : lineConfigs) {
+            if (lineCode.equals(lineConfig.getLine().getLineCode()) && lineConfig.isAutoExec() && lineConfig.getAutoExecOffset() > 0) {
+                DateTime dateTime = formatter.parseDateTime(schDate);
+                List<ScheduleRealInfo> schedules = scheduleRealInfoRepository.scheduleDaily(lineCode, schDate);
+                Map<String, List<ScheduleRealInfo>> nbbm2schedules = new HashMap<>();
+                for (ScheduleRealInfo schedule : schedules) {
+                    schAttrCalculator.calcRealDate(schedule);
+                    String nbbm = schedule.getClZbh();
+                    List<ScheduleRealInfo> schedules1 = nbbm2schedules.get(nbbm);
+                    if (schedules1 == null) {
+                        schedules1 = new ArrayList<>();
+                        nbbm2schedules.put(nbbm, schedules1);
+                    }
+                    schedules1.add(schedule);
+                }
+                BiMap<String, String> inside2device = BasicData.deviceId2NbbmMap.inverse();
+                for (Map.Entry<String, List<ScheduleRealInfo>> entry : nbbm2schedules.entrySet()) {
+                    String deviceId = inside2device.get(entry.getKey());
+                    List<ScheduleRealInfo> list = entry.getValue();
+                    Collections.sort(list, new ScheduleComparator.DFSJ());
+                    List<GpsInfo> gpsInfos = msJdbcTemplate.query("SELECT device_id,line_id,lon,lat,service_state,ts FROM bsth_c_gps_info_" + dateTime.getYear() + " WHERE days_year = ? AND device_id = ? AND line_id = ? AND service_state & 0x80000000 = 0 ORDER BY ts", new Object[]{dateTime.getDayOfYear(), deviceId, lineCode}, BeanPropertyRowMapper.newInstance(GpsInfo.class));
+                    GpsMileage gpsMileage = new GpsMileage();
+                    gpsMileage.setRq(schDate);
+                    gpsMileage.setLineCode(lineCode);
+                    gpsMileage.setClZbh(entry.getKey());
+                    gpsMileage.setDeviceId(deviceId);
+                    gpsMileage.setMileage(calcMileage(gpsInfos));
+                    gpsMileageService.save(gpsMileage);
+                    for (ScheduleRealInfo schedule : list) {
+                        if (schedule.getFcsjActual() == null || schedule.getZdsjActual() == null) {
+                            matchTime(schedule, gpsInfos, lineConfig.getAutoExecOffset());
+                            dayOfSchedule.save(schedule);
+                        }
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    private BigDecimal calcMileage(List<GpsInfo> gpsInfos) {
+        Assert.assertNotNull(gpsInfos);
+        BigDecimal mileage = BigDecimal.ZERO;
+        GpsInfo last = null, current = null;
+        Iterator<GpsInfo> it = gpsInfos.iterator();
+        while (it.hasNext()) {
+            GpsInfo gpsInfo = it.next();
+            if (gpsInfo.getLon() == 0 || gpsInfo.getLat() == 0) continue;
+            if (last == null) {
+                if ((gpsInfo.getServiceState() & 0x80000000) == 0) {
+                    last = gpsInfo;
+                }
+            } else {
+                if ((gpsInfo.getServiceState() & 0x80000000) == 0) {
+                    current = gpsInfo;
+                    double distance = GeoUtils.getDistance(new Point(last.getLon(), last.getLat()), new Point(current.getLon(), current.getLat()));
+                    boolean invalid = Double.isNaN(distance) || Double.isInfinite(distance);
+                    if (!invalid) {
+                        mileage = mileage.add(new BigDecimal(distance / 1000));
+                    }
+                    last = current;
+                }
+            }
+        }
+
+        return mileage.setScale(3, BigDecimal.ROUND_HALF_UP);
+    }
+
+    private void matchTime(ScheduleRealInfo schedule, List<GpsInfo> gpsInfos, int autoExecOffset) {
         List<StationRoute> srs = GeoCacheData.getStationRoute(schedule.getXlBm(), Integer.parseInt(schedule.getXlDir()));
         String qdz = schedule.getQdzCode(), zdz = schedule.getZdzCode();
         StationRoute qdzRoute = null, zdzRoute = null;
@@ -145,11 +243,11 @@ public class AfterServiceScheduler {
                 }
             }
         }
-        if (schedule.getFcsjActual() == null) {
+        if (schedule.getFcsjActual() == null || Math.abs(schedule.getFcsjT() - schedule.getFcsjActualTime()) > autoExecOffset * 120000) {
             schedule.setFcsjActual(new DateTime(schedule.getFcsjT()).toString("HH:mm"));
             schedule.setFcsjActualTime(schedule.getFcsjT());
         }
-        if (schedule.getZdsjActual() == null) {
+        if (schedule.getZdsjActual() == null || Math.abs(schedule.getZdsjT() - schedule.getZdsjActualTime()) > autoExecOffset * 120000) {
             schedule.setZdsjActual(new DateTime(schedule.getZdsjT()).toString("HH:mm"));
             schedule.setZdsjActualTime(schedule.getZdsjT());
         }
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+
+@Entity
+@Table(name = "bsth_c_gps_mileage")
+public class GpsMileage {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	/**
+	 * 日期
+	 */
+	private String rq;
+
+	/**
+	 * 线路编码
+	 */
+	private String lineCode;
+
+	/**
+	 * 车辆自编码
+	 */
+	private String clZbh;
+
+	/**
+	 * 设备编号
+	 */
+	private String deviceId;
+
+	/**
+	 * 里程
+	 */
+	private BigDecimal mileage;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getClZbh() {
+		return clZbh;
+	}
+
+	public void setClZbh(String clZbh) {
+		this.clZbh = clZbh;
+	}
+
+	public String getDeviceId() {
+		return deviceId;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public BigDecimal getMileage() {
+		return mileage;
+	}
+
+	public void setMileage(BigDecimal mileage) {
+		this.mileage = mileage;
+	}
+}
@@ -6,6 +6,8 @@ import com.bsth.data.SystemParamCache;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
  
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -29,7 +31,9 @@ public class AuthorityFilter extends BaseFilter {
  
 	private final String scheduleReferer = "/real_control/v2";
  
-	private String[] pubUrls = new String[]{ "/sockjs/", "/pages/", "/error", "/dictionary/all", "/user/isWeakCipher", "/user/isRealName", "/user/currentUser", "/user/companyData", "/module/findByCurrentUser", "/eci/validate_get_destroy_info", "/business", "/personnel/all_py", "/companyAuthority/all", "/line/all", "/basic/refresh_person_data", "/downloadFile", "/report/lineList" };
+	private String[] pubUrls = new String[]{ "/sockjs/", "/pages/home.html", "/error", "/dictionary/all", "/user/validPWDExpired", "/user/isWeakCipher", "/user/isRealName", "/user/currentUser", "/user/companyData", "/module/findByCurrentUser", "/business", "/personnel/all_py", "/companyAuthority/all", "/line/all", "/basic/refresh_person_data", "/downloadFile", "/report/lineList", "/adminUtils", "/metronic_v4.5.4", "/assets", "/pages/scheduleApp/module/common" };
+
+	private PathMatcher matcher = new AntPathMatcher();
  
 	@Override
 	public void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
@@ -47,7 +51,7 @@ public class AuthorityFilter extends BaseFilter {
 		if (links != null) {
 			boolean matched = false;
 			for (String link : links) {
-				if (uri.startsWith(link)) {
+				if (matcher.match(link, uri)) {
 					matched = true;
 					break;
 				}
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.GpsMileage;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface GpsMileageRepository extends BaseRepository<GpsMileage, Long> {
+
+
+}
-package com.bsth.service.gps.entity;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.data.BasicData;
-
-import java.util.*;
-
-/**
- * 越界异常 dto
- * Created by panzhao on 2017/4/7.
- */
-public class GpsOutbound_DTO {
-
-    public static List<GpsOutbound_DTO> create(List<Map<String, Object>> mapList){
-        //默认都是一辆车的数据
-        List<GpsOutbound> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsOutbound.class);
-        GpsOutbound outbound;
-
-        //排序
-        Collections.sort(list, new Comparator<GpsOutbound>() {
-            @Override
-            public int compare(GpsOutbound o1, GpsOutbound o2) {
-                return (int) (o1.getTimestamp() - o2.getTimestamp());
-            }
-        });
-
-        int space = 1000 * 60;
-        int size = list.size();
-        StringBuffer locations = new StringBuffer("");
-
-        List<GpsOutbound_DTO> rsList = new ArrayList<>();
-        GpsOutbound_DTO dto = null;
-
-        for(int i = 0; i < size; i++){
-            outbound = list.get(i);
-            locations.append(outbound.location() + ";");
-            if(dto == null){
-                dto = new GpsOutbound_DTO();
-                dto.setDeviceId(outbound.getVehicle());
-                dto.setNbbm(BasicData.deviceId2NbbmMap.get(outbound.getVehicle()));
-                dto.setSt(outbound.getTimestamp());
-            }
-            else{
-                //越界结束
-                if((i < size - 1 && list.get(i + 1).getTimestamp() - outbound.getTimestamp() > space)){
-                    dto.setEt(outbound.getTimestamp());
-                    dto.setLocations(locations.toString());
-
-                    rsList.add(dto);
-                    dto = null;
-                    locations = new StringBuffer("");
-                    continue;
-                }
-
-                if(i == size - 1)
-                    rsList.add(dto);
-            }
-        }
-
-        return rsList;
-    }
-
-    /**
-     * 设备号
-     */
-    private String deviceId;
-
-    /**
-     * 自编号
-     */
-    private String nbbm;
-
-    /**
-     * 越界开始时间
-     */
-    private long st;
-
-    /**
-     * 越界结束时间
-     */
-    private long et;
-
-    /**
-     * 越界点位集合
-     */
-    private String locations;
-
-    /**
-     * 所在路段
-     */
-    private String sectionName;
-
-    private String abnormalType = "outbound";
-
-    public String getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(String deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public long getSt() {
-        return st;
-    }
-
-    public void setSt(long st) {
-        this.st = st;
-    }
-
-    public long getEt() {
-        return et;
-    }
-
-    public void setEt(long et) {
-        this.et = et;
-    }
-
-    public String getLocations() {
-        return locations;
-    }
-
-    public void setLocations(String locations) {
-        this.locations = locations;
-    }
-
-    public String getAbnormalType() {
-        return abnormalType;
-    }
-
-    public void setAbnormalType(String abnormalType) {
-        this.abnormalType = abnormalType;
-    }
-
-    public String getSectionName() {
-        return sectionName;
-    }
-
-    public void setSectionName(String sectionName) {
-        this.sectionName = sectionName;
-    }
-}
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+
+import java.util.*;
+
+/**
+ * 越界异常 dto
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsOutbound_DTO {
+
+    public static List<GpsOutbound_DTO> create(List<Map<String, Object>> mapList){
+        //默认都是一辆车的数据
+        List<GpsOutbound> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsOutbound.class);
+        GpsOutbound outbound;
+
+        //排序
+        Collections.sort(list, new Comparator<GpsOutbound>() {
+            @Override
+            public int compare(GpsOutbound o1, GpsOutbound o2) {
+                return (int) (o1.getTimestamp() - o2.getTimestamp());
+            }
+        });
+
+        int space = 1000 * 15;
+        int size = list.size();
+        StringBuffer locations = new StringBuffer("");
+
+        List<GpsOutbound_DTO> rsList = new ArrayList<>();
+        GpsOutbound_DTO dto = null;
+
+        for (int i = 0; i < size; i++) {
+            outbound = list.get(i);
+            locations.append(outbound.location() + ";");
+            if (dto == null) {
+                dto = new GpsOutbound_DTO();
+                dto.setDeviceId(outbound.getVehicle());
+                dto.setNbbm(BasicData.deviceId2NbbmMap.get(outbound.getVehicle()));
+                dto.setSt(outbound.getTimestamp());
+            } else {
+                if (dto.getEt() == 0) {
+                    if (outbound.getTimestamp() - dto.getSt() > space) {
+                        dto = null;
+                    }
+                } else {
+                    if (outbound.getTimestamp() - dto.getEt() > space) {
+                        if (dto.getSt() != dto.getEt()) {
+                            rsList.add(dto);
+                        }
+                        dto = null;
+                        locations = new StringBuffer("");
+                        continue;
+                    } else {
+                        dto.setEt(outbound.getTimestamp());
+                        dto.setLocations(locations.toString());
+                    }
+                }
+
+                if (i == size - 1 && dto.getEt() > 0 && dto.getSt() != dto.getEt())
+                    rsList.add(dto);
+            }
+        }
+
+        return rsList;
+    }
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 自编号
+     */
+    private String nbbm;
+
+    /**
+     * 越界开始时间
+     */
+    private long st;
+
+    /**
+     * 越界结束时间
+     */
+    private long et;
+
+    /**
+     * 越界点位集合
+     */
+    private String locations;
+
+    /**
+     * 所在路段
+     */
+    private String sectionName;
+
+    private String abnormalType = "outbound";
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public String getLocations() {
+        return locations;
+    }
+
+    public void setLocations(String locations) {
+        this.locations = locations;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+
+    public String getSectionName() {
+        return sectionName;
+    }
+
+    public void setSectionName(String sectionName) {
+        this.sectionName = sectionName;
+    }
+}
-package com.bsth.service.gps.entity;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.data.BasicData;
-
-import java.util.*;
-
-/**
- * 超速异常 dto
- * Created by panzhao on 2017/4/7.
- */
-public class GpsSpeed_DTO {
-
-    public static List<GpsSpeed_DTO> create(List<Map<String, Object>> mapList){
-        //默认都是一辆车的数据
-        List<GpsSpeed> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsSpeed.class);
-        GpsSpeed gs;
-        //排序
-        Collections.sort(list, new Comparator<GpsSpeed>() {
-            @Override
-            public int compare(GpsSpeed o1, GpsSpeed o2) {
-                return (int) (o1.getTimestamp() - o2.getTimestamp());
-            }
-        });
-
-        int space = 1000 * 60;
-        int size = list.size();
-
-        List<GpsSpeed_DTO> rsList = new ArrayList<>();
-        GpsSpeed_DTO dto = null;
-
-        for(int i = 0; i < size; i++){
-            gs = list.get(i);
-            if(dto == null){
-                dto = new GpsSpeed_DTO();
-                dto.setDeviceId(gs.getVehicle());
-                dto.setNbbm(BasicData.deviceId2NbbmMap.get(gs.getVehicle()));
-                dto.setSt(gs.getTimestamp());
-                dto.setSpeed(gs.getSpeed());
-            }
-            else{
-                //超速结束
-                if((i < size - 1 && list.get(i + 1).getTimestamp() - gs.getTimestamp() > space)){
-                    dto.setEt(gs.getTimestamp());
-                    rsList.add(dto);
-                    dto = null;
-                    continue;
-                }
-
-                //记录最大速度
-                if(gs.getSpeed() > dto.getSpeed())
-                    dto.setSpeed(gs.getSpeed());
-
-                if(i == size - 1)
-                    rsList.add(dto);
-            }
-        }
-        return rsList;
-    }
-
-    /**
-     * 设备号
-     */
-    private String deviceId;
-
-    /**
-     * 自编号
-     */
-    private String nbbm;
-
-    /**
-     * 超速开始时间
-     */
-    private long st;
-
-    /**
-     * 超速结束时间
-     */
-    private long et;
-
-    /**
-     * 速度
-     */
-    private float speed;
-
-    /**
-     * 所在路段
-     */
-    private String sectionName;
-
-    private String abnormalType = "speed";
-
-    public String getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(String deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public long getSt() {
-        return st;
-    }
-
-    public void setSt(long st) {
-        this.st = st;
-    }
-
-    public long getEt() {
-        return et;
-    }
-
-    public void setEt(long et) {
-        this.et = et;
-    }
-
-    public float getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(float speed) {
-        this.speed = speed;
-    }
-
-    public String getAbnormalType() {
-        return abnormalType;
-    }
-
-    public void setAbnormalType(String abnormalType) {
-        this.abnormalType = abnormalType;
-    }
-
-    public String getSectionName() {
-        return sectionName;
-    }
-
-    public void setSectionName(String sectionName) {
-        this.sectionName = sectionName;
-    }
-}
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+
+import java.util.*;
+
+/**
+ * 超速异常 dto
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsSpeed_DTO {
+
+    public static List<GpsSpeed_DTO> create(List<Map<String, Object>> mapList){
+        //默认都是一辆车的数据
+        List<GpsSpeed> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsSpeed.class);
+        GpsSpeed gs;
+        //排序
+        Collections.sort(list, new Comparator<GpsSpeed>() {
+            @Override
+            public int compare(GpsSpeed o1, GpsSpeed o2) {
+                return (int) (o1.getTimestamp() - o2.getTimestamp());
+            }
+        });
+
+        int space = 1000 * 15;
+        int size = list.size();
+
+        List<GpsSpeed_DTO> rsList = new ArrayList<>();
+        GpsSpeed_DTO dto = null;
+
+        for (int i = 0; i < size; i++) {
+            gs = list.get(i);
+            if (dto == null) {
+                dto = new GpsSpeed_DTO();
+                dto.setDeviceId(gs.getVehicle());
+                dto.setNbbm(BasicData.deviceId2NbbmMap.get(gs.getVehicle()));
+                dto.setSt(gs.getTimestamp());
+                dto.setSpeed(gs.getSpeed());
+            } else {
+                if (dto.getEt() == 0) {
+                     if (gs.getTimestamp() - dto.getSt() > space) {
+                         dto = null;
+                     }
+                } else {
+                    if (gs.getTimestamp() - dto.getEt() > space) {
+                        if (dto.getSt() != dto.getEt()) {
+                            rsList.add(dto);
+                        }
+                        dto = null;
+                        continue;
+                    } else {
+                        dto.setEt(gs.getTimestamp());
+                    }
+                }
+
+                //记录最大速度
+                if (gs.getSpeed() > dto.getSpeed())
+                    dto.setSpeed(gs.getSpeed());
+
+                if (i == size - 1 && dto.getEt() > 0 && dto.getSt() != dto.getEt())
+                    rsList.add(dto);
+            }
+        }
+        return rsList;
+    }
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 自编号
+     */
+    private String nbbm;
+
+    /**
+     * 超速开始时间
+     */
+    private long st;
+
+    /**
+     * 超速结束时间
+     */
+    private long et;
+
+    /**
+     * 速度
+     */
+    private float speed;
+
+    /**
+     * 所在路段
+     */
+    private String sectionName;
+
+    private String abnormalType = "speed";
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+
+    public String getSectionName() {
+        return sectionName;
+    }
+
+    public void setSectionName(String sectionName) {
+        this.sectionName = sectionName;
+    }
+}
+package com.bsth.service.realcontrol;
+
+import com.bsth.entity.realcontrol.GpsMileage;
+import com.bsth.service.BaseService;
+
+public interface GpsMileageService extends BaseService<GpsMileage, Long> {
+}
+package com.bsth.service.realcontrol.impl;
+
+import com.bsth.entity.realcontrol.GpsMileage;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.realcontrol.GpsMileageService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GpsMileageServiceImpl extends BaseServiceImpl<GpsMileage, Long> implements GpsMileageService {
+}
@@ -11,24 +11,14 @@ import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.regex.Pattern;
  
 import com.bsth.entity.*;
+import com.bsth.entity.realcontrol.*;
+import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.repository.realcontrol.GpsMileageRepository;
 import com.bsth.util.*;
 import com.bsth.data.SystemParamCache;
 import org.apache.commons.io.IOUtils;
@@ -75,10 +65,6 @@ import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Qlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
-import com.bsth.entity.realcontrol.ChildTaskPlan;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.realcontrol.SvgAttribute;
 import com.bsth.entity.report.MileageReport;
 import com.bsth.entity.report.RepairReport;
 import com.bsth.entity.report.ScheduleCorrectionReport;
@@ -224,6 +210,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     RepairReportRepository repairReportRepository;
  
+    @Autowired
+    private GpsMileageRepository gpsMileageRepository;
+
     private final static Logger logger = LoggerFactory.getLogger(ScheduleRealInfoServiceImpl.class);
  
     SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -2094,6 +2083,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                                         String lpName, String date, String line) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("rq_eq", date);
+        params.put("clZbh_eq", clZbh);
+        params.put("lineCode_eq", line);
+        GpsMileage gpsMileage = null;
+        try {
+            gpsMileage = gpsMileageRepository.findOne(new CustomerSpecs<>(params)).get();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
         List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s = list.get(i);
@@ -2120,6 +2119,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ksgl", ksgl);//空驶公里
         double sjgl = culateService.culateSjgl(lists);//实际营运公里
         map.put("realMileage", Arith.add(Arith.add(ksgl, jccgl), Arith.add(sjgl, ljgl)));//总公里
+        map.put("realGpsMileage", gpsMileage == null ? 0 : gpsMileage.getMileage());//总公里
         map.put("zkslc", Arith.add(ksgl, jccgl));
         map.put("jcclc", jccgl);
         map.put("yygl", Arith.add(sjgl, ljgl)); //总营运公里
@@ -13,10 +13,10 @@ spring.jpa.show-sql= false
 spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MySQL56InnoDBSpatialDialect
  
 #DATABASE control
-spring.datasource.control.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.control.jdbc-url= jdbc:mysql://10.10.2.20/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.control.username= root
-spring.datasource.control.password= root2jsp
+spring.datasource.control.driver-class-name= com.mysql.cj.jdbc.Driver
+spring.datasource.control.jdbc-url= jdbc:mysql://127.0.0.1/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.control.username= schedule
+spring.datasource.control.password= fsodlgjiuigAQF2$9fs9
 spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE
 spring.datasource.control.minimum-idle= 8
@@ -26,15 +26,14 @@ spring.datasource.control.idle-timeout= 60000
 #spring.datasource.control.pool-name= HikariPool
 spring.datasource.control.max-lifetime= 1800000
 spring.datasource.control.connection-timeout= 3000
-spring.datasource.control.connection-test-query= SELECT 1
 spring.datasource.control.validation-timeout= 3000
 spring.datasource.control.register-mbeans=false
  
 #DATABASE info-publish
-spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.info-publish.jdbc-url= jdbc:mysql://10.10.2.20/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.info-publish.username= root
-spring.datasource.info-publish.password= root2jsp
+spring.datasource.info-publish.driver-class-name= com.mysql.cj.jdbc.Driver
+spring.datasource.info-publish.jdbc-url= jdbc:mysql://127.0.0.1/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.info-publish.username= schedule
+spring.datasource.info-publish.password= fsodlgjiuigAQF2$9fs9
 spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE
 spring.datasource.info-publish.minimum-idle= 8
@@ -44,15 +43,14 @@ spring.datasource.info-publish.idle-timeout= 60000
 #spring.datasource.info-publish.pool-name= HikariPool
 spring.datasource.info-publish.max-lifetime= 1800000
 spring.datasource.info-publish.connection-timeout= 3000
-spring.datasource.info-publish.connection-test-query= SELECT 1
 spring.datasource.info-publish.validation-timeout= 3000
 spring.datasource.info-publish.register-mbeans=false
  
 #DATABASE ms
-spring.datasource.ms.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.ms.jdbc-url= jdbc:mysql://10.10.2.20/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.ms.username= root
-spring.datasource.ms.password= root2jsp
+spring.datasource.ms.driver-class-name= com.mysql.cj.jdbc.Driver
+spring.datasource.ms.jdbc-url= jdbc:mysql://127.0.0.1/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.ms.username= schedule
+spring.datasource.ms.password= fsodlgjiuigAQF2$9fs9
 spring.datasource.ms.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE
 spring.datasource.ms.minimum-idle= 8
@@ -62,7 +60,6 @@ spring.datasource.ms.idle-timeout= 60000
 #spring.datasource.ms.pool-name= HikariPool
 spring.datasource.ms.max-lifetime= 1800000
 spring.datasource.ms.connection-timeout= 3000
-spring.datasource.ms.connection-test-query= SELECT 1
 spring.datasource.ms.validation-timeout= 3000
 spring.datasource.ms.register-mbeans=false
  
@@ -9,14 +9,14 @@ spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.Im
 spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= true
+spring.jpa.show-sql= false
 spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MySQL56InnoDBSpatialDialect
  
 #DATABASE control
-spring.datasource.control.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.control.jdbc-url= jdbc:mysql://192.168.168.152/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.control.username= root
-spring.datasource.control.password= root2jsp
+spring.datasource.control.driver-class-name= com.mysql.cj.jdbc.Driver
+spring.datasource.control.jdbc-url= jdbc:mysql://10.10.2.19/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.control.username= schedule
+spring.datasource.control.password= fsodlgjiuigAQF2$9fs9
 spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE
 spring.datasource.control.minimum-idle= 8
@@ -26,12 +26,11 @@ spring.datasource.control.idle-timeout= 60000
 #spring.datasource.control.pool-name= HikariPool
 spring.datasource.control.max-lifetime= 1800000
 spring.datasource.control.connection-timeout= 3000
-spring.datasource.control.connection-test-query= SELECT 1
 spring.datasource.control.validation-timeout= 3000
 spring.datasource.control.register-mbeans=false
  
 #DATABASE info-publish
-spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.info-publish.driver-class-name= com.mysql.cj.jdbc.Driver
 spring.datasource.info-publish.jdbc-url= jdbc:mysql://10.10.2.20/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.info-publish.username= root
 spring.datasource.info-publish.password= root2jsp
@@ -44,13 +43,12 @@ spring.datasource.info-publish.idle-timeout= 60000
 #spring.datasource.info-publish.pool-name= HikariPool
 spring.datasource.info-publish.max-lifetime= 1800000
 spring.datasource.info-publish.connection-timeout= 3000
-spring.datasource.info-publish.connection-test-query= SELECT 1
 spring.datasource.info-publish.validation-timeout= 3000
 spring.datasource.info-publish.register-mbeans=false
  
 #DATABASE ms
-spring.datasource.ms.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.ms.jdbc-url= jdbc:mysql://192.168.168.152/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.ms.driver-class-name= com.mysql.cj.jdbc.Driver
+spring.datasource.ms.jdbc-url= jdbc:mysql://10.10.2.20/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.ms.username= root
 spring.datasource.ms.password= root2jsp
 spring.datasource.ms.type= com.zaxxer.hikari.HikariDataSource
@@ -61,9 +59,8 @@ spring.datasource.ms.maximum-pool-size= 16
 spring.datasource.ms.idle-timeout= 60000
 #spring.datasource.ms.pool-name= HikariPool
 spring.datasource.ms.max-lifetime= 1800000
-spring.datasource.ms.connection-timeout= 3000
-spring.datasource.ms.connection-test-query= SELECT 1
-spring.datasource.ms.validation-timeout= 3000
+spring.datasource.ms.connection-timeout= 30000
+spring.datasource.ms.validation-timeout= 30000
 spring.datasource.ms.register-mbeans=false
  
 kafka.use= false
@@ -13,7 +13,7 @@ spring.jpa.show-sql= false
 spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MySQL56InnoDBSpatialDialect
  
 #DATABASE control
-spring.datasource.control.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.control.driver-class-name= com.mysql.cj.jdbc.Driver
 spring.datasource.control.jdbc-url= jdbc:mysql://10.10.2.200/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.control.username= root
 spring.datasource.control.password= root2jsp
@@ -31,7 +31,7 @@ spring.datasource.control.hikari.validation-timeout= 3000
 spring.datasource.control.hikari.register-mbeans=false
  
 #DATABASE info-publish
-spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.info-publish.driver-class-name= com.mysql.cj.jdbc.Driver
 spring.datasource.info-publish.jdbc-url= jdbc:mysql://10.10.2.200/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.info-publish.username= root
 spring.datasource.info-publish.password= root2jsp
@@ -49,7 +49,7 @@ spring.datasource.info-publish.hikari.validation-timeout= 3000
 spring.datasource.info-publish.hikari.register-mbeans=false
  
 #DATABASE ms
-spring.datasource.ms.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.ms.driver-class-name= com.mysql.cj.jdbc.Driver
 spring.datasource.ms.jdbc-url= jdbc:mysql://10.10.2.200/ms?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.ms.username= root
 spring.datasource.ms.password= root2jsp
-station.mysql.driver= com.mysql.jdbc.Driver
-station.mysql.url= jdbc:mysql://192.168.168.152/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+station.mysql.driver= com.mysql.cj.jdbc.Driver
+station.mysql.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 station.mysql.username= root
 station.mysql.password= root2jsp
  
-#station.mysql.driver= com.mysql.jdbc.Driver
+#station.mysql.driver= com.mysql.cj.jdbc.Driver
 #station.mysql.url= jdbc:mysql://10.10.200.121:3306/station?useUnicode=true&characterEncoding=utf-8
 #station.mysql.username= station
 #station.mysql.password= station@jsp
  
-#station.mysql.driver= com.mysql.jdbc.Driver
+#station.mysql.driver= com.mysql.cj.jdbc.Driver
 #station.mysql.url= jdbc:mysql://10.10.200.148:3306/station?useUnicode=true&characterEncoding=utf-8
 #station.mysql.username= station
 #station.mysql.password= station@jsp
@@ -179,7 +179,7 @@
         <!--<appender name="MYDB" class="com.bsth.service.schedule.log.ModuleOperatorDbAppender">-->
             <!--<connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource">-->
                 <!--<dataSource class="org.apache.commons.dbcp.BasicDataSource">-->
-                    <!--<driverClassName>com.mysql.jdbc.Driver</driverClassName>-->
+                    <!--<driverClassName>com.mysql.cj.jdbc.Driver</driverClassName>-->
                     <!--<url>-->
                         <!--<![CDATA[-->
                             <!--jdbc:mysql://127.0.0.1/test_control?useUnicode=true&characterEncoding=utf-8&useSSL=false-->
@@ -354,7 +354,7 @@
  
 	<!-- 日志输出级别 -->
 	<root level="info">
-		<appender-ref ref="STDOUT" />
+<!--		<appender-ref ref="STDOUT" />-->
 		<appender-ref ref="FILE" />
 	</root>
 </configuration>
-#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.driver= com.mysql.cj.jdbc.Driver
 #ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #ms.mysql.username= root
 #ms.mysql.password= 123456
  
-ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.2.20/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
-ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.driver= com.mysql.cj.jdbc.Driver
+ms.mysql.url= jdbc:mysql://127.0.0.1/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ms.mysql.username= schedule
+ms.mysql.password= fsodlgjiuigAQF2$9fs9
 \ No newline at end of file
-<style type="text/css">
-	.table-bordered {
-	  border: 1px solid; }
-	  .table-bordered > thead > tr > th,
-	  .table-bordered > thead > tr > td,
-	  .table-bordered > tbody > tr > th,
-	  .table-bordered > tbody > tr > td,
-	  .table-bordered > tfoot > tr > th,
-	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
-	  .table-bordered > thead > tr > th,
-	  .table-bordered > thead > tr > td {
-	    border-bottom-width: 2px; }
-	 
-	 .table > tbody + tbody {
-	   border-top: 1px solid; }
-</style>
-
-<div class="page-head">
-	<div class="page-title">
-		<h1>行车路单</h1>
-	</div>
-</div>
-
-<div class="row">
-	<div class="col-md-12">
-		<div class="portlet light porttlet-fit bordered">
-			<div class="portlet-title">
-				<form class="form-inline" action="">
-				 	<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_xcld">
-						<span class="item-label" style="width: 80px;">公司: </span>
-						<select class="form-control" name="company" id="gsdmXcld" style="width: 180px;"></select>
-					</div> 
-					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_xcld">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdmXcld" style="width: 180px;"></select>
-					</div>
-					<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>
-					</div>
-					<div style="display: inline-block;margin-left: 24px;">
-						<span class="item-label" style="width: 80px;">&nbsp;时间: </span>
-						<input class="form-control" type="text" id="date" style="width: 180px;"/>
-					</div>
-					<div class="form-group" style="display: inline-block;margin-left: 15px;">
-						<input class="btn btn-default" type="button" id="query" value="查询"/>
-						<input class="btn btn-default" type="button" id="export" value="导出"/>
-						<input class="btn btn-default" type="button" id="print" value="打印"/>
-						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
-					</div>
-				</form>
-			</div>
-			<div class="portlet-body">
-				<div class="row">
-					<div class="col-md-3">
-						<div class="" id="left_height" style="margin-top: 10px;overflow:auto;">
-							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
-								<thead>
-									<tr class="hidden">
-										<th class="rypx" style="cursor:pointer ">人员</th>
-										<th class="zbhpx" style="cursor:pointer ">自编号</th>
-										<th class="lppx" style="cursor:pointer ">路牌</th>
-									</tr>
-								</thead>
-								<tbody>
-									
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="col-md-9"  id="printArea">
-						<div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
-							<table class="table table-bordered table-checkable" id="forms">
-								<tbody class="ludan_1">
-									
-								</tbody>
-						        <tbody class="ludan_2">
-						        	
-						        </tbody>
-						        <tbody class="ludan_3">
-						        	
-						        </tbody>
-						        <tbody class="ludan_4">
-						        	
-						        </tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script>
-	$(function(){
-		var fage=false;
-		// 关闭左侧栏
-		if (!$('body').hasClass('page-sidebar-closed'))
-			$('.menu-toggler.sidebar-toggler').click();
-		
-		$("#date").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
-
-		$("#left_height").height($(window).height()-100);
-		$("#xcld_height").height($(window).height()-100);
-		
-		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;
-		$("#date").val(year + "-" + month + "-" + day);
-		
-		var obj = [];
-		var xlList;
-		$.get('/report/lineList',function(result){
-			xlList=result;
-			
-			$.get('/user/companyData', function(result){
-				obj = result;
-				console.log(obj);
-				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_xcld").css('display','none');
-				}else if(obj.length ==1){
-					 $("#gsdmDiv_xcld").css('display','none');
-					if(obj[0].children.length == 1  || obj[0].children.length ==0)
-						$('#fgsdmDiv_xcld').css('display','none');
-				}
-				$('#gsdmXcld').html(options);
-				
-				updateCompany();
-			});
-		});
-
-		$("#gsdmXcld").on("change",updateCompany);
-		function updateCompany(){
-			var company = $('#gsdmXcld').val();
-			var options = '';
-			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>';
-					}
-				}
-			}
-			$('#fgsdmXcld').html(options);
-// 			initXl();
-		}
-		
-		
-		 
-	
-// 		$("#fgsdmXcld").on("change",initXl);
-		/* function initXl(){
-			var data=[];
-			if(fage){
-				$("#line").select2("destroy").html('');
-			}
-			var fgs=$('#fgsdmXcld').val();
-			var gs=$('#gsdmXcld').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 tempData = {};
-		$.get('/report/lineList',function(xlList){
-			var data = [];
-// 			data.push({id: " ", text: "全部线路"});
-			$.get('/user/companyData', function(result){
-				for(var i = 0; i < result.length; i++){
-					var companyCode = result[i].companyCode;
-					var children = result[i].children;
-					for(var j = 0; j < children.length; j++){
-						var code = children[j].code;
-						for(var k=0;k < xlList.length;k++ ){
-							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
-								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
-								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
-							}
-						}
-					}
-				}
-				initPinYinSelect2('#line',data,'');
-				
-			});
-		});
-		
-		$("#line").on("change", function(){
-			if($("#line").val() == " "){
-				$("#gsdmXcld").attr("disabled", false);
-				$("#fgsdmXcld").attr("disabled", false);
-			} else {
-				var temp = (tempData[$("#line").val()] ? tempData[$("#line").val()] : " : ").split(":");
-				$("#gsdmXcld").val(temp[0]);
-				updateCompany();
-				$("#fgsdmXcld").val(temp[1]);
-				$("#gsdmXcld").attr("disabled", true);
-				$("#fgsdmXcld").attr("disabled", true);
-			}
-		});
-		var date = '';
-		var line = '';
-		var lineName;
-		$("#query").on("click",function(){
-			$("#left_height").height($(window).height()-100);
-			line = $("#line").val();
-			date = $("#date").val();
-			lineName = $('#line option:selected').text();
-			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
-				// 把数据填充到模版中
-				var tbodyHtml = template('list_info',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#info tbody').html(tbodyHtml);
-			});
-		});
-		var type="desc";
-		$(".rypx").on("click",function(){
-			line = $("#line").val();
-			date = $("#date").val();
-			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"jGh",type:type},function(result){
-				if(type=="desc"){
-					type ="asc";
-				}else{
-					type ="desc";
-				}
-				// 把数据填充到模版中
-				var tbodyHtml = template('list_info_px',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#info tbody').html(tbodyHtml);
-			});
-		})
-		
-		$(".zbhpx").on("click",function(){
-			line = $("#line").val();
-			date = $("#date").val();
-			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"clZbh",type:type},function(result){
-				if(type=="desc"){
-					type ="asc";
-				}else{
-					type ="desc";
-				}
-				// 把数据填充到模版中
-				var tbodyHtml = template('list_info_px',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#info tbody').html(tbodyHtml);
-			});
-		})
-		
-		$(".lppx").on("click",function(){
-			line = $("#line").val();
-			date = $("#date").val();
-			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"lpName",type:type},function(result){
-				if(type=="desc"){
-					type ="asc";
-				}else{
-					type ="desc";
-				}
-				// 把数据填充到模版中
-				var tbodyHtml = template('list_info_px',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#info tbody').html(tbodyHtml);
-			});
-		})
-		
-		var params = new Array();
-		var jName = '';
-		var jGh = '';
-		$("#info tbody").on("click","tr",function(){
-			if($(this).children().size() < 2){
-				return;
-			}
-			$("#xcld_height").height($(window).height()-100);
-			$(this).children().each(function(index){
-				params[index] = $(this).text();
-			});
-			jName = params[0].split("\\")[0];
-			jGh = params[0].split("\\")[1];
-			var id = params[3];
-			var obj = $(this);
-			  $get('/realSchedule/MapById',{id:id},function(result){
-			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
-				var ludan_1 = template('ludan_1',result);
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms .ludan_1').html(ludan_1);
-			});  
-			$get('/realSchedule/queryListWaybill',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
-				getTime(result);
-				/* $get('/realSchedule/MapById',{id:result[0].id},function(result){
-				    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
-					var ludan_1 = template('ludan_1',result);
-					// 把渲染好的模版html文本追加到表格中
-					$('#forms .ludan_1').html(ludan_1);
-				}); */
-				var ludan_2 = template('ludan_2',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms .ludan_2').html(ludan_2);
-			});
-			$get('/realSchedule/findKMBC',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
-			    var ludan_3 = template('ludan_3',result);
-			    $('#forms .ludan_3').html(ludan_3);
-			    $("#info tbody tr").css('background-color', '');
-			    obj.css('background-color', '#99CCFF');
-			});
-			
-			
-		});
-		
-		$("#export").on("click",function(){
-			if(params.length < 1){
-				return;
-			}
-		    var i = layer.load(2);
-			$get('/realSchedule/exportWaybill',{jName:jName,jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
-				var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单";
-				window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName));
-		   		layer.close(i);
-			});
-		});
-		
-		$("#print").click(function(){
-			$("#printArea").printArea();
-		});
-		
-		$("#exportMore").on("click",function(){
-			if($("#info tbody tr td").length <= 1)
-				return;
-		    var i = layer.load(2);
-			var param = new Array();
-			$("#info tbody tr").each(function(index){
-				param[index] = new Array();
-				$(this).children().each(function(i){
-					if(i<3){
-						param[index][i] = $(this).text().split("\\")[0];
-						if(i==0){
-							param[index][3] = $(this).text().split("\\")[1];
-							
-						}
-					}
-				});
-			});
-// 			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
-// 				window.open("/downloadFile/downloadList?fileName="+result.fileName);	//下载压缩包
-			$get('/busInterval/exportWaybillMore',{date:date,line:line,lineName:lineName,strs:JSON.stringify(param)},function(result){
-				window.open("/downloadFile/download?fileName="+result.fileName);
-		   		layer.close(i);
-			});
-		});
-		
-		function getTime(list){
-            $.each(list, function(i, obj) {
-                if(obj.zdsj != null && obj.zdsjActual != null ){
-                    var zdsjActual = (obj.zdsjActual).split(":");
-                    var zdsj = (obj.zdsj).split(":");
-                    if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
-                    	if(zdsjActual[0]*60+Number(zdsjActual[1]) - zdsj[0]*60+Number(zdsj[1]) > 1000){
-                    		obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) + 1440;
-                    	} else {
-                        	obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
-                    	}
-                    }
-                    else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
-                    	if((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) > 1000){
-                    		obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1])) + 1440;
-                    	} else {
-                        	obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
-                    	}
-                    }
-                }
-            }); 
-		}
-	});
-</script>
-<script type="text/html" id="list_info">
-	{{each list as obj i}}
-		<tr>
-			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
-			<td width="32%">{{obj.clZbh}}</td>
-			<td width="23%">{{obj.lpName}}</td>
-			<td  hidden="true">{{obj.id}}</td>
-		</tr>
-	{{/each}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
-	{{/if}}
-</script>
-<script type="text/html" id="list_info_px">
-	{{each list as obj i}}
-		<tr>
-			
-			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
-			<td width="32%">{{obj.clZbh}}</td>
-			<td width="23%">{{obj.lpName}}</td>
-			<td  hidden="true">{{obj.id}}</td>
-		</tr>
-	{{/each}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
-	{{/if}}
-</script>
-<script type="text/html" id="ludan_1">
-	  <tr>
-          <td colspan="14">行车路单</td>
-      </tr>
-      <tr>
-          <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}({{plate}})   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:{{dbdp}}   日期:{{scheduleDate}}</td>
-      </tr>
-      <tr>
-		{{if type==0 && hyd!=1}}  
-          <td colspan="2">出场存油 {{ccyl}}升</td>
-          <td colspan="2">加注量 {{jzl}}升</td>
-          <td colspan="2">进场存油 {{jcyl}}升</td>
-          <td colspan="2">加注机油 &nbsp;升</td>
-		  <td colspan="3">{{rylx}}</td>
-          <td colspan="3">本日耗油 {{yh}}升</td>
-		{{/if}}
-        {{if type==1}}  
-          <td colspan="2">出场存电 {{ccyl}}%</td>
-          <td colspan="2">充电量 {{jzl}}度</td>
-          <td colspan="2">进场存电 {{jcyl}}%</td>
-          <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗电 {{yh}}度</td>
-		{{/if}}
-		{{if type==2}}  
-          <td colspan="2">出场存电 {{ccyl}}%</td>
-          <td colspan="2">充电量 {{jzl}}度</td>
-          <td colspan="2">进场存电 {{jcyl}}%</td>
-          <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗电 {{yh}}度</td>
-		{{/if}}
-      </tr>
-	  {{if hyd==1}}
-		<tr>
-		  <td colspan="2">出场存氢 {{czcl}}%</td>
-          <td colspan="2">充氢量 {{jql}}方</td>
-          <td colspan="2">进场存氢 {{jzcl}}%</td>
-          <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗氢 {{hn}}方</td>
-		</tr>
-	  {{/if}}
-      <tr>
-          <td rowspan="2">调度章</td>
-          <td colspan="1">&nbsp;</td>
-          <td rowspan="2">早班</td>
-          <td colspan="1">&nbsp;</td>
-          <td rowspan="2">夜班</td>
-          <td colspan="1">&nbsp;</td>
-          <td rowspan="2" colspan="2">交叉</td>
-          <td colspan="2">&nbsp;</td>
-          <td rowspan="2">其他</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-      </tr>
-      <tr>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="2">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-          <td colspan="1">&nbsp;</td>
-      </tr>
-      <tr>
-          <td rowspan="2">车次</td>
-          <td colspan="2">工号</td>
-          <td rowspan="2">公里耗油</td>
-          <td colspan="2">起讫站</td>
-          <td colspan="4">时间</td>
-          <td colspan="2">误点</td>
-          <td rowspan="2" width="66px">里程(公里)计划</td>
-          <td rowspan="2">备注</td>
-      </tr>
-      <tr>
-          <td colspan="1" width="60px">司&nbsp;机</td>
-          <td colspan="1" width="60px">售&nbsp;票</td>
-          <td colspan="1">起点</td>
-          <td colspan="1">终点</td>
-          <td colspan="1">计发</td>
-          <td colspan="1">实发</td>
-          <td colspan="1">应到</td>
-          <td colspan="1">实到</td>
-          <td colspan="1">快</td>
-          <td colspan="1">慢</td>
-      </tr>
-</script>
-<script type="text/html" id="ludan_2">
-	{{each list as obj i}}
-		<tr>
-			<td>{{obj.adjustExps}}</td>
-			<td>{{obj.jGh}}{{obj.jName}}</td>
-			<td>{{if obj.sGh !=null}}
-				{{obj.sGh}}{{obj.sName}}
-				{{/if}}
-			</td>
-			<td>&nbsp;</td>
-			<td>{{obj.qdzName}}</td>
-			<td>{{obj.zdzName}}</td>
-			<td>{{obj.fcsj}}</td>
-			<td>{{obj.fcsjActual}}</td>
-			<td>{{obj.zdsj}}</td>
-			<td>{{obj.zdsjActual}}</td>
-			<td>{{obj.fast}}</td>
-			<td>{{obj.slow}}</td>
-			<td>
-			{{if obj.zdsjActual!=null}}
-				{{obj.jhlc}}
-			{{/if}}
-			</td>
-			<td >
-             	{{obj.remarks}}
-			</td>
-		</tr>
-	{{/each}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
-	{{/if}}
-</script>
-<script type="text/html" id="ludan_3">
-	<tr>
-		<td colspan="2">计划班次</td>
-		<td>{{jhbc}}</td>
-		<td colspan="2">计划公里</td>
-		<td>{{jhlc}}</td>
-		<td colspan="2">烂班班次</td>
-		<td>{{cjbc}}</td>
-		<td colspan="3"> 烂班公里</td>
-		<td colspan="2">{{remMileage}}</td>
-	</tr>
-	<tr>
-		<td colspan="2">临加班次</td>
-		<td>{{ljbc}}</td>
-		<td colspan="2">临加公里</td>
-		<td>{{addMileage}}</td>
-		<td colspan="2">实际班次</td>
-		<td>{{sjbc}}</td>
-		<td colspan="3">营运公里</td>
-		<td colspan="2">{{yygl}}</td>
-	</tr>
-	<tr>
-		<td colspan="2">空驶公里</td>
-		<td>{{zkslc}}</td>
-		<td colspan="2">总公里</td>
-		<td>{{realMileage}}</td>
-		<td colspan="2"></td>
-		<td></td>
-		<td colspan="3"></td>
-		<td colspan="2"></td>
-	</tr>
-</script>
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>行车路单</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+				 	<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_xcld">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdmXcld" style="width: 180px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_xcld">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmXcld" style="width: 180px;"></select>
+					</div>
+					<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>
+					</div>
+					<div style="display: inline-block;margin-left: 24px;">
+						<span class="item-label" style="width: 80px;">&nbsp;时间: </span>
+						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+					</div>
+					<div class="form-group" style="display: inline-block;margin-left: 15px;">
+						<input class="btn btn-default" type="button" id="query" value="查询"/>
+						<input class="btn btn-default" type="button" id="export" value="导出"/>
+						<input class="btn btn-default" type="button" id="print" value="打印"/>
+						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
+					</div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="row">
+					<div class="col-md-3">
+						<div class="" id="left_height" style="margin-top: 10px;overflow:auto;">
+							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
+								<thead>
+									<tr class="hidden">
+										<th class="rypx" style="cursor:pointer ">人员</th>
+										<th class="zbhpx" style="cursor:pointer ">自编号</th>
+										<th class="lppx" style="cursor:pointer ">路牌</th>
+									</tr>
+								</thead>
+								<tbody>
+									
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="col-md-9"  id="printArea">
+						<div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
+							<table class="table table-bordered table-checkable" id="forms">
+								<tbody class="ludan_1">
+									
+								</tbody>
+						        <tbody class="ludan_2">
+						        	
+						        </tbody>
+						        <tbody class="ludan_3">
+						        	
+						        </tbody>
+						        <tbody class="ludan_4">
+						        	
+						        </tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		var fage=false;
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+
+		$("#left_height").height($(window).height()-100);
+		$("#xcld_height").height($(window).height()-100);
+		
+		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;
+		$("#date").val(year + "-" + month + "-" + day);
+		
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			
+			$.get('/user/companyData', function(result){
+				obj = result;
+				console.log(obj);
+				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_xcld").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv_xcld").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv_xcld').css('display','none');
+				}
+				$('#gsdmXcld').html(options);
+				
+				updateCompany();
+			});
+		});
+
+		$("#gsdmXcld").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmXcld').val();
+			var options = '';
+			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>';
+					}
+				}
+			}
+			$('#fgsdmXcld').html(options);
+// 			initXl();
+		}
+		
+		
+		 
+	
+// 		$("#fgsdmXcld").on("change",initXl);
+		/* function initXl(){
+			var data=[];
+			if(fage){
+				$("#line").select2("destroy").html('');
+			}
+			var fgs=$('#fgsdmXcld').val();
+			var gs=$('#gsdmXcld').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 tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+// 			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdmXcld").attr("disabled", false);
+				$("#fgsdmXcld").attr("disabled", false);
+			} else {
+				var temp = (tempData[$("#line").val()] ? tempData[$("#line").val()] : " : ").split(":");
+				$("#gsdmXcld").val(temp[0]);
+				updateCompany();
+				$("#fgsdmXcld").val(temp[1]);
+				$("#gsdmXcld").attr("disabled", true);
+				$("#fgsdmXcld").attr("disabled", true);
+			}
+		});
+		var date = '';
+		var line = '';
+		var lineName;
+		$("#query").on("click",function(){
+			$("#left_height").height($(window).height()-100);
+			line = $("#line").val();
+			date = $("#date").val();
+			lineName = $('#line option:selected').text();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		});
+		var type="desc";
+		$(".rypx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"jGh",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		$(".zbhpx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"clZbh",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		$(".lppx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"lpName",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		var params = new Array();
+		var jName = '';
+		var jGh = '';
+		$("#info tbody").on("click","tr",function(){
+			if($(this).children().size() < 2){
+				return;
+			}
+			$("#xcld_height").height($(window).height()-100);
+			$(this).children().each(function(index){
+				params[index] = $(this).text();
+			});
+			jName = params[0].split("\\")[0];
+			jGh = params[0].split("\\")[1];
+			var id = params[3];
+			var obj = $(this);
+			  $get('/realSchedule/MapById',{id:id},function(result){
+			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
+				var ludan_1 = template('ludan_1',result);
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms .ludan_1').html(ludan_1);
+			});  
+			$get('/realSchedule/queryListWaybill',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+				getTime(result);
+				/* $get('/realSchedule/MapById',{id:result[0].id},function(result){
+				    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
+					var ludan_1 = template('ludan_1',result);
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms .ludan_1').html(ludan_1);
+				}); */
+				var ludan_2 = template('ludan_2',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms .ludan_2').html(ludan_2);
+			});
+			$get('/realSchedule/findKMBC',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			    var ludan_3 = template('ludan_3',result);
+			    $('#forms .ludan_3').html(ludan_3);
+			    $("#info tbody tr").css('background-color', '');
+			    obj.css('background-color', '#99CCFF');
+			});
+			
+			
+		});
+		
+		$("#export").on("click",function(){
+			if(params.length < 1){
+				return;
+			}
+		    var i = layer.load(2);
+			$get('/realSchedule/exportWaybill',{jName:jName,jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+				var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单";
+				window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName));
+		   		layer.close(i);
+			});
+		});
+		
+		$("#print").click(function(){
+			$("#printArea").printArea();
+		});
+		
+		$("#exportMore").on("click",function(){
+			if($("#info tbody tr td").length <= 1)
+				return;
+		    var i = layer.load(2);
+			var param = new Array();
+			$("#info tbody tr").each(function(index){
+				param[index] = new Array();
+				$(this).children().each(function(i){
+					if(i<3){
+						param[index][i] = $(this).text().split("\\")[0];
+						if(i==0){
+							param[index][3] = $(this).text().split("\\")[1];
+							
+						}
+					}
+				});
+			});
+// 			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
+// 				window.open("/downloadFile/downloadList?fileName="+result.fileName);	//下载压缩包
+			$get('/busInterval/exportWaybillMore',{date:date,line:line,lineName:lineName,strs:JSON.stringify(param)},function(result){
+				window.open("/downloadFile/download?fileName="+result.fileName);
+		   		layer.close(i);
+			});
+		});
+		
+		function getTime(list){
+            $.each(list, function(i, obj) {
+                if(obj.zdsj != null && obj.zdsjActual != null ){
+                    var zdsjActual = (obj.zdsjActual).split(":");
+                    var zdsj = (obj.zdsj).split(":");
+                    if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
+                    	if(zdsjActual[0]*60+Number(zdsjActual[1]) - zdsj[0]*60+Number(zdsj[1]) > 1000){
+                    		obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) + 1440;
+                    	} else {
+                        	obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                    	}
+                    }
+                    else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
+                    	if((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) > 1000){
+                    		obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1])) + 1440;
+                    	} else {
+                        	obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                    	}
+                    }
+                }
+            }); 
+		}
+	});
+</script>
+<script type="text/html" id="list_info">
+	{{each list as obj i}}
+		<tr>
+			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
+			<td width="32%">{{obj.clZbh}}</td>
+			<td width="23%">{{obj.lpName}}</td>
+			<td  hidden="true">{{obj.id}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="list_info_px">
+	{{each list as obj i}}
+		<tr>
+			
+			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
+			<td width="32%">{{obj.clZbh}}</td>
+			<td width="23%">{{obj.lpName}}</td>
+			<td  hidden="true">{{obj.id}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="ludan_1">
+	  <tr>
+          <td colspan="14">行车路单</td>
+      </tr>
+      <tr>
+          <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}({{plate}})   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:{{dbdp}}   日期:{{scheduleDate}}</td>
+      </tr>
+      <tr>
+		{{if type==0 && hyd!=1}}  
+          <td colspan="2">出场存油 {{ccyl}}升</td>
+          <td colspan="2">加注量 {{jzl}}升</td>
+          <td colspan="2">进场存油 {{jcyl}}升</td>
+          <td colspan="2">加注机油 &nbsp;升</td>
+		  <td colspan="3">{{rylx}}</td>
+          <td colspan="3">本日耗油 {{yh}}升</td>
+		{{/if}}
+        {{if type==1}}  
+          <td colspan="2">出场存电 {{ccyl}}%</td>
+          <td colspan="2">充电量 {{jzl}}度</td>
+          <td colspan="2">进场存电 {{jcyl}}%</td>
+          <td colspan="4">加注机油 &nbsp;升</td>
+          <td colspan="4">本日耗电 {{yh}}度</td>
+		{{/if}}
+		{{if type==2}}  
+          <td colspan="2">出场存电 {{ccyl}}%</td>
+          <td colspan="2">充电量 {{jzl}}度</td>
+          <td colspan="2">进场存电 {{jcyl}}%</td>
+          <td colspan="4">加注机油 &nbsp;升</td>
+          <td colspan="4">本日耗电 {{yh}}度</td>
+		{{/if}}
+      </tr>
+	  {{if hyd==1}}
+		<tr>
+		  <td colspan="2">出场存氢 {{czcl}}%</td>
+          <td colspan="2">充氢量 {{jql}}方</td>
+          <td colspan="2">进场存氢 {{jzcl}}%</td>
+          <td colspan="4">加注机油 &nbsp;升</td>
+          <td colspan="4">本日耗氢 {{hn}}方</td>
+		</tr>
+	  {{/if}}
+      <tr>
+          <td rowspan="2">调度章</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2">早班</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2">夜班</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2" colspan="2">交叉</td>
+          <td colspan="2">&nbsp;</td>
+          <td rowspan="2">其他</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+      </tr>
+      <tr>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="2">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+      </tr>
+      <tr>
+          <td rowspan="2">车次</td>
+          <td colspan="2">工号</td>
+          <td rowspan="2">公里耗油</td>
+          <td colspan="2">起讫站</td>
+          <td colspan="4">时间</td>
+          <td colspan="2">误点</td>
+          <td rowspan="2" width="66px">里程(公里)计划</td>
+          <td rowspan="2">备注</td>
+      </tr>
+      <tr>
+          <td colspan="1" width="60px">司&nbsp;机</td>
+          <td colspan="1" width="60px">售&nbsp;票</td>
+          <td colspan="1">起点</td>
+          <td colspan="1">终点</td>
+          <td colspan="1">计发</td>
+          <td colspan="1">实发</td>
+          <td colspan="1">应到</td>
+          <td colspan="1">实到</td>
+          <td colspan="1">快</td>
+          <td colspan="1">慢</td>
+      </tr>
+</script>
+<script type="text/html" id="ludan_2">
+	{{each list as obj i}}
+		<tr>
+			<td>{{obj.adjustExps}}</td>
+			<td>{{obj.jGh}}{{obj.jName}}</td>
+			<td>{{if obj.sGh !=null}}
+				{{obj.sGh}}{{obj.sName}}
+				{{/if}}
+			</td>
+			<td>&nbsp;</td>
+			<td>{{obj.qdzName}}</td>
+			<td>{{obj.zdzName}}</td>
+			<td>{{obj.fcsj}}</td>
+			<td>{{obj.fcsjActual}}</td>
+			<td>{{obj.zdsj}}</td>
+			<td>{{obj.zdsjActual}}</td>
+			<td>{{obj.fast}}</td>
+			<td>{{obj.slow}}</td>
+			<td>
+			{{if obj.zdsjActual!=null}}
+				{{obj.jhlc}}
+			{{/if}}
+			</td>
+			<td >
+             	{{obj.remarks}}
+			</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="ludan_3">
+	<tr>
+		<td colspan="2">计划班次</td>
+		<td>{{jhbc}}</td>
+		<td colspan="2">计划公里</td>
+		<td>{{jhlc}}</td>
+		<td colspan="2">烂班班次</td>
+		<td>{{cjbc}}</td>
+		<td colspan="3"> 烂班公里</td>
+		<td colspan="2">{{remMileage}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">临加班次</td>
+		<td>{{ljbc}}</td>
+		<td colspan="2">临加公里</td>
+		<td>{{addMileage}}</td>
+		<td colspan="2">实际班次</td>
+		<td>{{sjbc}}</td>
+		<td colspan="3">营运公里</td>
+		<td colspan="2">{{yygl}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">空驶公里</td>
+		<td>{{zkslc}}</td>
+		<td colspan="2">总公里</td>
+		<td>{{realMileage}}</td>
+		<td colspan="2">总公里(GPS)</td>
+		<td>{{realGpsMileage}}</td>
+		<td colspan="3"></td>
+		<td colspan="2"></td>
+	</tr>
+</script>
-#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.driver= com.mysql.cj.jdbc.Driver
 #ms.mysql.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #ms.mysql.username= root
 #ms.mysql.password= 123456
  
-ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.2.20/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
-ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.driver= com.mysql.cj.jdbc.Driver
+ms.mysql.url= jdbc:mysql://127.0.0.1/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ms.mysql.username= schedule
+ms.mysql.password= fsodlgjiuigAQF2$9fs9
 \ No newline at end of file