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

娄高锋
2 parents ffc71124 e87614d9
Showing 27 changed files with 1139 additions and 142 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/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
src/main/java/com/bsth/service/schedule/batch/webservice/vehiclesync/AddVehicleDataSyncResponse.java
src/main/java/com/bsth/service/schedule/batch/webservice/vehiclesync/ObjectFactory.java
@@ -360,6 +360,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 +406,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/**";
@@ -108,7 +108,7 @@ public class DataHandleProcess {
     				//发送邮件
     				EmailBean mail = new EmailBean();
     				mail.setSubject("线调GPS处理");
-    				mail.setContent("GPS处理超时，检查线程栈文件信息<br/>");
+    				mail.setContent("GPS处理超时，检查文件信息<br/>");
     				sendEmailController.sendMail("113252620@qq.com", mail);
     				logger.info("DataHandlerProcess:邮件发送成功!");
     			} catch (Exception 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
+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;
-<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>
@@ -58,14 +58,14 @@ angular.module(&#39;ScheduleApp&#39;).directive(
  
                     // 表单值，被赋值的次数
                     var form_data_assign_count = {
-                        cl1 : 1,
-                        cl2 : 1,
-                        j1 : 1,
-                        j2 : 1,
-                        j3 : 1,
-                        s1 : 1,
-                        s2 : 1,
-                        s3 : 1
+                        cl1 : -1,
+                        cl2 : -1,
+                        j1 : -1,
+                        j2 : -1,
+                        j3 : -1,
+                        s1 : -1,
+                        s2 : -1,
+                        s3 : -1
                     };
  
                     return {
@@ -359,7 +359,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_cl1 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    form_data_assign_count.cl1 ++;
+                                    if (form_data_assign_count.cl1 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    }
                                 },
                                 true
                             );
@@ -381,7 +384,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_cl2 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    form_data_assign_count.cl2 ++;
+                                    if (form_data_assign_count.cl2 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    }
                                 },
                                 true
                             );
@@ -403,8 +409,11 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_j1 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.j1 ++;
+                                    if (form_data_assign_count.j1 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
                                 },
                                 true
                             );
@@ -425,8 +434,12 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     } else {
                                         new_s1 = undefined;
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+
+                                    form_data_assign_count.s1 ++;
+                                    if (form_data_assign_count.s1 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
                                 },
                                 true
                             );
@@ -448,8 +461,11 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_j2 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.j2 ++;
+                                    if (form_data_assign_count.j2 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
                                 },
                                 true
                             );
@@ -471,8 +487,11 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_s2 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.s2 ++;
+                                    if (form_data_assign_count.s2 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
                                 },
                                 true
                             );
@@ -5940,14 +5940,14 @@ angular.module(&#39;ScheduleApp&#39;).directive(
  
                     // 表单值，被赋值的次数
                     var form_data_assign_count = {
-                        cl1 : 1,
-                        cl2 : 1,
-                        j1 : 1,
-                        j2 : 1,
-                        j3 : 1,
-                        s1 : 1,
-                        s2 : 1,
-                        s3 : 1
+                        cl1 : -1,
+                        cl2 : -1,
+                        j1 : -1,
+                        j2 : -1,
+                        j3 : -1,
+                        s1 : -1,
+                        s2 : -1,
+                        s3 : -1
                     };
  
                     return {
@@ -6241,7 +6241,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_cl1 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    form_data_assign_count.cl1 ++;
+                                    if (form_data_assign_count.cl1 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    }
                                 },
                                 true
                             );
@@ -6263,7 +6266,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_cl2 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    form_data_assign_count.cl2 ++;
+                                    if (form_data_assign_count.cl2 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_cl();
+                                    }
                                 },
                                 true
                             );
@@ -6285,8 +6291,11 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_j1 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.j1 ++;
+                                    if (form_data_assign_count.j1 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
                                 },
                                 true
                             );
@@ -6307,8 +6316,12 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     } else {
                                         new_s1 = undefined;
                                     }
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+
+                                    form_data_assign_count.s1 ++;
+                                    if (form_data_assign_count.s1 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
                                 },
                                 true
                             );
@@ -6330,8 +6343,11 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_j2 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.j2 ++;
+                                    if (form_data_assign_count.j2 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
                                 },
                                 true
                             );
@@ -6353,8 +6369,11 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         new_s2 = undefined;
                                     }
  
-                                    scope[ctrlAs].$$internal_refresh_dsdata_j();
-                                    scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    form_data_assign_count.s2 ++;
+                                    if (form_data_assign_count.s2 > 1) {
+                                        scope[ctrlAs].$$internal_refresh_dsdata_j();
+                                        scope[ctrlAs].$$internal_refresh_dsdata_s();
+                                    }
                                 },
                                 true
                             );
@@ -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>
+<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