Revert "初始化"

This reverts commit 681c58b7.

Revert "初始化"
This reverts commit 681c58b7.
游瑞烽
1 parent 681c58b7
Showing 45 changed files with 2354 additions and 2596 deletions
README.md
pom.xml
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/entity/Business.java
src/main/java/com/bsth/entity/ChildTaskPlan.java
src/main/java/com/bsth/entity/Dictionary.java
src/main/java/com/bsth/entity/Equipment.java
src/main/java/com/bsth/entity/Personnel.java
src/main/java/com/bsth/entity/PersonnelCopy.java
src/main/java/com/bsth/entity/ScheduleRealInfo.java
src/main/java/com/bsth/entity/result/RevisedReport.java
src/main/java/com/bsth/handler/ReportCalculationHandler.java
src/main/java/com/bsth/handler/personnelUpdateHandler.java
src/main/java/com/bsth/repository/PersonnelCopyRepository.java
src/main/java/com/bsth/repository/PersonnelRepository.java
src/main/java/com/bsth/repository/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/CulateService.java
src/main/java/com/bsth/service/PersonnelService.java
src/main/java/com/bsth/service/ScheduleRealInfoService.java
-人员表更新金蝶数据
 \ No newline at end of file
+计算报表 ！！！
+1.公里、班次修正报表
 \ No newline at end of file
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bsth</groupId>
-	<artifactId>personnel_update</artifactId>
+	<artifactId>report_calculator</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
@@ -14,16 +14,6 @@
 	</parent>
 	<dependencies>
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-core</artifactId>
-			<version>1.3.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -50,12 +40,6 @@
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
-		<!--<dependency>
-			<groupId>org.mybatis.spring.boot</groupId>
-			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>1.3.0</version>
-		</dependency>-->
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
@@ -2,12 +2,9 @@ package com.bsth;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
 @SpringBootApplication
-//@SpringBootApplication(exclude={DataSourceAutoConfiguration.class,HibernateJpaAutoConfiguration.class})
 public class Application extends SpringBootServletInitializer {
 	public static void main(String[] args) throws Exception {
 package com.bsth;
-import com.bsth.thread.PersonnelUpdateThrad;
+import com.bsth.thread.ReportCalculationThrad;
 import com.bsth.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,22 +29,21 @@ public class StartCommand implements CommandLineRunner{
 	private static long timeDiff;
 	@Autowired
-	PersonnelUpdateThrad personnelUpdateThrad;
+	ReportCalculationThrad mileageCalculationThrad;
 	static {
-		// 中午12:00
-		timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 60 * 24) - System.currentTimeMillis();
-//		if (timeDiff < 0)
-//			timeDiff += (1000 * 60 * 60 * 24);
+		// 早上02:30
+		timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 150) - System.currentTimeMillis();
+		if (timeDiff < 0)
+			timeDiff += (1000 * 60 * 60 * 24);
 	}
 	@Override
 	public void run(String... arg0){
 		try {
-			log.info("在："+timeDiff / 1000 / 60 + "分钟后开始同步数据");
-			mainServices.scheduleAtFixedRate(personnelUpdateThrad, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);//timeDiff / 1000
-//			mainServices.scheduleAtFixedRate(personnelUpdateThrad, 1, 60*60, TimeUnit.SECONDS);//timeDiff / 1000
+			log.info(timeDiff / 1000 / 60 + "分钟后统计修正班次和公里报表");
+			mainServices.scheduleAtFixedRate(mileageCalculationThrad, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);//timeDiff / 1000
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-package com.bsth.entity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-
-/**
- * 
- * @ClassName : Business(公司实体类)
- * 
- * @Author : bsth@lq
- * 
- * @Description : TODO(公司信息)
- * 
- * @Data : 2016-04-27
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-@Entity
-@Table(name = "bsth_c_business")
-public class Business {
-	
-	// ID
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-	
-	// 企业<公司>名称
-	private String businessName;
-	
-	// 企业<公司>代码
-	private String businessCode;
-	
-	// 所属企业<公司>代码
-	private String upCode;
-	
-	// 描述
-	private String descriptions;
-	
-	// 创建日期
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-			
-	// 修改日期
-	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date updateDate;
-	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 Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getBusinessName() {
-		return businessName;
-	}
-
-	public void setBusinessName(String businessName) {
-		this.businessName = businessName;
-	}
-
-	public String getBusinessCode() {
-		return businessCode;
-	}
-
-	public void setBusinessCode(String businessCode) {
-		this.businessCode = businessCode;
-	}
-
-	public String getUpCode() {
-		return upCode;
-	}
-
-	public void setUpCode(String upCode) {
-		this.upCode = upCode;
-	}
-
-	public String getDescriptions() {
-		return descriptions;
-	}
-
-	public void setDescriptions(String descriptions) {
-		this.descriptions = descriptions;
-	}
-}
+package com.bsth.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import javax.persistence.*;
+import java.util.Date;
+
+
+/**
+ * 
+ * @ClassName: ChildTaskPlan
+ * @Description: TODO(子任务)
+ * @author PanZhao
+ * @date 2016年6月20日 上午11:22:22
+ *
+ */
+@Entity
+@Table(name = "bsth_c_s_child_task")
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "childTaskPlan_schedule", attributeNodes = {
+            @NamedAttributeNode("schedule")
+    })
+})
+public class ChildTaskPlan {
+
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	/**
+	 * 任务类型1
+	 * 正常，临加
+	 */
+	private String type1;
+
+	/**
+	 * 任务类型2
+	 */
+	private String type2;
+
+	/**
+	 * 起点
+	 */
+	private String startStation;
+	
+	/**
+	 * 起点站名称
+	 */
+	private String startStationName;
+	
+	/**
+	 * 终点
+	 */
+	private String endStation;
+	
+	/**
+	 * 终点站名称
+	 */
+	private String endStationName;
+
+	/**
+	 * 里程类型
+	 */
+	private String mileageType;
+
+	/**
+	 * 里程
+	 */
+	private Float mileage;
+
+	/**
+	 * 开始时间 HH:mm
+	 */
+	private String startDate;
+
+	/**
+	 * 结束时间 HH:mm
+	 */
+	private String endDate;
+
+	/**
+	 * 是否烂班
+	 */
+	private boolean destroy;
+
+	/**
+	 * 烂班原因  -烂班时，该字段仍有值并 =reason
+	 */
+	private String destroyReason;
+
+	/**
+	 * 包括 烂班原因、进出场原因、换车原因 等
+	 */
+	private String reason;
+
+	/**
+	 * 车辆 如果为空，继承主任务
+	 */
+	private String nbbm;
+
+	/**
+	 * 为true 则无售票员， 否则继承主任务
+	 */
+	private boolean noClerk;
+
+	/** 创建日期 */
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+
+	/**
+	 * 主排班计划
+	 */
+	@JsonIgnore
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "schedule")
+	private ScheduleRealInfo schedule;
+	
+	private String remarks;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getType1() {
+		return type1;
+	}
+
+	public void setType1(String type1) {
+		this.type1 = type1;
+	}
+
+	public String getType2() {
+		return type2;
+	}
+
+	public void setType2(String type2) {
+		this.type2 = type2;
+	}
+
+	public String getStartStation() {
+		return startStation;
+	}
+
+	public void setStartStation(String startStation) {
+		this.startStation = startStation;
+	}
+
+	public String getEndStation() {
+		return endStation;
+	}
+
+	public void setEndStation(String endStation) {
+		this.endStation = endStation;
+	}
+
+	public String getMileageType() {
+		return mileageType;
+	}
+
+	public void setMileageType(String mileageType) {
+		this.mileageType = mileageType;
+	}
+
+	public Float getMileage() {
+		return mileage;
+	}
+
+	public void setMileage(Float mileage) {
+		this.mileage = mileage;
+	}
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+	public boolean isDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(boolean destroy) {
+		this.destroy = destroy;
+	}
+
+	public String getDestroyReason() {
+		return destroyReason;
+	}
+
+	public void setDestroyReason(String destroyReason) {
+		this.destroyReason = destroyReason;
+	}
+
+	public ScheduleRealInfo getSchedule() {
+		return schedule;
+	}
+
+	public void setSchedule(ScheduleRealInfo schedule) {
+		this.schedule = schedule;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getStartStationName() {
+		return startStationName;
+	}
+
+	public void setStartStationName(String startStationName) {
+		this.startStationName = startStationName;
+	}
+
+	public String getEndStationName() {
+		return endStationName;
+	}
+
+	public void setEndStationName(String endStationName) {
+		this.endStationName = endStationName;
+	}
+
+	@Override
+	public int hashCode() {
+		return ("cTask" + this.getId() + this.getSchedule().getId()).hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return this.id.equals(((ChildTaskPlan)obj).getId());
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public boolean isNoClerk() {
+		return noClerk;
+	}
+
+	public void setNoClerk(boolean noClerk) {
+		this.noClerk = noClerk;
+	}
+}
-package com.bsth.entity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-
-@Entity
-@Table(name = "bsth_c_sys_dictionary")
-public class Dictionary {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-	private String dCode;
-
-	private String dName;
-
-	private String descriptions;
-
-	private String dGroup;
-
-	/**
-	 * 固化的字典不能修改
-	 */
-	private boolean fixed;
-	
-	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date updateDate;
-	
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public boolean isFixed() {
-		return fixed;
-	}
-
-	public void setFixed(boolean fixed) {
-		this.fixed = fixed;
-	}
-
-	public String getdCode() {
-		return dCode;
-	}
-
-	public void setdCode(String dCode) {
-		this.dCode = dCode;
-	}
-
-	public String getdName() {
-		return dName;
-	}
-
-	public void setdName(String dName) {
-		this.dName = dName;
-	}
-
-	public String getDescriptions() {
-		return descriptions;
-	}
-
-	public void setDescriptions(String descriptions) {
-		this.descriptions = descriptions;
-	}
-
-	public String getdGroup() {
-		return dGroup;
-	}
-
-	public void setdGroup(String dGroup) {
-		this.dGroup = dGroup;
-	}
-
-	public Date getUpdateDate() {
-		return updateDate;
-	}
-
-	public void setUpdateDate(Date updateDate) {
-		this.updateDate = updateDate;
-	}
-}
+package com.bsth.entity;
+/**
+ * @ClassName: Equipment.java
+ * @Description: TODO(车辆自编号to设备号)
+ * @author: YouRuiFeng
+ * @date: 2017-8-30 下午7:36:07
+ * 
+ */
+public class Equipment {
+	
+	private String inside_code;
+	
+	private String equipment_code;
+
+	public String getInside_code() {
+		return inside_code;
+	}
+
+	public void setInside_code(String inside_code) {
+		this.inside_code = inside_code;
+	}
+
+	public String getEquipment_code() {
+		return equipment_code;
+	}
+
+	public void setEquipment_code(String equipment_code) {
+		this.equipment_code = equipment_code;
+	}
+	
+}
-package com.bsth.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.hibernate.annotations.Formula;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-
-/**
- * 
- * @ClassName : Personnel(人员实体类)
- * 
- * @Author : bsth@lq
- * 
- * @Description : TODO(人员)
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-@Entity
-@Table(name = "bsth_c_personnel")//_copy
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class Personnel {
-
-    /** 主键Id */
-	@Id
-	@GeneratedValue
-	private Integer id;
-
-    /** 所属公司 */
-    @Column(nullable = false)
-    private String company;
-    /** 公司编码 */
-    @Column(nullable = false)
-    private String companyCode;
-    /** 所属分公司 */
-    private String brancheCompany;
-    /** 分公司编码 */
-    private String brancheCompanyCode;
-    /** 组合公司分公司编码 */
-//    @Formula(" concat(company_code, '_', branche_company_code) ")
-//    private String cgsbm;
-
-    /** 工号（员工编号带公司编码前缀） */
-    @Column(nullable = false)
-    private String jobCode;
-    /** 姓名 */
-    @Column(nullable = false)
-    private String personnelName;
-
-    /** 运营服务证书号 */
-    private String papersCode;
-    /** 一卡通工作卡号 */
-    private String icCardCode;
-    /** 性别（字典类型sexType） */
-    private String personnelType;
-    /** 所属岗位/工种（字典类型gzType） */
-    private String posts;
-
-    /** 工号 */
-    @Column(nullable = false)
-    private String jobCodeori;
-
-    /** 金蝶工号 */
-//    @Column(nullable = false)
-    private String jdCodeori;
-
-    /** 身份证 */
-    private String card;
-
-    @Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-    /** 备注 */
-    private String remark;
-
-    /**
-     * 0为正常，1为停用
-     */
-    private Integer destroy;
-
-    public Personnel() {}
-
-    public Personnel(Object id, Object companyCode, Object gh) {
-        if (id != null) {
-            this.id = Integer.valueOf(id.toString());
-        }
-        if (companyCode != null) {
-            this.companyCode = companyCode.toString();
-        }
-        if (gh != null) {
-            this.jobCode = gh.toString();
-        }
-    }
-
-	public String getCard() {
-		return card;
-	}
-
-	public void setCard(String card) {
-		this.card = card;
-	}
-
-	/** 人员编码（TODO：在原系统里没有，这里暂时留着） */
-	private String personnelCode;
-	/** 照片地址（TODO：在原系统里没有，这里暂时留着） */
-	private String personnelImg;
-	/** 线路编号（TODO：在原系统里没有，这里暂时留着） */
-	private String lineCode;
-	/** 联系电话（TODO：在原系统里没有，这里暂时留着） */
-	private String telphone;
-    /** 描述（TODO：在原系统里没有，这里暂时留着） */
-    private String descriptions;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public void setCompany(String company) {
-        this.company = company;
-    }
-
-    public String getCompanyCode() {
-        return companyCode;
-    }
-
-    public void setCompanyCode(String companyCode) {
-        this.companyCode = companyCode;
-    }
-
-    public String getBrancheCompany() {
-        return brancheCompany;
-    }
-
-    public void setBrancheCompany(String brancheCompany) {
-        this.brancheCompany = brancheCompany;
-    }
-
-    public String getBrancheCompanyCode() {
-        return brancheCompanyCode;
-    }
-
-    public void setBrancheCompanyCode(String brancheCompanyCode) {
-        this.brancheCompanyCode = brancheCompanyCode;
-    }
-
-    public String getJobCode() {
-        return jobCode;
-    }
-
-    public void setJobCode(String jobCode) {
-        this.jobCode = jobCode;
-    }
-
-    public String getPersonnelName() {
-        return personnelName;
-    }
-
-    public void setPersonnelName(String personnelName) {
-        this.personnelName = personnelName;
-    }
-
-    public String getPapersCode() {
-        return papersCode;
-    }
-
-    public void setPapersCode(String papersCode) {
-        this.papersCode = papersCode;
-    }
-
-    public String getIcCardCode() {
-        return icCardCode;
-    }
-
-    public void setIcCardCode(String icCardCode) {
-        this.icCardCode = icCardCode;
-    }
-
-    public String getPersonnelType() {
-        return personnelType;
-    }
-
-    public void setPersonnelType(String personnelType) {
-        this.personnelType = personnelType;
-    }
-
-    public String getPosts() {
-        return posts;
-    }
-
-    public void setPosts(String posts) {
-        this.posts = posts;
-    }
-
-    public String getPersonnelCode() {
-        return personnelCode;
-    }
-
-    public void setPersonnelCode(String personnelCode) {
-        this.personnelCode = personnelCode;
-    }
-
-    public String getPersonnelImg() {
-        return personnelImg;
-    }
-
-    public void setPersonnelImg(String personnelImg) {
-        this.personnelImg = personnelImg;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getTelphone() {
-        return telphone;
-    }
-
-    public void setTelphone(String telphone) {
-        this.telphone = telphone;
-    }
-
-    public String getDescriptions() {
-        return descriptions;
-    }
-
-    public void setDescriptions(String descriptions) {
-        this.descriptions = descriptions;
-    }
-
-//    public String getCgsbm() {
-//        return cgsbm;
-//    }
-//
-//    public void setCgsbm(String cgsbm) {
-//        this.cgsbm = cgsbm;
-//    }
-
-    public String getJobCodeori() {
-        return jobCodeori;
-    }
-
-    public void setJobCodeori(String jobCodeori) {
-        this.jobCodeori = jobCodeori;
-    }
-
-    public String getJdCodeori() {
-        return jdCodeori;
-    }
-
-    public void setJdCodeori(String jdCodeori) {
-        this.jdCodeori = jdCodeori;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public Integer getDestroy() {
-        return destroy;
-    }
-
-    public void setDestroy(Integer destroy) {
-        this.destroy = destroy;
-    }
-}
-package com.bsth.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.hibernate.annotations.Formula;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-
-/**
- * 
- * @ClassName : PersonnelCopy(人员实体类备份)
- * 
- * @Author : bsth@lq
- * 
- * @Description : TODO(人员)
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-//@Entity
-//@Table(name = "bsth_c_personnel_copy")
-//@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class PersonnelCopy {
-
-    /** 主键Id */
-	@Id
-	@GeneratedValue
-	private Integer id;
-
-    /** 所属公司 */
-//    @Column(nullable = false)
-    private String company;
-    /** 公司编码 */
-//    @Column(nullable = false)
-    private String companyCode;
-    /** 所属分公司 */
-    private String brancheCompany;
-    /** 分公司编码 */
-    private String brancheCompanyCode;
-    /** 组合公司分公司编码 */
-    @Formula(" concat(company_code, '_', branche_company_code) ")
-    private String cgsbm;
-
-    /** 工号（员工编号带公司编码前缀） */
-//    @Column(nullable = false)
-    private String jobCode;
-    /** 姓名 */
-//    @Column(nullable = false)
-    private String personnelName;
-
-    /** 运营服务证书号 */
-    private String papersCode;
-    /** 一卡通工作卡号 */
-    private String icCardCode;
-    /** 性别（字典类型sexType） */
-    private String personnelType;
-    /** 所属岗位/工种（字典类型gzType） */
-    private String posts;
-
-    /** 工号 */
-//    @Column(nullable = false)
-    private String jobCodeori;
-    /** 身份证 */
-    private String card;
-
-    @Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-    /** 备注 */
-    private String remark;
-
-    public PersonnelCopy() {}
-
-    public PersonnelCopy(Object id, Object companyCode, Object gh) {
-        if (id != null) {
-            this.id = Integer.valueOf(id.toString());
-        }
-        if (companyCode != null) {
-            this.companyCode = companyCode.toString();
-        }
-        if (gh != null) {
-            this.jobCode = gh.toString();
-        }
-    }
-
-	public String getCard() {
-		return card;
-	}
-
-	public void setCard(String card) {
-		this.card = card;
-	}
-
-	/** 人员编码（TODO：在原系统里没有，这里暂时留着） */
-	private String personnelCode;
-	/** 照片地址（TODO：在原系统里没有，这里暂时留着） */
-	private String personnelImg;
-	/** 线路编号（TODO：在原系统里没有，这里暂时留着） */
-	private String lineCode;
-	/** 联系电话（TODO：在原系统里没有，这里暂时留着） */
-	private String telphone;
-    /** 描述（TODO：在原系统里没有，这里暂时留着） */
-    private String descriptions;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public void setCompany(String company) {
-        this.company = company;
-    }
-
-    public String getCompanyCode() {
-        return companyCode;
-    }
-
-    public void setCompanyCode(String companyCode) {
-        this.companyCode = companyCode;
-    }
-
-    public String getBrancheCompany() {
-        return brancheCompany;
-    }
-
-    public void setBrancheCompany(String brancheCompany) {
-        this.brancheCompany = brancheCompany;
-    }
-
-    public String getBrancheCompanyCode() {
-        return brancheCompanyCode;
-    }
-
-    public void setBrancheCompanyCode(String brancheCompanyCode) {
-        this.brancheCompanyCode = brancheCompanyCode;
-    }
-
-    public String getJobCode() {
-        return jobCode;
-    }
-
-    public void setJobCode(String jobCode) {
-        this.jobCode = jobCode;
-    }
-
-    public String getPersonnelName() {
-        return personnelName;
-    }
-
-    public void setPersonnelName(String personnelName) {
-        this.personnelName = personnelName;
-    }
-
-    public String getPapersCode() {
-        return papersCode;
-    }
-
-    public void setPapersCode(String papersCode) {
-        this.papersCode = papersCode;
-    }
-
-    public String getIcCardCode() {
-        return icCardCode;
-    }
-
-    public void setIcCardCode(String icCardCode) {
-        this.icCardCode = icCardCode;
-    }
-
-    public String getPersonnelType() {
-        return personnelType;
-    }
-
-    public void setPersonnelType(String personnelType) {
-        this.personnelType = personnelType;
-    }
-
-    public String getPosts() {
-        return posts;
-    }
-
-    public void setPosts(String posts) {
-        this.posts = posts;
-    }
-
-    public String getPersonnelCode() {
-        return personnelCode;
-    }
-
-    public void setPersonnelCode(String personnelCode) {
-        this.personnelCode = personnelCode;
-    }
-
-    public String getPersonnelImg() {
-        return personnelImg;
-    }
-
-    public void setPersonnelImg(String personnelImg) {
-        this.personnelImg = personnelImg;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getTelphone() {
-        return telphone;
-    }
-
-    public void setTelphone(String telphone) {
-        this.telphone = telphone;
-    }
-
-    public String getDescriptions() {
-        return descriptions;
-    }
-
-    public void setDescriptions(String descriptions) {
-        this.descriptions = descriptions;
-    }
-
-    public String getCgsbm() {
-        return cgsbm;
-    }
-
-    public void setCgsbm(String cgsbm) {
-        this.cgsbm = cgsbm;
-    }
-
-    public String getJobCodeori() {
-        return jobCodeori;
-    }
-
-    public void setJobCodeori(String jobCodeori) {
-        this.jobCodeori = jobCodeori;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-}
+package com.bsth.entity;
+
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 实际排班计划明细。
+ */
+@Entity
+@Table(name = "bsth_c_s_sp_info_real")
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "scheduleRealInfo_cTasks", attributeNodes = {
+            @NamedAttributeNode("cTasks")
+    })
+})
+public class ScheduleRealInfo implements Serializable{
+
+
+
+	/** 主键Id */
+	@Id
+	private Long id;
+	
+	/** 计划ID */
+	private Long spId;
+
+	/** 排班计划日期 */
+	private Date scheduleDate;
+	private String scheduleDateStr;
+	
+	/** 真实执行时间 yyyy-MM-dd */
+	private String realExecDate;
+
+	/** 线路名称 */
+	private String xlName;
+	/** 线路编码 */
+	private String xlBm;
+
+	/** 路牌名称 */
+	private String lpName;
+
+	/** 车辆自编号 */
+	private String clZbh;
+	
+	/** 设备终端号*/
+	@Transient
+	private String equipment_code;
+	
+	/** 驾驶员工号 */
+	private String jGh;
+	/** 驾驶员名字 */
+	private String jName;
+	/** 售票员工号 */
+	private String sGh;
+	/** 售票员名字 */
+	private String sName;
+
+	/** 线路方向 */
+	private String xlDir;
+	/** 起点站code*/
+	private String qdzCode;
+	/** 起点站名字 */
+	private String qdzName;
+	
+	/** 终点站code*/
+	private String zdzCode;
+	/** 终点站名字 */
+	private String zdzName;
+
+	/** 计划发车时间（格式 HH:mm） */
+	private String fcsj;
+	/** 计划发车时间戳*/
+	@Transient
+	private Long fcsjT;
+	
+	/** 计划终点时间（格式 HH:mm） */
+	private String zdsj;
+	/** 计划终点时间戳*/
+	@Transient
+	private Long zdsjT;
+	
+	/** 计划里程 */
+	private Double jhlc;
+
+	/** 原始计划里程 （原计调的数据） */
+	private Double jhlcOrig;
+
+	/** 班次历时 */
+	private Integer bcsj;
+
+	/**
+	 * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
+	 */
+	private String bcType;
+
+	/** 实际发车时间*/
+	private String fcsjActual;
+	/** 实际发车时间戳*/
+	@Transient
+	private Long fcsjActualTime;
+	/**实际终点时间 */
+	private String zdsjActual;
+	/** 实际终点时间戳*/
+	@Transient
+	private Long zdsjActualTime;
+
+	/**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
+	private int status;
+
+	private String adjustExps;
+	
+	/** 是否是临加班次 */
+	private boolean sflj;
+
+	/** 备注*/
+	private String remarks;
+	
+	/**待发时间（格式 HH:mm） */
+	private String dfsj;
+	
+	//待发调试（是否自动调整）
+	private boolean dfAuto;
+	
+	/**待发时间戳 */
+	@Transient
+	private Long dfsjT;
+	
+	/** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
+	private Integer directiveState = -1;
+
+	/** 子任务 */
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "schedule")
+	private Set<ChildTaskPlan> cTasks = new HashSet<>();
+
+	/** 关联的公司名称 */
+	private String gsName;
+	/** 关联的公司编码 */
+	private String gsBm;
+	/** 关联的分公司名称 */
+	private String fgsName;
+	/** 关联的分公司编码 */
+	private String fgsBm;
+	
+	/**
+	 * 漂移状态
+	 * 1: 发车漂移
+	 * 2：到站漂移
+	 * 3：中途漂移
+	 */
+	private int driftStatus = 0;
+
+	public boolean isDfAuto() {
+		return dfAuto;
+	}
+	
+	public void setDfAuto(boolean dfAuto) {
+		this.dfAuto = dfAuto;
+	}
+	
+	public boolean isDestroy(){
+		return this.status == -1;
+	}
+	
+	@Override
+	public int hashCode() {
+		return (this.id + this.scheduleDateStr + this.xlBm + this.fcsj).hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return this.id.equals(((ScheduleRealInfo)obj).getId());
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getSpId() {
+		return spId;
+	}
+
+	public void setSpId(Long spId) {
+		this.spId = spId;
+	}
+
+	public Date getScheduleDate() {
+		return scheduleDate;
+	}
+
+	public void setScheduleDate(Date scheduleDate) {
+		this.scheduleDate = scheduleDate;
+	}
+
+	public String getScheduleDateStr() {
+		return scheduleDateStr;
+	}
+
+	public void setScheduleDateStr(String scheduleDateStr) {
+		this.scheduleDateStr = scheduleDateStr;
+	}
+
+	public String getRealExecDate() {
+		return realExecDate;
+	}
+
+	public void setRealExecDate(String realExecDate) {
+		this.realExecDate = realExecDate;
+	}
+
+	public String getXlName() {
+		return xlName;
+	}
+
+	public void setXlName(String xlName) {
+		this.xlName = xlName;
+	}
+
+	public String getXlBm() {
+		return xlBm;
+	}
+
+	public void setXlBm(String xlBm) {
+		this.xlBm = xlBm;
+	}
+
+	public String getLpName() {
+		return lpName;
+	}
+
+	public void setLpName(String lpName) {
+		this.lpName = lpName;
+	}
+
+	public String getClZbh() {
+		return clZbh;
+	}
+
+	public void setClZbh(String clZbh) {
+		this.clZbh = clZbh;
+	}
+
+	public String getEquipment_code() {
+		return equipment_code;
+	}
+
+	public void setEquipment_code(String equipment_code) {
+		this.equipment_code = equipment_code;
+	}
+
+	public String getjGh() {
+		return jGh;
+	}
+
+	public void setjGh(String jGh) {
+		this.jGh = jGh;
+	}
+
+	public String getjName() {
+		return jName;
+	}
+
+	public void setjName(String jName) {
+		this.jName = jName;
+	}
+
+	public String getsGh() {
+		return sGh;
+	}
+
+	public void setsGh(String sGh) {
+		this.sGh = sGh;
+	}
+
+	public String getsName() {
+		return sName;
+	}
+
+	public void setsName(String sName) {
+		this.sName = sName;
+	}
+
+	public String getXlDir() {
+		return xlDir;
+	}
+
+	public void setXlDir(String xlDir) {
+		this.xlDir = xlDir;
+	}
+
+	public String getQdzCode() {
+		return qdzCode;
+	}
+
+	public void setQdzCode(String qdzCode) {
+		this.qdzCode = qdzCode;
+	}
+
+	public String getQdzName() {
+		return qdzName;
+	}
+
+	public void setQdzName(String qdzName) {
+		this.qdzName = qdzName;
+	}
+
+	public String getZdzCode() {
+		return zdzCode;
+	}
+
+	public void setZdzCode(String zdzCode) {
+		this.zdzCode = zdzCode;
+	}
+
+	public String getZdzName() {
+		return zdzName;
+	}
+
+	public void setZdzName(String zdzName) {
+		this.zdzName = zdzName;
+	}
+
+	public String getFcsj() {
+		return fcsj;
+	}
+
+	public void setFcsj(String fcsj) {
+		this.fcsj = fcsj;
+	}
+
+	public Long getFcsjT() {
+		return fcsjT;
+	}
+
+	public void setFcsjT(Long fcsjT) {
+		this.fcsjT = fcsjT;
+	}
+
+	public String getZdsj() {
+		return zdsj;
+	}
+
+	public void setZdsj(String zdsj) {
+		this.zdsj = zdsj;
+	}
+
+	public Long getZdsjT() {
+		return zdsjT;
+	}
+
+	public void setZdsjT(Long zdsjT) {
+		this.zdsjT = zdsjT;
+	}
+
+	public Double getJhlc() {
+		return jhlc;
+	}
+
+	public void setJhlc(Double jhlc) {
+		this.jhlc = jhlc;
+	}
+
+	public Integer getBcsj() {
+		return bcsj;
+	}
+
+	public void setBcsj(Integer bcsj) {
+		this.bcsj = bcsj;
+	}
+
+	public String getBcType() {
+		return bcType;
+	}
+
+	public void setBcType(String bcType) {
+		this.bcType = bcType;
+	}
+
+	public String getFcsjActual() {
+		return fcsjActual;
+	}
+
+	public void setFcsjActual(String fcsjActual) {
+		this.fcsjActual = fcsjActual;
+	}
+
+	public Long getFcsjActualTime() {
+		return fcsjActualTime;
+	}
+
+	public void setFcsjActualTime(Long fcsjActualTime) {
+		this.fcsjActualTime = fcsjActualTime;
+	}
+
+	public String getZdsjActual() {
+		return zdsjActual;
+	}
+
+	public void setZdsjActual(String zdsjActual) {
+		this.zdsjActual = zdsjActual;
+	}
+
+	public Long getZdsjActualTime() {
+		return zdsjActualTime;
+	}
+
+	public void setZdsjActualTime(Long zdsjActualTime) {
+		this.zdsjActualTime = zdsjActualTime;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	public void setStatus(int status) {
+		this.status = status;
+	}
+
+	public String getAdjustExps() {
+		return adjustExps;
+	}
+
+	public void setAdjustExps(String adjustExps) {
+		this.adjustExps = adjustExps;
+	}
+
+	public boolean isSflj() {
+		return sflj;
+	}
+
+	public void setSflj(boolean sflj) {
+		this.sflj = sflj;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getDfsj() {
+		return dfsj;
+	}
+
+	public void setDfsj(String dfsj) {
+		this.dfsj = dfsj;
+	}
+
+	public Long getDfsjT() {
+		return dfsjT;
+	}
+
+	public void setDfsjT(Long dfsjT) {
+		this.dfsjT = dfsjT;
+	}
+
+	public Integer getDirectiveState() {
+		return directiveState;
+	}
+
+	public void setDirectiveState(Integer directiveState) {
+		this.directiveState = directiveState;
+	}
+
+	public Set<ChildTaskPlan> getcTasks() {
+		return cTasks;
+	}
+
+	public void setcTasks(Set<ChildTaskPlan> cTasks) {
+		this.cTasks = cTasks;
+	}
+
+	public String getGsName() {
+		return gsName;
+	}
+
+	public void setGsName(String gsName) {
+		this.gsName = gsName;
+	}
+
+	public String getGsBm() {
+		return gsBm;
+	}
+
+	public void setGsBm(String gsBm) {
+		this.gsBm = gsBm;
+	}
+
+	public String getFgsName() {
+		return fgsName;
+	}
+
+	public void setFgsName(String fgsName) {
+		this.fgsName = fgsName;
+	}
+
+	public String getFgsBm() {
+		return fgsBm;
+	}
+
+	public void setFgsBm(String fgsBm) {
+		this.fgsBm = fgsBm;
+	}
+
+	public Double getJhlcOrig() {
+		return jhlcOrig;
+	}
+
+	public void setJhlcOrig(Double jhlcOrig) {
+		this.jhlcOrig = jhlcOrig;
+	}
+	
+	@Transient
+	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+	@Transient
+	private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+
+	/**
+	 *
+	 * @Title: setFcsjAll
+	 * @Description: TODO(设置计划发车时间)
+	 * @throws
+	 */
+	public void setFcsjAll(Long fcsjT){
+		this.fcsjT = fcsjT;
+		this.fcsj = fmtHHmm.print(fcsjT);
+	}
+
+	public void setDfsjAll(Long dfsjT) {
+		this.dfsjT = dfsjT;
+		this.dfsj = fmtHHmm.print(this.dfsjT);
+	}
+
+	/**
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际发车时间 时间戳)
+	 * @throws
+	 */
+	public void setFcsjActualAll(Long t){
+		this.fcsjActualTime = t;
+		this.fcsjActual = fmtHHmm.print(t);
+	}
+
+	/**
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际终点时间)
+	 * @throws
+	 */
+	public void setZdsjActualAll(Long t){
+		this.zdsjActualTime = t;
+		this.zdsjActual = fmtHHmm.print(t);
+	}
+
+	public void setDfsjAll(String dfsj) {
+		this.dfsjT = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + dfsj);
+		this.dfsj = dfsj;
+	}
+
+	/**
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际发车时间 字符串)
+	 * @throws
+	 */
+	public void setFcsjActualAll(String fcsjActual){
+		this.fcsjActualTime = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + fcsjActual);
+		this.fcsjActual = fcsjActual;
+	}
+
+	/**
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际终点时间)
+	 * @throws
+	 */
+	public void setZdsjActualAll(String zdsjActual){
+		this.zdsjActualTime = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + zdsjActual);
+		this.zdsjActual = zdsjActual;
+	}
+
+	public int getDriftStatus() {
+		return driftStatus;
+	}
+
+	public void setDriftStatus(int driftStatus) {
+		this.driftStatus = driftStatus;
+	}
+	
+	
+}
+package com.bsth.entity.result;
+
+import java.util.Date;
+
+/**
+ * @ClassName: OperatingMileage.java
+ * @Description: TODO(营运里程修正报表)
+ * @author: YouRuiFeng
+ * @date: 2017-8-14 上午11:09:19
+ * 
+ */
+public class RevisedReport {
+	/** 公司编码 */
+    private String companyId;
+
+    /** 分公司编码 */
+    private String subCompanyId;
+    
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司名称 */
+    private String subCompanyName;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 线路名称 */
+    private String lineName;
+    
+    /** 总营运公里  */
+    private double zgl;
+
+    /** 实际运营公里  */
+    private double sjyygl;
+    
+    /** 实际空驶公里  */
+    private double sjksgl;
+
+    /** 手动待发公里  */
+    private double sddfgl;
+    
+    /** 自动代发公里  */
+    private double zddfgl;
+    
+    /** 完全无Gps信号公里  */
+    private double wqwxhgl;
+    
+    /** 部分无Gps公里  */
+    private double bfwxhgl;
+    
+    /** 漂移公里  */
+    private double pygl;
+    
+    /** 临加公里  */
+    private double ljgl;
+    
+    /** 子任务  */
+    private double zrwgl;
+    
+    /** 总营运班次  */
+    private int zbc;
+    
+    /** 实际运营班次  */
+    private int sjyybc;
+    
+    /** 实际空驶班次  */
+    private int sjksbc;
+    
+    /** 手动待发班次  */
+    private int sddfbc;
+    
+    /** 自动代发班次  */
+    private int zddfbc;
+    
+    /** 完全无Gps信号班次  */
+    private int wqwxhbc;
+    
+    /** 部分无Gps班次  */
+    private int bfwxhbc;
+    
+    /** 漂移班次  */
+    private int pybc;
+    
+    /** 临加班次  */
+    private int ljbc;
+    
+    /** 子任务班次  */
+    private int zrwbc;
+
+    /** 其他*/
+    private String other;
+
+    /** 备注 */
+    private String remarks;
+    
+    /** 日期 （班次日期） */
+    private String rq;
+
+    private Date createDate;
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getSubCompanyId() {
+		return subCompanyId;
+	}
+
+	public void setSubCompanyId(String subCompanyId) {
+		this.subCompanyId = subCompanyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getSubCompanyName() {
+		return subCompanyName;
+	}
+
+	public void setSubCompanyName(String subCompanyName) {
+		this.subCompanyName = subCompanyName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
+
+	public double getZgl() {
+		return zgl;
+	}
+
+	public void setZgl(double zgl) {
+		this.zgl = zgl;
+	}
+
+	public double getSjyygl() {
+		return sjyygl;
+	}
+
+	public void setSjyygl(double sjyygl) {
+		this.sjyygl = sjyygl;
+	}
+	
+	public double getSjksgl() {
+		return sjksgl;
+	}
+
+	public void setSjksgl(double sjksgl) {
+		this.sjksgl = sjksgl;
+	}
+
+	public double getSddfgl() {
+		return sddfgl;
+	}
+
+	public void setSddfgl(double sddfgl) {
+		this.sddfgl = sddfgl;
+	}
+
+	public double getZddfgl() {
+		return zddfgl;
+	}
+
+	public void setZddfgl(double zddfgl) {
+		this.zddfgl = zddfgl;
+	}
+
+	public double getWqwxhgl() {
+		return wqwxhgl;
+	}
+
+	public void setWqwxhgl(double wqwxhgl) {
+		this.wqwxhgl = wqwxhgl;
+	}
+
+	public double getBfwxhgl() {
+		return bfwxhgl;
+	}
+
+	public void setBfwxhgl(double bfwxhgl) {
+		this.bfwxhgl = bfwxhgl;
+	}
+
+	public double getPygl() {
+		return pygl;
+	}
+
+	public void setPygl(double pygl) {
+		this.pygl = pygl;
+	}
+
+	public double getLjgl() {
+		return ljgl;
+	}
+
+	public void setLjgl(double ljgl) {
+		this.ljgl = ljgl;
+	}
+
+	public double getZrwgl() {
+		return zrwgl;
+	}
+
+	public void setZrwgl(double zrwgl) {
+		this.zrwgl = zrwgl;
+	}
+
+	public int getZbc() {
+		return zbc;
+	}
+
+	public void setZbc(int zbc) {
+		this.zbc = zbc;
+	}
+
+	public int getSjyybc() {
+		return sjyybc;
+	}
+
+	public void setSjyybc(int sjyybc) {
+		this.sjyybc = sjyybc;
+	}
+
+	public int getSjksbc() {
+		return sjksbc;
+	}
+
+	public void setSjksbc(int sjksbc) {
+		this.sjksbc = sjksbc;
+	}
+
+	public int getSddfbc() {
+		return sddfbc;
+	}
+
+	public void setSddfbc(int sddfbc) {
+		this.sddfbc = sddfbc;
+	}
+
+	public int getZddfbc() {
+		return zddfbc;
+	}
+
+	public void setZddfbc(int zddfbc) {
+		this.zddfbc = zddfbc;
+	}
+
+	public int getWqwxhbc() {
+		return wqwxhbc;
+	}
+
+	public void setWqwxhbc(int wqwxhbc) {
+		this.wqwxhbc = wqwxhbc;
+	}
+
+	public int getBfwxhbc() {
+		return bfwxhbc;
+	}
+
+	public void setBfwxhbc(int bfwxhbc) {
+		this.bfwxhbc = bfwxhbc;
+	}
+
+	public int getPybc() {
+		return pybc;
+	}
+
+	public void setPybc(int pybc) {
+		this.pybc = pybc;
+	}
+
+	public int getLjbc() {
+		return ljbc;
+	}
+
+	public void setLjbc(int ljbc) {
+		this.ljbc = ljbc;
+	}
+
+	public int getZrwbc() {
+		return zrwbc;
+	}
+
+	public void setZrwbc(int zrwbc) {
+		this.zrwbc = zrwbc;
+	}
+
+	public String getOther() {
+		return other;
+	}
+
+	public void setOther(String other) {
+		this.other = other;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+    
+    
+}
+package com.bsth.handler;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.List;
+
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import com.bsth.entity.result.RevisedReport;
+import com.bsth.service.ScheduleRealInfoService;
+
+
+
+/**
+ * @ClassName: MileageCalculationHandler.java
+ * @Description: TODO(营运公里处理程序)
+ * @author: YouRuiFeng
+ * @date: 2017-8-14 下午2:06:22
+ * 
+ */
+@Component
+public class ReportCalculationHandler {
+	
+	@Autowired
+    ScheduleRealInfoService scheduleRealInfoService;
+	
+	@Autowired
+    JdbcTemplate jdbcTemplate;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	public void calc() {
+    	try {
+	        DateTime dt = DateTime.now();
+	        dt = dt.plusDays(-2);//计算两天前的数据
+	        String rq = dt.toString("yyyy-MM-dd");
+//	        String rq = "2017-08-29";
+	        logger.info("开始计算报表： " + rq);
+	        List<RevisedReport> oMList = scheduleRealInfoService.mileageCorrectionTj(rq);
+	        logger.info("报表计算完成： " + rq);
+	        save(oMList);
+    	} catch (Exception e) {
+            logger.error("", e);
+        } 
+	}
+	
+	 private void save(final List<RevisedReport> list) {
+	        //编程式事务
+	        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+	        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+	        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+	        TransactionStatus status = tran.getTransaction(def);
+	        
+	        String sqlMileage = "insert into calc_mileage(company_id, sub_company_id, company_name, sub_company_name, line_code, line_name, " +
+	        		"zyygl, sjyygl, sjksgl, sddfgl, zddfgl, wqwxhgl, bfwxhgl, pygl, ljgl, zrwgl, other, rq, remarks, create_date) " +
+	        		"  VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+	       
+	        try {
+	            jdbcTemplate.batchUpdate(sqlMileage, new BatchPreparedStatementSetter() {
+	                @Override
+	                public void setValues(PreparedStatement ps, int i) throws SQLException {
+	                	RevisedReport report = list.get(i);
+	                    ps.setString(1, report.getCompanyId());
+	                    ps.setString(2, report.getSubCompanyId());
+	                    ps.setString(3, report.getCompanyName());
+	                    ps.setString(4, report.getSubCompanyName());
+	                    ps.setString(5, report.getLineCode());
+	                    ps.setString(6, report.getLineName());
+	                    ps.setDouble(7, report.getZgl());
+	                    ps.setDouble(8, report.getSjyygl());
+	                    ps.setDouble(9, report.getSjksgl());
+	                    ps.setDouble(10, report.getSddfgl());
+	                    ps.setDouble(11, report.getZddfgl());
+	                    ps.setDouble(12, report.getWqwxhgl());
+	                    ps.setDouble(13, report.getBfwxhgl());
+	                    ps.setDouble(14, report.getPygl());
+	                    ps.setDouble(15, report.getLjgl());
+	                    ps.setDouble(16, report.getZrwgl());
+	                    ps.setString(17, report.getOther());
+	                    ps.setString(18, report.getRq());
+	                    ps.setString(19, report.getRemarks());
+	                    ps.setDate(20, new java.sql.Date(report.getCreateDate().getTime()));
+	                }
+
+	                @Override
+	                public int getBatchSize() {
+	                    return list.size();
+	                }
+	            }); 
+	            
+		        String sqlSchedule = "insert into calc_schedule(company_id, sub_company_id, company_name, sub_company_name, line_code, line_name, " +
+		        		"zyybc, sjyybc, sjksbc, sddfbc, zddfbc, wqwxhbc, bfwxhbc, pybc, ljbc, zrwbc, other, rq, remarks, create_date) " +
+		        		"  VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+	            
+	            jdbcTemplate.batchUpdate(sqlSchedule, new BatchPreparedStatementSetter() {
+	                @Override
+	                public void setValues(PreparedStatement ps, int i) throws SQLException {
+	                	RevisedReport report = list.get(i);
+	                    ps.setString(1, report.getCompanyId());
+	                    ps.setString(2, report.getSubCompanyId());
+	                    ps.setString(3, report.getCompanyName());
+	                    ps.setString(4, report.getSubCompanyName());
+	                    ps.setString(5, report.getLineCode());
+	                    ps.setString(6, report.getLineName());
+	                    ps.setInt(7, report.getZbc());
+	                    ps.setInt(8, report.getSjyybc());
+	                    ps.setInt(9, report.getSjksbc());
+	                    ps.setInt(10, report.getSddfbc());
+	                    ps.setInt(11, report.getZddfbc());
+	                    ps.setInt(12, report.getWqwxhbc());
+	                    ps.setInt(13, report.getBfwxhbc());
+	                    ps.setInt(14, report.getPybc());
+	                    ps.setInt(15, report.getLjbc());
+	                    ps.setInt(16, report.getZrwbc());
+	                    ps.setString(17, report.getOther());
+	                    ps.setString(18, report.getRq());
+	                    ps.setString(19, report.getRemarks());
+	                    ps.setDate(20, new java.sql.Date(report.getCreateDate().getTime()));
+	                }
+
+	                @Override
+	                public int getBatchSize() {
+	                    return list.size();
+	                }
+	            });
+
+	            tran.commit(status);
+	        } catch (Exception e) {
+	            tran.rollback(status);
+	            logger.error("", e);
+	        }
+	    }
+}
-package com.bsth.handler;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.entity.Personnel;
-import com.bsth.repository.PersonnelRepository;
-import com.bsth.service.PersonnelService;
-import com.bsth.util.DBUtils_Personnel;
-import com.bsth.util.XmlToJson;
-import com.bsth.wsdl.PJDataSerivce;
-import com.bsth.wsdl.PJDataSerivceSoap;
-import org.hibernate.collection.internal.PersistentBag;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-
-import javax.xml.namespace.QName;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-
-@Component
-public class personnelUpdateHandler {
-
-	@Autowired
-	PersonnelService personnelService;
-
-	@Autowired
-	PersonnelRepository repository;
-
-	@Autowired
-    JdbcTemplate jdbcTemplate;
-	
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	private static final QName SERVICE_NAME = new QName("http://www.pd-transport.com/", "PJDataSerivce");
-	
-	public void sync() {
-
-		URL wsdlURL = PJDataSerivce.WSDL_LOCATION;
-
-		PJDataSerivce ss = new PJDataSerivce(wsdlURL, SERVICE_NAME);
-		PJDataSerivceSoap port = ss.getPJDataSerivceSoap12();
-
-
-
-
-    	try {
-			Connection conn ;
-			PreparedStatement ps;
-			ResultSet rs = null ;
-	        DateTime dt = DateTime.now();
-	        String rq = dt.toString("yyyy-MM-dd");
-	        logger.info("同步人员数据： " + rq);
-			System.out.println("Invoking getEmployee...");
-			String _getEmployee_idCard = "";
-			/*String unintCode_sn = "KD01.0110";
-			String _getEmployee_sn = port.getEmployee(unintCode_sn, _getEmployee_idCard);
-			String unintCode_jg = "KD01.0111";
-			String _getEmployee_jg = port.getEmployee(unintCode_jg, _getEmployee_idCard);
-			String unintCode_yg = "KD01.0113";
-			String _getEmployee_yg = port.getEmployee(unintCode_yg, _getEmployee_idCard);
-			String unintCode_nh = "KD01.0112";
-			String _getEmployee_nh = port.getEmployee(unintCode_nh, _getEmployee_idCard);*/
-
-			logger.info("金蝶数据同步到：bsth_c_personnel 表，开始");
-
-			// 把所有人员设为停用状态，然后在用金蝶人员数据匹配，匹配上的设为在职
-			conn = DBUtils_Personnel.getConnection();
-			// 服务器
-			ps = conn.prepareStatement("UPDATE control.bsth_c_personnel SET destroy = 1");
-			// 本地
-//			ps = conn.prepareStatement("UPDATE pd_control.bsth_c_personnel SET destroy = 1");
-			ps.executeUpdate();
-
-			// 取出所有调度人员，转存map
-			Map<String, Personnel> personnelMap= new HashMap<>();
-			Iterator<Personnel> perIterator=repository.findAll().iterator();
-//			List<Personnel> personnelList = new ArrayList<>();
-			while(perIterator.hasNext()){
-				Personnel per=perIterator.next();
-				personnelMap.put(per.getJobCode(),per);
-				// 工号补全6位
-//				String JobCodeori = per.getJobCodeori();
-//				while (JobCodeori.length() < 6){
-//					JobCodeori = "0"+JobCodeori;
-//				}
-//				per.setJobCodeori(JobCodeori);
-//				per.setJobCode(per.getCompanyCode()+"-"+JobCodeori);
-//				personnelList.add(per);
-			}
-			// 工号补全6位
-//			repository.save(personnelList);
-
-			for(int i=0;i<4;i++){
-				String unintCode = "KD01.011"+i;
-				String _getEmployee__return = port.getEmployee(unintCode, _getEmployee_idCard);
-				String _getRetiredInfor_unintCode = null;
-				System.out.println("Invoking getRetiredInfor...");
-				String _getRetiredInfor_beginDate = "1900-01-01";
-				String _getRetiredInfor_endDate = rq;
-				JSONArray retiredInfor = new JSONArray();
-				if(_getRetiredInfor_unintCode != null){
-					String _getRetiredInfor__return = port.getRetiredInfor(unintCode, _getRetiredInfor_beginDate, _getRetiredInfor_endDate);
-					JSONObject jsonRetiredInfor= XmlToJson.xml2Json(_getRetiredInfor__return);
-					retiredInfor = JSONArray.parseArray(jsonRetiredInfor.get("Retire").toString());
-				}
-
-				personnelService.matchPersonnel(retiredInfor,_getEmployee__return,i,personnelMap);
-			}
-
-			logger.info("金蝶数据同步到：bsth_c_personnel 表，完成");
-
-			logger.info("把bsth_c_personnel备份到：personnel库的bsth_c_personnel"+rq+" 表");
-			String sql="CREATE TABLE `bsth_c_personnel"+rq+"` (" +
-					"  `id` int(11) NOT NULL ," +//AUTO_INCREMENT
-					"  `branche_company` varchar(255) DEFAULT NULL," +
-					"  `branche_company_code` varchar(255) DEFAULT NULL," +
-					"  `company` varchar(255) DEFAULT NULL," +
-					"  `company_code` varchar(255) NOT NULL," +
-					"  `create_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP," +
-					"  `descriptions` varchar(255) DEFAULT NULL," +
-					"  `ic_card_code` varchar(255) DEFAULT NULL," +
-					"  `job_code` varchar(255) NOT NULL," +
-					"  `line_code` varchar(255) DEFAULT NULL," +
-					"  `papers_code` varchar(255) DEFAULT NULL," +
-					"  `personnel_code` varchar(255) DEFAULT NULL," +
-					"  `personnel_img` varchar(255) DEFAULT NULL," +
-					"  `personnel_name` varchar(255) NOT NULL," +
-					"  `personnel_type` varchar(255) DEFAULT NULL," +
-					"  `posts` varchar(255) DEFAULT NULL," +
-					"  `telphone` varchar(255) DEFAULT NULL," +
-					"  `update_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP," +
-					"  `create_by` int(11) DEFAULT NULL," +
-					"  `update_by` int(11) DEFAULT NULL," +
-					"  `card` varchar(255) DEFAULT NULL," +
-					"  `ic_rfid` varchar(255) DEFAULT NULL," +
-					"  `id_rfid` varchar(255) DEFAULT NULL," +
-					"  `tag_rfid` varchar(255) DEFAULT NULL," +
-					"  `remark` varchar(255) DEFAULT NULL," +
-					"  `job_codeori` varchar(255) NOT NULL," +
-					"  `destroy` int(11)," +
-					"  `jd_codeori` varchar(255)," +
-					"PRIMARY KEY (`id`)"+
-					") ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8";
-
-			int returnRs;
-			try {
-				logger.info("创建personnel库的bsth_c_personnel"+rq+" 表");
-//				conn = DBUtils_Personnel.getConnection();
-				ps = conn.prepareStatement("DROP TABLE IF EXISTS `bsth_c_personnel"+rq+"`");
-				ps.executeUpdate();
-				ps = conn.prepareStatement(sql);
-				returnRs = ps.executeUpdate();
-				if(returnRs == 0){
-					logger.info("备份数据到personnel库的bsth_c_personnel"+rq+" 表，开始");
-					// 服务器
-					sql = "INSERT into `bsth_c_personnel"+rq+"` (SELECT * FROM control.bsth_c_personnel)";
-					// 本地
-//					sql = "INSERT into `bsth_c_personnel"+rq+"` (SELECT * FROM pd_control.bsth_c_personnel)";
-					ps = conn.prepareStatement(sql);
-					returnRs = ps.executeUpdate();
-
-					logger.info("备份数据到personnel库的bsth_c_personnel"+rq+" 表，完成");
-				}
-			} catch (SQLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}finally {
-				DBUtils_Personnel.close(rs, ps, conn);
-			}
-
-
-//			logger.info("把bsth_c_personnel_copy数据同步到：bsth_c_personnel 表，开始");
-//			List<Personnel> retuenList = jdbcTemplate.query("select * from bsth_c_personnel_copy",new BeanPropertyRowMapper(Personnel.class));
-//			repository.save(retuenList);
-//			logger.info("bsth_c_personnel_copy数据同步到：bsth_c_personnel 表，完成");
-//			jdbcTemplate.execute()
-//			// 备份数据
-//			jdbcTemplate.update("INSERT into `bsth_c_personnel"+rq+"` (SELECT * FROM pd_control.bsth_c_personnel)");
-//			jdbcTemplate.update("insert into bsth_c_personnel_copy select * from bsth_c_personnel");
-//			String _getEmployee__return = _getEmployee_sn + _getEmployee_jg + _getEmployee_yg + _getEmployee_nh;
-//			JSONObject jsonInfor = XmlToJson.xml2Json(_getEmployee__return);
-//			System.out.println("getEmployee.result=" + _getEmployee__return);
-
-	        logger.info("同步完成： " + rq);
-    	} catch (Exception e) {
-            logger.error("", e);
-        } 
-	}
-}
-package com.bsth.repository;
-
-import com.bsth.entity.PersonnelCopy;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PersonnelCopyRepository extends PagingAndSortingRepository<PersonnelCopy, Long> {
-	
-//	@Query(value="select s from Personnel s where s.id in(select e.jsy.id from EmployeeConfigInfo e where e.xl.id = ?1) ")
-//    List<Personnel> findJsysByLineId(Integer lineId);
-//
-//	@Query(value="select s from Personnel s where s.id in(select e.spy.id from EmployeeConfigInfo e where e.xl.id = ?1) ")
-//    List<Personnel> findSpysByLineId(Integer lineId);
-
-//    @Query(value="select s from Personnel s ")
-//    List<Personnel> findAll();
-
-}
-package com.bsth.repository;
-
-import com.bsth.entity.Personnel;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PersonnelRepository extends PagingAndSortingRepository<Personnel, Long> {
-	
-//	@Query(value="select s from Personnel s where s.id in(select e.jsy.id from EmployeeConfigInfo e where e.xl.id = ?1) ")
-//    List<Personnel> findJsysByLineId(Integer lineId);
-//
-//	@Query(value="select s from Personnel s where s.id in(select e.spy.id from EmployeeConfigInfo e where e.xl.id = ?1) ")
-//    List<Personnel> findSpysByLineId(Integer lineId);
-
-//    @Query(value="select s from Personnel s ")
-//    List<Personnel> findAll();
-
-}
+package com.bsth.repository;
+
+import com.bsth.entity.ScheduleRealInfo;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ScheduleRealInfoRepository extends PagingAndSortingRepository<ScheduleRealInfo, Long> {
+	
+	//按照时间段统计
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1 order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLineTj(String scheduleDateStr);
+	
+}
+package com.bsth.service;
+
+import java.util.List;
+
+import com.bsth.entity.ScheduleRealInfo;
+
+public interface CulateService {
+		
+	double culateKsgl(List<ScheduleRealInfo> lists);
+	
+	double culateJccgl(List<ScheduleRealInfo> lists);
+	
+	double culateSjgl(List<ScheduleRealInfo> lists);
+	
+	double culateLjgl(List<ScheduleRealInfo> lists);
+	
+	double culateZrwgl(List<ScheduleRealInfo> lists);//所有子任务统计
+	
+	double culatesddfgl(List<ScheduleRealInfo> list);//手动待发调整公里
+	
+	double culatezddfgl(List<ScheduleRealInfo> list);//自动待发调整公里
+	
+	double culateSjgldf(ScheduleRealInfo list);//计算待发实际运营公里
+
+	double culateSjgl(ScheduleRealInfo scheduleRealInfo);//一个班次实际公里
+
+	double culateLjgl(ScheduleRealInfo scheduleRealInfo);//一个班次临加公里
+
+	int culateLjbc(List<ScheduleRealInfo> lists);
+
+	int culateSjbc(List<ScheduleRealInfo> lists);
+
+	int culateKsbc(List<ScheduleRealInfo> lists);
+
+	int culateJccbc(List<ScheduleRealInfo> lists);
+
+	int culatesddfbc(List<ScheduleRealInfo> list);
+
+	int culatezddfbc(List<ScheduleRealInfo> list);
+
+	int culateZrwbc(List<ScheduleRealInfo> lists);
+	 
+}
+
-package com.bsth.service;
-
-import com.alibaba.fastjson.JSONArray;
-import com.bsth.entity.Personnel;
-import com.bsth.entity.PersonnelCopy;
-
-import java.util.List;
-import java.util.Map;
-
-public interface PersonnelService {
-	List<PersonnelCopy> matchPersonnel(JSONArray retiredInfor,String jobCode, int i,Map<String, Personnel> personnelMap);
-}
+package com.bsth.service;
+
+import com.bsth.entity.result.RevisedReport;
+
+import java.util.List;
+
+ /**
+ * @ClassName: ScheduleRealInfoService.java
+ * @Description: TODO()
+ * @author: YouRuiFeng
+ * @date: 2017-8-15 下午1:36:58
+ * 
+ */
+public interface ScheduleRealInfoService {	
+    List<RevisedReport> mileageCorrectionTj(String scheduleDateStr);
+}
+package com.bsth.service.impl;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.ChildTaskPlan;
+import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.service.CulateService;
+import com.bsth.util.Arith;
+
+@Service
+public class CulateServiceImpl  implements CulateService{
+	
+	@Autowired
+    JdbcTemplate jdbcTemplate;
+	
+	@Override
+	public double culateKsgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double ksgl =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!(scheduleRealInfo.getBcType().equals("in") 
+					|| scheduleRealInfo.getBcType().equals("out"))) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(!childTaskPlans.isEmpty()){
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("empty")){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+	 	                    	ksgl=Arith.add(ksgl,jhgl);
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return ksgl;
+	}
+
+	@Override
+	public double culateJccgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double jcclc =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (scheduleRealInfo.getBcType().equals("in") 
+					|| scheduleRealInfo.getBcType().equals("out")||scheduleRealInfo.getBcType().equals("ldks")) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(childTaskPlans.isEmpty()){
+					if(!scheduleRealInfo.isDestroy())
+					jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("empty")){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+	 	                    	jcclc=Arith.add(jcclc,jhgl);
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return jcclc;
+	}
+	
+	@Override
+	public int culateKsbc(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		int ksbc =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!(scheduleRealInfo.getBcType().equals("in") 
+					|| scheduleRealInfo.getBcType().equals("out"))) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(!childTaskPlans.isEmpty()){
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("empty")){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	                    		 ksbc++;
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return ksbc;
+	}
+
+	@Override
+	public int culateJccbc(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		int jccbc =0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (scheduleRealInfo.getBcType().equals("in") 
+					|| scheduleRealInfo.getBcType().equals("out")||scheduleRealInfo.getBcType().equals("ldks")) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(childTaskPlans.isEmpty()){
+					if(!scheduleRealInfo.isDestroy())
+						jccbc++;
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("empty")){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	                    		 jccbc++;
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return jccbc;
+	}
+	
+	@Override
+	public double culateSjgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double sjgl =0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			sjgl =Arith.add(sjgl,culateSjgl(scheduleRealInfo));
+		}
+		return sjgl;
+	}
+	@Override
+	public double culateSjgl(ScheduleRealInfo scheduleRealInfo) {
+		// TODO Auto-generated method stub
+		double sjgl =0.0;
+		if (!isInOut(scheduleRealInfo)) {
+			Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+			if(!scheduleRealInfo.isSflj()){
+				if(childTaskPlans.isEmpty()){
+						if(!scheduleRealInfo.isDestroy()){
+							double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+							double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+							if(jhlc-jhlcOrig>0){
+								sjgl=Arith.add(sjgl,jhlcOrig);
+							}else{
+								sjgl=Arith.add(sjgl,jhlc);
+							}
+							
+						}
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("service")){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+	 	                    	sjgl=Arith.add(sjgl,jhgl);
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return sjgl;
+	}
+	
+	@Override
+	public int culateSjbc(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		int sjbc=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				if(!scheduleRealInfo.isSflj()){
+					sjbc++;
+				}
+			}
+		}
+		return sjbc;
+	}
+	
+	
+	@Override
+	public double culateLjgl(ScheduleRealInfo scheduleRealInfo) {
+		// TODO Auto-generated method stub
+		double ljgl=0.0;
+		if (!isInOut(scheduleRealInfo)) {
+			if(!scheduleRealInfo.isDestroy()){
+				if(scheduleRealInfo.isSflj()){
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						ljgl=Arith.add(ljgl,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if(childTaskPlan.getMileageType().equals("service")){
+		                    	 if (!childTaskPlan.isDestroy()) {
+		 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+		 	                    	ljgl=Arith.add(ljgl,jhgl);
+		 	                    } 
+		                    }
+		                }
+					}
+				}else{
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+						double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+						double zjlc=Arith.sub(jhlc, jhlcOrig);
+						if(zjlc>0){
+							ljgl=Arith.add(zjlc, ljgl);
+						}
+					}
+				}
+			}
+			
+		}
+		return ljgl;
+	}
+	
+	
+	@Override
+	public double culateLjgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double ljgl=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			ljgl = Arith.add(ljgl, culateLjgl(scheduleRealInfo));
+		}
+		return ljgl;
+	}
+	
+	@Override
+	public int culateLjbc(List<ScheduleRealInfo> lists) {
+		int ljbc=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				if(scheduleRealInfo.isSflj()){					
+					ljbc++;
+				}
+			}
+		}
+		return ljbc;
+	}
+	
+	@Override
+	public double culateZrwgl(List<ScheduleRealInfo> lists) {
+		// TODO 统计总子任务数
+		double zrwgl=0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo t=lists.get(i);
+			if(!t.isSflj()){
+				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+				if(!childTaskPlans.isEmpty()){
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();	
+	                    zrwgl=Arith.add(zrwgl,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+	                }
+				}
+			}
+		}
+		return zrwgl;
+	}
+	
+	@Override
+	public int culateZrwbc(List<ScheduleRealInfo> lists) {
+		// TODO 统计总子任务数
+		int zrwbc=0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo t=lists.get(i);
+			if(!t.isSflj()){
+				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+				if(!childTaskPlans.isEmpty()){
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();	
+	                    zrwbc++;
+	                }
+				}
+			}
+		}
+		return zrwbc;
+	}
+
+	@Override
+	public double culatesddfgl(List<ScheduleRealInfo> list) {
+		double  sddfgl = 0;
+		for(ScheduleRealInfo schedule : list){
+			if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
+				if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
+					if(!schedule.isDfAuto())
+						sddfgl = Arith.add(sddfgl, culateSjgldf(schedule));
+				}				
+			}
+		}
+		return sddfgl;
+	}
+	
+	@Override
+	public int culatesddfbc(List<ScheduleRealInfo> list) {
+		int  sddfbc = 0;
+		for(ScheduleRealInfo schedule : list){
+			if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
+				if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
+					if(!schedule.isDfAuto())
+						sddfbc++;
+				}				
+			}
+		}
+		return sddfbc;
+	}
+
+
+	@Override
+	public double culatezddfgl(List<ScheduleRealInfo> list) {
+		double  zddfgl = 0;
+		for(ScheduleRealInfo schedule : list){
+			if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
+				if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
+					if(schedule.isDfAuto())
+						zddfgl = Arith.add(zddfgl, culateSjgldf(schedule));
+				}				
+			}
+		}
+		return zddfgl;
+	}
+	
+	@Override
+	public int culatezddfbc(List<ScheduleRealInfo> list) {
+		int  zddfbc = 0;
+		for(ScheduleRealInfo schedule : list){
+			if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
+				if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
+					if(schedule.isDfAuto())
+						zddfbc++;
+				}				
+			}
+		}
+		return zddfbc;
+	}
+	
+	@Override
+	public double culateSjgldf(ScheduleRealInfo scheduleRealInfo) {
+		// TODO Auto-generated method stub
+		double sjgl =0;
+		if (!isInOut(scheduleRealInfo)) {
+			Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+			if(!scheduleRealInfo.isSflj()){
+				if(childTaskPlans.isEmpty()){
+						if(!scheduleRealInfo.isDestroy()){
+							double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+							double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+							if(jhlc-jhlcOrig>0){
+								sjgl=Arith.add(sjgl,jhlcOrig);
+							}else{
+								sjgl=Arith.add(sjgl,jhlc);
+							}							
+						}
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("service")){
+	                    	 if (!childTaskPlan.isDestroy()) {
+	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+	 	                    	sjgl=Arith.add(sjgl,jhgl);
+	 	                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return sjgl;
+	}
+	
+	public static boolean isInOut(ScheduleRealInfo s){
+		boolean fage=false;
+		if(s.getBcType().equals("in")){
+			fage=true;
+		}
+		if(s.getBcType().equals("out")){
+			fage=true;
+		}
+		if(s.getBcType().equals("ldks")){
+			fage=true;
+		}
+			
+		return fage;
+	}
+}
-package com.bsth.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.entity.Business;
-import com.bsth.entity.Personnel;
-import com.bsth.entity.PersonnelCopy;
-import com.bsth.repository.PersonnelRepository;
-import com.bsth.service.PersonnelService;
-import com.bsth.util.XmlToJson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.annotation.Transient;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by xu on 16/6/15.
- */
-@Service
-public class PersonnelServiceImpl implements PersonnelService {
-	// TODO 以后过滤退休人员
-	@Autowired
-	PersonnelRepository repository;
-
-	@Autowired
-	JdbcTemplate jdbcTemplate;
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Transient
-	@Override
-	public List<PersonnelCopy> matchPersonnel(JSONArray retiredInfor,String _getEmployee__return,int index,Map<String, Personnel> personnelMap) {
-
-		Map<String,String> gzDictionaryMap = new HashMap<>();
-		gzDictionaryMap.put("路线驾驶员","1");
-		gzDictionaryMap.put("团客车驾驶员","1");
-		gzDictionaryMap.put("后方驾驶员","1");
-		gzDictionaryMap.put("实习驾驶员","1");
-		gzDictionaryMap.put("调度员","2");
-		gzDictionaryMap.put("售票员","3");
-		gzDictionaryMap.put("公共汽电车售票员","3");
-		gzDictionaryMap.put("管理员","3");
-		gzDictionaryMap.put("站员","4");
-		gzDictionaryMap.put("安检员","6");
-		gzDictionaryMap.put("机务","7");
-		gzDictionaryMap.put("机务员/质检员","7");
-		gzDictionaryMap.put("引导员","8");
-		gzDictionaryMap.put("乘务员","9");
-		gzDictionaryMap.put("线长（正职）","10");
-		gzDictionaryMap.put("线长（副职）","10");
-		gzDictionaryMap.put("见习管理人员","11");
-		gzDictionaryMap.put("公司部门管理人员","11");
-		gzDictionaryMap.put("机务员/警消人员","12");
-		gzDictionaryMap.put("线长（副职）","13");
-		gzDictionaryMap.put("见习管理人员","11");
-		gzDictionaryMap.put("公司部门管理人员","11");
-		gzDictionaryMap.put("机务员/警消人员","12");
-		gzDictionaryMap.put("票务人员","13");
-		gzDictionaryMap.put("其他服务人员","14");
-
-		String sql="select * from bsth_c_business ";
-		List<Business> businessList=jdbcTemplate.query(sql, new BeanPropertyRowMapper(Business.class));
-		Map<String,Map<String,Business>> businessMap = new HashMap<>();
-		for (Business bu:businessList) {
-
-			Map<String,Business> buMap = new HashMap<>();
-			if (businessMap.get(bu.getUpCode()) != null)
-				buMap = businessMap.get(bu.getUpCode());
-
-			/*if(bu.getUpCode().equals("55"))
-				buMap.put(bu.getBusinessName().substring(2),bu);
-			else*/
-				buMap.put(bu.getBusinessName(),bu);
-
-			businessMap.put(bu.getUpCode(),buMap);
-		}
-
-		List<Personnel> newPersonnel = new ArrayList<>();
-
-//		Map<String, Object> retiredInforMap = new HashMap<>();
-		try{
-//			if(retiredInfor.size() > 0){
-//				for(int i=0;i<retiredInfor.size()-1; i++){
-//					JSONObject pjson =  retiredInfor.getJSONObject(i);
-//					String codeArr[] = pjson.getString("Code").split("-");
-//					String code = "",
-//							companyCode="";
-//
-//					if(codeArr.length > 1){
-//						if (index == 0) {
-//							// 上南
-//							code = 55+"-"+codeArr[1];
-//							companyCode = "55";
-//						} else if (index == 1) {
-//							// 金高
-//							code = 22+"-"+codeArr[1];
-//							companyCode = "22";
-//						} else if (index == 2) {
-//							// 南汇
-//							code = 26+"-"+codeArr[1];
-//							companyCode = "26";
-//						} else if(index == 3){
-//							// 杨高
-//							code = "05"+"-"+codeArr[1];
-//							companyCode = "05";
-//						}
-////						retiredInforMap.put(code,pjson);
-//					}
-//				}
-//			}
-
-			// 金蝶人员数据转为json，然后遍历匹配
-			JSONObject jsonInfor = XmlToJson.xml2Json(_getEmployee__return);
-			System.out.println("getEmployee.result=" + _getEmployee__return);
-
-
-			JSONArray jsonArr = JSONArray.parseArray(jsonInfor.get("Emp").toString());
-			for(int i=0;i<jsonArr.size()-1; i++){
-				JSONObject pjson =  jsonArr.getJSONObject(i);
-				String codeArr[] = pjson.getString("Code").split("-");
-				String JobCodeori = codeArr[1];
-				while (JobCodeori.length() < 6){
-					JobCodeori = "0"+JobCodeori;
-				}
-
-
-//				Personnel p = new Personnel();
-//				p.setJdCodeori(pjson.getString("Code"));
-//				p.setJobCodeori(JobCodeori);
-//				p.setPersonnelName(pjson.getString("EmployeeName"));
-//				p.setCompany(pjson.getString("CompanyName"));
-//
-//				newPersonnel.add(p);
-
-				String code = "",
-						companyCode="",
-						company="";
-				Business business = new Business();
-				String companyName = pjson.getString("CompanyName");
-
-				// 人员数据匹配公司
-				if (index == 0) {
-					// 上南
-					code = 55+"-"+JobCodeori;
-					companyCode = "55";
-					company = "上南公司";
-					if (companyName.indexOf("一分") > -1) {
-						business = businessMap.get(companyCode).get("上南一分公司");
-					} else if (companyName.indexOf("二分") > -1) {
-						business = businessMap.get(companyCode).get("上南二分公司");
-					} else if (companyName.indexOf("三分") > -1) {
-						business = businessMap.get(companyCode).get("上南三分公司");
-					} else if (companyName.indexOf("六分") > -1) {
-						business = businessMap.get(companyCode).get("上南六分公司");
-					} else if (companyName.indexOf("山南") > -1) {
-						business = businessMap.get(companyCode).get("山南培训部");
-					} else {
-						business = businessMap.get(companyCode).get("其它分公司");
-					}
-				} else if (index == 1) {
-					// 金高
-					code = 22+"-"+JobCodeori;
-					companyCode = "22";
-					company = "金高公司";
-					if (companyName.indexOf("一分") > -1) {
-						business = businessMap.get(companyCode).get("一分公司");
-					} else if (companyName.indexOf("二分") > -1) {
-						business = businessMap.get(companyCode).get("二分公司");
-					} else if (companyName.indexOf("三分") > -1) {
-						business = businessMap.get(companyCode).get("三分公司");
-					} else if (companyName.indexOf("四分") > -1) {
-						business = businessMap.get(companyCode).get("四分公司");
-					} else {
-						business = businessMap.get(companyCode).get("其它分公司");
-					}
-				} else if (index == 2) {
-					// 南汇
-					code = 26+"-"+JobCodeori;
-					companyCode = "26";
-					company = "南汇公司";
-					if (companyName.indexOf("一分") > -1) {
-						business = businessMap.get(companyCode).get("南汇一分");
-					} else if (companyName.indexOf("二分") > -1) {
-						business = businessMap.get(companyCode).get("南汇二分");
-					} else if (companyName.indexOf("三分") > -1) {
-						business = businessMap.get(companyCode).get("南汇三分");
-					} else if (companyName.indexOf("维修") > -1) {
-						business = businessMap.get(companyCode).get("南汇维修公司");
-					} else if (companyName.indexOf("南汇公司") > -1) {
-						business = businessMap.get(companyCode).get("南汇公司");
-					} else if (companyName.indexOf("航头") > -1) {
-						business = businessMap.get(companyCode).get("航头枢纽站");
-					} else {
-						business = businessMap.get(companyCode).get("其它分公司");
-					}
-				} else if(index == 3){
-					code = "05"+"-"+JobCodeori;
-					companyCode = "05";
-					company = "杨高公司";
-					if (companyName.indexOf("川沙") > -1) {
-						business = businessMap.get(companyCode).get("川沙分公司");
-					} else if (companyName.indexOf("金桥") > -1) {
-						business = businessMap.get(companyCode).get("金桥分公司");
-					} else if (companyName.indexOf("杨高") > -1) {
-						business = businessMap.get(companyCode).get("杨高分公司");
-					} else if (companyName.indexOf("周浦") > -1) {
-						business = businessMap.get(companyCode).get("周浦分公司");
-					} else if (companyName.indexOf("芦潮港") > -1) {
-						business = businessMap.get(companyCode).get("芦潮港分公司");
-					} else {
-						business = businessMap.get(companyCode).get("其它分公司");
-					}
-				}
-
-//
-//				if(pjson.getString("Code").equals("03-S07265") ||pjson.getString("Code").equals("03-S07273") ||pjson.getString("Code").equals("03-S07264")
-//						||pjson.getString("Code").equals("03-S07269") ||pjson.getString("Code").equals("03-S07274") ||pjson.getString("Code").equals("03-S07275")
-//						||pjson.getString("Code").equals("03-S07267") ||pjson.getString("Code").equals("03-S07268") ||pjson.getString("Code").equals("05-006008")
-//						||pjson.getString("Code").equals("02-017122")){
-//					System.out.print(pjson);
-//				}
-//				if(pjson.getString("EmployeeName").equals("吴燕辉") || pjson.getString("EmployeeName").equals("顾振军")|| pjson.getString("EmployeeName").equals("宋荣甲")){
-//					System.out.print(pjson);
-//				}
-
-				/*if(codeArr[0].equals("02")){
-					code = "05"+"-"+JobCodeori;
-					companyCode = "05";
-					company = "杨高公司";
-				} else if(codeArr[0].equals("03")){
-					code = 55+"-"+JobCodeori;
-					companyCode = "55";
-					company = "上南公司";
-				} else if(codeArr[0].equals("04")){
-					code = 22+"-"+JobCodeori;
-					companyCode = "22";
-					company = "金高公司";
-				} else if(codeArr[0].equals("05")){
-					code = 26+"-"+JobCodeori;
-					companyCode = "26";
-					company = "南汇公司";
-				}*/
-
-				Personnel p = personnelMap.get(code);
-//				Object isRetiredInfor = retiredInforMap.get(code);
-				// p不为空这表示调度数据和金蝶数据能匹配、则更新数据，不能匹配这新增数据
-				if(p != null ){
-//					p.setCard(pjson.getString("IDCardID"));// 第一次需要添加身份证，后面则不需要了
-					if(pjson.getString("IDCardID").equals(p.getCard())){
-						p.setBrancheCompanyCode(business.getBusinessCode());
-						p.setBrancheCompany(business.getBusinessName());
-						p.setPersonnelName(pjson.getString("EmployeeName"));
-						p.setDescriptions(pjson.getString("UnitFullName"));
-						p.setJdCodeori(pjson.getString("Code")); // 金蝶工号
-						p.setUpdateDate(new Date());
-						// 设置人员为在职状态
-						p.setDestroy(0);
-						newPersonnel.add(p);
-					}
-				} else {
-					p = new Personnel();
-					p.setJobCode(code);
-					p.setJobCodeori(JobCodeori);
-					p.setCard(pjson.getString("IDCardID"));
-//					String companyName = pjson.getString("CompanyName");
-//					// 搜索分公司
-//					Business business = businessMap.get(companyCode).get(companyName);
-//					if(business != null){
-//					} else {
-//						p.setBrancheCompanyCode("");
-//						p.setBrancheCompany("");
-//					}
-
-					p.setBrancheCompanyCode(business.getBusinessCode());
-					p.setBrancheCompany(business.getBusinessName());
-					p.setCompanyCode(companyCode);
-					p.setCompany(company);
-					p.setJdCodeori(pjson.getString("Code")); // 金蝶工号
-					p.setPersonnelName(pjson.getString("EmployeeName"));
-					p.setPersonnelType(pjson.getString("SexType").indexOf("男") > -1 ?"1":"2");
-					p.setPosts(gzDictionaryMap.get(pjson.getString("PositName")) == null?"14":gzDictionaryMap.get(pjson.getString("PositName")));
-					p.setDescriptions(pjson.getString("UnitFullName"));
-					p.setTelphone(pjson.getString("Telphone"));
-					p.setUpdateDate(new Date());
-					p.setRemark("新增");
-					// 设置人员为在职状态
-					p.setDestroy(0);
-//					if(isRetiredInfor != null && isRetiredInfor != ""){
-//						p.setRemark("退休");
-//					}
-					newPersonnel.add(p);
-				}
-			}
-			// 批量保存
-			repository.save(newPersonnel);
-
-		} catch (Exception e) {
-		logger.error("", e);
-		}
-		return  null;
-	}
-	
-	/*public Map<String, Personnel> loadPersonnel(){
-		Map<String, Personnel> personnelMap= new HashMap<>();
-		Iterator<Personnel> perIterator=repository.findAll().iterator();
-		Personnel per;
-		while(perIterator.hasNext()){
-			per=perIterator.next();
-			personnelMap.put(per.getJobCode(),per);
-		}
-		return personnelMap;
-		
-	}*/
-}
+package com.bsth.service.impl;
+
+import com.bsth.entity.ChildTaskPlan;
+import com.bsth.entity.Equipment;
+import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.entity.result.RevisedReport;
+import com.bsth.repository.ScheduleRealInfoRepository;
+import com.bsth.service.CulateService;
+import com.bsth.service.ScheduleRealInfoService;
+import com.bsth.util.Arith;
+import com.bsth.util.DBUtils_MS;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+@Service
+public class ScheduleRealInfoServiceImpl implements ScheduleRealInfoService {
+
+    @Autowired
+    ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    CulateService culateService;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    
+    List<Equipment> equipmentCodeList = new ArrayList<>();
+    
+    List<Object[]> gpsDateList = new ArrayList<>();
+    
+    @Override
+    public List<RevisedReport> mileageCorrectionTj(String scheduleDateStr) {
+    	try {
+//    		logger.info("-----------开始加载设备号！！！！！！！！！");
+    		initEquipmentCodeList();
+//    		logger.info("-----------设备号个数:"+equipmentCodeList.size());
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();//所有线路
+        List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();//单个线路
+        //查询所有线路
+        list = scheduleRealInfoRepository.scheduleByDateAndLineTj(scheduleDateStr);
+        
+        for (int i = 0; i < list.size(); i++) {
+            ScheduleRealInfo s=list.get(i);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	 list_s.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null){
+	                list_s.add(s);
+	            }
+            }
+        }
+        List<RevisedReport> omList = new ArrayList<RevisedReport>();
+        for (int i = 0; i < list.size(); i++) {
+            if(i<list.size()-1){
+                if(list.get(i+1).getXlBm().equals(list.get(i).getXlBm())){
+                    lists.add(list.get(i));
+                }else{
+                    lists.add(list.get(i));
+                    RevisedReport report=staticTj(lists);
+                    omList.add(report);
+                    lists.clear();
+                }
+            }else{
+                if(list.get(i).getXlBm().equals(list.get(i-1).getXlBm())){
+                    lists.add(list.get(i));
+                    RevisedReport report=staticTj(lists);
+                    omList.add(report);
+                }else{
+                    lists.add(list.get(i));
+                    RevisedReport report=staticTj(lists);
+                    omList.add(report);
+                    lists.clear();
+                }
+            }
+        }          
+        return omList;
+    }
+    
+    public final RevisedReport staticTj(List<ScheduleRealInfo> list){
+    	List<Long> bcsj = new ArrayList<>();//多有班次的时间
+    	String realExecDate ="";
+        Boolean iskt = false;//班次是否跨天
+        String lineId = list.get(0).getXlBm();
+        List<ScheduleRealInfo>  listSj=new ArrayList<ScheduleRealInfo>();//实际营运的班次
+        double wqwxhgl = 0.0;//完全漂移公里
+        double bfwxhgl = 0.0;//部分漂移公里
+        int wqwxhbc = 0;//完全漂移班次
+        int bfwxhbc = 0;//部分漂移班次
+        double pygl = 0.0;//子任务公里
+        int pybc = 0;//子任务
+        for(int i=0;i<list.size();i++){
+            ScheduleRealInfo s=list.get(i);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	listSj.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null){
+	            	listSj.add(s);
+	            }
+            }
+            try {
+            	if (!realExecDate.equals(s.getRealExecDate())) {
+            		iskt = true;
+				}
+            	realExecDate = s.getRealExecDate();//实际班次日期
+            	String fcsj = "";
+            	if(s.getFcsjActual() == null || s.getFcsjActual().equals("")) {
+        			fcsj = s.getFcsj();
+        		} else {						
+        			fcsj = s.getFcsjActual();
+				}
+        		String zdsj = "";
+        		if(s.getZdsjActual() == null || s.getZdsjActual().equals("")) {
+        			zdsj = s.getZdsj();
+        		} else {						
+        			zdsj = s.getZdsjActual();
+				}
+				Long fcsjStr = Long.valueOf(dateToStamp(realExecDate +" " + fcsj  +":00"));
+				Long zdsjStr = Long.valueOf(dateToStamp(realExecDate +" " + zdsj  +":00"));
+				if (zdsjStr < fcsjStr) {//到站时间跨天 则到站时间加一天时间
+					zdsjStr = (1000 * 60 * 60 * 24) + zdsjStr;
+				}
+				bcsj.add(fcsjStr);
+				bcsj.add(zdsjStr);
+			} catch (NumberFormatException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+        }
+        logger.info("计算线路："+lineId);
+        if (iskt) {
+        	realExecDate = "('"+ orderDate(realExecDate)+"','"+ (orderDate(realExecDate)+1) +"')";
+        	initGpsDateList(realExecDate,lineId,Collections.min(bcsj),Collections.max(bcsj));
+		} else {
+			realExecDate = "('"+ orderDate(realExecDate) +"')";
+			initGpsDateList(realExecDate,lineId,Collections.min(bcsj),Collections.max(bcsj));
+		}
+        for (int i = 0; i < listSj.size(); i++) {
+        	ScheduleRealInfo sr=listSj.get(i);
+        	try {
+        		realExecDate = sr.getRealExecDate();//实际班次日期
+        		String fcsj = "";
+        		if(sr.getFcsjActual() == null || sr.getFcsjActual().equals("")) {
+        			fcsj = sr.getFcsj();
+        		} else {						
+        			fcsj = sr.getFcsjActual();
+				}
+        		String zdsj = "";
+        		if(sr.getZdsjActual() == null || sr.getZdsjActual().equals("")) {
+        			zdsj = sr.getZdsj();
+        		} else {						
+        			zdsj = sr.getZdsjActual();
+				}
+        		Long fcsjStr = Long.valueOf(dateToStamp(realExecDate +" " + fcsj  +":00"));
+				Long zdsjStr = Long.valueOf(dateToStamp(realExecDate +" " + zdsj  +":00"));
+				if (zdsjStr < fcsjStr) {//到站时间跨天 则到站时间加一天时间
+					zdsjStr = (1000 * 60 * 60 * 24) + zdsjStr;
+				}
+				
+    	        double sjgl = culateService.culateSjgl(sr);//一个班次实际公里
+    	        double ljgl = culateService.culateLjgl(sr);  //一个班次临加公里
+    	        double zyygl = Arith.add(sjgl,ljgl);	//一个班次总运营公里  
+       		
+        		String equipment_code = getEquipmentCode(sr.getClZbh());
+        		List<Long> listTime = getGpsDate(realExecDate, equipment_code, fcsjStr, zdsjStr);
+        		if (listTime.size() > 10) {
+        			for (int j = 1; j < listTime.size(); j++) {
+        				if ((listTime.get(j) - listTime.get(j-1))/ (1000 * 60) > 5) {
+        					bfwxhgl = Arith.add(bfwxhgl,zyygl);
+        					if (!CulateServiceImpl.isInOut(sr)) {
+    							bfwxhbc++;
+    						}
+        					continue;
+						}
+        			}
+				} else {
+					wqwxhgl = Arith.add(wqwxhgl,zyygl);
+					if (!CulateServiceImpl.isInOut(sr)) {
+						wqwxhbc++;
+					}
+				}
+        		int type = sr.getDriftStatus();
+        		if (type == 1 || type ==2) {
+        			pygl = Arith.add(pygl,zyygl);
+        			if (!CulateServiceImpl.isInOut(sr)) {
+						pybc++;
+					}
+				}
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+        RevisedReport report = new RevisedReport();
+    	if(list.size()>0){
+	        double ljgl = culateService.culateLjgl(listSj);  //临加公里
+	        double sjgl = culateService.culateSjgl(listSj);//实际公里
+	        double zyygl = Arith.add(sjgl,ljgl);			//总运营公里       	  
+	        int ljbc = culateService.culateLjbc(listSj);
+	        int sjbc = culateService.culateSjbc(listSj);
+	        int zyybc = ljbc + sjbc;//总(实际)营运班次
+	        
+	        double sjjccgl=culateService.culateJccgl(listSj);
+	        double sjksgl = culateService.culateKsgl(listSj);
+	        double zksgl=Arith.add(sjjccgl, sjksgl);//实际空驶公里
+	        int sjjccbc=culateService.culateJccbc(listSj);
+	        int sjksbc = culateService.culateKsbc(listSj);
+	        int zksbc = sjjccbc + sjksbc;//实际空驶班次
+	        
+	        double zgl = Arith.add(zyygl, zksgl);//实际总公里
+	        int zbc = zksbc + zyybc;//实际总
+	        
+	        double sddfgl =culateService.culatesddfgl(list);//手动待发调整公里
+	        double zddfgl = culateService.culatezddfgl(list);//自动待发调整公里
+	        double zrwgl = culateService.culateZrwgl(list);//子任务公里
+	        int sddfbc =culateService.culatesddfbc(list);//手动待发调整
+	        int zddfbc = culateService.culatezddfbc(list);//自动待发调整
+	        int zrwbc = culateService.culateZrwbc(list);//子任务
+    		report.setCompanyId(list.get(0).getGsBm());
+    		report.setSubCompanyId(list.get(0).getFgsBm());
+    		report.setCompanyName(list.get(0).getGsName());
+    		report.setSubCompanyName(list.get(0).getFgsName());
+    		report.setLineCode(list.get(0).getXlBm());
+    		report.setLineName(list.get(0).getXlName());
+    		report.setZgl(zgl);
+    		report.setSjyygl(zyygl);
+    		report.setSjksgl(zksgl);
+    		report.setSddfgl(sddfgl);
+    		report.setZddfgl(zddfgl);
+    		report.setWqwxhgl(wqwxhgl);
+    		report.setBfwxhgl(bfwxhgl);
+    		report.setPygl(pygl);
+    		report.setLjgl(ljgl);
+    		report.setZrwgl(zrwgl);
+    		report.setZbc(zbc);
+    		
+    		report.setSjyybc(zyybc);
+    		report.setSjksbc(zksbc);
+    		report.setSddfbc(sddfbc);
+    		report.setZddfbc(zddfbc);
+    		report.setWqwxhbc(wqwxhbc);
+    		report.setBfwxhbc(bfwxhbc);
+    		report.setPybc(pybc);
+    		report.setLjbc(ljbc);
+    		report.setZrwbc(zrwbc);    		
+    		
+    		report.setRq(list.get(0).getScheduleDateStr());
+    		report.setOther(null);
+    		report.setCreateDate(new Date());
+    	}
+        return report;
+    }
+    
+    public void initGpsDateList(String scheduleDateStr, String lineId, Long startTime, Long endTime) {
+    	
+    	gpsDateList.clear();//清空上一条线路的gps信息
+    	Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		
+		Date date=new Date();
+		Calendar calendar=Calendar.getInstance();
+		calendar.setTime(date);
+    	String sql = "select device_id as device_id, ts as ts from bsth_c_gps_info where days_year in "+ scheduleDateStr +" and line_id=? and ts>=? and ts<=? ORDER BY device_id , ts";
+		try{
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			ps.setString(1, lineId);
+			ps.setLong(2, startTime);
+			ps.setLong(3, endTime);
+			rs = ps.executeQuery();
+			while(rs.next()){
+				Object obj[] = new Object[2];
+				obj[0] = rs.getString("device_id");
+				obj[1] = rs.getString("ts");
+				gpsDateList.add(obj);
+			}
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+    }
+    
+    public void initEquipmentCodeList() throws Exception {
+    	
+    	String sql = "select inside_code, equipment_code from bsth_c_cars where 1=1";
+    	equipmentCodeList = jdbcTemplate.query(sql, new BeanPropertyRowMapper(Equipment.class));
+    	
+    	/*Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		
+		// 设置连接数据库的配置信息  本地
+    	String url = "jdbc:mysql://localhost:3306/control_cope?"
+                + "user=root&password=root&useUnicode=true&characterEncoding=UTF8";
+		
+		// 设置连接数据库的配置信息  服务器
+    	String url = "jdbc:mysql://10.10.150.20:3306/control?useUnicode=true&characterEncoding=UTF8";
+ 
+        try {
+            // 之所以要使用下面这条语句，是因为要使用MySQL的驱动，所以我们要把它驱动起来，
+            // 可以通过Class.forName把它加载进去，也可以通过初始化来驱动起来，下面三种形式都可以
+            Class.forName("com.mysql.jdbc.Driver");// 动态加载mysql驱动 
+//            System.out.println("成功加载MySQL驱动程序");
+            // 一个Connection代表一个数据库连接
+            conn = DriverManager.getConnection(url);
+            // Statement里面带有很多方法，比如executeUpdate可以实现插入，更新和删除等
+            String sql = "select inside_code, equipment_code from bsth_c_cars where 1=1";
+            ps = conn.prepareStatement(sql);
+            rs = ps.executeQuery();
+            while(rs.next()){
+            	Object obj[] = new Object[2];
+            	obj[0] = rs.getString("inside_code"); //车辆自编号
+            	obj[1] = rs.getString("equipment_code").toString(); //终端设备号
+            	equipmentCodeList.add(obj);
+            }
+        } catch (SQLException e) {
+            System.out.println("MySQL操作错误");
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+        	rs.close();
+        	ps.close();
+            conn.close();
+        }    */	
+    }
+    
+    /** 获取设备终端号 */
+    public String getEquipmentCode(String clZbm) throws Exception {
+    	String equipment_code = "";
+    	for (Equipment equipment:equipmentCodeList) {
+			if (equipment.getInside_code().equals(clZbm)) {
+				equipment_code = equipment.getEquipment_code().toString();
+			}  		
+		}
+		return equipment_code;
+	}
+    
+    public List<Long> getGpsDate(String daysYear, String equipment_code, Long fcsjStr, Long zdsjStr) throws ParseException {
+		List<Long> list = new ArrayList<>();
+		for (Object[] obj :gpsDateList ) {
+			if (obj[0].equals(equipment_code)) {
+				Long ts = Long.valueOf(obj[1].toString());
+				if (ts >= fcsjStr && ts <= zdsjStr) {
+					list.add(ts);
+				}
+			}
+		}    	
+		return list;
+    }
+    
+    /* 
+     * 将时间转换为时间戳
+     */    
+    public static String dateToStamp(String s) throws ParseException{
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = simpleDateFormat.parse(s);
+        long ts = date.getTime();
+        res = String.valueOf(ts);
+        return res;
+    }
+    
+    /* 
+     * 将时间戳转换为时间
+     */
+    public static String stampToDate(String s){
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long lt = new Long(s);
+        Date date = new Date(lt);
+        res = simpleDateFormat.format(date);
+        return res;
+    }
+    
+    /* 
+     * 计算今天是今年的第几天
+     */
+    public int orderDate(String dateStr){
+	  int dateSum = 0;
+	  /*SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+	  String dateStr = format.format(date);*/
+	  int year = Integer.valueOf(dateStr.substring(0,4));
+	  int month = Integer.valueOf(dateStr.substring(5,7));
+	  int day = Integer.valueOf(dateStr.substring(8,10));
+	  for (int i = 1; i < month; i++){
+	   switch(i){
+	     case 1: case 3: case 5: case 7: case 8: case 10: case 12:dateSum += 31; break;
+	     case 4: case 6: case 9: case 11:dateSum += 30; break;
+	     case 2: 
+	      if(((year % 4 == 0) & (year % 100 != 0)) | (year % 400 == 0))
+	       dateSum += 29;
+	      else dateSum += 28;    
+	   }
+	  }
+	  
+	  return dateSum = dateSum + day;
+	 }
+    
+}
 package com.bsth.thread;
-import com.bsth.handler.personnelUpdateHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.bsth.handler.ReportCalculationHandler;
+
 /**
- * @ClassName: PersonnelUpdateThrad.java
- * @Description: TODO(用金蝶数据更新人员数据)
+ * @ClassName: MileageCalculationThrad.java
+ * @Description: TODO(营运公里计算线程)
  * @author: YouRuiFeng
- * @date: 2019-06-26
+ * @date: 2017-8-14 下午2:04:14
  * 
  */
 @Component
-public class PersonnelUpdateThrad extends Thread {
+public class ReportCalculationThrad extends Thread {
 	@Autowired
-    personnelUpdateHandler personnelUpdateHandler;
+	ReportCalculationHandler mileageCalculationHandler;
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
     public void run() {
         try {
-            personnelUpdateHandler.sync();
+        	mileageCalculationHandler.calc();
         } catch (Exception e) {
             logger.error("", e);
         }
@@ -15,12 +15,12 @@ import java.util.Map;
 import java.util.Properties;
 /**
- * 数据备份personnel库连接池
+ * 网关ms库连接池
  * @author PanZhao
  *
  */
 //@Component
-public class DBUtils_Personnel {
+public class DBUtils_MS {
 	private static String url = null;
@@ -30,13 +30,13 @@ public class DBUtils_Personnel {
 	private static DataSource ds_pooled;
-	static Logger logger = Logger.getLogger(DBUtils_Personnel.class);
+	static Logger logger = Logger.getLogger(DBUtils_MS.class);
 	static {
 		Properties env = new Properties();
 		try {
-			env.load(DBUtils_Personnel.class.getClassLoader().getResourceAsStream("personnel-jdbc.properties"));
+			env.load(DBUtils_MS.class.getClassLoader().getResourceAsStream("ms-jdbc.properties"));
 			// 1. 加载驱动类
 			Class.forName(env.getProperty("ms.mysql.driver"));
-package com.bsth.util;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import org.dom4j.*;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.util.List;
-
-public class XmlToJson {
-    public static void main(String[] args) throws Exception {
-//        String xmlStr= readFile("D:/ADA/et/Issue_20130506_back.xml");
-//        Document doc= DocumentHelper.parseText(xmlStr);
-//        JSONObject json=new JSONObject();
-//        dom4j2Json(doc.getRootElement(),json);
-//        System.out.println("xml2Json:"+json.toJSONString());
-        String a = "[{'s':'sd','b':'sd'},{'s':'11','b':'22'}]";
-
-        System.out.println(a.toString());
-        String b = "{lhjcData={tabledata=[[{zdmc=组织机构代码, zd=TYSBM, zdmcdata=630301035}, {zdmc=对象名称, zd=DXMC, zdmcdata=测试公司1}, {zdmc=备忘录ID, zd=BWLID, zdmcdata=e4e4e4b15c3346ff015c336517a80043}, {zdmc=备忘录名称, zd=BWLMC, zdmcdata=对失信被执行人实施联合惩戒的合作备忘录}, {zdmc=行为事项, zd=XWSX, zdmcdata=最高人民法院公布的失信被执行人}, {zdmc=奖惩类型编码, zd=JCLX, zdmcdata=20}, {zdmc=奖惩类型名称, zd=JCLXMC, zdmcdata=惩戒}, {zdmc=判决法院, zd=PJFY, zdmcdata=上海市宝山区人民法院}, {zdmc=文书号, zd=WSH, zdmcdata=(2016)沪0113民初02817号}, {zdmc=立案日期, zd=LARQ, zdmcdata=2017/08/11}]], tablename=奖惩对象信息}, enterpriseData={resultGLL=null, resultDJL=[{tabledata=[[{zdmc=法定代表人, zdmcdata=TIMOTHY BRIAN CONSIDINE, zd=principalname}, {zdmc=工商注册号, zdmcdata=310000400595922, zd=regno}, {zdmc=法人类型, zdmcdata=公司, zd=organtype}, {zdmc=成立日期, zdmcdata=2009-03-30, zd=approvedate}, {zdmc=经营范围, zdmcdata=家具、金属制品、木工制品、亚克力制品的批发、进出口，并提供相关配套服务。 【依法须经批准的项目，经相关部门批准后方可开展经营活动】, zd=tradescope}, {zdmc=组织机构代码, zdmcdata=685514951, zd=organcode}, {zdmc=注册地址, zdmcdata=上海市静安区南京西路920号南泰大厦16A楼11室, zd=address}, {zdmc=法人名称, zdmcdata=测试公司1, zd=organname}, {zdmc=注册资金(万), zdmcdata=14, zd=regcapital}, {zdmc=币种, zdmcdata=美元, zd=currencytype}, {zdmc=登记状态, zdmcdata=确立, zd=organstatus}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商局, zd=XXSSDW}]], tablename=企业登记信息}, {tabledata=[[{zdmc=个人独资企业出资方式, zdmcdata=, zd=invest_type_id}, {zdmc=证照类型, zdmcdata=, zd=cert_type}, {zdmc=合伙人国别(地区)（外资）, zdmcdata=英国, zd=nationality_id}, {zdmc=投资人名称, zdmcdata=CARDINAL PROJECT MANAGEMENT LIMITED, zd=investor_name}, {zdmc=证照编号, zdmcdata=, zd=cert_number}, {zdmc=投资人类型, zdmcdata=外国(地区)企业, zd=investor_type_gb}, {zdmc=合伙人住所（外资）, zdmcdata=, zd=address}, {zdmc=合伙人承担责任方式（外资）, zdmcdata=, zd=respond_way}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}]], tablename=出资信息}, {tabledata=[[{zdmc=姓名, zdmcdata=TIMOTHY BRIAN CONSIDINE, zd=person_name}, {zdmc=职务, zdmcdata=执行董事, zd=hdsh_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=姓名, zdmcdata=陈漪, zd=person_name}, {zdmc=职务, zdmcdata=总经理, zd=hdsh_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=姓名, zdmcdata=MARK SIMPSON, zd=person_name}, {zdmc=职务, zdmcdata=监事, zd=hdsh_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}]], tablename=主要成员信息}, {tabledata=[[{zdmc=变更前内容, zdmcdata=0.0000万美元, zd=before_content}, {zdmc=变更后内容, zdmcdata=2.8000万美元, zd=after_content}, {zdmc=变更日期, zdmcdata=20090702, zd=change_date}, {zdmc=变更事项, zdmcdata=实收资本变更, zd=reg_item_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=变更前内容, zdmcdata=2.8000万美元, zd=before_content}, {zdmc=变更后内容, zdmcdata=7.0000万美元, zd=after_content}, {zdmc=变更日期, zdmcdata=20091111, zd=change_date}, {zdmc=变更事项, zdmcdata=实收资本变更, zd=reg_item_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=变更前内容, zdmcdata=CARDINAL PROJECT MANAGEMENT LIMITED 2009-09-24 货币4.2000万美元;CARDINAL PROJECT MANAGEMENT LIMITED 2009-06-15 货币2.8000万美元, zd=before_content}, {zdmc=变更后内容, zdmcdata=CARDINAL PROJECT MANAGEMENT LIMITED 2009-09-24 货币4.2000万美元;CARDINAL PROJECT MANAGEMENT LIMITED 2009-06-15 货币2.8000万美元;CARDINAL PROJECT MANAGEMENT LIMITED 2010-05-31 货币0.4500万美元;CARDINAL PROJECT MANAGEMENT LIMITED 2011-02-09 货币6.5500万美元, zd=after_content}, {zdmc=变更日期, zdmcdata=20110523, zd=change_date}, {zdmc=变更事项, zdmcdata=实收资本变更, zd=reg_item_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=变更前内容, zdmcdata=无, zd=before_content}, {zdmc=变更后内容, zdmcdata=陈漪, zd=after_content}, {zdmc=变更日期, zdmcdata=20171206, zd=change_date}, {zdmc=变更事项, zdmcdata=经理备案, zd=reg_item_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=变更前内容, zdmcdata=MICHAEL ANDREW BARNARD, zd=before_content}, {zdmc=变更后内容, zdmcdata=MARK SIMPSON, zd=after_content}, {zdmc=变更日期, zdmcdata=20171206, zd=change_date}, {zdmc=变更事项, zdmcdata=监事备案, zd=reg_item_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=变更前内容, zdmcdata=家具、货柜架、收银台、电器设备的批发、进出口，并提供相关设计咨询和配套服务（不涉及国营贸易管理商品，涉及配额、许可证管理商品的，按国家有关规定办理申请）。 【依法须经批准的项目，经相关部门批准后方可开展经营活动】, zd=before_content}, {zdmc=变更后内容, zdmcdata=家具、金属制品、木工制品、亚克力制品的批发、进出口，并提供相关配套服务。 【依法须经批准的项目，经相关部门批准后方可开展经营活动】, zd=after_content}, {zdmc=变更日期, zdmcdata=20171206, zd=change_date}, {zdmc=变更事项, zdmcdata=经营范围变更, zd=reg_item_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=变更前内容, zdmcdata=PAUL DAVID BENJAMIN CONSIDINE, zd=before_content}, {zdmc=变更后内容, zdmcdata=TIMOTHY BRIAN CONSIDINE, zd=after_content}, {zdmc=变更日期, zdmcdata=20171206, zd=change_date}, {zdmc=变更事项, zdmcdata=法定代表人变更, zd=reg_item_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=变更前内容, zdmcdata=MICHAEL PATRICK THOMPSON;BRIAN ROSS GORMAN;TIMOTHY BRIAN CONSIDINE;GRAHAM PHILIP DAVIES, zd=before_content}, {zdmc=变更后内容, zdmcdata=无, zd=after_content}, {zdmc=变更日期, zdmcdata=20171206, zd=change_date}, {zdmc=变更事项, zdmcdata=董事备案, zd=reg_item_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}], [{zdmc=变更前内容, zdmcdata=无, zd=before_content}, {zdmc=变更后内容, zdmcdata=2017-09-18章程备案, zd=after_content}, {zdmc=变更日期, zdmcdata=20171206, zd=change_date}, {zdmc=变更事项, zdmcdata=章程备案, zd=reg_item_gb}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商行政管理局, zd=XXSSDW}]], tablename=变更信息}, {tabledata=[[{zdmc=备案日期, zdmcdata=2010/5/24, zd=A4}, {zdmc=企业备案号, zdmcdata=3100633346, zd=A3}, {zdmc=法定代表人, zdmcdata=Paul David considine, zd=A5}, {zdmc=信息类别, zdmcdata=登记类, zd=XXLB}, {zdmc=来源部门, zdmcdata=上海海关, zd=XXSSDW}]], tablename=自理报检单位备案}], resultZZL=null, resultWYL=null, resultGYL=null, resultZXL=null, resultJDL=[{tabledata=[[{zdmc=信用等级, zdmcdata=A, zd=A8}, {zdmc=信息类别, zdmcdata=监管类, zd=XXLB}, {zdmc=来源部门, zdmcdata=上海海关, zd=XXSSDW}]], tablename=信用ABCD级}, {tabledata=[[{zdmc=年检结果, zdmcdata=年检结果正常, zd=annlresult}, {zdmc=年检年度, zdmcdata=2009, zd=annlyear}, {zdmc=信息类别, zdmcdata=监管类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商局, zd=XXSSDW}], [{zdmc=年检结果, zdmcdata=年检结果正常, zd=annlresult}, {zdmc=年检年度, zdmcdata=2010, zd=annlyear}, {zdmc=信息类别, zdmcdata=监管类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商局, zd=XXSSDW}], [{zdmc=年检结果, zdmcdata=年检结果正常, zd=annlresult}, {zdmc=年检年度, zdmcdata=2011, zd=annlyear}, {zdmc=信息类别, zdmcdata=监管类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商局, zd=XXSSDW}], [{zdmc=年检结果, zdmcdata=年检结果正常, zd=annlresult}, {zdmc=年检年度, zdmcdata=2012, zd=annlyear}, {zdmc=信息类别, zdmcdata=监管类, zd=XXLB}, {zdmc=来源部门, zdmcdata=市工商局, zd=XXSSDW}]], tablename=年检信息}], resultPJL=null}}\";\n";
-
-        JSONArray jsonArr = JSONArray.parseArray(a);
-        System.out.println(jsonArr);
-    }
-
-    public static String readFile(String path) throws Exception {
-        File file=new File(path);
-        FileInputStream fis = new FileInputStream(file);
-        FileChannel fc = fis.getChannel();
-        ByteBuffer bb = ByteBuffer.allocate(new Long(file.length()).intValue());
-        //fc向buffer中读入数据
-        fc.read(bb);
-        bb.flip();
-        String str=new String(bb.array(),"UTF8");
-        fc.close();
-        fis.close();
-        return str;
-
-    }
-    /**
-     * xml转json
-     * @param xmlStr
-     * @return
-     * @throws DocumentException
-     */
-    public static JSONObject xml2Json(String xmlStr) throws DocumentException{
-        Document doc= DocumentHelper.parseText(xmlStr);
-        JSONObject json=new JSONObject();
-        dom4j2Json(doc.getRootElement(), json);
-        return json;
-    }
-
-    /**
-     * xml转json
-     * @param element
-     * @param json
-     */
-    public static void dom4j2Json(Element element,JSONObject json){
-        //如果是属性
-        for(Object o:element.attributes()){
-            Attribute attr=(Attribute)o;
-            if(!isEmpty(attr.getValue())){
-                json.put("@"+attr.getName(), attr.getValue());
-            }
-        }
-        List<Element> chdEl=element.elements();
-        if(chdEl.isEmpty()&&!isEmpty(element.getText())){//如果没有子元素,只有一个值
-            json.put(element.getName(), element.getText());
-        }
-
-        for(Element e:chdEl){//有子元素
-            if(!e.elements().isEmpty()){//子元素也有子元素
-                JSONObject chdjson=new JSONObject();
-                dom4j2Json(e,chdjson);
-                Object o=json.get(e.getName());
-                if(o!=null){
-                    JSONArray jsona=null;
-                    if(o instanceof JSONObject){//如果此元素已存在,则转为jsonArray
-                        JSONObject jsono=(JSONObject)o;
-                        json.remove(e.getName());
-                        jsona=new JSONArray();
-                        jsona.add(jsono);
-                        jsona.add(chdjson);
-                    }
-                    if(o instanceof JSONArray){
-                        jsona=(JSONArray)o;
-                        jsona.add(chdjson);
-                    }
-                    json.put(e.getName(), jsona);
-                }else{
-                    if(!chdjson.isEmpty()){
-                        json.put(e.getName(), chdjson);
-                    }
-                }
-
-
-            }else{//子元素没有子元素
-                for(Object o:element.attributes()){
-                    Attribute attr=(Attribute)o;
-                    if(!isEmpty(attr.getValue())){
-                        json.put("@"+attr.getName(), attr.getValue());
-                    }
-                }
-                if(!e.getText().isEmpty()){
-                    json.put(e.getName(), e.getText());
-                }
-            }
-        }
-    }
-
-    public static boolean isEmpty(String str) {
-
-        if (str == null || str.trim().isEmpty() || "null".equals(str)) {
-            return true;
-        }
-        return false;
-    }
-}
-
-package com.bsth.wsdl;
-
-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&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="UnintCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="IDCard" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "unintCode",
-    "idCard"
-})
-@XmlRootElement(name = "GetEmployee")
-public class GetEmployee {
-
-    @XmlElement(name = "UnintCode")
-    protected String unintCode;
-    @XmlElement(name = "IDCard")
-    protected String idCard;
-
-    /**
-     * ��ȡunintCode���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUnintCode() {
-        return unintCode;
-    }
-
-    /**
-     * ����unintCode���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUnintCode(String value) {
-        this.unintCode = value;
-    }
-
-    /**
-     * ��ȡidCard���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIDCard() {
-        return idCard;
-    }
-
-    /**
-     * ����idCard���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIDCard(String value) {
-        this.idCard = value;
-    }
-
-}
-
-package com.bsth.wsdl;
-
-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&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="GetEmployeeResult" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "getEmployeeResult"
-})
-@XmlRootElement(name = "GetEmployeeResponse")
-public class GetEmployeeResponse {
-
-    @XmlElement(name = "GetEmployeeResult")
-    protected String getEmployeeResult;
-
-    /**
-     * ��ȡgetEmployeeResult���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGetEmployeeResult() {
-        return getEmployeeResult;
-    }
-
-    /**
-     * ����getEmployeeResult���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGetEmployeeResult(String value) {
-        this.getEmployeeResult = value;
-    }
-
-}
-
-package com.bsth.wsdl;
-
-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&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Year" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *         &lt;element name="Period" type="{http://www.w3.org/2001/XMLSchema}int"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "year",
-    "period"
-})
-@XmlRootElement(name = "GetPAItem")
-public class GetPAItem {
-
-    @XmlElement(name = "Year")
-    protected int year;
-    @XmlElement(name = "Period")
-    protected int period;
-
-    /**
-     * ��ȡyear���Ե�ֵ��
-     * 
-     */
-    public int getYear() {
-        return year;
-    }
-
-    /**
-     * ����year���Ե�ֵ��
-     * 
-     */
-    public void setYear(int value) {
-        this.year = value;
-    }
-
-    /**
-     * ��ȡperiod���Ե�ֵ��
-     * 
-     */
-    public int getPeriod() {
-        return period;
-    }
-
-    /**
-     * ����period���Ե�ֵ��
-     * 
-     */
-    public void setPeriod(int value) {
-        this.period = value;
-    }
-
-}
-
-package com.bsth.wsdl;
-
-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&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="GetPAItemResult" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "getPAItemResult"
-})
-@XmlRootElement(name = "GetPAItemResponse")
-public class GetPAItemResponse {
-
-    @XmlElement(name = "GetPAItemResult")
-    protected String getPAItemResult;
-
-    /**
-     * ��ȡgetPAItemResult���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGetPAItemResult() {
-        return getPAItemResult;
-    }
-
-    /**
-     * ����getPAItemResult���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGetPAItemResult(String value) {
-        this.getPAItemResult = value;
-    }
-
-}
-
-package com.bsth.wsdl;
-
-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&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="UnintCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="begin_date" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="end_date" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "unintCode",
-    "beginDate",
-    "endDate"
-})
-@XmlRootElement(name = "GetRetiredInfor")
-public class GetRetiredInfor {
-
-    @XmlElement(name = "UnintCode")
-    protected String unintCode;
-    @XmlElement(name = "begin_date")
-    protected String beginDate;
-    @XmlElement(name = "end_date")
-    protected String endDate;
-
-    /**
-     * ��ȡunintCode���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUnintCode() {
-        return unintCode;
-    }
-
-    /**
-     * ����unintCode���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUnintCode(String value) {
-        this.unintCode = value;
-    }
-
-    /**
-     * ��ȡbeginDate���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBeginDate() {
-        return beginDate;
-    }
-
-    /**
-     * ����beginDate���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBeginDate(String value) {
-        this.beginDate = value;
-    }
-
-    /**
-     * ��ȡendDate���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEndDate() {
-        return endDate;
-    }
-
-    /**
-     * ����endDate���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEndDate(String value) {
-        this.endDate = value;
-    }
-
-}
-
-package com.bsth.wsdl;
-
-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&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="GetRetiredInforResult" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "getRetiredInforResult"
-})
-@XmlRootElement(name = "GetRetiredInforResponse")
-public class GetRetiredInforResponse {
-
-    @XmlElement(name = "GetRetiredInforResult")
-    protected String getRetiredInforResult;
-
-    /**
-     * ��ȡgetRetiredInforResult���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGetRetiredInforResult() {
-        return getRetiredInforResult;
-    }
-
-    /**
-     * ����getRetiredInforResult���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGetRetiredInforResult(String value) {
-        this.getRetiredInforResult = value;
-    }
-
-}
-
-package com.bsth.wsdl;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-
-/**
- * <p>MyHeader complex type�� Java �ࡣ
- * 
- * <p>����ģʽƬ��ָ�������ڴ����е�Ԥ�����ݡ�
- * 
- * <pre>
- * &lt;complexType name="MyHeader"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="UserPermissionAcct" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *         &lt;element name="UserPermissionPwd" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *       &lt;anyAttribute/&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MyHeader", propOrder = {
-    "userPermissionAcct",
-    "userPermissionPwd"
-})
-public class MyHeader {
-
-    @XmlElement(name = "UserPermissionAcct")
-    protected String userPermissionAcct;
-    @XmlElement(name = "UserPermissionPwd")
-    protected String userPermissionPwd;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * ��ȡuserPermissionAcct���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserPermissionAcct() {
-        return userPermissionAcct;
-    }
-
-    /**
-     * ����userPermissionAcct���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserPermissionAcct(String value) {
-        this.userPermissionAcct = value;
-    }
-
-    /**
-     * ��ȡuserPermissionPwd���Ե�ֵ��
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getUserPermissionPwd() {
-        return userPermissionPwd;
-    }
-
-    /**
-     * ����userPermissionPwd���Ե�ֵ��
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setUserPermissionPwd(String value) {
-        this.userPermissionPwd = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
-
-package com.bsth.wsdl;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.pd_transport 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 {
-
-    private final static QName _MyHeader_QNAME = new QName("http://www.pd-transport.com/", "MyHeader");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.pd_transport
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link GetEmployee }
-     * 
-     */
-    public GetEmployee createGetEmployee() {
-        return new GetEmployee();
-    }
-
-    /**
-     * Create an instance of {@link GetEmployeeResponse }
-     * 
-     */
-    public GetEmployeeResponse createGetEmployeeResponse() {
-        return new GetEmployeeResponse();
-    }
-
-    /**
-     * Create an instance of {@link MyHeader }
-     * 
-     */
-    public MyHeader createMyHeader() {
-        return new MyHeader();
-    }
-
-    /**
-     * Create an instance of {@link GetPAItem }
-     * 
-     */
-    public GetPAItem createGetPAItem() {
-        return new GetPAItem();
-    }
-
-    /**
-     * Create an instance of {@link GetPAItemResponse }
-     * 
-     */
-    public GetPAItemResponse createGetPAItemResponse() {
-        return new GetPAItemResponse();
-    }
-
-    /**
-     * Create an instance of {@link GetRetiredInfor }
-     * 
-     */
-    public GetRetiredInfor createGetRetiredInfor() {
-        return new GetRetiredInfor();
-    }
-
-    /**
-     * Create an instance of {@link GetRetiredInforResponse }
-     * 
-     */
-    public GetRetiredInforResponse createGetRetiredInforResponse() {
-        return new GetRetiredInforResponse();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MyHeader }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link MyHeader }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.pd-transport.com/", name = "MyHeader")
-    public JAXBElement<MyHeader> createMyHeader(MyHeader value) {
-        return new JAXBElement<MyHeader>(_MyHeader_QNAME, MyHeader.class, null, value);
-    }
-
-}
-package com.bsth.wsdl;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-/**
- * This class was generated by Apache CXF 3.3.2
- * 2019-06-25T10:55:23.807+08:00
- * Generated source version: 3.3.2
- *
- */
-@WebServiceClient(name = "PJDataSerivce",
-                  wsdlLocation = "http://116.236.238.218:31/PJDataInterface/PJDataService.asmx?wsdl",
-                  targetNamespace = "http://www.pd-transport.com/")
-public class PJDataSerivce extends Service {
-
-    public final static URL WSDL_LOCATION;
-
-    public final static QName SERVICE = new QName("http://www.pd-transport.com/", "PJDataSerivce");
-    public final static QName PJDataSerivceSoap12 = new QName("http://www.pd-transport.com/", "PJDataSerivceSoap12");
-    public final static QName PJDataSerivceSoap = new QName("http://www.pd-transport.com/", "PJDataSerivceSoap");
-    static {
-        URL url = null;
-        try {
-            url = new URL("http://116.236.238.218:31/PJDataInterface/PJDataService.asmx?wsdl");
-        } catch (MalformedURLException e) {
-            java.util.logging.Logger.getLogger(PJDataSerivce.class.getName())
-                .log(java.util.logging.Level.INFO,
-                     "Can not initialize the default wsdl from {0}", "http://116.236.238.218:31/PJDataInterface/PJDataService.asmx?wsdl");
-        }
-        WSDL_LOCATION = url;
-    }
-
-    public PJDataSerivce(URL wsdlLocation) {
-        super(wsdlLocation, SERVICE);
-    }
-
-    public PJDataSerivce(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public PJDataSerivce() {
-        super(WSDL_LOCATION, SERVICE);
-    }
-
-    public PJDataSerivce(WebServiceFeature ... features) {
-        super(WSDL_LOCATION, SERVICE, features);
-    }
-
-    public PJDataSerivce(URL wsdlLocation, WebServiceFeature ... features) {
-        super(wsdlLocation, SERVICE, features);
-    }
-
-    public PJDataSerivce(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
-        super(wsdlLocation, serviceName, features);
-    }
-
-
-
-
-    /**
-     *
-     * @return
-     *     returns PJDataSerivceSoap
-     */
-    @WebEndpoint(name = "PJDataSerivceSoap12")
-    public PJDataSerivceSoap getPJDataSerivceSoap12() {
-        return super.getPort(PJDataSerivceSoap12, PJDataSerivceSoap.class);
-    }
-
-    /**
-     *
-     * @param features
-     *     A list of {@link WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns PJDataSerivceSoap
-     */
-    @WebEndpoint(name = "PJDataSerivceSoap12")
-    public PJDataSerivceSoap getPJDataSerivceSoap12(WebServiceFeature... features) {
-        return super.getPort(PJDataSerivceSoap12, PJDataSerivceSoap.class, features);
-    }
-
-
-    /**
-     *
-     * @return
-     *     returns PJDataSerivceSoap
-     */
-    @WebEndpoint(name = "PJDataSerivceSoap")
-    public PJDataSerivceSoap getPJDataSerivceSoap() {
-        return super.getPort(PJDataSerivceSoap, PJDataSerivceSoap.class);
-    }
-
-    /**
-     *
-     * @param features
-     *     A list of {@link WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns PJDataSerivceSoap
-     */
-    @WebEndpoint(name = "PJDataSerivceSoap")
-    public PJDataSerivceSoap getPJDataSerivceSoap(WebServiceFeature... features) {
-        return super.getPort(PJDataSerivceSoap, PJDataSerivceSoap.class, features);
-    }
-
-}
-package com.bsth.wsdl;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-/**
- * This class was generated by Apache CXF 3.3.2
- * 2019-06-25T10:55:23.796+08:00
- * Generated source version: 3.3.2
- *
- */
-@WebService(targetNamespace = "http://www.pd-transport.com/", name = "PJDataSerivceSoap")
-@XmlSeeAlso({ObjectFactory.class})
-public interface PJDataSerivceSoap {
-
-    /**
-     * 离退人员信息接口
-     */
-    @WebMethod(operationName = "GetRetiredInfor", action = "http://www.pd-transport.com/GetRetiredInfor")
-    @RequestWrapper(localName = "GetRetiredInfor", targetNamespace = "http://www.pd-transport.com/", className = "com.pd_transport.GetRetiredInfor")
-    @ResponseWrapper(localName = "GetRetiredInforResponse", targetNamespace = "http://www.pd-transport.com/", className = "com.pd_transport.GetRetiredInforResponse")
-    @WebResult(name = "GetRetiredInforResult", targetNamespace = "http://www.pd-transport.com/")
-    public String getRetiredInfor(
-
-            @WebParam(name = "UnintCode", targetNamespace = "http://www.pd-transport.com/")
-                    String unintCode,
-            @WebParam(name = "begin_date", targetNamespace = "http://www.pd-transport.com/")
-                    String beginDate,
-            @WebParam(name = "end_date", targetNamespace = "http://www.pd-transport.com/")
-                    String endDate
-    );
-
-    /**
-     * 薪资信息数据接口
-     */
-    @WebMethod(operationName = "GetPAItem", action = "http://www.pd-transport.com/GetPAItem")
-    @RequestWrapper(localName = "GetPAItem", targetNamespace = "http://www.pd-transport.com/", className = "com.pd_transport.GetPAItem")
-    @ResponseWrapper(localName = "GetPAItemResponse", targetNamespace = "http://www.pd-transport.com/", className = "com.pd_transport.GetPAItemResponse")
-    @WebResult(name = "GetPAItemResult", targetNamespace = "http://www.pd-transport.com/")
-    public String getPAItem(
-
-            @WebParam(name = "Year", targetNamespace = "http://www.pd-transport.com/")
-                    int year,
-            @WebParam(name = "Period", targetNamespace = "http://www.pd-transport.com/")
-                    int period
-    );
-
-    /**
-     * 在职人员信息接口
-     */
-    @WebMethod(operationName = "GetEmployee", action = "http://www.pd-transport.com/GetEmployee")
-    @RequestWrapper(localName = "GetEmployee", targetNamespace = "http://www.pd-transport.com/", className = "com.pd_transport.GetEmployee")
-    @ResponseWrapper(localName = "GetEmployeeResponse", targetNamespace = "http://www.pd-transport.com/", className = "com.pd_transport.GetEmployeeResponse")
-    @WebResult(name = "GetEmployeeResult", targetNamespace = "http://www.pd-transport.com/")
-    public String getEmployee(
-
-            @WebParam(name = "UnintCode", targetNamespace = "http://www.pd-transport.com/")
-                    String unintCode,
-            @WebParam(name = "IDCard", targetNamespace = "http://www.pd-transport.com/")
-                    String idCard
-    );
-}
-
-package com.bsth.wsdl;
-
-/**
- * Please modify this class to meet your needs
- * This class is not complete
- */
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.util.XmlToJson;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-/**
- * This class was generated by Apache CXF 3.3.2
- * 2019-06-25T10:55:23.727+08:00
- * Generated source version: 3.3.2
- *
- */
-public final class PJDataSerivceSoap_PJDataSerivceSoap12_Client {
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    private static final QName SERVICE_NAME = new QName("http://www.pd-transport.com/", "PJDataSerivce");
-
-    private PJDataSerivceSoap_PJDataSerivceSoap12_Client() {
-    }
-
-    public static void main(String args[]) throws Exception {
-        URL wsdlURL = PJDataSerivce.WSDL_LOCATION;
-        if (args.length > 0 && args[0] != null && !"".equals(args[0])) {
-            File wsdlFile = new File(args[0]);
-            try {
-                if (wsdlFile.exists()) {
-                    wsdlURL = wsdlFile.toURI().toURL();
-                } else {
-                    wsdlURL = new URL(args[0]);
-                }
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
-            }
-        }
-
-        PJDataSerivce ss = new PJDataSerivce(wsdlURL, SERVICE_NAME);
-        PJDataSerivceSoap port = ss.getPJDataSerivceSoap12();
-
-        {
-        System.out.println("Invoking getRetiredInfor...");
-        String _getRetiredInfor_unintCode = "KD01.0110";
-        String _getRetiredInfor_beginDate = "1900-01-01";
-        String _getRetiredInfor_endDate = "2019-06-25";
-        String _getRetiredInfor__return = port.getRetiredInfor(_getRetiredInfor_unintCode, _getRetiredInfor_beginDate, _getRetiredInfor_endDate);
-
-        JSONObject jsonInfor = XmlToJson.xml2Json(_getRetiredInfor__return);
-        System.out.println("getRetiredInfor.result=" + _getRetiredInfor__return);
-            JSONArray jsonArr = JSONArray.parseArray(jsonInfor.get("Retire").toString());
-            for(int i=0;i<jsonArr.size()-1; i++){
-                JSONObject pjson =  jsonArr.getJSONObject(i);
-                String codeArr[] = pjson.getString("Code").split("-");
-//                if(pjson.getString("EmployeeName").equals("潘英") || pjson.getString("EmployeeName").equals("陆志兴")|| pjson.getString("EmployeeName").equals("沈志钢")){
-//                    System.out.print(pjson);
-//                }
-//                if(codeArr.length > 1){
-//                    if(codeArr[1].equals("016007") || codeArr[1].equals("006005") || codeArr[1].equals("005634")  || codeArr[1].equals("007969")){
-//                        System.out.print(pjson);
-//                    }
-//                } else {
-//                    System.out.print(codeArr);
-//                }
-            }
-
-        }
-//        {
-//        System.out.println("Invoking getPAItem...");
-//        int _getPAItem_year = 0;
-//        int _getPAItem_period = 0;
-//        String _getPAItem__return = port.getPAItem(_getPAItem_year, _getPAItem_period);
-//        System.out.println("getPAItem.result=" + _getPAItem__return);
-//
-//
-//        }
-
-        {
-        System.out.println("Invoking getEmployee...");
-        String _getEmployee_unintCode = "KD01.0112";
-        String _getEmployee_idCard = "";
-        String _getEmployee__return = port.getEmployee(_getEmployee_unintCode, _getEmployee_idCard);
-        JSONObject jsonInfor = XmlToJson.xml2Json(_getEmployee__return);
-        JSONArray jsonArr = JSONArray.parseArray(jsonInfor.get("Emp").toString());
-        jsonArr.getJSONObject(0).get("Code");
-//            jsonArr =  JSONArray.fromObject(jsonInfor.get("Emp").toString());
-        System.out.println("getEmployee.result=" + _getEmployee__return);
-        for(int i=0;i<jsonArr.size()-1; i++){
-                JSONObject pjson =  jsonArr.getJSONObject(i);
-                String codeArr[] = pjson.getString("Code").split("-");
-            if(codeArr[1].equals("016007") || codeArr[1].equals("006005") || codeArr[1].equals("005634")  || codeArr[1].equals("007969")){
-                System.out.print(pjson);
-            }
-        }
-
-        }
-
-        System.exit(0);
-    }
-
-}
-
-package com.bsth.wsdl;
-
-/**
- * Please modify this class to meet your needs
- * This class is not complete
- */
-
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-/**
- * This class was generated by Apache CXF 3.3.2
- * 2019-06-25T10:55:23.780+08:00
- * Generated source version: 3.3.2
- *
- */
-public final class PJDataSerivceSoap_PJDataSerivceSoap_Client {
-
-    private static final QName SERVICE_NAME = new QName("http://www.pd-transport.com/", "PJDataSerivce");
-
-    private PJDataSerivceSoap_PJDataSerivceSoap_Client() {
-    }
-
-    public static void main(String args[]) throws Exception {
-        URL wsdlURL = PJDataSerivce.WSDL_LOCATION;
-        if (args.length > 0 && args[0] != null && !"".equals(args[0])) {
-            File wsdlFile = new File(args[0]);
-            try {
-                if (wsdlFile.exists()) {
-                    wsdlURL = wsdlFile.toURI().toURL();
-                } else {
-                    wsdlURL = new URL(args[0]);
-                }
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
-            }
-        }
-
-        PJDataSerivce ss = new PJDataSerivce(wsdlURL, SERVICE_NAME);
-        PJDataSerivceSoap port = ss.getPJDataSerivceSoap();
-
-        {
-        System.out.println("Invoking getRetiredInfor...");
-        String _getRetiredInfor_unintCode = "";
-        String _getRetiredInfor_beginDate = "";
-        String _getRetiredInfor_endDate = "";
-        String _getRetiredInfor__return = port.getRetiredInfor(_getRetiredInfor_unintCode, _getRetiredInfor_beginDate, _getRetiredInfor_endDate);
-        System.out.println("getRetiredInfor.result=" + _getRetiredInfor__return);
-
-
-        }
-        {
-        System.out.println("Invoking getPAItem...");
-        int _getPAItem_year = 0;
-        int _getPAItem_period = 0;
-        String _getPAItem__return = port.getPAItem(_getPAItem_year, _getPAItem_period);
-        System.out.println("getPAItem.result=" + _getPAItem__return);
-
-
-        }
-        {
-        System.out.println("Invoking getEmployee...");
-        String _getEmployee_unintCode = "";
-        String _getEmployee_idCard = "";
-        String _getEmployee__return = port.getEmployee(_getEmployee_unintCode, _getEmployee_idCard);
-        System.out.println("getEmployee.result=" + _getEmployee__return);
-
-
-        }
-
-        System.exit(0);
-    }
-
-}
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.pd-transport.com/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package com.bsth.wsdl;
-server.port=8776
+server.port=9099
 management.port= 9001
 management.address= 127.0.0.1
-spring.jpa.hibernate.ddl-auto= update
+spring.jpa.hibernate.ddl-auto= none
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://localhost:3306/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://localhost:3306/control_cope?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password=
+spring.datasource.password= root
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
-server.port=8776
+server.port=9088
 management.port= 9001
 management.address= 127.0.0.1
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.150.24:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://10.10.150.20:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root2jsp
+spring.datasource.password= root2jsp@JSP
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
 spring.profiles: dev,prod
-spring.profiles.active: prod
+spring.profiles.active: dev
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -16,6 +16,3 @@ server.compression.mime-types=application/json,application/xml,text/html,text/xm
 #redis »º´æ¶àÉÙÌìµÄÊý¾Ý
 cache.days=60
-
-
-mybatis.mapper-locations=classpath:mapper/*.xml
@@ -3,7 +3,7 @@
 <configuration>
 	<!-- <property resource="application.properties" /> -->
-	<property name="LOG_BASE" value="E:/personnel_update_log" />
+	<property name="LOG_BASE" value="E:/calc_log" />
 	<!-- 控制台输出 -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -19,7 +19,7 @@
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${LOG_BASE}/calc_log.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${LOG_BASE}/personnel_update_log-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<fileNamePattern>${LOG_BASE}/calc_log-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
 			<timeBasedFileNamingAndTriggeringPolicy
 				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<maxFileSize>100MB</maxFileSize>
+#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://10.10.150.21:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#ms.mysql.username= root
+#ms.mysql.password= root2jsp@JSP
+
+ms.mysql.driver= com.mysql.jdbc.Driver
+ms.mysql.url= jdbc:mysql://localhost:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.username= root
+ms.mysql.password= root
-#ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://127.0.0.1:3306/personnel?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#ms.mysql.username= root
-#ms.mysql.password=
-
-ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.150.24:3306/personnel?useUnicode=true&characterEncoding=utf-8
-ms.mysql.username= root
-ms.mysql.password= root2jsp