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

游瑞烽
2 parents ce313275 08e392a1
Showing 43 changed files with 2236 additions and 869 deletions
pom.xml
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/entity/schedule/batch/VehicleDataSync.java
src/main/java/com/bsth/entity/schedule/batch/VehicleDataSyncStat.java
src/main/java/com/bsth/entity/schedule/batch/VehicleDataSyncStatusEnum.java
src/main/java/com/bsth/entity/schedule/batch/VehicleDataSyncStatusEnumConverter.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/repository/schedule/batch/VehicleDataSyncRepo.java
src/main/java/com/bsth/repository/schedule/batch/VehicleDataSyncStatRepo.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/java/com/bsth/service/schedule/batch/VehicleDataSyncService.java
src/main/java/com/bsth/service/schedule/batch/VehicleDataSyncServiceImpl.java
src/main/java/com/bsth/service/schedule/batch/VehicleDataSyncStatService.java
src/main/java/com/bsth/service/schedule/batch/VehicleDataSyncStatServiceImpl.java
src/main/java/com/bsth/service/schedule/batch/webservice/VehicleSyncEndpoint.java
src/main/java/com/bsth/service/schedule/batch/webservice/WebServiceConfig.java
src/main/java/com/bsth/service/schedule/batch/webservice/vehiclesync/AddVehicleDataSyncRequest.java
@@ -194,6 +194,12 @@
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>jxl</artifactId>
 			<version>2.6.12</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>rhino</groupId>
@@ -320,6 +326,10 @@
             <version>3.4.5</version>
             <exclusions>
                 <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
@@ -330,6 +340,12 @@
             <groupId>com.101tec</groupId>
             <artifactId>zkclient</artifactId>
             <version>0.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- plan common工程依赖 -->
@@ -360,6 +376,16 @@
             <version>1.7.7</version>
         </dependency>
+        <!-- web服务依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-ws</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+        </dependency>
+
 	</dependencies>
 	<dependencyManagement>
@@ -396,6 +422,26 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxb2-maven-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <id>xjc</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>xjc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <schemaDirectory>${project.basedir}/src/main/resources/xsd/</schemaDirectory>
+                    <outputDirectory>${project.basedir}/src/main/java</outputDirectory>
+                    <clearOutputDir>false</clearOutputDir>
+                    <encoding>utf-8</encoding>
+                </configuration>
+            </plugin>
 		</plugins>
 		<resources>
 			<resource>
@@ -23,6 +23,8 @@ public class Constants {
     // springboot manage health的检测url
     public static final String ACTUATOR_MANAGEMENT_HEALTH = "/manage/health";
+    // web服务url
+    public static final String WEBSERVICE_URL = "/ws/**";
 	//对外的营运数据接口
 	public static final String SERVICE_INTERFACE = "/companyService/**";
@@ -6,6 +6,7 @@ import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.*;
 import com.bsth.email.SendEmailController;
 import com.bsth.email.entity.EmailBean;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -102,14 +103,15 @@ public class DataHandleProcess {
             //等待子线程结束
-            boolean isNormal = count.await(1500, TimeUnit.MILLISECONDS);
+            boolean isNormal = count.await(5000, TimeUnit.MILLISECONDS);
             if (!isNormal) {
             	try {
     				//发送邮件
     				EmailBean mail = new EmailBean();
     				mail.setSubject("线调GPS处理");
-    				mail.setContent("GPS处理超时，检查线程栈文件信息<br/>");
+    				mail.setContent("GPS处理超时，检查日志信息<br/>");
     				sendEmailController.sendMail("113252620@qq.com", mail);
+    				logger.info(new ObjectMapper().writeValueAsString(list));
     				logger.info("DataHandlerProcess:邮件发送成功!");
     			} catch (Exception e){
     				logger.error("DataHandlerProcess:邮件发送失败!",e);
+package com.bsth.entity.schedule.batch;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 车辆数据同步数据。
+ */
+@Entity
+@Table(name = "bsth_c_cars_sync")
+public class VehicleDataSync implements Serializable {
+    /** 主健Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    //--------------- 标识车辆的数据（自编号和车牌号） ---------------//
+    /** 自编号/内部编号 */
+    private String idenZbh;
+    /** 车牌号 */
+    private String idenCph;
+
+    //--------------- 更新的数据 ------------//
+    /** 更新 公司代码 */
+    private String updateGsdm;
+    /** 更新 公司名称 */
+    private String updateGsmc;
+    /** 更新 分公司代码 */
+    private String updateFgsdm;
+    /** 更新 分公司名称 */
+    private String updateFgsmc;
+    /** 是否报废 */
+    private Boolean updateSfbf;
+    /** 报废日期 */
+    private Date updateBfd;
+
+    // TODO：后续再添加
+
+    //--------------- 时间，状态数据 ------------//
+    /** 创建时间 */
+    @Column(nullable = false)
+    private Date createDate;
+    /** 更新时间 */
+    @Column(nullable = false)
+    private Date updateDate;
+    /** 同步状态 */
+    @Column(nullable = false)
+    @Convert(converter = VehicleDataSyncStatusEnumConverter.class)
+    private VehicleDataSyncStatusEnum status;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIdenZbh() {
+        return idenZbh;
+    }
+
+    public void setIdenZbh(String idenZbh) {
+        this.idenZbh = idenZbh;
+    }
+
+    public String getIdenCph() {
+        return idenCph;
+    }
+
+    public void setIdenCph(String idenCph) {
+        this.idenCph = idenCph;
+    }
+
+    public String getUpdateGsdm() {
+        return updateGsdm;
+    }
+
+    public void setUpdateGsdm(String updateGsdm) {
+        this.updateGsdm = updateGsdm;
+    }
+
+    public String getUpdateGsmc() {
+        return updateGsmc;
+    }
+
+    public void setUpdateGsmc(String updateGsmc) {
+        this.updateGsmc = updateGsmc;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public VehicleDataSyncStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(VehicleDataSyncStatusEnum status) {
+        this.status = status;
+    }
+
+    public Boolean getUpdateSfbf() {
+        return updateSfbf;
+    }
+
+    public void setUpdateSfbf(Boolean updateSfbf) {
+        this.updateSfbf = updateSfbf;
+    }
+
+    public Date getUpdateBfd() {
+        return updateBfd;
+    }
+
+    public void setUpdateBfd(Date updateBfd) {
+        this.updateBfd = updateBfd;
+    }
+
+    public String getUpdateFgsdm() {
+        return updateFgsdm;
+    }
+
+    public void setUpdateFgsdm(String updateFgsdm) {
+        this.updateFgsdm = updateFgsdm;
+    }
+
+    public String getUpdateFgsmc() {
+        return updateFgsmc;
+    }
+
+    public void setUpdateFgsmc(String updateFgsmc) {
+        this.updateFgsmc = updateFgsmc;
+    }
+}
 \ No newline at end of file
+package com.bsth.entity.schedule.batch;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 车辆数据同步数据统计。
+ */
+@Entity
+@Table(name = "bsth_c_cars_sync_stat")
+public class VehicleDataSyncStat implements Serializable {
+    /** 主健Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** job实例Id */
+    @Column(nullable = false)
+    private Long jobId;
+    /** job名字 */
+    @Column(nullable = false)
+    private String jobName;
+    /** job执行Id */
+    @Column(nullable = false, unique = true)
+    private Long jobExecutionId;
+
+    /** 待同步的车辆数据ids（同步状态=SYNCING） */
+    @Column(length = 2000)
+    private String syncDataPrepareIds;
+    /** 待同步的车辆数据自编号s（同步状态=SYNCING） */
+    @Column(length = 2000)
+    private String syncDataPrepareZbhs;
+
+    /** 待同步的车辆count */
+    private Integer syncDataPrepareCount;
+    /** 同步成功的车辆count */
+    private Integer syncDataSuccessCount;
+
+    /** 退出step执行Id */
+    private Long exitStepExecutionId;
+    /** 退出异常stack信息 */
+    @Column(length = 2500)
+    private String exitStackTrace;
+
+    /** 同步状态 */
+    @Column(nullable = false)
+    @Convert(converter = VehicleDataSyncStatusEnumConverter.class)
+    private VehicleDataSyncStatusEnum status;
+
+    /** job执行开始时间 */
+    @Column(nullable = false)
+    private Date startDate;
+    /** job执行结束时间 */
+    private Date endDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(Long jobId) {
+        this.jobId = jobId;
+    }
+
+    public String getJobName() {
+        return jobName;
+    }
+
+    public void setJobName(String jobName) {
+        this.jobName = jobName;
+    }
+
+    public Long getJobExecutionId() {
+        return jobExecutionId;
+    }
+
+    public void setJobExecutionId(Long jobExecutionId) {
+        this.jobExecutionId = jobExecutionId;
+    }
+
+    public String getSyncDataPrepareIds() {
+        return syncDataPrepareIds;
+    }
+
+    public void setSyncDataPrepareIds(String syncDataPrepareIds) {
+        this.syncDataPrepareIds = syncDataPrepareIds;
+    }
+
+    public String getSyncDataPrepareZbhs() {
+        return syncDataPrepareZbhs;
+    }
+
+    public void setSyncDataPrepareZbhs(String syncDataPrepareZbhs) {
+        this.syncDataPrepareZbhs = syncDataPrepareZbhs;
+    }
+
+    public Integer getSyncDataPrepareCount() {
+        return syncDataPrepareCount;
+    }
+
+    public void setSyncDataPrepareCount(Integer syncDataPrepareCount) {
+        this.syncDataPrepareCount = syncDataPrepareCount;
+    }
+
+    public Integer getSyncDataSuccessCount() {
+        return syncDataSuccessCount;
+    }
+
+    public void setSyncDataSuccessCount(Integer syncDataSuccessCount) {
+        this.syncDataSuccessCount = syncDataSuccessCount;
+    }
+
+    public Long getExitStepExecutionId() {
+        return exitStepExecutionId;
+    }
+
+    public void setExitStepExecutionId(Long exitStepExecutionId) {
+        this.exitStepExecutionId = exitStepExecutionId;
+    }
+
+    public String getExitStackTrace() {
+        return exitStackTrace;
+    }
+
+    public void setExitStackTrace(String exitStackTrace) {
+        this.exitStackTrace = exitStackTrace;
+    }
+
+    public VehicleDataSyncStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(VehicleDataSyncStatusEnum status) {
+        this.status = status;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+}
+package com.bsth.entity.schedule.batch;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import org.springframework.util.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 车辆数据同步状态enum。
+ */
+public enum VehicleDataSyncStatusEnum {
+    PREPARE("准备"),
+    SYNCING("同步中"),
+    SUCCESS("成功"),
+    FAILURE("失败");
+
+    public static Map<String, VehicleDataSyncStatusEnum> enumMap =
+            new HashMap<String, VehicleDataSyncStatusEnum>() {{
+                put("准备", PREPARE);
+                put("同步中", SYNCING);
+                put("成功", SUCCESS);
+                put("失败", FAILURE);
+            }};
+
+    /** 字典描述（对应数据库的字典） */
+    private String dicDesc;
+
+    @JsonCreator
+    VehicleDataSyncStatusEnum(String dicDesc) {
+        this.dicDesc = dicDesc;
+    }
+
+    public static VehicleDataSyncStatusEnum fromDicDesc(String dicDesc) {
+        if (StringUtils.isEmpty(dicDesc)) {
+            throw new RuntimeException("车辆数据同步状态描述不能为空！");
+        } else if (enumMap.get(dicDesc) == null) {
+            throw new RuntimeException("车辆数据同步状态未定义：" + dicDesc);
+        }
+        return enumMap.get(dicDesc);
+    }
+
+    @JsonValue
+    public String getDicDesc() {
+        return dicDesc;
+    }
+
+    public void setDicDesc(String dicDesc) {
+        this.dicDesc = dicDesc;
+    }
+
+    @Override
+    public String toString() {
+        return dicDesc;
+    }
+}
+package com.bsth.entity.schedule.batch;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Convert;
+
+@Convert
+public class VehicleDataSyncStatusEnumConverter implements AttributeConverter<VehicleDataSyncStatusEnum, String> {
+    @Override
+    public String convertToDatabaseColumn(VehicleDataSyncStatusEnum vehicleDataSyncStatusEnum) {
+        return vehicleDataSyncStatusEnum.getDicDesc();
+    }
+
+    @Override
+    public VehicleDataSyncStatusEnum convertToEntityAttribute(String s) {
+        return VehicleDataSyncStatusEnum.fromDicDesc(s);
+    }
+}
@@ -17,7 +17,7 @@ public abstract class BaseFilter implements Filter {
 	 * 白名单
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.WEBSERVICE_URL };
 	@Override
 	public void destroy() {
+package com.bsth.repository.schedule.batch;
+
+import com.bsth.entity.schedule.batch.VehicleDataSync;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface VehicleDataSyncRepo extends BaseRepository<VehicleDataSync, Long> {
+}
+package com.bsth.repository.schedule.batch;
+
+import com.bsth.entity.schedule.batch.VehicleDataSyncStat;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface VehicleDataSyncStatRepo extends BaseRepository<VehicleDataSyncStat, Long> {
+
+}
@@ -33,7 +33,7 @@ public class LoginInterceptor implements Filter {
 	 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT, Constants.WEBSERVICE_URL };
 	@Override
@@ -13,9 +13,11 @@ 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.Set;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,8 +29,6 @@ import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
 import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.sheet.CalcSheet;
-import com.bsth.entity.sheet.Sheet;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.calc.CalcIntervalRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
@@ -36,9 +36,7 @@ import com.bsth.service.LineService;
 import com.bsth.service.calc.CalcIntervalService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.util.Arith;
-import com.bsth.util.ComparableReal;
 import com.bsth.util.ReportUtils;
-import com.mysql.fabric.xmlrpc.base.Array;
 @Service
 public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Integer> implements CalcIntervalService {
@@ -61,6 +59,8 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	public List<Map<String, Object>> countList(Map<String, Object> map) {
 		// TODO Auto-generated method stub
     	final DecimalFormat df = new DecimalFormat("0.00");
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
 		List<Map<String, Object>> list=new ArrayList<>();
 		String level=map.get("levelType").toString();
 		String line=map.get("line").toString().trim();
@@ -69,6 +69,25 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		String sDate=map.get("date").toString();
 		String eDate=map.get("endDate").toString();
 		String nature=map.get("nature").toString();
+		String week=map.get("week").toString();
+		String weekend="";
+		
+		try {
+			if(!("0".equals(week))){
+				Date d1 = sdf.parse(sDate);
+				Date d2 = sdf.parse(eDate);
+				for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
+					if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
+						if(weekend.length() > 0){
+							weekend = weekend + ",";
+						}
+						weekend = weekend + "'" + sdf.format(d1) + "'";
+					}
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
 		//D级线路显示发车准点率
 		if(level.equals("D") && false){		//新的计算规则D级也显示大间隔
@@ -136,7 +155,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 //					+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
 //					+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D'  ";
 			String sql="select gsbm,fgsbm,xl_bm,xl_name,SUM(bcs) as bcs,MAX(id) as id,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,"
-			+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime, level "
+			+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime,substr(level,1,1) level "
 			+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level like '%"+level+"%' "
 			+ "and level is not null and level <> '' ";
 			if(line.equals("")){
@@ -148,8 +167,13 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 			}else{
 				sql +=" and xl_bm ='"+line+"'";
 			}
-			sql += "   group by  xl_bm,gsbm,fgsbm,xl_name,level"
-					+" order by  xl_bm,level";
+			if(weekend.length() > 0 && "1".equals(week)){
+				sql +=" and date not in ("+weekend+")";
+			} else if(weekend.length() > 0 && "2".equals(week)){
+				sql +=" and date in ("+weekend+")";
+			}
+			sql += "   group by  xl_bm,gsbm,fgsbm,xl_name,substr(level,1,1)"
+					+" order by  gsbm,fgsbm,xl_bm,level";
 			list=jdbcTemplate.query(sql, 
 					 new RowMapper<Map<String,Object>>(){
@@ -171,15 +195,15 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					 }else{
 						 m.put("fsl", "0.0");
 					 }
-					 m.put("djgAll", rs.getString("djgAll"));
-					 m.put("djgGf", rs.getString("djgGf"));
-					 m.put("djgZgf", rs.getString("djgZgf"));
-					 m.put("djgWgf", rs.getString("djgWgf"));
-					 m.put("djgDg", rs.getString("djgDg"));
+					 m.put("djgAll", rs.getString("djgAll")!=null?rs.getString("djgAll"):"");
+					 m.put("djgGf", rs.getString("djgGf")!=null?rs.getString("djgGf"):"");
+					 m.put("djgZgf", rs.getString("djgZgf")!=null?rs.getString("djgZgf"):"");
+					 m.put("djgWgf", rs.getString("djgWgf")!=null?rs.getString("djgWgf"):"");
+					 m.put("djgDg", rs.getString("djgDg")!=null?rs.getString("djgDg"):"");
 					 if("0".equals(rs.getString("djgTime")) || "0.0".equals(rs.getString("djgTime"))){
 						 m.put("djgTime", "");
 					 } else {
-						 m.put("djgTime", rs.getString("djgTime"));
+						 m.put("djgTime", rs.getString("djgTime")!=null?rs.getString("djgTime"):"");
 					 }
 					 if(rs.getString("level").toString().trim().length() > 1){
 						 m.put("level", rs.getString("level").trim().substring(0, 1));
@@ -263,15 +287,44 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	public List<Map<String, Object>> listInterval(Map<String, Object> map) {
 		// TODO Auto-generated method stub
     	final DecimalFormat df = new DecimalFormat("0.00");
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String line=map.get("line").toString();
 		String date=map.get("date").toString();
 		String endDate=map.get("endDate").toString();
 		String levelType=map.get("levelType").toString();
+		String week=map.get("week").toString();
+		Set<String> weekend = new HashSet<String>();
+		
+		try {
+			if(!("0".equals(week))){
+				Date d1 = sdf.parse(date);
+				Date d2 = sdf.parse(endDate);
+				for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
+					if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
+						weekend.add(sdf.format(d1));
+					}
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		
 		List<CalcInterval> listAll=calcIntervalRepository.selectByDateAndLine(line, date, endDate, levelType);
 		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
 		for (int i = 0; i < listAll.size(); i++) {
 			CalcInterval t=listAll.get(i);
+			
+			if("1".equals(week)){
+				if(weekend.contains(t.getDate())){
+					continue;
+				}
+			} else if("2".equals(week)){
+				if(!(weekend.contains(t.getDate()))){
+					continue;
+				}
+			}
+			
 //			if(!t.getLevel().equals("D") && t.getDjgAll()>0){
 			if(t.getDjgAll() != null && t.getDjgAll() > 0){
 				Map<String, Object> m=new HashMap<>();
@@ -300,7 +353,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				tempList.add(m);
 			}
 		}
-		if(map.get("type").equals("export")){	
+		if(map.get("type").equals("export")){
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("date", date);
@@ -710,10 +763,29 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	@Override
 	public List<Map<String, Object>> exportDetail(Map<String, Object> map) {
 		// TODO Auto-generated method stub
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
 		String line=map.get("line").toString().trim();
 		String date=map.get("date").toString();
 		String endDate=map.get("endDate").toString();
 		String level=map.get("levelType").toString();
+		String week=map.get("week").toString();
+		Set<String> weekend = new HashSet<String>();
+		
+		try {
+			if(!("0".equals(week))){
+				Date d1 = sdf.parse(date);
+				Date d2 = sdf.parse(endDate);
+				for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
+					if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
+						weekend.add(sdf.format(d1));
+					}
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		
 		String nature="0", gs = "", fgs = "";
 		if(map.containsKey("nature")){
 			nature = map.get("nature").toString().trim();
@@ -735,7 +807,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				+ " d.date >= '"+date+"' and d.date <= '"+endDate+"' "
 				+ " and d.level like '%"+level+"%' "
 				+ " and d.level is not null and d.level <> '' "
-				+ " order by d.line_code, d.date asc, d.level asc ";
+				+ " order by i.gsbm, i.fgsbm, d.line_code, d.date asc, d.level asc ";
 		List<Map<String, Object>> resList=jdbcTemplate.query(sql, 
 				 new RowMapper<Map<String,Object>>(){
@@ -763,6 +835,17 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		Map<String, Boolean> lineMap=lineService.lineNature();
         for (int i = 0; i < resList.size(); i++) {
 			Map<String, Object> m=resList.get(i);
+			
+			if("1".equals(week)){
+				if(weekend.contains(m.get("date"))){
+					continue;
+				}
+			} else if("2".equals(week)){
+				if(!(weekend.contains(m.get("date")))){
+					continue;
+				}
+			}
+			
 			if(null != line && line.length() > 0){
 				if(line.equals(m.get("xlBm").toString())){
 					list.add(m);
@@ -811,12 +894,33 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	public List<Map<String, Object>> sumInterval(Map<String, Object> map) {
 		// TODO Auto-generated method stub
-    	final DecimalFormat df = new DecimalFormat("0.00");
+		final DecimalFormat df = new DecimalFormat("0.00");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
 		String gs=map.get("gs").toString().trim();
 		String fgs=map.get("fgs").toString().trim();
 		String sDate=map.get("date").toString();
 		String eDate=map.get("endDate").toString();
 		String nature=map.get("nature").toString();
+		String week=map.get("week").toString();
+		String weekend="";
+		
+		try {
+			if(!("0".equals(week))){
+				Date d1 = sdf.parse(sDate);
+				Date d2 = sdf.parse(eDate);
+				for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
+					if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
+						if(weekend.length() > 0){
+							weekend = weekend + ",";
+						}
+						weekend = weekend + "'" + sdf.format(d1) + "'";
+					}
+				}
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
         List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
@@ -830,6 +934,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				sql +=" and gsbm = '"+gs+"'";
 			}
 		}
+		if(weekend.length() > 0 && "1".equals(week)){
+			sql +=" and date not in ("+weekend+")";
+		} else if(weekend.length() > 0 && "2".equals(week)){
+			sql +=" and date in ("+weekend+")";
+		}
 		sql += " order by gsbm,fgsbm,level";
 		List<Map<String, Object>> countList = new ArrayList<Map<String, Object>>();
@@ -119,21 +119,21 @@ public class JdtestServiceImpl implements JdtestService {
 		if(map.get("fgsbm")!=null){
 			fgsbm=map.get("fgsbm").toString().trim();
 		}
-				
-		String sql="select r.xl_bm, r.cl_zbh,r.j_gh,r.lp_name "
+		
+		String sql="select r.xl_bm, r.cl_zbh, r.j_gh, r.lp_name, min(fcsj) mintime "
 				+ " from bsth_c_s_sp_info_real r where "
-				+ "r.schedule_date_str = '"+map.get("date").toString()+"'";
+				+ " r.schedule_date_str = '"+map.get("date").toString()+"'";
 		if(!gsbm.equals("")){
-			sql += "and r.gs_bm ='"+gsbm+"'";
-		}	
+			sql += " and r.gs_bm ='"+gsbm+"'";
+		}
 		if(!fgsbm.equals("")){
-			sql += "and r.fgs_bm='"+fgsbm+"'";
+			sql += " and r.fgs_bm='"+fgsbm+"'";
 		}
 		if(!xlbm.equals("")){
 			sql += " and r.xl_bm = '"+xlbm+"'";
-		}		
+		}
-				sql += " group by r.xl_bm, r.cl_zbh,r.j_gh,r.lp_name order by r.xl_bm,r.cl_zbh";
+				sql += " group by r.xl_bm,r.cl_zbh,r.j_gh,r.lp_name order by r.xl_bm,r.cl_zbh,mintime";
 		List<Map<String, Object>> list = jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
 			@Override
+package com.bsth.service.schedule.batch;
+
+import com.bsth.entity.schedule.batch.VehicleDataSync;
+import com.bsth.service.schedule.BService;
+
+public interface VehicleDataSyncService extends BService<VehicleDataSync, Long> {
+}
+package com.bsth.service.schedule.batch;
+
+import com.bsth.control_v2.plan_module.common.exception.PlanModuleException;
+import com.bsth.entity.schedule.batch.VehicleDataSync;
+import com.bsth.service.schedule.impl.BServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class VehicleDataSyncServiceImpl extends BServiceImpl<VehicleDataSync, Long> implements VehicleDataSyncService {
+    @Override
+    public void delete(Long aLong) {
+        throw new PlanModuleException("不支持delete方法！");
+    }
+}
+package com.bsth.service.schedule.batch;
+
+import com.bsth.entity.schedule.batch.VehicleDataSyncStat;
+import com.bsth.service.schedule.BService;
+
+public interface VehicleDataSyncStatService extends BService<VehicleDataSyncStat, Long> {
+}
+package com.bsth.service.schedule.batch;
+
+import com.bsth.control_v2.plan_module.common.exception.PlanModuleException;
+import com.bsth.entity.schedule.batch.VehicleDataSyncStat;
+import com.bsth.service.schedule.impl.BServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class VehicleDataSyncStatServiceImpl extends BServiceImpl<VehicleDataSyncStat, Long> implements VehicleDataSyncStatService {
+    @Override
+    public VehicleDataSyncStat save(VehicleDataSyncStat vehicleDataSyncStat) {
+        throw new PlanModuleException("不支持save方法！");
+    }
+
+    @Override
+    public void delete(Long aLong) {
+        throw new PlanModuleException("不支持delete方法！");
+    }
+}
+package com.bsth.service.schedule.batch.webservice;
+
+import com.bsth.entity.schedule.batch.VehicleDataSync;
+import com.bsth.entity.schedule.batch.VehicleDataSyncStatusEnum;
+import com.bsth.service.schedule.batch.VehicleDataSyncService;
+import com.bsth.service.schedule.batch.webservice.vehiclesync.AddVehicleDataSyncRequest;
+import com.bsth.service.schedule.batch.webservice.vehiclesync.AddVehicleDataSyncResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ws.server.endpoint.annotation.Endpoint;
+import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
+import org.springframework.ws.server.endpoint.annotation.RequestPayload;
+import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
+
+import java.util.Date;
+
+@Endpoint
+public class VehicleSyncEndpoint {
+    /** 名字空间uri */
+    private static final String NAMESPACE_URI = "http://bsth.com/service/schedule/batch/webservice/vehicleSync";
+
+    @Autowired
+    private VehicleDataSyncService vehicleDataSyncService;
+    @PayloadRoot(namespace = NAMESPACE_URI, localPart = "addVehicleDataSyncRequest")
+    @ResponsePayload
+    public AddVehicleDataSyncResponse addVehicleDataSync(
+            @RequestPayload AddVehicleDataSyncRequest addVehicleDataSyncRequest) {
+        AddVehicleDataSyncResponse addVehicleDataSyncResponse = new AddVehicleDataSyncResponse();
+        try {
+            // 创建车辆同步数据
+            VehicleDataSync vehicleDataSync = new VehicleDataSync();
+            vehicleDataSync.setIdenZbh(addVehicleDataSyncRequest.getIdenZbh());
+            vehicleDataSync.setIdenCph(addVehicleDataSyncRequest.getIdenCph());
+            vehicleDataSync.setUpdateGsmc(addVehicleDataSyncRequest.getUpdateGsmc());
+            vehicleDataSync.setUpdateFgsmc(addVehicleDataSyncRequest.getUpdateFgsmc());
+            vehicleDataSync.setUpdateSfbf(addVehicleDataSyncRequest.isUpdateSfbf());
+
+            vehicleDataSync.setStatus(VehicleDataSyncStatusEnum.PREPARE);
+            vehicleDataSync.setCreateDate(new Date());
+            vehicleDataSync.setUpdateDate(new Date());
+            vehicleDataSyncService.save(vehicleDataSync);
+
+            addVehicleDataSyncResponse.setSuccess(true);
+            addVehicleDataSyncResponse.setMessage("OK！");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            addVehicleDataSyncResponse.setSuccess(false);
+            addVehicleDataSyncResponse.setMessage(exp.getMessage());
+        }
+
+        return addVehicleDataSyncResponse;
+    }
+}
+package com.bsth.service.schedule.batch.webservice;
+
+import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.ws.config.annotation.EnableWs;
+import org.springframework.ws.config.annotation.WsConfigurerAdapter;
+import org.springframework.ws.transport.http.MessageDispatcherServlet;
+import org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition;
+import org.springframework.xml.xsd.SimpleXsdSchema;
+import org.springframework.xml.xsd.XsdSchema;
+
+@EnableWs
+@Configuration
+public class WebServiceConfig extends WsConfigurerAdapter {
+    @Bean
+    public ServletRegistrationBean messageDispatcherServlet(ApplicationContext applicationContext) {
+        MessageDispatcherServlet servlet = new MessageDispatcherServlet();
+        servlet.setApplicationContext(applicationContext);
+        servlet.setTransformWsdlLocations(true);
+        return new ServletRegistrationBean(servlet, "/ws/*");
+    }
+
+    @Bean(name="vehicleSync")
+    public DefaultWsdl11Definition vehicleSyncWsdl11Definition(XsdSchema vehicleSyncSchema) {
+        DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition();
+        wsdl11Definition.setPortTypeName("vehicleSyncPort");
+        wsdl11Definition.setLocationUri("/ws");
+        wsdl11Definition.setTargetNamespace("http://bsth.com/service/schedule/batch/webservice/vehicleSync");
+        wsdl11Definition.setSchema(vehicleSyncSchema);
+        return wsdl11Definition;
+    }
+
+    @Bean
+    public XsdSchema vehicleSyncSchema() {
+        return new SimpleXsdSchema(new ClassPathResource("/xsd/vehicleSync.xsd"));
+    }
+
+
+}
+//
+// 此文件是由 JavaTM Architecture for XML Binding (JAXB) 引用实现 v2.2.7 生成的
+// 请访问 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// 在重新编译源模式时, 对此文件的所有修改都将丢失。
+// 生成时间: 2020.06.23 时间 03:15:37 PM CST 
+//
+
+
+package com.bsth.service.schedule.batch.webservice.vehiclesync;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>anonymous complex type的 Java 类。
+ * 
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="idenZbh" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="idenCph" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="updateGsmc" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="updateFgsmc" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="updateSfbf" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "idenZbh",
+    "idenCph",
+    "updateGsmc",
+    "updateFgsmc",
+    "updateSfbf"
+})
+@XmlRootElement(name = "addVehicleDataSyncRequest")
+public class AddVehicleDataSyncRequest {
+
+    @XmlElement(required = true)
+    protected String idenZbh;
+    @XmlElement(required = true)
+    protected String idenCph;
+    @XmlElement(required = true)
+    protected String updateGsmc;
+    @XmlElement(required = true)
+    protected String updateFgsmc;
+    protected boolean updateSfbf;
+
+    /**
+     * 获取idenZbh属性的值。
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIdenZbh() {
+        return idenZbh;
+    }
+
+    /**
+     * 设置idenZbh属性的值。
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIdenZbh(String value) {
+        this.idenZbh = value;
+    }
+
+    /**
+     * 获取idenCph属性的值。
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIdenCph() {
+        return idenCph;
+    }
+
+    /**
+     * 设置idenCph属性的值。
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIdenCph(String value) {
+        this.idenCph = value;
+    }
+
+    /**
+     * 获取updateGsmc属性的值。
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getUpdateGsmc() {
+        return updateGsmc;
+    }
+
+    /**
+     * 设置updateGsmc属性的值。
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUpdateGsmc(String value) {
+        this.updateGsmc = value;
+    }
+
+    /**
+     * 获取updateFgsmc属性的值。
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getUpdateFgsmc() {
+        return updateFgsmc;
+    }
+
+    /**
+     * 设置updateFgsmc属性的值。
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUpdateFgsmc(String value) {
+        this.updateFgsmc = value;
+    }
+
+    /**
+     * 获取updateSfbf属性的值。
+     * 
+     */
+    public boolean isUpdateSfbf() {
+        return updateSfbf;
+    }
+
+    /**
+     * 设置updateSfbf属性的值。
+     * 
+     */
+    public void setUpdateSfbf(boolean value) {
+        this.updateSfbf = value;
+    }
+
+}
+//
+// 此文件是由 JavaTM Architecture for XML Binding (JAXB) 引用实现 v2.2.7 生成的
+// 请访问 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// 在重新编译源模式时, 对此文件的所有修改都将丢失。
+// 生成时间: 2020.06.23 时间 03:15:37 PM CST 
+//
+
+
+package com.bsth.service.schedule.batch.webservice.vehiclesync;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>anonymous complex type的 Java 类。
+ * 
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="success" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="message" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "success",
+    "message"
+})
+@XmlRootElement(name = "addVehicleDataSyncResponse")
+public class AddVehicleDataSyncResponse {
+
+    protected boolean success;
+    @XmlElement(required = true)
+    protected String message;
+
+    /**
+     * 获取success属性的值。
+     * 
+     */
+    public boolean isSuccess() {
+        return success;
+    }
+
+    /**
+     * 设置success属性的值。
+     * 
+     */
+    public void setSuccess(boolean value) {
+        this.success = value;
+    }
+
+    /**
+     * 获取message属性的值。
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * 设置message属性的值。
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setMessage(String value) {
+        this.message = value;
+    }
+
+}
+//
+// 此文件是由 JavaTM Architecture for XML Binding (JAXB) 引用实现 v2.2.7 生成的
+// 请访问 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// 在重新编译源模式时, 对此文件的所有修改都将丢失。
+// 生成时间: 2020.06.23 时间 03:15:37 PM CST 
+//
+
+
+package com.bsth.service.schedule.batch.webservice.vehiclesync;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the com.bsth.service.schedule.batch.webservice.vehiclesync package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.bsth.service.schedule.batch.webservice.vehiclesync
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link AddVehicleDataSyncResponse }
+     * 
+     */
+    public AddVehicleDataSyncResponse createAddVehicleDataSyncResponse() {
+        return new AddVehicleDataSyncResponse();
+    }
+
+    /**
+     * Create an instance of {@link AddVehicleDataSyncRequest }
+     * 
+     */
+    public AddVehicleDataSyncRequest createAddVehicleDataSyncRequest() {
+        return new AddVehicleDataSyncRequest();
+    }
+
+}
+//
+// 此文件是由 JavaTM Architecture for XML Binding (JAXB) 引用实现 v2.2.7 生成的
+// 请访问 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// 在重新编译源模式时, 对此文件的所有修改都将丢失。
+// 生成时间: 2020.06.23 时间 03:15:37 PM CST 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://bsth.com/service/schedule/batch/webservice/vehicleSync", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package com.bsth.service.schedule.batch.webservice.vehiclesync;
@@ -2,6 +2,9 @@
 spring.dubbo.application.name=bsth_control_v_multi_service
 # zookeeper注册中心地址
 spring.dubbo.registry=zookeeper://127.0.0.1:2181
+# protocol配置
+spring.dubbo.protocol.name=dubbo
+spring.dubbo.protocol.port=30881
 #----------- dubbo:consumer 性能调优选项 -------------#
 # 远程服务调用超时时间，单位毫秒，这里设置30分钟
@@ -2,6 +2,9 @@
 spring.dubbo.application.name=bsth_control_v_multi_service
 # zookeeper注册中心地址
 spring.dubbo.registry=zookeeper://127.0.0.1:2181
+# protocol配置
+spring.dubbo.protocol.name=dubbo
+spring.dubbo.protocol.port=30881
 #----------- dubbo:consumer 性能调优选项 -------------#
 # 远程服务调用超时时间，单位毫秒，这里设置30分钟
@@ -2,6 +2,9 @@
 spring.dubbo.application.name=bsth_control_v2
 # zookeeper注册中心地址
 spring.dubbo.registry=zookeeper://127.0.0.1:2181
+# protocol配置
+spring.dubbo.protocol.name=dubbo
+spring.dubbo.protocol.port=30881
 #----------- dubbo:consumer 性能调优选项 -------------#
 # 远程服务调用超时时间，单位毫秒，这里设置30分钟
-<style type="text/css">
+<style type="text/css">
 	.table-bordered {
 	  border: 1px solid; }
 	  .table-bordered > thead > tr > th,
@@ -40,14 +40,6 @@
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
-					<div style="display: inline-block; margin-left: 18px;" id="sfdcDiv">
-                        <span class="item-label" style="width: 80px;">是否电车: </span>
-                        <select class="form-control form-filter " name="sfdc" id="sfdc">
-							<option value="">请选择...</option>
-							<option value="0">否</option>
-							<option value="1">是</option>
-						</select>
-                    </div>
 					<div style="margin-top: 10px"></div>
                     <div style="display: inline-block;margin-left: 3px;">
                         <span class="item-label" style="width: 140px;">开始时间: </span>
@@ -108,7 +100,6 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
 		var d = new Date();
 		d.setTime(d.getTime() - 4*1000*60*60*24);
 		var year = d.getFullYear();
@@ -118,20 +109,13 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		var dateTime = year + "-" + month + "-" + day;
-		$("#startDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn',
-			maxDate : dateTime
-		});
-		$("#endDate").datetimepicker({
+		
+		$("#startDate,#endDate").datetimepicker({
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn',
-			maxDate : dateTime
+			maxDate : year + "-" + month + "-" + day
 		});
-		$("#startDate").val(dateTime);
-		$("#endDate").val(dateTime);
-
+		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
 		var fage=false;
 		var xlList;
@@ -211,8 +195,6 @@
 			}
 		});
-		$("#sfdcDiv").hide();
-		
 		var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = "";
 		$("#tjtype").on("change",function(){
 			if(cont == "驾驶员"){
@@ -225,13 +207,10 @@
 			cont = $("#tjtype").val();
 			if($("#tjtype").val() == "驾驶员"){
 				$("#cont").val(cont1);
-				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "售票员"){
 				$("#cont").val(cont2);
-				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "车辆自编号"){
 				$("#cont").val(cont3);
-				$("#sfdcDiv").show();
 			}
 		});
@@ -252,10 +231,9 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
-		    var sfdc=$("#sfdc").val();
 		    var params = {};
 		    var i = layer.load(2);
-		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc},function(result){		        
+		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont},function(result){		        
 				layer.close(i);
 				var singledata = template('singledata',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -271,12 +249,11 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
-		    var sfdc=$("#sfdc").val();
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdmSing option:selected').text();
 		    var i = layer.load(2);
-			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc,type:'export',lineName:lineName},function(result){
+			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,type:'export',lineName:lineName},function(result){
 				var dateTime = "";
 				if(startDate == endDate){
 					dateTime = moment(startDate).format("YYYYMMDD");
-<style type="text/css">
+<style type="text/css">
 	.table-bordered {
 	  border: 1px solid; }
 	  .table-bordered > thead > tr > th,
@@ -150,7 +150,7 @@
 			$('.menu-toggler.sidebar-toggler').click();
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		d.setTime(d.getTime() - 4*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
-<style>
-    .system_change_log{
-        background: #fff;
-        color: #666;
-        box-shadow: 0 5px 15px rgba(0,0,0,0.08);
-        height: calc(100% + 10px);
-        margin-top: -10px;
-        font-size: 14px;
-        padding: 10px 0 0 15px;
-        overflow: auto;
-    }
-    .system_change_log>ul{
-        margin:0px;
-        list-style:none;
-    }
-
-    .system_change_log>ul>li.sub_title{
-        text-indent: 0;
-    }
-
-    .system_change_log>ul>li.sub_title>h6{
-        font-size: 12px;
-        font-family: 微软雅黑;
-        color: #000;
-        margin-top: 8px;
-        margin-bottom: 8px;
-    }
-
-    .system_change_log>ul>li{
-        margin: 5px 0;
-        text-indent: 25px;
-    }
-
-    .system_change_log .label{
-        width: 55px;
-        display: inline-block;
-        padding: 0 10px;
-        line-height: 1.5;
-        font-size: 12px;
-        color: #fff;
-        vertical-align: middle;
-        white-space: nowrap;
-        border-radius: 2px !important;
-        text-transform: uppercase;
-        text-align: center;
-        text-indent: 3px;
-        margin-right: 15px;
-    }
-    .system_change_log .label.s_c_add{
-        background-color: #32d296;
-    }
-
-    .system_change_log .label.s_c_change{
-        background-color: #1e87f0;
-    }
-
-    .system_change_log .label.s_c_remove{
-        background-color: #faa05a;
-    }
-</style>
-<div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2020-03-12 更新说明 Changelog</h2>
-    <br><br>
-    <ul >
-        <li class="sub_title"><h6>权限管理</h6></li>
-        <li><span class="label s_c_change">修改</span>1、密码修改加入密码复杂度校验机制</li>
-        <li class="sub_title"><h6>线调</h6></li>
-        <li><span class="label s_c_change">新增</span>1、线调页面新增维修上报功能</li>
-    </ul>
-
-</div>
-
-<script type="text/javascript">
-    $.ajax({
-        url: '/eci/validate_get_destroy_info',
-        dataType: "json",
-        success: function(rs) {
-            if (rs && rs.status === "SUCCESS") {
-                if (rs.data && rs.data.length && rs.data.length > 0) {
-                    swal({
-                        title: "人员配置停用信息",
-                        text: rs.data.join("</br>"),
-                        html: true,
-                        type: "warning",
-                        showCancelButton: true,
-                        confirmButtonColor: "RED",
-                        confirmButtonText: "是",
-                        cancelButtonText: "取消"
-                    });
-                }
-            }
-        }
-    });
-
-</script>
+<style>
+    .system_change_log{
+        background: #fff;
+        color: #666;
+        box-shadow: 0 5px 15px rgba(0,0,0,0.08);
+        height: calc(100% + 10px);
+        margin-top: -10px;
+        font-size: 14px;
+        padding: 10px 0 0 15px;
+        overflow: auto;
+    }
+    .system_change_log>ul{
+        margin:0px;
+        list-style:none;
+    }
+
+    .system_change_log>ul>li.sub_title{
+        text-indent: 0;
+    }
+
+    .system_change_log>ul>li.sub_title>h6{
+        font-size: 12px;
+        font-family: 微软雅黑;
+        color: #000;
+        margin-top: 8px;
+        margin-bottom: 8px;
+    }
+
+    .system_change_log>ul>li{
+        margin: 5px 0;
+        text-indent: 25px;
+    }
+
+    .system_change_log .label{
+        width: 55px;
+        display: inline-block;
+        padding: 0 10px;
+        line-height: 1.5;
+        font-size: 12px;
+        color: #fff;
+        vertical-align: middle;
+        white-space: nowrap;
+        border-radius: 2px !important;
+        text-transform: uppercase;
+        text-align: center;
+        text-indent: 3px;
+        margin-right: 15px;
+    }
+    .system_change_log .label.s_c_add{
+        background-color: #32d296;
+    }
+
+    .system_change_log .label.s_c_change{
+        background-color: #1e87f0;
+    }
+
+    .system_change_log .label.s_c_remove{
+        background-color: #faa05a;
+    }
+</style>
+<div class="system_change_log">
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2020-07-30 更新说明 Changelog</h2>
+    <br><br>
+    <ul >
+        <li class="sub_title"><h6>权限管理</h6></li>
+        <li><span class="label s_c_change">修改</span>1、权限加入分级概念，同级、上级不能操作，如:下级账户不能创建管理员账户</li>
+        <li><span class="label s_c_change">修改</span>2、权限操作时验证角色信息</li>
+        <li class="sub_title"><h6>线调</h6></li>
+        <li><span class="label s_c_change">修改</span>1、轨迹回放版本切换问题修复</li>
+        <li><span class="label s_c_change">修改</span>2、批量换人换车可能造成某日班次不能清除问题修复</li>
+        <li><span class="label s_c_change">修改</span>3、调度系统中偶然出现的批量掉线问题修复(调度网关有数据情况)</li>
+        <li><span class="label s_c_change">修改</span>4、安全驾驶添加了安全检查类别、接口地址调整</li>
+        <li><span class="label s_c_change">新增</span>5、与服务热线系统对接,可在线调页填写服务投诉信息</li>
+        <li class="sub_title"><h6>计调</h6></li>
+        <li><span class="label s_c_change">新增</span>1、人员停用在home.html做弹出框，后台获取当前用户权限下的线路人员配置停用信息</li>
+        <li><span class="label s_c_change">新增</span>2、人员管理添加金蝶工号显示</li>
+        <li><span class="label s_c_change">新增</span>3、修改时刻表明细编辑页面，添加班型编辑列，修改相关指令</li>
+        <li><span class="label s_c_change">修改</span>4、修复时刻表批量修改问题所在</li>
+        <li><span class="label s_c_change">新增</span>5、添加车辆同步接口web服务</li>
+        <li><span class="label s_c_change">新增</span>6、调度执勤日报修改人员，车辆时，初始会修改已有车辆人员配置（如套跑某个班次的车辆不一样，初始时会修改）</li>
+        <li><span class="label s_c_change">修改</span>7、排班明细修改班次时，修改去除工号的前缀</li>
+        <li class="sub_title"><h6>基础信息</h6></li>
+        <li><span class="label s_c_change">新增</span>1、添加线路和修改线路时，选择环线或者双向的提示</li>
+        <li><span class="label s_c_change">新增</span>2、添加站点行业编码字段</li>
+    </ul>
+
+</div>
+
+<script type="text/javascript">
+    $.ajax({
+        url: '/eci/validate_get_destroy_info',
+        dataType: "json",
+        success: function(rs) {
+            if (rs && rs.status === "SUCCESS") {
+                if (rs.data && rs.data.length && rs.data.length > 0) {
+                    swal({
+                        title: "人员配置停用信息",
+                        text: rs.data.join("</br>"),
+                        html: true,
+                        type: "warning",
+                        showCancelButton: true,
+                        confirmButtonColor: "RED",
+                        confirmButtonText: "是",
+                        cancelButtonText: "取消"
+                    });
+                }
+            }
+        }
+    });
+
+</script>
-<style type="text/css">
+<style type="text/css">
 	.table-bordered {
 	  border: 1px solid; }
 	  .table-bordered > thead > tr > th,
@@ -123,7 +123,7 @@
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		//d.setTime(d.getTime() - 1*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
-<style type="text/css">
+<style type="text/css">
 	.table-bordered {
 	  border: 1px solid; }
 	  .table-bordered > thead > tr > th,
@@ -113,7 +113,7 @@
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		//d.setTime(d.getTime() - 1*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
-<div class="row">
-<div class="col-md-12">
-<!-- BEGIN VALIDATION STATES-->
-<div class="portlet light portlet-fit portlet-form bordered">
-<div class="portlet-body">
-	<form class="form-horizontal" id="changePWDForm">
-		<div class="alert alert-danger display-hide">
-            <button class="close" data-close="alert"></button>您的输入有误，请检查下面的输入项
-        </div>
-		<div class="form-group" style="margin-top: 60px">
-		    <label class="control-label col-md-5">原始密码：
-		    </label>
-		    <div class="col-md-4">
-		        <div class="input-icon right">
-		            <i class="fa"></i>
-		            <input type="password" class="form-control" name="oldPWD" /> </div>
-		    </div>
-		</div>
-		<div class="form-group">
-		    <label class="control-label col-md-5">输入新密码：
-		    </label>
-		    <div class="col-md-4">
-		        <div class="input-icon right">
-		            <i class="fa"></i>
-		            <input type="password" class="form-control" name="newPWD" id="newPWD"/> </div>
-		    </div>
-		</div>
-		<div class="form-group">
-		    <label class="control-label col-md-5">确认新密码：
-		    </label>
-		    <div class="col-md-4">
-		        <div class="input-icon right">
-		            <i class="fa"></i>
-		            <input type="password" class="form-control" name="cnewPWD" /> </div>
-		    </div>
-		</div>
-		<div class="form-actions">
-	        <div class="row">
-	            <div class="col-md-offset-5 col-md-7">
-	                <button type="submit" id="confirm" class="btn green">确定</button>
-	                <button type="reset" class="btn default">取消</button>
-	            </div>
-	        </div>
-	    </div>
-	</form>
-</div>
-</div>
-</div>
-</div>
-
-<script>
-$(function(){
-	var form = $('#changePWDForm');
-    //表单 validate
-    var error = $('.alert-danger', form);
-
-    $.validator.addMethod("passwordrule", function(value, element) {
-        //var userblank = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*?[#?!@$%^&*-]).{8,16}$/;
-        var userblank = /^(?=.*[a-zA-Z])(?=.*\d).{8,16}$/;
-        return this.optional(element) ||(userblank.test(value));
-    }, "需包含字母、数字的8-16位字符");
-
-    //表单 validate
-    form.validate({
-        errorElement : 'span',
-        errorClass : 'help-block help-block-error',
-        focusInvalid : false,
-        rules : {
-            'newPWD' : {
-                required : true,
-                minlength: 8,
-                maxlength: 16,
-                passwordrule:true
-            },
-            'cnewPWD' : {
-                equalTo: '#newPWD'
-            }
-        },
-        invalidHandler : function(event, validator) {
-            error.show();
-            App.scrollTo(error, -200);
-        },
-
-        highlight : function(element) {
-            $(element).closest('.form-group').addClass('has-error');
-        },
-
-        unhighlight : function(element) {
-            $(element).closest('.form-group').removeClass('has-error');
-        },
-
-        success : function(label) {
-            label.closest('.form-group').removeClass('has-error');
-        },
-        
-        submitHandler : function(f) {
-            var params = form.serializeJSON();
-            error.hide();
-
-            var keys;
-            $.ajax({
-                url: "/user/login/jCryptionKey?t="+Math.random(),
-                type: "Get",
-                async:false,
-                data: null,
-                success: function(data) {
-                    keys = data.publickey;
-                }
-            });
-            //RSA加密
-            var encrypt = new JSEncrypt();
-            encrypt.setPublicKey(keys);
-            params.oldPWD = encrypt.encrypt(params.oldPWD);
-            params.newPWD = encrypt.encrypt(params.newPWD);
-            params.cnewPWD = encrypt.encrypt(params.cnewPWD);
-            $.ajax({
-                url: '/user/changePWD',
-                type: 'POST',
-                traditional: true,
-                data: params,
-                success: function(msg){
-                    layer.alert(msg);
-                }
-            });
-        }
-    });
-});
+<div class="row">
+<div class="col-md-12">
+<!-- BEGIN VALIDATION STATES-->
+<div class="portlet light portlet-fit portlet-form bordered">
+<div class="portlet-body">
+	<form class="form-horizontal" id="changePWDForm">
+		<div class="alert alert-danger display-hide">
+            <button class="close" data-close="alert"></button>您的输入有误，请检查下面的输入项
+        </div>
+		<div class="form-group" style="margin-top: 60px">
+		    <label class="control-label col-md-5">原始密码：
+		    </label>
+		    <div class="col-md-4">
+		        <div class="input-icon right">
+		            <i class="fa"></i>
+		            <input type="password" class="form-control" name="oldPWD" /> </div>
+		    </div>
+		</div>
+		<div class="form-group">
+		    <label class="control-label col-md-5">输入新密码：
+		    </label>
+		    <div class="col-md-4">
+		        <div class="input-icon right">
+		            <i class="fa"></i>
+		            <input type="password" class="form-control" name="newPWD" id="newPWD"/> </div>
+		    </div>
+		</div>
+		<div class="form-group">
+		    <label class="control-label col-md-5">确认新密码：
+		    </label>
+		    <div class="col-md-4">
+		        <div class="input-icon right">
+		            <i class="fa"></i>
+		            <input type="password" class="form-control" name="cnewPWD" /> </div>
+		    </div>
+		</div>
+		<div class="form-actions">
+	        <div class="row">
+	            <div class="col-md-offset-5 col-md-7">
+	                <button type="submit" id="confirm" class="btn green">确定</button>
+	                <button type="reset" class="btn default">取消</button>
+	            </div>
+	        </div>
+	    </div>
+	</form>
+</div>
+</div>
+</div>
+</div>
+
+<script>
+$(function(){
+	var form = $('#changePWDForm');
+    //表单 validate
+    var error = $('.alert-danger', form);
+
+    $.validator.addMethod("passwordrule", function(value, element) {
+        var reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*?[#?!@$%^&*-]).{8,16}$/;
+        //var reg = /^(?=.*[a-zA-Z])(?=.*\d).{8,16}$/;
+        return this.optional(element) ||(reg.test(value));
+    }, "需包含字母、数字的8-16位字符");
+
+    //表单 validate
+    form.validate({
+        errorElement : 'span',
+        errorClass : 'help-block help-block-error',
+        focusInvalid : false,
+        rules : {
+            'newPWD' : {
+                required : true,
+                minlength: 8,
+                maxlength: 16,
+                passwordrule:true
+            },
+            'cnewPWD' : {
+                equalTo: '#newPWD'
+            }
+        },
+        invalidHandler : function(event, validator) {
+            error.show();
+            App.scrollTo(error, -200);
+        },
+
+        highlight : function(element) {
+            $(element).closest('.form-group').addClass('has-error');
+        },
+
+        unhighlight : function(element) {
+            $(element).closest('.form-group').removeClass('has-error');
+        },
+
+        success : function(label) {
+            label.closest('.form-group').removeClass('has-error');
+        },
+        
+        submitHandler : function(f) {
+            var params = form.serializeJSON();
+            error.hide();
+
+            var keys;
+            $.ajax({
+                url: "/user/login/jCryptionKey?t="+Math.random(),
+                type: "Get",
+                async:false,
+                data: null,
+                success: function(data) {
+                    keys = data.publickey;
+                }
+            });
+            //RSA加密
+            var encrypt = new JSEncrypt();
+            encrypt.setPublicKey(keys);
+            params.oldPWD = encrypt.encrypt(params.oldPWD);
+            params.newPWD = encrypt.encrypt(params.newPWD);
+            params.cnewPWD = encrypt.encrypt(params.cnewPWD);
+            $.ajax({
+                url: '/user/changePWD',
+                type: 'POST',
+                traditional: true,
+                data: params,
+                success: function(msg){
+                    layer.alert(msg);
+                }
+            });
+        }
+    });
+});
 </script>
 \ No newline at end of file
+<div class="row">
+<div class="col-md-12">
+<!-- BEGIN VALIDATION STATES-->
+<div class="portlet light portlet-fit portlet-form bordered">
+<div class="portlet-body">
+	<form class="form-horizontal" id="forceChangePWDForm">
+		<div class="alert alert-danger display-hide">
+            <button class="close" data-close="alert"></button>您的输入有误，请检查下面的输入项
+        </div>
+		<div class="form-group" style="margin-top: 60px">
+		    <label class="control-label col-md-5">原始密码：
+		    </label>
+		    <div class="col-md-4">
+		        <div class="input-icon right">
+		            <i class="fa"></i>
+		            <input type="password" class="form-control" name="oldPWD" /> </div>
+		    </div>
+		</div>
+		<div class="form-group">
+		    <label class="control-label col-md-5">输入新密码：
+		    </label>
+		    <div class="col-md-4">
+		        <div class="input-icon right">
+		            <i class="fa"></i>
+		            <input type="password" class="form-control" name="newPWD" id="newPWD"/> </div>
+		    </div>
+		</div>
+		<div class="form-group">
+		    <label class="control-label col-md-5">确认新密码：
+		    </label>
+		    <div class="col-md-4">
+		        <div class="input-icon right">
+		            <i class="fa"></i>
+		            <input type="password" class="form-control" name="cnewPWD" /> </div>
+		    </div>
+		</div>
+		<div class="form-actions">
+	        <div class="row">
+	            <div class="col-md-offset-5 col-md-7">
+	                <button type="submit" id="confirm" class="btn green">确定</button>
+	            </div>
+	        </div>
+	    </div>
+	</form>
+</div>
+</div>
+</div>
+</div>
+
+<script>
+$(function(){
+	var form = $('#forceChangePWDForm');
+    //表单 validate
+    var error = $('.alert-danger', form);
+
+    $.validator.addMethod("passwordrule", function(value, element) {
+        var reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*?[#?!@$%^&*-]).{8,16}$/;
+        //var reg = /^(?=.*[a-zA-Z])(?=.*\d).{8,16}$/;
+        return this.optional(element) ||(reg.test(value));
+    }, "需包含字母、数字的8-16位字符");
+
+    //表单 validate
+    form.validate({
+        errorElement : 'span',
+        errorClass : 'help-block help-block-error',
+        focusInvalid : false,
+        rules : {
+            'newPWD' : {
+                required : true,
+                minlength: 8,
+                maxlength: 16,
+                passwordrule:true
+            },
+            'cnewPWD' : {
+                equalTo: '#newPWD'
+            }
+        },
+        invalidHandler : function(event, validator) {
+            error.show();
+            App.scrollTo(error, -200);
+        },
+
+        highlight : function(element) {
+            $(element).closest('.form-group').addClass('has-error');
+        },
+
+        unhighlight : function(element) {
+            $(element).closest('.form-group').removeClass('has-error');
+        },
+
+        success : function(label) {
+            label.closest('.form-group').removeClass('has-error');
+        },
+        
+        submitHandler : function(f) {
+            var params = form.serializeJSON();
+            error.hide();
+
+            var keys;
+            $.ajax({
+                url: "/user/login/jCryptionKey?t="+Math.random(),
+                type: "Get",
+                async:false,
+                data: null,
+                success: function(data) {
+                    keys = data.publickey;
+                }
+            });
+            //RSA加密
+            var encrypt = new JSEncrypt();
+            encrypt.setPublicKey(keys);
+            params.oldPWD = encrypt.encrypt(params.oldPWD);
+            params.newPWD = encrypt.encrypt(params.newPWD);
+            params.cnewPWD = encrypt.encrypt(params.cnewPWD);
+            $.ajax({
+                url: '/user/changePWD',
+                type: 'POST',
+                traditional: true,
+                data: params,
+                success: function(msg){
+                    layer.close();
+                }
+            });
+        }
+    });
+});
+</script>
 \ No newline at end of file
@@ -27,54 +27,60 @@
 		<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">
-							<span class="item-label" style="width: 80px;">公司: </span>
-							<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
-						</div> 
-						<div style="display: inline-block; margin-left: 28px;" id="fgsdmDiv">
-							<span class="item-label" style="width: 80px;">分公司: </span>
-							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
-						</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: 18px;">
+					<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdm" style="width: 160px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 20px;" id="fgsdmDiv">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 160px;"></select>
+					</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: 160px;"></select>
+                   	</div>
+                   	<div style="display: inline-block;margin-left: 6px;">
 						<span class="item-label" style="width: 80px;">线路性质: </span>
-						 <select
-							class="form-control" name="nature" id="nature"
-							style="width: 180px;">
+						<select class="form-control" name="nature" id="nature" style="width: 160px;">
 							<option value="0">全部线路</option>
 							<option value="1" selected="selected">营运线路</option>
 							<option value="2">非营运线路</option>
 						</select>
-						</div>
-						<div style="margin-top: 10px">
+					</div>
+                   	<div style="display: inline-block;margin-left: 20px;">
+						<span class="item-label" style="width: 80px;">日期: </span>
+						<select class="form-control" name="week" id="week" style="width: 160px;">
+							<option value="0" selected="selected">全部</option>
+							<option value="1">周一至周五</option>
+							<option value="2">周六日</option>
+						</select>
+					</div>
+					<div style="margin-top: 10px">
                     </div>
 					<div style="display: inline-block;margin-left: 33px;">
-                    	    <span class="item-label" style="width: 80px;">等级: </span>
-                            <select class="form-control"  style="width: 180px;" id=levelType>
-                                <option id="levelTypeAll" value="">全部</option>
-                                <option value="A" selected="selected">A级线路</option>
-                                <option value="B">B级线路</option>
-                                <option value="C">C级线路</option>
-                            	<option value="D">D级线路</option>
-                            	<option value="E">E级线路</option>
-                            </select>
+                   	    <span class="item-label" style="width: 80px;">等级: </span>
+						<select class="form-control"  style="width: 160px;" id=levelType>
+							<option id="levelTypeAll" value="">全部</option>
+							<option value="A" selected="selected">A级线路</option>
+							<option value="B">B级线路</option>
+							<option value="C">C级线路</option>
+							<option value="D">D级线路</option>
+							<option value="E">E级线路</option>
+						</select>
                     </div>
 					<div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;margin-left: 14px;">开始时间: </span>
-                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                        <span class="item-label" style="width: 80px;margin-left: 6px;">开始时间: </span>
+                        <input class="form-control" type="text" id="date" style="width: 160px;"/>
                     </div>
                     <div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;margin-left: 14px;">结束时间: </span>
-                        <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
+                        <span class="item-label" style="width: 80px;margin-left: 6px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 160px;"/>
                     </div>
                     <div class="form-group">
                     	<input type="hidden" id="id"/>
                     	<input type="hidden" id="dataLevel"/>
-                        <input class="btn btn-default" type="button" id="query" value="查询"/>
+                        <input class="btn btn-default" type="button" id="query" value="查询" style="margin-left: 2px;"/>
                         <input class="btn btn-default" type="button" id="export" value="导出" title="导出查询的大间隔情况"/>
                         <input class="btn btn-default" type="button" id="export2" value="导出全部详情" title="导出查询的全部线路的大间隔详细"/>
                     </div>
@@ -297,8 +303,9 @@
 			var gs=$('#gsdm').val();
 			var levelType=$('#levelType').val();
 			var nature=$("#nature").val();
+			var week=$("#week").val();
 			var i = layer.load(2);
-		    $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,type:'query'},function(result){
+		    $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,week:week,type:'query'},function(result){
 // 			if(levelType=="D"){
 // 				var intervalList_d = template('intervalList_d',{list:result});
 // 				$('#forms_d tbody').html(intervalList_d);
@@ -334,9 +341,10 @@
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
 			var levelType=$(this).data('level');
+			var week=$("#week").val();
 			$("#id").val(id);
 			$("#dataLevel").val(levelType);
-			$get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,type:'query'},function(result){
+			$get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,week:week,type:'query'},function(result){
 				var intervalList = template('intervalList_1',{list:result});
 				$('#forms_1 tbody').html(intervalList);
 				$('.btn-intervalList_1').on('click', openIntervalList);
@@ -427,6 +435,7 @@
 			var gs=$('#gsdm').val();
 			var levelType=$('#levelType').val();
 			var nature=$('#nature').val();
+			var week=$("#week").val();
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdm option:selected').text();
@@ -434,7 +443,7 @@
 				lineName = $('#gsdm option:selected').text();
 			var i = layer.load(2);
-			$get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,type:"export",lineName:lineName},function(result){
+			$get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,week:week,type:"export",lineName:lineName},function(result){
 				var dateTime = "";
 				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");
@@ -462,9 +471,10 @@
 			var nature=$('#nature').val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
+			var week=$("#week").val();
 			var i = layer.load(2);
-			$get('/calcInterval/exportDetail',{gs:gs,fgs:fgs,line:id,date:date,endDate:endDate,levelType:levelType,nature:nature,type:'export'},function(result){
+			$get('/calcInterval/exportDetail',{gs:gs,fgs:fgs,line:id,date:date,endDate:endDate,levelType:levelType,nature:nature,week:week,type:'export'},function(result){
 				window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD")+"大间隔详细");
 				layer.close(i);
 			});
@@ -475,6 +485,7 @@
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
 			var levelType=$("#dataLevel").val();
+			var week=$("#week").val();
 // 			if(levelType=='D'){
 // 				var i = layer.load(2);
 // 				$get('/calcSheet/calcListSheet',{line:id,date:date,endDate:endDate,type:'export'},function(result){
@@ -483,7 +494,7 @@
 // 				});
 // 			}else{
 				var i = layer.load(2);
-				$get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,type:'export'},function(result){
+				$get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,week:week,type:'export'},function(result){
 					window.open("/downloadFile/download?fileName=大间距汇总表"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
 					layer.close(i);
 				});
@@ -496,8 +507,9 @@
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
 			var levelType=$("#dataLevel").val();
+			var week=$("#week").val();
 			var i = layer.load(2);
-			$get('/calcInterval/exportDetail',{line:id,date:date,endDate:endDate,levelType:levelType,type:'export'},function(result){
+			$get('/calcInterval/exportDetail',{line:id,date:date,endDate:endDate,levelType:levelType,week:week,type:'export'},function(result){
 				window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD")+"大间隔详细");
 				layer.close(i);
 			});
@@ -27,24 +27,32 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-				<div style="display: inline-block; margin-left: 42px;" id="gsdmDiv">
-							<span class="item-label" style="width: 80px;">公司: </span>
-							<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
-						</div> 
-						<div style="display: inline-block; margin-left: 28px;" id="fgsdmDiv">
-							<span class="item-label" style="width: 80px;">分公司: </span>
-							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
-						</div>
-                    	<div style="display: inline-block;margin-left: 18px;">
-							<span class="item-label" style="width: 80px;">线路性质: </span>
-							 <select
-								class="form-control" name="nature" id="nature"
-								style="width: 180px;">
-								<option value="0" selected="selected">全部线路</option>
-								<option value="1">营运线路</option>
-								<option value="2">非营运线路</option>
-							</select>
-						</div>
+					<div style="display: inline-block; margin-left: 42px;" id="gsdmDiv">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 28px;" id="fgsdmDiv">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+					</div>
+                   	<div style="display: inline-block;margin-left: 18px;">
+						<span class="item-label" style="width: 80px;">线路性质: </span>
+						 <select
+							class="form-control" name="nature" id="nature"
+							style="width: 180px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+					</div>
+                   	<div style="display: inline-block;margin-left: 20px;">
+						<span class="item-label" style="width: 80px;">日期: </span>
+						<select class="form-control" name="week" id="week" style="width: 160px;">
+							<option value="0" selected="selected">全部</option>
+							<option value="1">周一至周五</option>
+							<option value="2">周六日</option>
+						</select>
+					</div>
 					<div style="margin-top: 10px">
                     </div>
 					<div style="display: inline-block;">
@@ -167,8 +175,10 @@
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			var nature=$("#nature").val();
+			var week=$("#week").val();
+
 			var i = layer.load(2);
-		    $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:'query'},function(result){
+		    $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,week:week,type:'query'},function(result){
 			var intervalList_sum = template('intervalList_sum',{list:result});
 			$('#forms_djg_sum tbody').html(intervalList_sum);
@@ -186,12 +196,13 @@
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			var nature=$('#nature').val();
+			var week=$("#week").val();
 			var lineName = $('#fgsdm option:selected').text();
 			if(lineName=="全部分公司")
 				lineName = $('#gsdm option:selected').text();
 			var i = layer.load(2);
-			$get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:"export",lineName:lineName},function(result){
+			$get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,week:week,type:"export",lineName:lineName},function(result){
 				var dateTime = "";
 				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");
@@ -57,15 +57,15 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                     var new_dddesc = undefined; // 调度描述
                     // 表单值，被赋值的次数
-                    var form_data_assign_count = {
-                        cl1 : 1,
-                        cl2 : 1,
-                        j1 : 1,
-                        j2 : 1,
-                        j3 : 1,
-                        s1 : 1,
-                        s2 : 1,
-                        s3 : 1
+                    var form_data_assign_count = { // 大于1表示已经初始化过了
+                        cl1 : -1,
+                        cl2 : -1,
+                        j1 : -1,
+                        j2 : -1,
+                        j3 : -1,
+                        s1 : -1,
+                        s2 : -1,
+                        s3 : -1
                     };
                     return {
@@ -348,18 +348,20 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.cl1;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化new_cl1
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.zbh) {
-                                            new_cl1 = newValue.id + "_" + newValue.zbh;
+                                    if (form_data_assign_count.cl1 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.zbh) {
+                                                new_cl1 = newValue.id + "_" + newValue.zbh;
+                                            } else {
+                                                new_cl1 = undefined;
+                                            }
                                         } else {
                                             new_cl1 = undefined;
                                         }
-                                    } else {
-                                        new_cl1 = undefined;
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    form_data_assign_count.cl1 ++;
                                 },
                                 true
                             );
@@ -370,18 +372,20 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.cl2;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化new_cl2
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.zbh) {
-                                            new_cl2 = newValue.id + "_" + newValue.zbh;
+                                    if (form_data_assign_count.cl2 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.zbh) {
+                                                new_cl2 = newValue.id + "_" + newValue.zbh;
+                                            } else {
+                                                new_cl2 = undefined;
+                                            }
                                         } else {
                                             new_cl2 = undefined;
                                         }
-                                    } else {
-                                        new_cl2 = undefined;
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    form_data_assign_count.cl2 ++;
                                 },
                                 true
                             );
@@ -392,19 +396,22 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.j1;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化j1
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.name && newValue.jobCode) {
-                                            new_j1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                    if (form_data_assign_count.j1 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_j1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_j1 = undefined;
+                                            }
                                         } else {
                                             new_j1 = undefined;
                                         }
-                                    } else {
-                                        new_j1 = undefined;
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.j1 ++;
                                 },
                                 true
                             );
@@ -415,18 +422,22 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.s1;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化s1
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.name && newValue.jobCode) {
-                                            new_s1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                    if (form_data_assign_count.s1 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_s1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_s1 = undefined;
+                                            }
                                         } else {
                                             new_s1 = undefined;
                                         }
-                                    } else {
-                                        new_s1 = undefined;
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+
+                                    form_data_assign_count.s1 ++;
                                 },
                                 true
                             );
@@ -437,19 +448,22 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.j2;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化j2
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.name && newValue.jobCode) {
-                                            new_j2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                    if (form_data_assign_count.j2 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_j2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_j2 = undefined;
+                                            }
                                         } else {
                                             new_j2 = undefined;
                                         }
-                                    } else {
-                                        new_j2 = undefined;
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.j2 ++;
                                 },
                                 true
                             );
@@ -460,19 +474,22 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.s2;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化s2
-                                    if (newValue && newValue.id) {
-                                        if (newValue.id && newValue.name && newValue.jobCode) {
-                                            new_s2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                    if (form_data_assign_count.s2 > 2) {
+                                        if (newValue && newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_s2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_s2 = undefined;
+                                            }
                                         } else {
                                             new_s2 = undefined;
                                         }
-                                    } else {
-                                        new_s2 = undefined;
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.s2 ++;
                                 },
                                 true
                             );
@@ -486,8 +503,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     if (newValue && newValue.length > 0) {
                                         var j1 = newValue[0].j;
-                                        var cl_ids = []; // 车辆ids数组（有顺序）
-                                        var j_s_ids = []; // 驾驶员ids，售票员ids，[{j:id,s:id},...]（有顺序）
+                                        var cl_idFlags = []; // 车辆idFlags数组（有顺序）
+                                        var j_s_idFlags = []; // 驾驶员idFlags，售票员idFlags，[{j:idFlag,s:idFlag},...]（有顺序）
                                         var addreason = []; // 营运调度的原因
                                         var adddesc = []; // 营运导读的备注
                                         var isRepeat = false;
@@ -553,30 +570,30 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                             // 车辆处理
                                             isRepeat = false;
                                             if (obj.cl) {
-                                                for (i = 0; i < cl_ids.length; i++) {
-                                                    if (cl_ids[i] == obj.cl) {
+                                                for (i = 0; i < cl_idFlags.length; i++) {
+                                                    if (cl_idFlags[i] == (obj.cl + "_" + obj.clZbh)) {
                                                         isRepeat = true;
                                                         break;
                                                     }
                                                 }
                                                 if (!isRepeat) {
-                                                    cl_ids.push(obj.cl);
+                                                    cl_idFlags.push(obj.cl + "_" + obj.clZbh);
                                                 }
                                             }
                                             // 人员处理（以驾驶员id为主，没有的话，售票员不管了）
                                             isRepeat = false;
                                             if (obj.j) {
-                                                for (i = 0; i < j_s_ids.length; i++) {
-                                                    if (j_s_ids[i].j == obj.j) {
+                                                for (i = 0; i < j_s_idFlags.length; i++) {
+                                                    if (j_s_idFlags[i].j == (obj.j + "_" + obj.jName + "_" + obj.jGh)) {
                                                         isRepeat = true;
                                                         break;
                                                     }
                                                 }
                                                 if (!isRepeat) {
-                                                    j_s_ids.push({
-                                                        j: obj.j,
-                                                        s: !obj.s? undefined: obj.s
+                                                    j_s_idFlags.push({
+                                                        j: obj.j + "_" + obj.jName + "_" + obj.jGh,
+                                                        s: !obj.s? undefined: (obj.s + "_" + obj.sName + "_" + obj.sGh)
                                                     });
                                                 }
                                             }
@@ -615,25 +632,66 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         old_half_bcs = newValue.length / 2;
                                         // 更新formdata
-                                        for (i = 0; i < cl_ids.length; i++) { // 车辆更新前两辆
-                                            if (i >= 2) {
+                                        for (i = 0; i < cl_idFlags.length; i++) { // 车辆更新前两辆
+                                            if (i == 0) { // 第一组车
+                                                scope[ctrlAs].fd["cl1"].id = cl_idFlags[i].split("_")[0];
+                                                new_cl1 = cl_idFlags[i];
+                                            } else if (i == 1) { // 第二组车
+                                                scope[ctrlAs].fd["cl2"].id = cl_idFlags[i].split("_")[0];
+                                                new_cl2 = cl_idFlags[i];
+                                            } else { // 第三组及以上车全部忽略
                                                 break;
-                                            } else {
-                                                form_data_assign_count["cl" + (i + 1)] = 0;
-                                                scope[ctrlAs].fd["cl" + (i + 1)].id = cl_ids[i];
                                             }
                                         }
-                                        for (i = 0; i < j_s_ids.length; i++) { // 人员更新
-                                            if (i >= 3) {
+                                        for (i = 0; i < j_s_idFlags.length; i++) { // 人员更新
+                                            if (i == 0) { // 第一组人员
+                                                scope[ctrlAs].fd["j1"].id = j_s_idFlags[i].j.split("_")[0];
+                                                scope[ctrlAs].fd["s1"].id = j_s_idFlags[i].s && j_s_idFlags[i].s.split("_")[0];
+                                                new_j1 = j_s_idFlags[i].j;
+                                                new_s1 = j_s_idFlags[i].s;
+
+                                            } else if (i == 1) { // 第二组人员
+                                                scope[ctrlAs].fd["j2"].id = j_s_idFlags[i].j.split("_")[0];
+                                                scope[ctrlAs].fd["s2"].id = j_s_idFlags[i].s && j_s_idFlags[i].s.split("_")[0];
+                                                new_j2 = j_s_idFlags[i].j;
+                                                new_s2 = j_s_idFlags[i].s;
+                                            } else { // 第三组及以上全部忽律
                                                 break;
-                                            } else {
-                                                form_data_assign_count["j" + (i + 1)] = 0;
-                                                scope[ctrlAs].fd["j" + (i + 1)].id = j_s_ids[i].j;
-
-                                                form_data_assign_count["s" + (i + 1)] = 0;
-                                                scope[ctrlAs].fd["s" + (i + 1)].id = j_s_ids[i].s;
                                             }
                                         }
+                                        // 更新form_data_assign_count，有值设置成2，没值设置成3，表示已经从ds处初始化完毕
+                                        if (new_cl1) {
+                                            form_data_assign_count["cl1"] = 2;
+                                        } else {
+                                            form_data_assign_count["cl1"] = 3;
+                                        }
+                                        if (new_cl2) {
+                                            form_data_assign_count["cl2"] = 2;
+                                        } else {
+                                            form_data_assign_count["cl2"] = 3;
+                                        }
+                                        if (new_j1) {
+                                            form_data_assign_count["j1"] = 2;
+                                        } else {
+                                            form_data_assign_count["j1"] = 3;
+                                        }
+                                        if (new_j2) {
+                                            form_data_assign_count["j2"] = 2;
+                                        } else {
+                                            form_data_assign_count["j2"] = 3;
+                                        }
+                                        if (new_s1) {
+                                            form_data_assign_count["s1"] = 2;
+                                        } else {
+                                            form_data_assign_count["s1"] = 3;
+                                        }
+                                        if (new_s2) {
+                                            form_data_assign_count["s2"] = 2;
+                                        } else {
+                                            form_data_assign_count["s2"] = 3;
+                                        }
+
+
                                         for (i = 0; i < addreason.length; i++) { // 调度原因更新
                                             if (i > 1) { // 有多个，只更新第一个
                                                 break;
@@ -5939,15 +5939,15 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                     var new_dddesc = undefined; // 调度描述
                     // 表单值，被赋值的次数
-                    var form_data_assign_count = {
-                        cl1 : 1,
-                        cl2 : 1,
-                        j1 : 1,
-                        j2 : 1,
-                        j3 : 1,
-                        s1 : 1,
-                        s2 : 1,
-                        s3 : 1
+                    var form_data_assign_count = { // 大于1表示已经初始化过了
+                        cl1 : -1,
+                        cl2 : -1,
+                        j1 : -1,
+                        j2 : -1,
+                        j3 : -1,
+                        s1 : -1,
+                        s2 : -1,
+                        s3 : -1
                     };
                     return {
@@ -6230,18 +6230,20 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.cl1;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化new_cl1
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.zbh) {
-                                            new_cl1 = newValue.id + "_" + newValue.zbh;
+                                    if (form_data_assign_count.cl1 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.zbh) {
+                                                new_cl1 = newValue.id + "_" + newValue.zbh;
+                                            } else {
+                                                new_cl1 = undefined;
+                                            }
                                         } else {
                                             new_cl1 = undefined;
                                         }
-                                    } else {
-                                        new_cl1 = undefined;
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    form_data_assign_count.cl1 ++;
                                 },
                                 true
                             );
@@ -6252,18 +6254,20 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.cl2;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化new_cl2
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.zbh) {
-                                            new_cl2 = newValue.id + "_" + newValue.zbh;
+                                    if (form_data_assign_count.cl2 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.zbh) {
+                                                new_cl2 = newValue.id + "_" + newValue.zbh;
+                                            } else {
+                                                new_cl2 = undefined;
+                                            }
                                         } else {
                                             new_cl2 = undefined;
                                         }
-                                    } else {
-                                        new_cl2 = undefined;
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    form_data_assign_count.cl2 ++;
                                 },
                                 true
                             );
@@ -6274,19 +6278,22 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.j1;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化j1
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.name && newValue.jobCode) {
-                                            new_j1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                    if (form_data_assign_count.j1 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_j1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_j1 = undefined;
+                                            }
                                         } else {
                                             new_j1 = undefined;
                                         }
-                                    } else {
-                                        new_j1 = undefined;
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.j1 ++;
                                 },
                                 true
                             );
@@ -6297,18 +6304,22 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.s1;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化s1
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.name && newValue.jobCode) {
-                                            new_s1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                    if (form_data_assign_count.s1 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_s1 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_s1 = undefined;
+                                            }
                                         } else {
                                             new_s1 = undefined;
                                         }
-                                    } else {
-                                        new_s1 = undefined;
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+
+                                    form_data_assign_count.s1 ++;
                                 },
                                 true
                             );
@@ -6319,19 +6330,22 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.j2;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化j2
-                                    if (newValue.id) {
-                                        if (newValue.id && newValue.name && newValue.jobCode) {
-                                            new_j2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                    if (form_data_assign_count.j2 > 2) {
+                                        if (newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_j2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_j2 = undefined;
+                                            }
                                         } else {
                                             new_j2 = undefined;
                                         }
-                                    } else {
-                                        new_j2 = undefined;
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.j2 ++;
                                 },
                                 true
                             );
@@ -6342,19 +6356,22 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     return scope[ctrlAs].fd.s2;
                                 },
                                 function(newValue, oldValue) {
-                                    // 初始化s2
-                                    if (newValue && newValue.id) {
-                                        if (newValue.id && newValue.name && newValue.jobCode) {
-                                            new_s2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                    if (form_data_assign_count.s2 > 2) {
+                                        if (newValue && newValue.id) {
+                                            if (newValue.id && newValue.name && newValue.jobCode) {
+                                                new_s2 = newValue.id + "_" + newValue.name + "_" + newValue.jobCode;
+                                            } else {
+                                                new_s2 = undefined;
+                                            }
                                         } else {
                                             new_s2 = undefined;
                                         }
-                                    } else {
-                                        new_s2 = undefined;
+
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.s2 ++;
                                 },
                                 true
                             );
@@ -6368,8 +6385,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     if (newValue && newValue.length > 0) {
                                         var j1 = newValue[0].j;
-                                        var cl_ids = []; // 车辆ids数组（有顺序）
-                                        var j_s_ids = []; // 驾驶员ids，售票员ids，[{j:id,s:id},...]（有顺序）
+                                        var cl_idFlags = []; // 车辆idFlags数组（有顺序）
+                                        var j_s_idFlags = []; // 驾驶员idFlags，售票员idFlags，[{j:idFlag,s:idFlag},...]（有顺序）
                                         var addreason = []; // 营运调度的原因
                                         var adddesc = []; // 营运导读的备注
                                         var isRepeat = false;
@@ -6435,30 +6452,30 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                             // 车辆处理
                                             isRepeat = false;
                                             if (obj.cl) {
-                                                for (i = 0; i < cl_ids.length; i++) {
-                                                    if (cl_ids[i] == obj.cl) {
+                                                for (i = 0; i < cl_idFlags.length; i++) {
+                                                    if (cl_idFlags[i] == (obj.cl + "_" + obj.clZbh)) {
                                                         isRepeat = true;
                                                         break;
                                                     }
                                                 }
                                                 if (!isRepeat) {
-                                                    cl_ids.push(obj.cl);
+                                                    cl_idFlags.push(obj.cl + "_" + obj.clZbh);
                                                 }
                                             }
                                             // 人员处理（以驾驶员id为主，没有的话，售票员不管了）
                                             isRepeat = false;
                                             if (obj.j) {
-                                                for (i = 0; i < j_s_ids.length; i++) {
-                                                    if (j_s_ids[i].j == obj.j) {
+                                                for (i = 0; i < j_s_idFlags.length; i++) {
+                                                    if (j_s_idFlags[i].j == (obj.j + "_" + obj.jName + "_" + obj.jGh)) {
                                                         isRepeat = true;
                                                         break;
                                                     }
                                                 }
                                                 if (!isRepeat) {
-                                                    j_s_ids.push({
-                                                        j: obj.j,
-                                                        s: !obj.s? undefined: obj.s
+                                                    j_s_idFlags.push({
+                                                        j: obj.j + "_" + obj.jName + "_" + obj.jGh,
+                                                        s: !obj.s? undefined: (obj.s + "_" + obj.sName + "_" + obj.sGh)
                                                     });
                                                 }
                                             }
@@ -6497,25 +6514,66 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         old_half_bcs = newValue.length / 2;
                                         // 更新formdata
-                                        for (i = 0; i < cl_ids.length; i++) { // 车辆更新前两辆
-                                            if (i >= 2) {
+                                        for (i = 0; i < cl_idFlags.length; i++) { // 车辆更新前两辆
+                                            if (i == 0) { // 第一组车
+                                                scope[ctrlAs].fd["cl1"].id = cl_idFlags[i].split("_")[0];
+                                                new_cl1 = cl_idFlags[i];
+                                            } else if (i == 1) { // 第二组车
+                                                scope[ctrlAs].fd["cl2"].id = cl_idFlags[i].split("_")[0];
+                                                new_cl2 = cl_idFlags[i];
+                                            } else { // 第三组及以上车全部忽略
                                                 break;
-                                            } else {
-                                                form_data_assign_count["cl" + (i + 1)] = 0;
-                                                scope[ctrlAs].fd["cl" + (i + 1)].id = cl_ids[i];
                                             }
                                         }
-                                        for (i = 0; i < j_s_ids.length; i++) { // 人员更新
-                                            if (i >= 3) {
+                                        for (i = 0; i < j_s_idFlags.length; i++) { // 人员更新
+                                            if (i == 0) { // 第一组人员
+                                                scope[ctrlAs].fd["j1"].id = j_s_idFlags[i].j.split("_")[0];
+                                                scope[ctrlAs].fd["s1"].id = j_s_idFlags[i].s && j_s_idFlags[i].s.split("_")[0];
+                                                new_j1 = j_s_idFlags[i].j;
+                                                new_s1 = j_s_idFlags[i].s;
+
+                                            } else if (i == 1) { // 第二组人员
+                                                scope[ctrlAs].fd["j2"].id = j_s_idFlags[i].j.split("_")[0];
+                                                scope[ctrlAs].fd["s2"].id = j_s_idFlags[i].s && j_s_idFlags[i].s.split("_")[0];
+                                                new_j2 = j_s_idFlags[i].j;
+                                                new_s2 = j_s_idFlags[i].s;
+                                            } else { // 第三组及以上全部忽律
                                                 break;
-                                            } else {
-                                                form_data_assign_count["j" + (i + 1)] = 0;
-                                                scope[ctrlAs].fd["j" + (i + 1)].id = j_s_ids[i].j;
-
-                                                form_data_assign_count["s" + (i + 1)] = 0;
-                                                scope[ctrlAs].fd["s" + (i + 1)].id = j_s_ids[i].s;
                                             }
                                         }
+                                        // 更新form_data_assign_count，有值设置成2，没值设置成3，表示已经从ds处初始化完毕
+                                        if (new_cl1) {
+                                            form_data_assign_count["cl1"] = 2;
+                                        } else {
+                                            form_data_assign_count["cl1"] = 3;
+                                        }
+                                        if (new_cl2) {
+                                            form_data_assign_count["cl2"] = 2;
+                                        } else {
+                                            form_data_assign_count["cl2"] = 3;
+                                        }
+                                        if (new_j1) {
+                                            form_data_assign_count["j1"] = 2;
+                                        } else {
+                                            form_data_assign_count["j1"] = 3;
+                                        }
+                                        if (new_j2) {
+                                            form_data_assign_count["j2"] = 2;
+                                        } else {
+                                            form_data_assign_count["j2"] = 3;
+                                        }
+                                        if (new_s1) {
+                                            form_data_assign_count["s1"] = 2;
+                                        } else {
+                                            form_data_assign_count["s1"] = 3;
+                                        }
+                                        if (new_s2) {
+                                            form_data_assign_count["s2"] = 2;
+                                        } else {
+                                            form_data_assign_count["s2"] = 3;
+                                        }
+
+
                                         for (i = 0; i < addreason.length; i++) { // 调度原因更新
                                             if (i > 1) { // 有多个，只更新第一个
                                                 break;
@@ -251,6 +251,19 @@ angular.module(&quot;ScheduleApp&quot;).controller(
             // 提交方法
             self.submit = function() {
                 // 保存或者更新
+
+                // 修正工号，去除前缀（如：05-001122，05就是前缀，用 - 分割）
+                var _jGh = self.schedulePlanInfoForSave.jGh;
+                if (_jGh) {
+                    _jGh = _jGh.indexOf("-") != -1 ? _jGh.split("-")[1] : _jGh;
+                    self.schedulePlanInfoForSave.jGh = _jGh;
+                }
+                var _sGh = self.schedulePlanInfoForSave.sGh;
+                if (_sGh) {
+                    _sGh = _sGh.indexOf("-") != -1 ? _sGh.split("-")[1] : _sGh;
+                    self.schedulePlanInfoForSave.sGh = _sGh;
+                }
+
                 self.schedulePlanInfoForSave.$save(function() {
                     self.toPlanInfoListPage();
                 });
@@ -71,7 +71,7 @@
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.pageInfo.infos"
+            <tr ng-repeat="info in ctrl.pageInfo.infos track by info.lpName"
                 ng-class="{odd: true, gradeX: true, info: ctrl.isModify(info), 'row-active': ctrl.isModify(info)}" >
                 <td>
                     <div>
@@ -128,21 +128,21 @@
                     </div>
                 </td>
                 <td>
-                    <div ng-repeat="clzbh in info.clZbhs">
+                    <div ng-repeat="clzbh in info.clZbhs track by $index">
                         <a href="#">
                             {{clzbh}}
                         </a>
                     </div>
                 </td>
                 <td>
-                    <div ng-repeat="ccsj in info.ccsjs">
+                    <div ng-repeat="ccsj in info.ccsjs track by $index">
                         <a href="#">
                             {{ccsj}}
                         </a>
                     </div>
                 </td>
                 <td>
-                    <div ng-repeat="jcsj in info.jcsjs">
+                    <div ng-repeat="jcsj in info.jcsjs track by $index">
                         <a href="#">
                             {{jcsj}}
                         </a>
@@ -151,7 +151,7 @@
                 <td class="container-fluid">
                     <div class="row">
                         <div style="padding-right: 0px;" class="col-md-6">
-                            <div ng-repeat="jsyname in info.jsyNames">
+                            <div ng-repeat="jsyname in info.jsyNames track by $index">
                                 <a href="#">
                                     <i class="fa fa-bus" aria-hidden="true"></i>
                                     {{jsyname}}
@@ -159,7 +159,7 @@
                             </div>
                         </div>
                         <div style="padding-left: 0px;" class="col-md-6">
-                            <div ng-repeat="jsygh in info.jsyGhs">
+                            <div ng-repeat="jsygh in info.jsyGhs track by $index">
                                 <a href="#">
                                     {{jsygh}}
                                 </a>
@@ -170,7 +170,7 @@
                 <td class="container-fluid">
                     <div class="row">
                         <div style="padding-right: 0px;" class="col-md-6">
-                            <div ng-repeat="spyname in info.spyNames">
+                            <div ng-repeat="spyname in info.spyNames track by $index">
                                 <a href="#">
                                     <i class="fa fa-ticket" aria-hidden="true"></i>
                                     {{spyname}}
@@ -178,7 +178,7 @@
                             </div>
                         </div>
                         <div style="padding-left: 0px;" class="col-md-6">
-                            <div ng-repeat="spygh in info.spyGhs">
+                            <div ng-repeat="spygh in info.spyGhs track by $index">
                                 <a href="#">
                                     {{spygh}}
                                 </a>
-/** 空间数据 */
-
-var gb_map_spatial_data = (function () {
-
-    var storage = window.localStorage;
-
-    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
-    var line_idx = (function () {
-        var str = '';
-        for (var i = 0, item; item = activeLines[i++];) {
-            str += (',' + item.lineCode);
-        }
-        return str.substr(1);
-    })();
-
-    var cont = '#spatial-tree-content';
-    //线路站点路由数据
-    var lineStationArr;
-
-    //停车场数据
-    var carparkArr;
-
-    var init = function () {
-        //加载站点路由数据
-        gb_common.$get('/realMap/stationVersionSpatialData', {idx: line_idx}, function (rs) {
-            var list = rs.list;
-            $.each(list, function () {
-                this.lat = this.gLaty;
-                this.lon = this.gLonx;
-                delete this.gLaty;
-                delete this.gLonx;
-                if(this.shapesType=='d'){
-                    var calcRs = calcPolygonArea(this.gPolygonGrid);
-                    this._polygonArea = calcRs._polygonArea;
-                    this._gPoints = calcRs._gPoints;
-                }
-            });
-            //排序
-            list.sort(function (a, b) {
-                return a.stationRouteCode - b.stationRouteCode;
-            });
-            //按线路分组
-            lineStationArr = gb_common.groupBy(list, 'lineCode');
-            //再按上下行分组
-            for (var lineCode in lineStationArr) {
-                lineStationArr[lineCode] = gb_common.groupBy(lineStationArr[lineCode], 'directions');
-            }
-
-            ep.emitLater('station');
-        });
-
-        //加载停车场数据
-        gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
-            carparkArr = rs.list;
-            $.each(carparkArr, function () {
-                if(this.shapesType=='d'){
-                    var calcRs = calcPolygonArea(this.gParkPoint);
-                    this._polygonArea = calcRs._polygonArea;
-                    this._gPoints = calcRs._gPoints;
-                }
-            });
-            ep.emitLater('carpark');
-        });
-
-        var ep = EventProxy.create('station', 'carpark', function () {
-            $(".real_spatial_panel").resizable({
-                maxHeight: '100%',
-                minHeight: 18
-            });
-
-            //绘制站点路由树
-            $('.station-route-tree', cont)
-            //state插件 状态恢复完成
-                .on('state_ready.jstree', function () {
-                    //绑定checkbox状态切换事件
-                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawStation);
-                })
-                .on('activate_node.jstree', function (e, n) {
-                    var node = n.node;
-                    if(node.state.checked)
-                        gb_map_overlay_mge._focus_station(node.data);
-                })
-                .jstree({
-                    'core': {
-                        'data': get_st_route_tree_data()
-                    },
-                    'checkbox': {
-                        'keep_selected_style': false,
-                        'whole_node': false,
-                        'tie_selection': false
-                    },
-                    //local storage里的key
-                    'state': {
-                        'key': 'jstree_map_station_route'
-                    },
-                    'plugins': ['checkbox', 'state']
-                });
-
-
-            //停车场
-            $('.carpark-panel', cont)
-                .on('state_ready.jstree', function () {
-                    //绑定checkbox状态切换事件
-                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawCarpark);
-                })
-                .on('activate_node.jstree', function (e, n) {
-                    var node = n.node;
-                    if(node.state.checked)
-                        gb_map_overlay_mge._focus_carpark(node.data);
-                })
-                .jstree({
-                    'core': {
-                        'data': get_st_carpark_tree_data()
-                    },
-                    'checkbox': {
-                        'keep_selected_style': false,
-                        'whole_node': false,
-                        'tie_selection': false
-                    },
-                    //local storage里的key
-                    'state': {
-                        'key': 'jstree_map_carpark'
-                    },
-                    'plugins': ['checkbox', 'state']
-                });
-
-            refresh();
-        });
-    };
-
-    //计算多边形面积
-    function calcPolygonArea(polygonStr) {
-        var pStr = polygonStr.substring(9, polygonStr.length - 2);
-        var array = pStr.split(',');
-        var newArr=[];
-
-        //递归去掉闭合的尾
-        (function () {
-            var f = arguments.callee;
-            var end=array.length - 1;
-            if(array.length > 1 && array[0] == array[end]){
-                array = array.slice(0, end);
-                f();
-            }
-        })();
-
-        //去掉连续的重复点
-        var last;
-        $.each(array, function (i, str) {
-            if(last){
-                if(last != str)
-                    newArr.push(str);
-            }
-            else
-                newArr.push(str);
-            last = str;
-        });
-
-        var gPoints=[],ts;
-        $.each(newArr, function (i, c) {
-            ts=c.split(' ');
-            gPoints.push({
-                lat: parseFloat(ts[1]),
-                lng: parseFloat(ts[0])
-            });
-        });
-
-        //用百度geo工具库计算面积
-        var _polygonArea = BMapLib.GeoUtils.getPolygonArea(gPoints);
-        return {_polygonArea: _polygonArea.toFixed(2), _gPoints: gPoints};
-    }
-
-    var refresh = function (type, checked) {
-        if (!triggerElem())
-            return;
-
-        if ((type == 'carPark' && checked) || (type == 'station' && !checked)) {
-            //显示停车场面板
-            $('.car-park-item', cont).addClass('uk-active');
-            $('li.cp-tab-btn', '.real_spatial_panel').addClass('uk-active');
-            $('.carpark-panel', cont).jstree(true).check_all();
-
-            //绘制停车场
-            gb_map_overlay_mge.drawCarpark();
-        }
-        else {
-            //显示站点路由面板
-            $('.station-route-item', cont).addClass('uk-active');
-            $('li.sr-tab-btn', '.real_spatial_panel').addClass('uk-active');
-
-            //选中相关站点路由树
-            var chs = gb_map_overlay_mge.getCheckedDevice();
-            var idx = {};
-            $.each(chs, function () {
-                idx[this.data.lineId + '_' + this.data.upDown] = 1;
-            });
-
-            var treeObj = $('.station-route-tree', cont).jstree(true);
-            for (var id in idx) {
-                treeObj.check_node(treeObj.get_node(id + '_st'));
-            }
-
-            //drawStation();
-            gb_map_overlay_mge.drawStation();
-        }
-    }
-
-    var triggerElem = function () {
-        var config = gb_map_config.getConfig().spatialData;
-
-        if(config.station || config.carPark){
-            showPanel();
-            return true;
-        }
-        hidePanel();
-        //gb_map_imap.call('hideAllStationMarker');
-        //gb_map_imap.call('hideDrawCarpark');
-        return false;
-    }
-
-    var animationend = 'webkitAnimationEnd animationend';
-    var showPanel = function () {
-        var elem = $('.real_spatial_panel');
-        var config = gb_map_config.getConfig().spatialData;
-
-        if (config.station && config.carPark) {
-            anim_show($('.uk-subnav', elem), 'uk-animation-scale-up');
-            $('.real_spatial_body', elem).addClass('show-tab');
-        }
-        else {
-            $('.uk-subnav', elem).hide();
-            $('.real_spatial_body', elem).removeClass('show-tab');
-        }
-
-        $('li.uk-active', elem).removeClass('uk-active');
-
-        if (!elem.is(":hidden"))
-            return;
-
-        anim_show(elem, 'uk-animation-slide-left');
-    }
-
-    var hidePanel = function () {
-        var elem = $('.real_spatial_panel');
-        elem.hide();
-    }
-
-    function anim_show(e, anim) {
-        e.addClass(anim).show().one(animationend, function () {
-            $(this).removeClass(anim);
-        });
-    }
-
-    function getCheckedStation() {
-        var list = [];
-        var chs = $('.station-route-tree', cont).jstree(true).get_checked(true);
-        chs = chs.filter(function (item) {
-            return item.data;
-        });
-        $.each(chs, function () {
-            list.push(this.data);
-        });
-        return list;
-    }
-
-    function gteCheckedCarpark() {
-        var list = [];
-        var chs = $('.carpark-panel', cont).jstree(true).get_checked(true);
-        $.each(chs, function () {
-            list.push(this.data);
-        });
-        return list;
-    }
-
-    var get_st_route_tree_data = function () {
-        var treeData = [];
-
-        for (var lineCode in lineStationArr) {
-            name = gb_data_basic.codeToLine[lineCode].name;
-            treeData.push({
-                'text': name,
-                'open': true,
-                'children': [
-                    {
-                        'text': '上行',
-                        'children': grabs(lineStationArr[lineCode][0]),
-                        'id': lineCode + '_0_st'
-                    },
-                    {
-                        'text': '下行',
-                        'children': grabs(lineStationArr[lineCode][1]),
-                        'id': lineCode + '_1_st'
-                    }
-                ]
-            })
-        }
-        return treeData;
-    };
-    var get_st_route_tree_data_version = function () {
-        var treeData = [];
-
-        for (var lineCode in lineVersionStationArr) {
-            name = gb_data_basic.codeToLine[lineCode].name;
-            treeData.push({
-                'text': name,
-                'open': true,
-                'children': [
-                    {
-                        'text': '上行',
-                        'children': grabs(lineVersionStationArr[lineCode][0]),
-                        'id': lineCode + '_0_st'
-                    },
-                    {
-                        'text': '下行',
-                        'children': grabs(lineVersionStationArr[lineCode][1]),
-                        'id': lineCode + '_1_st'
-                    }
-                ]
-            })
-        }
-        return treeData;
-    };
-    var get_st_carpark_tree_data = function () {
-        var treeData = [];
-
-        $.each(carparkArr, function () {
-            treeData.push({
-                'text': this.parkName,
-                'data': this
-            });
-        });
-
-        return treeData;
-    }
-
-    var grabs = function (array) {
-        if (!array)
-            return;
-        var rs = [];
-        $.each(array, function () {
-            rs.push({
-                'text': this.stationName,
-                'data': this,
-                'icon': false
-            });
-        });
-        return rs;
-    }
-
-    return {
-        refresh: refresh,
-        init: init,
-        getCheckedStation:getCheckedStation,
-        gteCheckedCarpark: gteCheckedCarpark,
-        getStationArray: function (lineCode) {
-            return lineStationArr[lineCode];
-        },
-        carparkArray: function () {
-            return carparkArr;
-        }
-    };
+/** 空间数据 */
+
+var gb_map_spatial_data = (function () {
+
+    var storage = window.localStorage;
+
+    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
+    var line_idx = (function () {
+        var str = '';
+        for (var i = 0, item; item = activeLines[i++];) {
+            str += (',' + item.lineCode);
+        }
+        return str.substr(1);
+    })();
+
+    var cont = '#spatial-tree-content';
+    //线路站点路由数据
+    var lineStationArr, currentLineStationArr;
+
+    //停车场数据
+    var carparkArr;
+
+    var init = function () {
+
+        //加载各线路当前版本站点路由数据
+        gb_common.$get('/realMap/stationSpatialData', {idx: line_idx}, function (rs) {
+            var list = rs.list;
+            $.each(list, function () {
+                this.lat = this.gLaty;
+                this.lon = this.gLonx;
+                delete this.gLaty;
+                delete this.gLonx;
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gPolygonGrid);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
+            //排序
+            list.sort(function (a, b) {
+                return a.stationRouteCode - b.stationRouteCode;
+            });
+            //按线路分组
+            currentLineStationArr = gb_common.groupBy(list, 'lineCode');
+            //再按上下行分组
+            for (var lineCode in currentLineStationArr) {
+                currentLineStationArr[lineCode] = gb_common.groupBy(currentLineStationArr[lineCode], 'directions');
+            }
+
+            ep.emitLater('currentstation');
+        });
+
+        //加载各线路所有版本站点路由数据(轨迹回放时用)
+        gb_common.$get('/realMap/stationVersionSpatialData', {idx: line_idx}, function (rs) {
+            var list = rs.list;
+            $.each(list, function () {
+                this.lat = this.gLaty;
+                this.lon = this.gLonx;
+                delete this.gLaty;
+                delete this.gLonx;
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gPolygonGrid);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
+            //排序
+            list.sort(function (a, b) {
+                return a.stationRouteCode - b.stationRouteCode;
+            });
+            //按线路分组
+            lineStationArr = gb_common.groupBy(list, 'lineCode');
+            //再按上下行分组
+            for (var lineCode in lineStationArr) {
+                lineStationArr[lineCode] = gb_common.groupBy(lineStationArr[lineCode], 'directions');
+            }
+
+            ep.emitLater('station');
+        });
+
+        //加载停车场数据
+        gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+            carparkArr = rs.list;
+            $.each(carparkArr, function () {
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gParkPoint);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
+            ep.emitLater('carpark');
+        });
+
+        var ep = EventProxy.create('currentstation', 'station', 'carpark', function () {
+            $(".real_spatial_panel").resizable({
+                maxHeight: '100%',
+                minHeight: 18
+            });
+
+            //绘制站点路由树
+            $('.station-route-tree', cont)
+            //state插件 状态恢复完成
+                .on('state_ready.jstree', function () {
+                    //绑定checkbox状态切换事件
+                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawStation);
+                })
+                .on('activate_node.jstree', function (e, n) {
+                    var node = n.node;
+                    if(node.state.checked)
+                        gb_map_overlay_mge._focus_station(node.data);
+                })
+                .jstree({
+                    'core': {
+                        'data': get_st_route_tree_data()
+                    },
+                    'checkbox': {
+                        'keep_selected_style': false,
+                        'whole_node': false,
+                        'tie_selection': false
+                    },
+                    //local storage里的key
+                    'state': {
+                        'key': 'jstree_map_station_route'
+                    },
+                    'plugins': ['checkbox', 'state']
+                });
+
+
+            //停车场
+            $('.carpark-panel', cont)
+                .on('state_ready.jstree', function () {
+                    //绑定checkbox状态切换事件
+                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawCarpark);
+                })
+                .on('activate_node.jstree', function (e, n) {
+                    var node = n.node;
+                    if(node.state.checked)
+                        gb_map_overlay_mge._focus_carpark(node.data);
+                })
+                .jstree({
+                    'core': {
+                        'data': get_st_carpark_tree_data()
+                    },
+                    'checkbox': {
+                        'keep_selected_style': false,
+                        'whole_node': false,
+                        'tie_selection': false
+                    },
+                    //local storage里的key
+                    'state': {
+                        'key': 'jstree_map_carpark'
+                    },
+                    'plugins': ['checkbox', 'state']
+                });
+
+            refresh();
+        });
+    };
+
+    //计算多边形面积
+    function calcPolygonArea(polygonStr) {
+        var pStr = polygonStr.substring(9, polygonStr.length - 2);
+        var array = pStr.split(',');
+        var newArr=[];
+
+        //递归去掉闭合的尾
+        (function () {
+            var f = arguments.callee;
+            var end=array.length - 1;
+            if(array.length > 1 && array[0] == array[end]){
+                array = array.slice(0, end);
+                f();
+            }
+        })();
+
+        //去掉连续的重复点
+        var last;
+        $.each(array, function (i, str) {
+            if(last){
+                if(last != str)
+                    newArr.push(str);
+            }
+            else
+                newArr.push(str);
+            last = str;
+        });
+
+        var gPoints=[],ts;
+        $.each(newArr, function (i, c) {
+            ts=c.split(' ');
+            gPoints.push({
+                lat: parseFloat(ts[1]),
+                lng: parseFloat(ts[0])
+            });
+        });
+
+        //用百度geo工具库计算面积
+        var _polygonArea = BMapLib.GeoUtils.getPolygonArea(gPoints);
+        return {_polygonArea: _polygonArea.toFixed(2), _gPoints: gPoints};
+    }
+
+    var refresh = function (type, checked) {
+        if (!triggerElem())
+            return;
+
+        if ((type == 'carPark' && checked) || (type == 'station' && !checked)) {
+            //显示停车场面板
+            $('.car-park-item', cont).addClass('uk-active');
+            $('li.cp-tab-btn', '.real_spatial_panel').addClass('uk-active');
+            $('.carpark-panel', cont).jstree(true).check_all();
+
+            //绘制停车场
+            gb_map_overlay_mge.drawCarpark();
+        }
+        else {
+            //显示站点路由面板
+            $('.station-route-item', cont).addClass('uk-active');
+            $('li.sr-tab-btn', '.real_spatial_panel').addClass('uk-active');
+
+            //选中相关站点路由树
+            var chs = gb_map_overlay_mge.getCheckedDevice();
+            var idx = {};
+            $.each(chs, function () {
+                idx[this.data.lineId + '_' + this.data.upDown] = 1;
+            });
+
+            var treeObj = $('.station-route-tree', cont).jstree(true);
+            for (var id in idx) {
+                treeObj.check_node(treeObj.get_node(id + '_st'));
+            }
+
+            //drawStation();
+            gb_map_overlay_mge.drawStation();
+        }
+    }
+
+    var triggerElem = function () {
+        var config = gb_map_config.getConfig().spatialData;
+
+        if(config.station || config.carPark){
+            showPanel();
+            return true;
+        }
+        hidePanel();
+        //gb_map_imap.call('hideAllStationMarker');
+        //gb_map_imap.call('hideDrawCarpark');
+        return false;
+    }
+
+    var animationend = 'webkitAnimationEnd animationend';
+    var showPanel = function () {
+        var elem = $('.real_spatial_panel');
+        var config = gb_map_config.getConfig().spatialData;
+
+        if (config.station && config.carPark) {
+            anim_show($('.uk-subnav', elem), 'uk-animation-scale-up');
+            $('.real_spatial_body', elem).addClass('show-tab');
+        }
+        else {
+            $('.uk-subnav', elem).hide();
+            $('.real_spatial_body', elem).removeClass('show-tab');
+        }
+
+        $('li.uk-active', elem).removeClass('uk-active');
+
+        if (!elem.is(":hidden"))
+            return;
+
+        anim_show(elem, 'uk-animation-slide-left');
+    }
+
+    var hidePanel = function () {
+        var elem = $('.real_spatial_panel');
+        elem.hide();
+    }
+
+    function anim_show(e, anim) {
+        e.addClass(anim).show().one(animationend, function () {
+            $(this).removeClass(anim);
+        });
+    }
+
+    function getCheckedStation() {
+        var list = [];
+        var chs = $('.station-route-tree', cont).jstree(true).get_checked(true);
+        chs = chs.filter(function (item) {
+            return item.data;
+        });
+        $.each(chs, function () {
+            list.push(this.data);
+        });
+        return list;
+    }
+
+    function gteCheckedCarpark() {
+        var list = [];
+        var chs = $('.carpark-panel', cont).jstree(true).get_checked(true);
+        $.each(chs, function () {
+            list.push(this.data);
+        });
+        return list;
+    }
+
+    var get_st_route_tree_data = function () {
+        var treeData = [];
+
+        for (var lineCode in currentLineStationArr) {
+            name = gb_data_basic.codeToLine[lineCode].name;
+            treeData.push({
+                'text': name,
+                'open': true,
+                'children': [
+                    {
+                        'text': '上行',
+                        'children': grabs(currentLineStationArr[lineCode][0]),
+                        'id': lineCode + '_0_st'
+                    },
+                    {
+                        'text': '下行',
+                        'children': grabs(currentLineStationArr[lineCode][1]),
+                        'id': lineCode + '_1_st'
+                    }
+                ]
+            })
+        }
+        return treeData;
+    };
+    var get_st_route_tree_data_version = function () {
+        var treeData = [];
+
+        for (var lineCode in lineVersionStationArr) {
+            name = gb_data_basic.codeToLine[lineCode].name;
+            treeData.push({
+                'text': name,
+                'open': true,
+                'children': [
+                    {
+                        'text': '上行',
+                        'children': grabs(lineVersionStationArr[lineCode][0]),
+                        'id': lineCode + '_0_st'
+                    },
+                    {
+                        'text': '下行',
+                        'children': grabs(lineVersionStationArr[lineCode][1]),
+                        'id': lineCode + '_1_st'
+                    }
+                ]
+            })
+        }
+        return treeData;
+    };
+    var get_st_carpark_tree_data = function () {
+        var treeData = [];
+
+        $.each(carparkArr, function () {
+            treeData.push({
+                'text': this.parkName,
+                'data': this
+            });
+        });
+
+        return treeData;
+    }
+
+    var grabs = function (array) {
+        if (!array)
+            return;
+        var rs = [];
+        $.each(array, function () {
+            rs.push({
+                'text': this.stationName,
+                'data': this,
+                'icon': false
+            });
+        });
+        return rs;
+    }
+
+    return {
+        refresh: refresh,
+        init: init,
+        getCheckedStation:getCheckedStation,
+        gteCheckedCarpark: gteCheckedCarpark,
+        getStationArray: function (lineCode) {
+            return lineStationArr[lineCode];
+        },
+        carparkArray: function () {
+            return carparkArr;
+        }
+    };
 })();
 \ No newline at end of file
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:tns="http://bsth.com/service/schedule/batch/webservice/vehicleSync"
+           targetNamespace="http://bsth.com/service/schedule/batch/webservice/vehicleSync"
+           elementFormDefault="qualified">
+
+    <!-- 车辆信息更新请求类型 -->
+    <xs:element name="addVehicleDataSyncRequest">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="idenZbh" type="xs:string" />
+                <xs:element name="idenCph" type="xs:string" />
+                <xs:element name="updateGsmc" type="xs:string" />
+                <xs:element name="updateFgsmc" type="xs:string" />
+                <xs:element name="updateSfbf" type="xs:boolean" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <!-- 车辆信息更新返回类型 -->
+    <xs:element name="addVehicleDataSyncResponse">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="success" type="xs:boolean"/>
+                <xs:element name="message" type="xs:string"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+</xs:schema>
 \ No newline at end of file