Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents e16f191f 933fcbe6
Showing 50 changed files with 2372 additions and 445 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/summary/DestroySituationController.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/auto_exec/AutoExecScanThread.java
src/main/java/com/bsth/data/schedule/auto_exec/RealScheduleAutoExecHandler.java
src/main/java/com/bsth/data/summary/entity/DestroySituation.java
src/main/java/com/bsth/data/summary/entity/FastAndSlow.java
src/main/java/com/bsth/data/summary/repository/DestroySituationRepository.java
src/main/java/com/bsth/data/summary/service/DestroySituationService.java
src/main/java/com/bsth/data/summary/service/impl/DestroySituationServiceImpl.java
src/main/java/com/bsth/data/summary/service/impl/FastAndSlowServiceImpl.java
src/main/java/com/bsth/data/utils/CustomStringUtils.java
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
@@ -17,7 +17,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(16);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(17);
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -9,6 +9,7 @@ import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.schedule.auto_exec.AutoExecScanThread;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
 import com.bsth.data.schedule.signal.SchSiginUpdateDBThread;
@@ -64,6 +65,8 @@ public class XDApplication implements CommandLineRunner {
     SampleTimeDataLoader sampleTimeDataLoader;
     @Autowired
     SchSiginUpdateDBThread schSiginUpdateDBThread;
+    @Autowired
+    AutoExecScanThread autoExecScanThread;
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -111,6 +114,8 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(autoExecScanThread, 100, 50, TimeUnit.SECONDS);//班次自动执行
+        //WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //班次修正日志延迟入库
@@ -137,6 +142,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
+        sexec.scheduleWithFixedDelay(autoExecScanThread, 160, 50, TimeUnit.SECONDS);//班次自动执行
         DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
@@ -116,4 +116,9 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public Map<String, Object> parkAndStationSet(@RequestParam Map<String, String> map){
 		return lineConfigService.parkAndStationSet(map);
 	}
+
+	@RequestMapping(value = "/setAutoExec", method = RequestMethod.POST)
+	public Map<String, Object> setAutoExec(@RequestParam Map<String, String> map){
+		return lineConfigService.setAutoExec(map);
+	}
 }
@@ -529,8 +529,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
-	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks){
-		return scheduleRealInfoService.changeBcType(id, bcType, remarks);
+	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
+		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
 	}
 	@RequestMapping(value="/history", method=RequestMethod.POST)
@@ -549,9 +549,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
 		List<String> rs = new ArrayList<>();
-		long t = new Date().getTime();
+		long t = System.currentTimeMillis();
 		if(c != 1)
-		 	t -= ONE_DAY - (1000 * 60 * 60 * 2);
+		 	t -= (ONE_DAY + (1000 * 60 * 60 * 2));
 		for(int i = 0; i < 3; i ++){
 			rs.add(fmtyyyyMMdd.print(t));
 			t -= ONE_DAY;
+package com.bsth.controller.realcontrol.summary;
+
+import com.bsth.controller.BaseController;
+import com.bsth.data.summary.entity.DestroySituation;
+import com.bsth.data.summary.service.DestroySituationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@RestController
+@RequestMapping("/summary/destroy_detail")
+public class DestroySituationController extends BaseController<DestroySituation, Long> {
+
+    @Autowired
+    DestroySituationService destroySituationService;
+
+    @RequestMapping("excel")
+    public void excel(@RequestParam Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        destroySituationService.excel(map, request, response);
+    }
+}
@@ -41,7 +41,7 @@ public class GpsRealAnalyse {
     @Autowired
     GpsRealData gpsRealData;
-    final static int POOL_SIZE = 15;
+    final static int POOL_SIZE = 30;
     static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
     public static long st;
@@ -68,7 +68,7 @@ public class GpsRealAnalyse {
             }
             List<String> deviceList = new ArrayList<>(multimap.keySet());
-            //数据均分给20个线程
+            //数据均分给线程
             ArrayListMultimap dataListMap = ArrayListMultimap.create();
             int size = deviceList.size(), threadIndex=0, threadSize = size / POOL_SIZE;
             for(int i = 0; i < size; i++){
@@ -70,14 +70,18 @@ public class InOutStationSignalHandle extends SignalHandle{
             return false;
         }
-        if(isNotEmpty(prevs)){
-            GpsEntity prev = prevs.getTail();
-            if(isOutStation(gps, prev))
-                outStation(gps, prev);
+        try{
+            if(isNotEmpty(prevs)){
+                GpsEntity prev = prevs.getTail();
+                if(isOutStation(gps, prev))
+                    outStation(gps, prev);
-            if(isInStation(gps, prev))
-                inStation(gps, prev);
+                if(isInStation(gps, prev))
+                    inStation(gps, prev);
+            }
+        }catch (Exception e){
+            logger.error("in out error info ..", e);
         }
         return true;
+package com.bsth.data.schedule.auto_exec;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 班次自动执行扫描线程
+ * Created by panzhao on 2017/10/31.
+ */
+@Component
+public class AutoExecScanThread extends Thread{
+
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    RealScheduleAutoExecHandler realScheduleAutoExecHandler;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try{
+            //要自动执行的线路
+            List<String> autos = new ArrayList<>();
+            Collection<LineConfig> lcs = lineConfigData.getAll();
+
+            for(LineConfig config : lcs){
+                if(config.isAutoExec()){
+                    autos.add(config.getLine().getLineCode());
+                }
+            }
+
+            if(autos.size()==0)
+                return;
+            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+            for(ScheduleRealInfo sch : all){
+                if(autos.contains(sch.getXlBm())){
+                    realScheduleAutoExecHandler.exec(sch);
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
+package com.bsth.data.schedule.auto_exec;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 实际班次自动执行
+ * Created by panzhao on 2017/10/31.
+ */
+@Component
+public class RealScheduleAutoExecHandler {
+
+    @Autowired
+    SendUtils sendUtils;
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+
+    public void exec(ScheduleRealInfo sch) {
+        boolean flag = false;
+        long t = System.currentTimeMillis();
+
+        if (sch.getDfsjT() < t) {
+            sch.setFcsjActualAll(sch.getDfsjT());
+            flag = true;
+        }
+
+        if (sch.getZdsjT() < t) {
+            sch.setZdsjActualAll(sch.getZdsjT());
+            ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
+            if (null != next) {
+                next.setQdzArrDatesj(sch.getZdsjActual());
+
+                List<ScheduleRealInfo> refs = new ArrayList<>();
+                refs.add(sch);
+                refs.add(next);
+                sendUtils.refreshSch(refs);
+                return;
+            }
+        }
+
+        if (flag) {
+            sendUtils.refreshSch(sch);
+        }
+    }
+}
+package com.bsth.data.summary.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 烂班情况
+ * Created by panzhao on 2017/10/31.
+ */
+@Entity
+@Table(name = "z_calc_destroy_detail")
+public class DestroySituation {
+
+    @Id
+    private Long id;
+
+    private String rq;
+
+    private String gsBm;
+
+    private String fgsBm;
+
+    private String lineCode;
+
+    private String lineName;
+
+    private String nbbm;
+
+    private String jGh;
+
+    private String sGh;
+
+    private String reason;
+
+    private int size;
+
+    private Double mileage;
+
+    private Long t;
+
+    private String remark;
+
+    private String idsStr;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public Double getMileage() {
+        return mileage;
+    }
+
+    public void setMileage(Double mileage) {
+        this.mileage = mileage;
+    }
+
+    public Long getT() {
+        return t;
+    }
+
+    public void setT(Long t) {
+        this.t = t;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getIdsStr() {
+        return idsStr;
+    }
+
+    public void setIdsStr(String idsStr) {
+        this.idsStr = idsStr;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+}
@@ -21,6 +21,22 @@ public class FastAndSlow {
     private Long id;
     /**
+     * 驾驶员
+     */
+    private String jsy;
+
+    /**
+     * 车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 路牌名称
+     */
+    @Column(name = "lp_name")
+    private String lpName;
+
+    /**
      * 发车站点
      */
     private String stationName;
@@ -281,4 +297,28 @@ public class FastAndSlow {
     public boolean isFast() {
         return this.fcsjFast>0 || this.dfsjFast>0 || this.zdsjFast>0 || this.zdsjDfFast>0;
     }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getJsy() {
+        return jsy;
+    }
+
+    public void setJsy(String jsy) {
+        this.jsy = jsy;
+    }
 }
 \ No newline at end of file
+package com.bsth.data.summary.repository;
+
+import com.bsth.data.summary.entity.DestroySituation;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@Repository
+public interface DestroySituationRepository extends BaseRepository<DestroySituation, Long> {
+}
+package com.bsth.data.summary.service;
+
+import com.bsth.data.summary.entity.DestroySituation;
+import com.bsth.service.BaseService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+public interface DestroySituationService extends BaseService<DestroySituation, Long> {
+    void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response);
+}
 \ No newline at end of file
+package com.bsth.data.summary.service.impl;
+
+import com.bsth.data.summary.entity.DestroySituation;
+import com.bsth.data.summary.service.DestroySituationService;
+import com.bsth.data.utils.CustomStringUtils;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@Service
+public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituation, Long> implements DestroySituationService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        try {
+            map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
+                    , map.get("rq_le").toString(), 62));
+
+            List<DestroySituation> list = (List<DestroySituation>) super.list(map);
+
+            if(list.size() == 0){
+                response.setHeader("Content-type", "text/html;charset=UTF-8");
+                response.getWriter().print("<span style='color:red;font-size:24px;'>根据查询条件没有搜索到数据，别导了！</span>");
+                return ;
+            }
+
+            //排序
+            Collections.sort(list, new Comparator<DestroySituation>() {
+                @Override
+                public int compare(DestroySituation o1, DestroySituation o2) {
+                    return (int) (o1.getT() - o2.getT());
+                }
+            });
+
+            //输出excel
+            String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
+            String filePath = basePath + "/static/pages/summary/excel/烂班明细情况.xls";
+            POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath));
+            HSSFWorkbook wb = new HSSFWorkbook(fs);
+
+            //写入数据
+            Sheet sheet = wb.getSheetAt(0);
+            Row row;
+            DestroySituation dys;
+            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+            for(int i = 0; i < list.size(); i++){
+                dys = list.get(i);
+                row = sheet.createRow(i + 1);
+                row.createCell(0).setCellValue(dys.getRq());
+                row.createCell(1).setCellValue(dys.getLineName());
+                row.createCell(2).setCellValue(dys.getNbbm());
+                row.createCell(3).setCellValue(dys.getjGh());
+                row.createCell(4).setCellValue(dys.getsGh());
+                row.createCell(5).setCellValue(dys.getReason());
+                row.createCell(6).setCellValue(dys.getSize());
+                row.createCell(7).setCellValue(dys.getMileage());
+                row.createCell(8).setCellValue(sdf.format(new Date(dys.getT())));
+                row.createCell(9).setCellValue(dys.getRemark());
+            }
+
+            String name = list.get(0).getLineName();
+            wb.setSheetName(0, name + "烂班明细");
+            //response 输出
+            String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "烂班明细情况.xls";
+            response.setContentType("application/x-msdownload");
+            response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+
+            OutputStream os = response.getOutputStream();
+            wb.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+}
 \ No newline at end of file
@@ -4,6 +4,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.summary.entity.FastAndSlow;
 import com.bsth.data.summary.service.FastAndSlowService;
 import com.bsth.data.utils.ConvertUtil;
+import com.bsth.data.utils.CustomStringUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -22,8 +23,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 /**
@@ -40,7 +39,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
     public Iterable<FastAndSlow> list(Map<String, Object> map) {
         try {
             //最多5天
-            map.put("rq_le", maxEndTime(map.get("rq_ge").toString()
+            map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
                     , map.get("rq_le").toString(), 4));
             List<FastAndSlow> list = (List) super.list(map);
@@ -58,7 +57,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
         try {
             Map<String, Object> params = new HashMap();
             //最多31天
-            et = maxEndTime(st, et, 31);
+            et = CustomStringUtils.maxEndTime(st, et, 31);
             params.put("rq_ge", st);
             params.put("rq_le", et);
             params.put("lineCode_eq", lineCode);
@@ -119,29 +118,33 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
         //前4行是表头
         Row row;
         row = sheet.getRow(0);
-        row.getCell(4).setCellValue(list.get(0).getRq());
+        row.getCell(0).setCellValue(list.get(0).getRq());
         row.getCell(13).setCellValue(BasicData.lineCode2NameMap.get(list.get(0).getLineCode()));
         FastAndSlow fas;
         for(int i = 0; i < list.size(); i++){
             fas = list.get(i);
             row = sheet.createRow(i + 4);
             row.createCell(0).setCellValue(i + 1);
-            row.createCell(1).setCellValue(fas.getStationName());
-            row.createCell(2).setCellValue(fas.getUpDown());
-            row.createCell(3).setCellValue(fas.getFcsj());
-            row.createCell(4).setCellValue(fas.getDfsj());
-            row.createCell(5).setCellValue(fas.getFcsjActual());
-            row.createCell(6).setCellValue(fas.getFcsjFast());
-            row.createCell(7).setCellValue(fas.getFcsjSlow());
-            row.createCell(8).setCellValue(fas.getDfsjFast());
-            row.createCell(9).setCellValue(fas.getDfsjSlow());
-            row.createCell(10).setCellValue(fas.getZdsj());
-            row.createCell(11).setCellValue(fas.getZdsjDf());
-            row.createCell(12).setCellValue(fas.getZdsjActual());
-            row.createCell(13).setCellValue(fas.getZdsjFast());
-            row.createCell(14).setCellValue(fas.getZdsjSlow());
-            row.createCell(15).setCellValue(fas.getZdsjDfFast());
-            row.createCell(16).setCellValue(fas.getZdsjDfSlow());
+            row.createCell(1).setCellValue(fas.getLpName());
+            row.createCell(2).setCellValue(fas.getNbbm());
+            row.createCell(3).setCellValue(fas.getJsy());
+
+            row.createCell(4).setCellValue(fas.getStationName());
+            row.createCell(5).setCellValue(fas.getUpDown());
+            row.createCell(6).setCellValue(fas.getFcsj());
+            row.createCell(7).setCellValue(fas.getDfsj());
+            row.createCell(8).setCellValue(fas.getFcsjActual());
+            row.createCell(9).setCellValue(fas.getFcsjFast());
+            row.createCell(10).setCellValue(fas.getFcsjSlow());
+            row.createCell(11).setCellValue(fas.getDfsjFast());
+            row.createCell(12).setCellValue(fas.getDfsjSlow());
+            row.createCell(13).setCellValue(fas.getZdsj());
+            row.createCell(14).setCellValue(fas.getZdsjDf());
+            row.createCell(15).setCellValue(fas.getZdsjActual());
+            row.createCell(16).setCellValue(fas.getZdsjFast());
+            row.createCell(17).setCellValue(fas.getZdsjSlow());
+            row.createCell(18).setCellValue(fas.getZdsjDfFast());
+            row.createCell(19).setCellValue(fas.getZdsjDfSlow());
             if(fas.getUpDown()==0)
                 ups.add(fas);
@@ -151,28 +154,28 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
         //合计
         int size = list.size();
         row = sheet.createRow(size + 4);
-        row.createCell(1).setCellValue("发车：上行（计划快误点："+jhfcFast(ups)+"  累计时间："+jhfcFastTime(ups)+"  待发快误点："+dffcFast(ups)+"  累计时间："+dffcFastTime(ups)+"） ");
-        row.createCell(9).setCellValue("下行（计划快误点："+jhfcFast(downs)+"  累计时间："+jhfcFastTime(downs)+"  待发快误点："+dffcFast(downs)+"  累计时间："+dffcFastTime(downs)+"）");
+        row.createCell(2).setCellValue("发车：上行（计划快误点："+jhfcFast(ups)+"  累计时间："+jhfcFastTime(ups)+"  待发快误点："+dffcFast(ups)+"  累计时间："+dffcFastTime(ups)+"） ");
+        row.createCell(12).setCellValue("下行（计划快误点："+jhfcFast(downs)+"  累计时间："+jhfcFastTime(downs)+"  待发快误点："+dffcFast(downs)+"  累计时间："+dffcFastTime(downs)+"）");
         row = sheet.createRow(size + 5);
-        row.createCell(1).setCellValue("发车：上行（计划慢误点："+jhfcSlow(ups)+"  累计时间："+jhfcSlowTime(ups)+"  待发慢误点："+dffcSlow(ups)+"  累计时间："+dffcSlowTime(ups)+"） ");
-        row.createCell(9).setCellValue("下行（计划慢误点："+jhfcSlow(downs)+"  累计时间："+jhfcSlowTime(downs)+"  待发慢误点："+dffcSlow(downs)+"  累计时间："+dffcSlowTime(downs)+"）");
+        row.createCell(2).setCellValue("发车：上行（计划慢误点："+jhfcSlow(ups)+"  累计时间："+jhfcSlowTime(ups)+"  待发慢误点："+dffcSlow(ups)+"  累计时间："+dffcSlowTime(ups)+"） ");
+        row.createCell(12).setCellValue("下行（计划慢误点："+jhfcSlow(downs)+"  累计时间："+jhfcSlowTime(downs)+"  待发慢误点："+dffcSlow(downs)+"  累计时间："+dffcSlowTime(downs)+"）");
         row = sheet.createRow(size + 6);
-        row.createCell(1).setCellValue("到达：上行（计划快误点："+jhzdFast(ups)+"  累计时间："+jhzdFastTime(ups)+"  待发快误点："+dfzdFast(ups)+"  累计时间："+dfzdFastTime(ups)+"） ");
-        row.createCell(9).setCellValue("下行（计划快误点："+jhzdFast(downs)+"  累计时间："+jhzdFastTime(downs)+"  待发快误点："+dfzdFast(downs)+"  累计时间："+dfzdFastTime(downs)+"）");
+        row.createCell(2).setCellValue("到达：上行（计划快误点："+jhzdFast(ups)+"  累计时间："+jhzdFastTime(ups)+"  待发快误点："+dfzdFast(ups)+"  累计时间："+dfzdFastTime(ups)+"） ");
+        row.createCell(12).setCellValue("下行（计划快误点："+jhzdFast(downs)+"  累计时间："+jhzdFastTime(downs)+"  待发快误点："+dfzdFast(downs)+"  累计时间："+dfzdFastTime(downs)+"）");
         row = sheet.createRow(size + 7);
-        row.createCell(1).setCellValue("到达：上行（计划慢误点："+jhzdSlow(ups)+"  累计时间："+jhzdSlowTime(ups)+"  待发慢误点："+dfzdSlow(ups)+"  累计时间："+dfzdSlowTime(ups)+"） ");
-        row.createCell(9).setCellValue("下行（计划慢误点："+jhzdSlow(downs)+"  累计时间："+jhzdSlowTime(downs)+"  待发慢误点："+dfzdSlow(downs)+"  累计时间："+dfzdSlowTime(downs)+"）");
+        row.createCell(2).setCellValue("到达：上行（计划慢误点："+jhzdSlow(ups)+"  累计时间："+jhzdSlowTime(ups)+"  待发慢误点："+dfzdSlow(ups)+"  累计时间："+dfzdSlowTime(ups)+"） ");
+        row.createCell(12).setCellValue("下行（计划慢误点："+jhzdSlow(downs)+"  累计时间："+jhzdSlowTime(downs)+"  待发慢误点："+dfzdSlow(downs)+"  累计时间："+dfzdSlowTime(downs)+"）");
         //合并单元格
-        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 1, 8));
-        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 9, 16));
-        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 1, 8));
-        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 9, 16));
-        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 1, 8));
-        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 9, 16));
-        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 1, 8));
-        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 9, 16));
-
-        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 7, 0, 0));
+        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 2, 11));
+        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 12, 19));
+        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 2, 11));
+        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 12, 19));
+        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 2, 11));
+        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 12, 19));
+        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 2, 11));
+        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 12, 19));
+
+        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 7, 0, 1));
     }
     private List<FastAndSlow> filterByType(List<FastAndSlow> all, String type) {
@@ -194,23 +197,6 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
     }
-    private String maxEndTime(String sStr, String eStr, int space) throws ParseException {
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            long st = sdf.parse(sStr).getTime();
-            long et = sdf.parse(eStr).getTime();
-            long dayTime = 24 * 60 * 60 * 1000;
-            long spaceTime = dayTime * space;
-
-            if (et - st > spaceTime) {
-                eStr = sdf.format(new Date(st + spaceTime));
-            }
-        } catch (Exception e) {
-            throw e;
-        }
-        return eStr;
-    }
-
     /**
      * 计划发出快误点
      * @param list
@@ -2,6 +2,10 @@ package com.bsth.data.utils;
 import org.apache.commons.lang3.StringUtils;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * Created by panzhao on 2017/7/10.
  */
@@ -16,4 +20,21 @@ public class CustomStringUtils {
         }
         return s1.equals(s2);
     }
+
+    public static String maxEndTime(String sStr, String eStr, int space) throws ParseException {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            long st = sdf.parse(sStr).getTime();
+            long et = sdf.parse(eStr).getTime();
+            long dayTime = 24 * 60 * 60 * 1000;
+            long spaceTime = dayTime * space;
+
+            if (et - st > spaceTime) {
+                eStr = sdf.format(new Date(st + spaceTime));
+            }
+        } catch (Exception e) {
+            throw e;
+        }
+        return eStr;
+    }
 }
@@ -73,7 +73,7 @@ public class Dlb {
 	private String fgsname;
-	
+	private String lp;
 	public Integer getId() {
 		return id;
@@ -383,6 +383,15 @@ public class Dlb {
 	public void setUpdatetime(Date updatetime) {
 		this.updatetime = updatetime;
 	}
+
+	public String getLp() {
+		return lp;
+	}
+
+	public void setLp(String lp) {
+		this.lp = lp;
+	}
+	
 }
@@ -56,6 +56,7 @@ public class Ylb {
 	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
 	private int jcsx;
+	private String lp;
 	@Transient
 	private String bglyh;
@@ -330,5 +331,14 @@ public class Ylb {
 	public void setUpdatetime(Date updatetime) {
 		this.updatetime = updatetime;
 	}
+
+	public String getLp() {
+		return lp;
+	}
+
+	public void setLp(String lp) {
+		this.lp = lp;
+	}
+	
 }
@@ -35,6 +35,7 @@ public class ChildTaskPlan {
 	/**
 	 * 任务类型2
+	 * 1 正常 2 进场 3 出场
 	 */
 	private String type2;
@@ -99,6 +100,11 @@ public class ChildTaskPlan {
 	private String nbbm;
 	/**
+	 * 中途换车营运， 新车关联的主任务ID，子任务删除时，主任务ID将级联
+	 */
+	private Long ccId;
+
+	/**
 	 * 为true 则无售票员， 否则继承主任务
 	 */
 	private boolean noClerk;
@@ -277,4 +283,12 @@ public class ChildTaskPlan {
 	public void setNoClerk(boolean noClerk) {
 		this.noClerk = noClerk;
 	}
+
+	public Long getCcId() {
+		return ccId;
+	}
+
+	public void setCcId(Long ccId) {
+		this.ccId = ccId;
+	}
 }
@@ -65,6 +65,8 @@ public class LineConfig {
 	/** 原线路回场 */
 	private boolean inParkForSource;
+	private boolean autoExec;
+
 	/**
 	 * 到离站偏移值
 	 */
@@ -294,4 +296,12 @@ public class LineConfig {
 	public void setLockFirstOutTime(boolean lockFirstOutTime) {
 		this.lockFirstOutTime = lockFirstOutTime;
 	}
+
+	public boolean isAutoExec() {
+		return autoExec;
+	}
+
+	public void setAutoExec(boolean autoExec) {
+		this.autoExec = autoExec;
+	}
 }
@@ -108,6 +108,9 @@ public class ScheduleRealInfo {
 	 */
 	private String bcType;
+	//放站班次 站点名称
+	private String majorStationName;
+
 	/** 创建人 */
 	@JsonIgnore
 	@ManyToOne(fetch = FetchType.LAZY)
@@ -225,6 +228,11 @@ public class ScheduleRealInfo {
 	 */
 	private Integer driftStatus = 0;
+	/**
+	 * 换车营运标记 true 表示该主任务由 【中途换车子任务】 级联生成
+	 */
+	private boolean ccService;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -958,4 +966,20 @@ public class ScheduleRealInfo {
 	public void setDriftStatus(Integer driftStatus) {
 		this.driftStatus = driftStatus;
 	}
+
+	public boolean isCcService() {
+		return ccService;
+	}
+
+	public void setCcService(boolean ccService) {
+		this.ccService = ccService;
+	}
+
+	public String getMajorStationName() {
+		return majorStationName;
+	}
+
+	public void setMajorStationName(String majorStationName) {
+		this.majorStationName = majorStationName;
+	}
 }
 package com.bsth.repository;
-
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -8,6 +7,8 @@ import org.springframework.transaction.annotation.Transactional;
 import com.bsth.entity.Section;
+import java.util.List;
+
 /**
  * 
  * @Interface: SectionRepository(路段Repository数据持久层接口)
@@ -112,4 +113,8 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 							  Double speedLimit,String descriptions,Integer version,Integer createBy,String createDate,
 							  Integer updateBy,String updateDate);
+
+	@Query(value = "SELECT AsText(s.bsection_vector) as section,r.directions as dir FROM bsth_c_section s left join bsth_c_sectionroute r on s.section_code = r.section_code " +
+			"where r.line = ?1 and directions = ?2 ORDER BY r.directions,r.sectionroute_code ",nativeQuery = true)
+	List<Object[]> getSectionDirByLineId(Integer lineId , Integer directions);
 }
@@ -125,8 +125,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select s from Ylb s "
 			+ " where to_days(?1)=to_days(s.rq) "
-			+ " and s.ssgsdm like %?2% "
-			+ " and s.fgsdm like %?3%"
+			+ " and s.ssgsdm =?2 "
+			+ " and s.fgsdm =?3 "
 			+ " and s.xlbm like %?4% "
 			+ " and s.nbbm in ?5 order by nbbm,jcsx")
 	List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
@@ -17,17 +17,17 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	 * @param rq
 	 * @return
 	 */
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where yyrq=?1 and nylx=?2 and gsdm like %?3%",nativeQuery=true)
 	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and gsdm=?2",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where yyrq=?1 and gsdm=?2",nativeQuery=true)
 	List<Ylxxb> checkYlxx(String rq,String gs);
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where yyrq=?1 and nbbm =?2 and jylx=1",nativeQuery=true)
 	List<Ylxxb> obtainYlxx2(String rq,String nbbm);
 	@Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and "
-			+ "to_days(s.yyrq) = to_days(?2)",nativeQuery=true)
+			+ "s.yyrq=?2",nativeQuery=true)
 	List<Ylxxb> queryListYlxxb(String clZbh,String date);
@@ -129,7 +129,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	int countByLineCodeAndDate(String xlBm, String schDate);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value = "select DISTINCT s from ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2")
+	@Query(value = "select DISTINCT s from ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2 and ccService=false")
 	List<ScheduleRealInfo> findByLineCodeAndDate(String xlBm, String schDate);
 	@Modifying
@@ -146,7 +146,14 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 order by s.lpName, s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
-
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.ccService=false order by s.lpName, s.realExecDate,s.fcsj")
+	List<ScheduleRealInfo> scheduleDdrb(String line,String date);
+	
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and s.scheduleDateStr= ?2 and s.ccService=false order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
+	List<ScheduleRealInfo> scheduleDdrb2(String line,String date);
+	
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and s.scheduleDateStr = ?3 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineByGs_(String gsdm,String fgsdm,String date);
@@ -170,7 +177,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr >= ?2  and s.scheduleDateStr<= ?3  and gsBm like %?4% and fgsBm like %?5% order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr between ?2 and ?3 and gsBm = ?4 and fgsBm = ?5 order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2,String gsdm,String fgsdm);
 	//按照时间段统计
@@ -183,10 +190,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm like %?1% and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,s.lpName as lpName,min(s.fcsj) as fcsj,min(s.realExecDate) as realExecDate ) from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,lpName ORDER BY clZbh,realExecDate,fcsj")
 	List<Map<String,Object>> yesterdayDataList_eq(String line,String date,String gsbm,String fgsbm,String nbbm);
 	@Query(value="select s from ScheduleRealInfo s where s.scheduleDateStr = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
@@ -110,8 +110,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 logger.warn("烂班不允许发送调度指令....");
                 return -1;
             }
-            String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
-                    + sch.getQdzName() + "发往" + sch.getZdzName();
+            String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
+                    + sch.getQdzName() + "发往" + sch.getZdzName() ;
+
+            if(sch.getBcType().equals("venting")){
+                text += " (直放)";
+            }
+            else if(sch.getBcType().equals("major")){
+                text += " (放站到"+sch.getMajorStationName()+"带客)";
+            }
             //下发0x01指令  调度指令(闹钟有效)
             long t = System.currentTimeMillis() + 1000 * 30,
@@ -739,15 +739,29 @@ public class FormsServiceImpl implements FormsService {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
-							newList.add(s);
-							 Set<ChildTaskPlan> cts = s.getcTasks();
-				            if(cts != null && cts.size() > 0){
-				            	newList_.add(s);
-				            }else{
-					            if(s.getZdsjActual()!=null){
+							if(y.getLp()==null){
+								newList.add(s);
+								 Set<ChildTaskPlan> cts = s.getcTasks();
+					            if(cts != null && cts.size() > 0){
 					            	newList_.add(s);
+					            }else{
+						            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+						            	newList_.add(s);
+						            }
 					            }
-				            }
+							}else{
+								if(y.getLp().equals(s.getLpName())){
+									newList.add(s);
+									 Set<ChildTaskPlan> cts = s.getcTasks();
+						            if(cts != null && cts.size() > 0){
+						            	newList_.add(s);
+						            }else{
+							            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+							            	newList_.add(s);
+							            }
+						            }
+								}
+							}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -793,15 +807,29 @@ public class FormsServiceImpl implements FormsService {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
-							newList.add(s);
-							 Set<ChildTaskPlan> cts = s.getcTasks();
+							if(y.getLp()==null){
+								newList.add(s);
+								 Set<ChildTaskPlan> cts = s.getcTasks();
 					            if(cts != null && cts.size() > 0){
 					            	newList_.add(s);
 					            }else{
-						            if(s.getZdsjActual()!=null){
+						            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 						            	newList_.add(s);
 						            }
 					            }
+							}else{
+								if(y.getLp().equals(s.getLpName())){
+									newList.add(s);
+									 Set<ChildTaskPlan> cts = s.getcTasks();
+						            if(cts != null && cts.size() > 0){
+						            	newList_.add(s);
+						            }else{
+							            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+							            	newList_.add(s);
+							            }
+						            }
+								}
+							}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -884,7 +912,7 @@ public class FormsServiceImpl implements FormsService {
 					            if(cts != null && cts.size() > 0){
 					            	newList_.add(s);
 					            }else{
-						            if(s.getZdsjActual()!=null){
+						            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 						            	newList_.add(s);
 						            }
 					            }
@@ -1199,8 +1227,8 @@ public class FormsServiceImpl implements FormsService {
 		String sql = "select gs_name, fgs_name, cl_zbh, fcsj, bc_type, xl_bm, xl_name, schedule_date"
 				+ " from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
-				+ "and schedule_date_str >= '"+startDate+"' "
-				+ "and schedule_date_str <= '"+endDate+"' ";
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' "
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"' ";
 		if(line.trim().length() != 0){
 			sql += "and xl_bm = '"+line+"' ";
 		}
@@ -1356,8 +1384,8 @@ public class FormsServiceImpl implements FormsService {
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
 				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ " from bsth_c_s_sp_info" + "  where schedule_date_str >= '"
-				+ map.get("startDate").toString() + "'  and  schedule_date_str <='" + map.get("endDate").toString() + "'  and xl_bm='"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
+				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
 				+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
@@ -1440,8 +1468,8 @@ public class FormsServiceImpl implements FormsService {
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
 				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ " from bsth_c_s_sp_info" + "  where schedule_date_str >= '"
-				+ map.get("startDate").toString() + "'  and schedule_date_str<= '" + map.get("endDate").toString() + "'  and xl_bm='"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
+				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out') "
 				+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
@@ -1604,7 +1632,7 @@ public class FormsServiceImpl implements FormsService {
 		 @Override
 			public int compare(Singledata o1, Singledata o2) {
 				// TODO Auto-generated method stub
-				return  o2.getxL().compareTo(o1.getxL());
+				return  (o2.getxL()+o2.getClzbh()).compareTo((o1.getxL()+o1.getClzbh()));
 			}
 	}
 }
@@ -57,7 +57,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -86,7 +86,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
 					schedule.setId(rs.getLong("id"));
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setXlName(rs.getString("xl_name"));
@@ -117,6 +117,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setjName(rs.getString("j_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
 					schedule.setSflj(rs.getBoolean("sflj"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -371,6 +372,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
 		for(ScheduleRealInfo schedule : list){
+			if(schedule.isCcService())
+				continue;
 			String[] split1 = schedule.getFcsj().split(":");
 			String[] split2 = schedule.getZdsj().split(":");
 			long fcsj = Long.valueOf(split1[0])*60 + Long.valueOf(split1[1]);
@@ -674,10 +677,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 			where += " and bc_type != 'ldks'";
-			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type,"
+			String sql = "select id, schedule_date_str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type,"
 					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
-					+ " from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
-					+ " and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"+where+"";
+					+ " ,cc_service from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"'"
+					+ " and schedule_date_str <= '"+endDate+"'"+where+"";
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -685,7 +688,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
 					schedule.setId(rs.getLong("id"));
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
@@ -705,6 +708,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -885,7 +889,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		for(ScheduleRealInfo schedule : list){
-			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0)
+			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0
+					|| schedule.isCcService())
 				continue;
 			if(model.length() != 0){
 				if(ttSet.contains(schedule.getSpId())){
@@ -1393,6 +1398,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
 		for(ScheduleRealInfo s : list){
+			if(s.isCcService()){
+				continue;
+			}
 			String key = s.getScheduleDateStr() + "/" + s.getLpName();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
@@ -1668,14 +1676,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					lc = new BigDecimal("0"+schedule.getJhlc());
 				}
-				if(!schedule.isSflj()){
+				if(!schedule.isSflj() && !schedule.isCcService()){
 					jhbc++;
 					jhlc = jhlc.add(lc);
 				}
-				if(schedule.getStatus() != -1){
+				if(schedule.getStatus() != -1 && !schedule.isCcService()){
 					sjbc++;
 					sjlc = sjlc.add(lc);
-				} else if(schedule.getStatus() == -1){
+				} else if(schedule.getStatus() == -1 && !schedule.isCcService()){
 					if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){
 						lzbc++;
 						lzlc = lzlc.add(lc);
@@ -1811,8 +1819,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d')"
-					+ " >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str"
+					+ " >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -1829,7 +1837,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+				sql += " and (gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"')";
 			}
 			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
@@ -1838,7 +1846,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
@@ -1864,6 +1872,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setjGh(rs.getString("j_gh"));
 					schedule.setjName(rs.getString("j_name"));
 					schedule.setUpdateDate(rs.getDate("update_date"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -1905,7 +1914,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					dxtz = 0, lbtz = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
 				boolean flag = false;
-				if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
+				if(schedule.getFcsjActual() != null && schedule.getStatus() != -1
+						&& !schedule.isCcService()){
 					sjbc++;
 					if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
 						flag = true;
@@ -1937,9 +1947,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf + lbtz);
-			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
+			tempMap.put("dfbl", sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0 + "%");
 //			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
-			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
+			tempMap.put("lbbl", sjbc>0?df.format((double)(lbtz)/sjbc*100):0 + "%");
 //			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 //			tempMap.put("workList", tempList);
@@ -2069,9 +2079,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf  + lbtz);
-			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
+			tempMap.put("dfbl", sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0 + "%");
-			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
+			tempMap.put("lbbl", sjbc>0?df.format((double)(lbtz)/sjbc*100):0 + "%");
 //			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 			resList.add(tempMap);
 		}
@@ -2097,8 +2107,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         			resMap.put("dxbl", "0");
         			resMap.put("correctbl", "0");
         		}else{
-        			resMap.put("dxbl", df.format((double)(dxtzz)/sjbc*100) + "%");
-        			resMap.put("correctbl", df.format((double)(correct+dxtzz)/sjbc*100) + "%");
+        			resMap.put("dxbl", sjbc>0?df.format((double)(dxtzz)/sjbc*100):0 + "%");
+        			resMap.put("correctbl", sjbc>0?df.format((double)(correct+dxtzz)/sjbc*100):0 + "%");
         		}
@@ -2152,8 +2162,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         			resMap.put("dxbl", "0");
         			resMap.put("correctbl", "0");
         		}else{
-        			resMap.put("dxbl", df.format((double)(dxtzf)/sjbc*100) + "%");
-        			resMap.put("correctbl", df.format((double)(correct+dxtzf)/sjbc*100) + "%");
+        			resMap.put("dxbl", sjbc>0?df.format((double)(dxtzf)/sjbc*100):0 + "%");
+        			resMap.put("correctbl", sjbc>0?df.format((double)(correct+dxtzf)/sjbc*100):0 + "%");
         		}
         		resMap.put("xlname",BasicData.lineCode2NameMap.get(xlbm));
         	}
@@ -30,6 +30,10 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 		try {
 			// 停车场编码
 			String parkCode = map.get("parkCode").equals("") ? null : map.get("parkCode").toString();
+			if (!selectTccInfoByCode(map)) {
+				resultMap.put("status", ResponseCode.ERROR);
+				return resultMap;
+			}
 			// 停车场名称
 			String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
 			// 地理位置(百度坐标集合)
@@ -19,7 +19,6 @@ import com.bsth.service.TrafficManageService;
 import com.bsth.service.traffic.YgcBasicDataService;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
-import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
 import com.bsth.webService.trafficManage.org.tempuri.Results;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
@@ -40,6 +39,7 @@ import java.sql.ResultSet;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 /**
@@ -67,10 +67,16 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private LineRepository lineRepository;
+	@Autowired
+	private LineInformationRepository lineInformationRepository;
+
 	// 站点路由repository
 	@Autowired
 	private StationRouteRepository stationRouteRepository;
+	@Autowired
+	private SectionRepository sectionRepository;
+
 	// 车辆repository
 	@Autowired
 	private CarsRepository carsRepository;
@@ -104,8 +110,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	private YgcBasicDataService ygcBasicDataService;
-	// 运管处接口
-	private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
+	// 运管处上传接口
+	private com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap webServiceSoapUp;
 	private WebServiceSoap ssop ;
 	{
 		try {
@@ -127,6 +133,23 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	private final String userNameOther = "user";
 	// 密码
 	private final String passwordOther = "user";
+
+	// 用户名
+	private final String userNameUp = "user";
+	// 密码
+	private final String passwordUp = "user";
+
+	private synchronized com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap  getWebServiceSoapUp(){
+		try {
+			if(webServiceSoapUp == null){
+				webServiceSoapUp = new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceLocator().getWebServiceSoap();
+			}
+		}catch (Exception e){
+			e.printStackTrace();
+		}finally {
+			return webServiceSoapUp;
+		}
+	}
 	/**
 	 * 上传线路信息
 	 */
@@ -140,23 +163,38 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				Map<String,Object> map = new HashMap<>();
 				map.put("lineCode_eq", id);
 				Line line ;
+				LineInformation lineInformation;
 				line = lineRepository.findOne(new CustomerSpecs<Line>(map));
 				if(line == null){
 					continue;
 				}
 				List<StationRoute> upStationsList ;// 上行站点路由集
-				List<StationRoute> downStationsList = null;// 下行站点路由集
-				sBuffer.append("<Data>");
-				sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
-				sBuffer.append("<DataList>");
+				List<StationRoute> downStationsList;// 下行站点路由集
+				List<Object[]> downPointList;// 下行站点集
+				List<Object[]> upPointList;// 上行站点集
+				sBuffer.append("<XLs>");
+				sBuffer.append("<XL>");
 				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
 					return result;
 				}
-				sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");
-				sBuffer.append("<LINE_CODE>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</LINE_CODE>");
-				sBuffer.append("<LINE_NAME>").append(line.getName()).append("</LINE_NAME>");
+				map = new HashMap<>();
+				map.put("line.id_eq",line.getId());
+				lineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(map));
+				if(lineInformation == null){
+					continue;
+				}
+				sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
+				sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
+				sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
+				sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
+				sBuffer.append("<QZLC>").append(lineInformation.getUpMileage()).append("</QZLC>");
+				sBuffer.append("<ZQLC>").append(lineInformation.getDownMileage()).append("</ZQLC>");
+				sBuffer.append("<XLGH>").append(line.getLinePlayType()).append("</XLGH>");
+				sBuffer.append("<UPDATE_DATE>").append(sdfnyr.format(new Date())).append("</UPDATE_DATE>");
+
 				// 循环添加站点信息
-				sBuffer.append("<LineStationList>");
+				sBuffer.append("<StationList>");
+
 				// 先查上行
 				upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
 				int startId = 1;
@@ -167,25 +205,23 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
 					packagStationXml(downStationsList, sBuffer, startId);
 				}
-				sBuffer.append("</LineStationList>");
+				sBuffer.append("</StationList>");
 				// 循环添加站点点位信息
 				sBuffer.append("<LinePointList>");
+				upPointList = sectionRepository.getSectionDirByLineId(line.getId(),0);
 				startId = 1;
-				startId = packagStationPointXml(upStationsList, sBuffer, startId);
+				startId = packagStationPointXml(upPointList, sBuffer, startId);
 				// 环线不查下行
 				if(line.getLinePlayType() != 1){
-					packagStationPointXml(downStationsList, sBuffer, startId);
+					downPointList = sectionRepository.getSectionDirByLineId(line.getId(),1);
+					packagStationPointXml(downPointList, sBuffer, startId);
 				}
 				sBuffer.append("</LinePointList>");
-				sBuffer.append("</DataList>");
-				sBuffer.append("</Data>");
+				sBuffer.append("</XL>");
+				sBuffer.append("</XLs>");
 				// 调用上传方法
-				result = ygcBasicDataService.invokeMethod("UpdateBusLineStation",sBuffer.toString());
-				String str = "ReturnCode";
-				// 解析返回值
-				result = result.substring(result.indexOf(str)+str.length()+1,result.lastIndexOf(str)-2);
-				if(result.equals("1")){
+				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,sBuffer.toString()).isSuccess()){
 					result = "success";
 				}else{
 					result = "failure";
@@ -1162,15 +1198,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}
 			paraMap = packageYgcStationNumParam(srRoute,null);
 			sBuffer.append("<Station>");
-			sBuffer.append("<STATION_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</STATION_ID>");
-			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
-			sBuffer.append("<STATION_NO>").append(i).append("</STATION_NO>");
-			sBuffer.append("<STATION_CODE>").append(srRoute.getStationCode()).append("</STATION_CODE>");
-			sBuffer.append("<STATION_NAME>").append(srRoute.getStationName()).append("</STATION_NAME>");
-			sBuffer.append("<STATION_LON>").append(srRoute.getStation().getgLonx()).append("</STATION_LON>");
-			sBuffer.append("<STATION_LAT>").append(srRoute.getStation().getgLaty()).append("</STATION_LAT>");
-			sBuffer.append("<STATION_TYPE>").append(zdlx).append("</STATION_TYPE>");
-			sBuffer.append("<STATION_DISTANCE>").append(srRoute.getDistances()).append("</STATION_DISTANCE>");
+			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</ZDXH>");
+			sBuffer.append("<SXX>").append(srRoute.getDirections()).append("</SXX>");
+			sBuffer.append("<ZDMC>").append(srRoute.getStationName()).append("</ZDMC>");
+			sBuffer.append("<ZDBM>").append(srRoute.getStationCode()).append("</ZDBM>");
+			sBuffer.append("<ZDJD>").append(srRoute.getStation().getgLonx()).append("</ZDJD>");
+			sBuffer.append("<ZDWD>").append(srRoute.getStation().getgLaty()).append("</ZDWD>");
+			sBuffer.append("<ZZ>").append(srRoute.getStation().getAddr() == null ? "" : srRoute.getStation().getAddr()).append("</ZZ>");
+			sBuffer.append("<ZDLX>").append(zdlx).append("</ZDLX>");
+			sBuffer.append("<ZJLC>").append(srRoute.getDistances()).append("</ZJLC>");
 			sBuffer.append("</Station>");
 			startId++;
 		}
@@ -1178,35 +1214,37 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
-	 * @param stationsList 站点路由集
+	 * @param pointList 站点点位集
 	 * @param sBuffer sBuffer
 	 * @param startId 站点序号起始ID
 	 *
 	 * @return 站点序号累加后的ID
 	 */
-	private int packagStationPointXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
-		int size = stationsList.size();
-		StationRoute srRoute;
-		HashMap<String,String> paraMap;
-		String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
+	private int packagStationPointXml(List<Object[]> pointList,StringBuffer sBuffer,int startId){
+		int size = pointList.size();
+		Object[] objs;
+		String bsection,dir,section;
+		String[] sections ;
 		for (int i = 0; i < size; i++) {
-			srRoute = stationsList.get(i);
-			zdlx = srRoute.getStationMark();
-			if(zdlx.equals("B")){
-				zdlx = "0";
-			}else if(zdlx.equals("E")){
-				zdlx = "1";
-			}else{
-				zdlx = "2";
+			objs = pointList.get(i);
+			bsection = objs[0]+"";
+			dir = objs[1]+"";
+			// 取括号内的内容
+			Pattern pattern = Pattern.compile("(?<=\\()(.+?)(?=\\))");
+			Matcher matcher = pattern.matcher(bsection);
+			if(matcher.find()){
+				sections = matcher.group().split(",");
+				for (int j = 0 ; j < sections.length ; j ++){
+					section = sections[j];
+					sBuffer.append("<LinePoint>");
+					sBuffer.append("<ZDXH>").append(startId).append("</ZDXH>");
+					sBuffer.append("<SXX>").append(dir).append("</SXX>");
+					sBuffer.append("<ZDJD>").append(section.split(" ")[0]).append("</ZDJD>");
+					sBuffer.append("<ZDWD>").append(section.split(" ")[1]).append("</ZDWD>");
+					sBuffer.append("</LinePoint>");
+					startId++;
+				}
 			}
-			paraMap = packageYgcStationNumParam(srRoute,null);
-			sBuffer.append("<Point>");
-			sBuffer.append("<POINT_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</POINT_ID>");
-			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
-			sBuffer.append("<POINTLON>").append(srRoute.getStation().getgLonx()).append("</POINTLON>");
-			sBuffer.append("<POINTLAT>").append(srRoute.getStation().getgLaty()).append("</POINTLAT>");
-			sBuffer.append("</Point>");
-			startId++;
 		}
 		return startId;
 	}
@@ -427,7 +427,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			// TODO Auto-generated method stub
 			// 当天YLB信息
 			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
-//					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 从排班表中计算出行驶的总里程
@@ -484,8 +483,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			Map<String, Object> newMap_=new HashMap<String,Object>();
 			List<Dlb> addList = new ArrayList<Dlb>();
 			List<Dlb> updateList = new ArrayList<Dlb>();
-			String ins="";
-			Map<String, Object> ylMap=new HashMap<String, Object>();
+			Map<String, Object> cMap=new HashMap<String, Object>();
 			List<Map<String, Object>> listpb_=listpb;
 			Collections.sort(listpb,new NbbmJcsxMap());
 			for (int x = 0; x < listpb_.size(); x++) {
@@ -531,9 +529,24 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									if (t1.getNbbm().equals(map.get("clZbh").toString())
 											&& t1.getJsy().equals(map.get("jGh").toString())
 											&& t1.getXlbm().equals(map.get("xlBm").toString())) {
-										t = t1;
-										type = "update";
+										if(t1.getLp()==null){
+											//同人同车同线路不同路牌的过滤  （考虑到历史数据）
+											if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
+												t = t1;
+												type = "update";
+												cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
+														map.get("clZbh").toString());
+											}
+										}else{
+											if(t1.getLp().equals(map.get("lpName").toString())){
+												t = t1;
+												type = "update";
+											}
+											
+										}
 									}
+									
+									
 								}
 								Double lc= Double.parseDouble(map.get("totalKilometers").toString());
 								if(map.get("seqNumber").toString().equals("1")){
@@ -593,7 +606,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
 								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 								t.setRq(sdf.parse(rq));
-								
+								t.setLp(map.get("lpName").toString());
 								 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 									 if(type.equals("add")){
 										 t.setCreatetime(date);
@@ -601,10 +614,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									 }else{
 										 t.setUpdatetime(date);
 									     updateList.add(t); 
-									     ins += t.getId().toString()+",";
 									  }
 								 }
-//								repository.save(t);
 								newMap.put("status", ResponseCode.SUCCESS);
 							}
 						}
@@ -184,6 +184,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 						t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+						t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
 						t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 						t.setRq(sdf.parse(rq));
 						t.setCreatetime(dNow);
@@ -262,13 +263,16 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// TODO Auto-generated method stub
 			// 当天YLB信息
 			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
-//					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
+
 			// 前一天所有车辆最后进场班次信息
 //			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
 			List<Ylb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
+
 			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
+
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
 			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
@@ -307,11 +311,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					}
 				}
 			}
-			
+
 			List<Ylb> addList = new ArrayList<Ylb>();
 			List<Ylb> updateList = new ArrayList<Ylb>();
-			String ins="";
 			Map<String, Object> ylMap=new HashMap<String, Object>();
+			
+			Map<String, Object> cMap=new HashMap<String, Object>();
 			for (int x = 0; x < listpb.size(); x++) {
 				String type = "add";
 				boolean sfdc = true;
@@ -328,12 +333,25 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						Ylb t1 = ylList.get(k);
 						if (t1.getNbbm().equals(map.get("clZbh").toString())
 								&& t1.getJsy().equals(map.get("jGh").toString())
-								&& t1.getXlbm().equals(map.get("xlBm").toString())) {
-							t = t1;
-							type = "update";
+								&& t1.getXlbm().equals(map.get("xlBm").toString()
+								)) {
+							if(t1.getLp()==null){
+								//同人同车同线路不同路牌的过滤  （考虑到历史数据）
+								if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
+									t = t1;
+									type = "update";
+									cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
+											map.get("clZbh").toString());
+								}
+							}else{
+								if(t1.getLp().equals(map.get("lpName").toString())){
+									t = t1;
+									type = "update";
+								}
+								
+							}
 						}
 					}
-
 					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
 					if (map.get("seqNumber").toString().equals("1")) {
 						boolean fage = true;
@@ -428,7 +446,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
 					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
-					
+					t.setLp(map.get("lpName")==null?"":map.get("lpName").toString());
 					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						 if(type.equals("add")){
 							 t.setCreatetime(date);
@@ -436,7 +454,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						 }else{
 							 t.setUpdatetime(date);
 						     updateList.add(t); 
-						     ins += t.getId().toString()+",";
 						  }
 					 }
 //					repository.save(t);
@@ -456,7 +473,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				}
 			}
-			
 			if(updateList.size()>0){
 				for (int i = 0; i < updateList.size(); i++) {
 					repository.save(updateList.get(i));
@@ -1437,23 +1453,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								t.setYh(yh);
 								t.setJzyl(ylxs);
 								nextJzyl=ylxs;
-								
-								
 							}else{
 								t.setYh(yh);
 								t.setJzyl(nextJzyl);
 							}
 					}
 					repository.save(t);
-					for (int z = 0; z < cylList.size(); z++) {
-						Cyl cyl = cylList.get(z);
-						if (t.getNbbm().equals(cyl.getNbbm())) {
-							cyl.setCyl(t.getJzyl());
-							cyl.setUpdatetime(t.getRq());
-							break;
-						}
-						cylRepository.save(cyl);
-					}
 				}
 				newMap.put("status", ResponseCode.SUCCESS);
 			}
@@ -1547,7 +1552,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			String px) {
 		// TODO Auto-generated method stub
 		String sql="SELECT * FROM bsth_c_ylb  "
-				+ " where to_days('"+rq+"')=to_days(rq) and ssgsdm like '%"+gsdm+"%' "
+				+ " where rq ='"+rq+"' and ssgsdm like '%"+gsdm+"%' "
 				+ " and fgsdm like '%"+fgsdm+"%'";
 		if(xlbm.equals("")){
 			sql+= " and xlbm like '%"+xlbm+"%' ";
@@ -26,4 +26,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
     Map<String,Object> parkAndStationSet(Map<String, String> map);
     Map<String,Object> findByIdx(String idx);
+
+    Map<String,Object> setAutoExec(Map<String, String> map);
 }
@@ -139,9 +139,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs);
-    Map<String,Object> changeBcType(Long id, String bcType, String remarks);
+	Map<String, Object> changeBcType(Long id, String bcType, String remarks, String majorStationName);
-    Map<String,Object> historySave(ScheduleRealInfo sch);
+	Map<String,Object> historySave(ScheduleRealInfo sch);
     Map<String, Object> MapById(Long id) ;
@@ -46,14 +46,11 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         try {
             ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
             //保存起终点名称
-            //String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
             if(StringUtils.isEmpty(t.getStartStationName()))
                 t.setStartStationName(getStationName(sch.getXlBm(), t.getStartStation()));
-                //t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
             if(StringUtils.isEmpty(t.getEndStationName()))
                 t.setEndStationName(getStationName(sch.getXlBm(), t.getEndStation()));
-                //t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
             if(t.getDestroyReason() == null)
                 t.setDestroyReason("");
@@ -61,13 +58,63 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
             if(t.isDestroy() && StringUtils.isEmpty(t.getDestroyReason()))
                 t.setDestroyReason(t.getReason());
+            //中途换车出场子任务，级联生成一个主任务，供报表和对外接口计算用
+            if(StringUtils.isNotEmpty(t.getNbbm())){
+                ScheduleRealInfo ccServiceSch = new ScheduleRealInfo();
+                ccServiceSch.setSflj(sch.isSflj());
+                ccServiceSch.setjGh(sch.getjGh());
+                ccServiceSch.setjName(sch.getjName());
+                ccServiceSch.setsGh(sch.getsGh());
+                ccServiceSch.setsName(sch.getsName());
+                ccServiceSch.setGsBm(sch.getGsBm());
+                ccServiceSch.setFgsBm(sch.getFgsBm());
+                ccServiceSch.setGsName(sch.getGsName());
+                ccServiceSch.setFgsName(sch.getFgsName());
+                ccServiceSch.setLpName(sch.getLpName());
+                ccServiceSch.setXlBm(sch.getXlBm());
+                ccServiceSch.setXlName(sch.getXlName());
+                ccServiceSch.setXlDir(sch.getXlDir());
+                ccServiceSch.setScheduleDate(sch.getScheduleDate());
+                ccServiceSch.setScheduleDateStr(sch.getScheduleDateStr());
+                ccServiceSch.setRealExecDate(sch.getRealExecDate());
+
+                ccServiceSch.setId(null);
+                ccServiceSch.setSpId(null);
+                ccServiceSch.setClZbh(t.getNbbm());
+                ccServiceSch.setCcService(true);
+                ccServiceSch.setFcsj(t.getStartDate());
+                ccServiceSch.setDfsj(t.getStartDate());
+                ccServiceSch.setZdsj(t.getEndDate());
+                ccServiceSch.setBcsj(0);
+                ccServiceSch.setJhlcOrig(Double.parseDouble(String.valueOf(t.getMileage())));
+                ccServiceSch.setJhlc(ccServiceSch.getJhlcOrig());
+                ccServiceSch.setQdzCode(t.getStartStation());
+                ccServiceSch.setZdzCode(t.getEndStation());
+                ccServiceSch.setQdzName(t.getStartStationName());
+                ccServiceSch.setZdzName(t.getEndStationName());
+                ccServiceSch.setFcsjActual(ccServiceSch.getDfsj());
+                ccServiceSch.setZdsjActual(ccServiceSch.getZdsj());
+                ccServiceSch.setRemarks(t.getRemarks());
+                ccServiceSch.setStatus(2);
+                if("1".equals(t.getType2())){
+                    ccServiceSch.setBcType("normal");
+                }
+                else {
+                    if("2".equals(t.getType2()))
+                        ccServiceSch.setBcType("in");
+                    else if("3".equals(t.getType2()))
+                        ccServiceSch.setBcType("out");
+                }
+                //实时入库
+                ccServiceSch = scheduleRealInfoRepository.save(ccServiceSch);
+                t.setCcId(ccServiceSch.getId());
+            }
+
             //先持久化子任务
             rs = super.save(t);
             //关联主任务
             sch.getcTasks().add(t);
             dayOfSchedule.save(sch);
-            //直接持久化
-            //scheduleRealInfoRepository.save(sch);
             //站到场对照
             t.setSchedule(sch);
             Station2ParkBuffer.put(t);
@@ -101,6 +148,11 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         //删除子任务
         rs = super.delete(id);
+
+        //删除级联生成的换车主任务
+        if(null != cPlan.getCcId()){
+            scheduleRealInfoRepository.delete(cPlan.getCcId());
+        }
         //dayOfSchedule.save(sch);
         //解除和主任务关联
         ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
@@ -224,4 +224,25 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> setAutoExec(Map<String, String> map) {
+        String lineCode = map.get("lineCode").toString();
+        boolean autoExec = Boolean.parseBoolean(map.get("autoExec").toString());
+
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            LineConfig conf = lineConfigData.get(lineCode);
+            conf.setAutoExec(autoExec);
+
+            lineConfigData.set(conf);
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("conf", conf);
+        } catch (Exception e) {
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            logger.error("", e);
+        }
+        return rs;
+    }
 }
@@ -24,7 +24,6 @@ import com.bsth.data.utils.CustomStringUtils;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
-import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -873,7 +872,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
@@ -1743,30 +1742,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getFcsjActual() !=null&&s.getZdsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
         }
-        double ksgl=culateService.culateKsgl(list);
-        double sjgl=culateService.culateSjgl(lists);
-        double jccgl=culateService.culateJccgl(lists);
-        double ljgl=culateService.culateLjgl(lists);
-
-        map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
+        map.put("jhbc", culateService.culateJhbc(list,""));//计划班次
+        map.put("jhlc", Arith.add(culateService.culateJhgl(list),
+        		culateService.culateJhJccgl(list))); //计划总里程
+        map.put("cjbc", culateService.culateLbbc(list));//烂班班次
         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
+        map.put("ljbc", culateService.culateLjbc(lists,""));//临加班次
+        double ljgl=culateService.culateLjgl(lists);
         map.put("addMileage", ljgl); //临加公里
-        map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
-        map.put("ksgl", ksgl);//空驶公里
-        map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
-//         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
-        map.put("jhbc", culateService.culateJhbc(list,""));
-        map.put("cjbc", culateService.culateLbbc(list));
-        map.put("ljbc", culateService.culateLjbc(lists,""));
         map.put("sjbc", culateService.culateSjbc(lists,"") + culateService.culateLjbc(lists,""));
-        map.put("jcclc", jccgl);
+        double ksgl=culateService.culateKsgl(list);//子任务空驶公里
+        double jccgl=culateService.culateJccgl(lists);//空驶班次公里
+        map.put("ksgl", ksgl);//空驶公里
+        double sjgl=culateService.culateSjgl(lists);//实际营运公里
+        map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));//总公里
         map.put("zkslc", Arith.add(ksgl,jccgl));
-//         map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
+        map.put("jcclc", jccgl);
+        map.put("yygl",Arith.add(sjgl,ljgl)); //总营运公里
         return map;
     }
@@ -1789,7 +1786,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
                 lists.add(s);
             }else{
-                if(s.getZdsjActual()!=null){
+                if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
                     lists.add(s);
                 }
             }
@@ -2139,20 +2136,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 for (int j = 0; j < listit.size(); j++) {
                     ScheduleRealInfo t = new ScheduleRealInfo();
                     ChildTaskPlan childTaskPlan = listit.get(j);
-                    if (childTaskPlan.isDestroy()) {
-                        t.setFcsjActual("");
-                        t.setZdsjActual("");
-                        t.setJhlc(0.0);
-                    } else {
-                        t.setFcsjActual(childTaskPlan.getStartDate());
-                        t.setZdsjActual(childTaskPlan.getEndDate());
-                        t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                    if(childTaskPlan.getCcId()==null){
+                    	 if (childTaskPlan.isDestroy()) {
+                             t.setFcsjActual("");
+                             t.setZdsjActual("");
+                             t.setJhlc(0.0);
+                         } else {
+                             t.setFcsjActual(childTaskPlan.getStartDate());
+                             t.setZdsjActual(childTaskPlan.getEndDate());
+                             t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                         }
+                         t.setFcsj(childTaskPlan.getStartDate());
+                         t.setZdsj(childTaskPlan.getEndDate());
+                         t.setQdzName(childTaskPlan.getStartStationName());
+                         t.setZdzName(childTaskPlan.getEndStationName());
+                         t.setRemarks(childTaskPlan.getRemarks());
+                         t.setAdjustExps("子");
+                         listSchedule.add(t);
                     }
-                    t.setQdzName(childTaskPlan.getStartStationName());
-                    t.setZdzName(childTaskPlan.getEndStationName());
-                    t.setRemarks(childTaskPlan.getRemarks());
-                    t.setAdjustExps("子");
-                    listSchedule.add(t);
                 }
             }
         }
@@ -2295,7 +2296,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
@@ -2370,7 +2371,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
                 lists.add(s);
             }else{
-                if(s.getZdsjActual()!=null){
+                if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
                     lists.add(s);
                 }
             }
@@ -2433,7 +2434,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
@@ -2487,10 +2488,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	        map.put("dtbc", 0);
 	        map.put("dtbc_m", 0);
 	        map.put("dtbc_a", 0);
-	        map.put("djg", 0);
-	        map.put("djg_m", 0);
-	        map.put("djg_a", 0);
-	        map.put("djg_time", 0);
+	        Map<String, Object> m_=culateService.culateDjg(lists, list.get(0).getXlBm());
+	        map.put("djg", m_.get("djgcsq"));
+	        map.put("djg_m", m_.get("djgcsz"));
+	        map.put("djg_a", m_.get("djgcsw"));
+	        map.put("djg_time", m_.get("djgsj"));
     	}
         return map;
     }
@@ -2515,7 +2517,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	 list_s.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	                list_s.add(s);
 	            }
             }
@@ -2592,10 +2594,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("dtbc", 0);
         map.put("dtbc_m", 0);
         map.put("dtbc_a", 0);
-        map.put("djg", 0);
-        map.put("djg_m", 0);
-        map.put("djg_a", 0);
-        map.put("djg_time", 0);
+        Map<String, Object> m_=culateService.culateDjg(list_s, list.get(0).getXlBm());
+        map.put("djg", m_.get("djgcsq"));
+        map.put("djg_m", m_.get("djgcsz"));
+        map.put("djg_a", m_.get("djgcsw"));
+        map.put("djg_time", m_.get("djgsj"));
         lMap.add(map);
         if (type != null && type.length() != 0 && type.equals("export")) {
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -2723,7 +2726,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String zdsjActual = "";
         String zdsj1 = "";
         String zdsjActual1 = "";
-        List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
+        List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleDdrb(line, date);
         for (int i = 0; i < listInfo.size(); i++) {
             ScheduleRealInfo t = listInfo.get(i);
             if (!lpName.equals(t.getLpName())) {
@@ -2743,7 +2746,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             list.add(t);
         }
-        List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleByDateAndLineQp2(line, date);
+        List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleDdrb2(line, date);
         List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
@@ -2945,21 +2948,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }else{
         	yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList_eq(line, date,gsbm,fgsbm,nbbm);
         }
-        System.out.println("time2:"+new Date());
-	
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
         for (int x = 0; x < yesterdayDataList.size(); x++) {
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
             String xlbm  = yesterdayDataList.get(x).get("xlBm").toString();
+            String lp =yesterdayDataList.get(x).get("lpName").toString();
             Map<String, Object> map = new HashMap<String, Object>();
             boolean fage = true;
             String company="";
             String bCompany="";
             List<ScheduleRealInfo> listS=new ArrayList<ScheduleRealInfo>();
             for (ScheduleRealInfo scheduleRealInfo : lists) {
-                if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)
-                		&& scheduleRealInfo.getXlBm().equals(xlbm)){
+                if(scheduleRealInfo.getjGh().equals(jName) 
+                		&& scheduleRealInfo.getClZbh().equals(clZbh)
+                		&& scheduleRealInfo.getXlBm().equals(xlbm)
+                		&& scheduleRealInfo.getLpName().equals(lp)){
                     if (fage) {
                         //根据线路代码获取公司
                         company=scheduleRealInfo.getGsBm();
@@ -2976,7 +2980,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     }
                 }
             }
-
             yesterdayDataList.get(x).put("company", company);
             yesterdayDataList.get(x).put("bCompany", bCompany);
             Double ljgl=culateMieageService.culateLjgl(listS);
@@ -3001,6 +3004,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
+
         return yesterdayDataList;
     }
@@ -3237,7 +3241,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      * @return
      */
     @Override
-    public Map<String, Object> changeBcType(Long id, String bcType, String remarks) {
+    public Map<String, Object> changeBcType(Long id, String bcType, String remarks, String majorStationName) {
         Map<String, Object> rs = new HashMap<>();
         try {
@@ -3247,6 +3251,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 sch.addRemarks(remarks);
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
+
+                if("major".equals(bcType)){
+                    sch.setMajorStationName(majorStationName);
+                }
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -3546,7 +3554,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                             map.put("fast", "");
                             map.put("slow", "");
                         }
-                        System.out.println(map);
                         listMap.add(map);
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -3737,26 +3744,46 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         	 type=0;
         	for (int i = 0; i < listYlb.size(); i++) {
                 Ylb y = listYlb.get(i);
-                ccyl=Arith.add(ccyl, y.getCzyl());
-                jcyl=Arith.add(jcyl, y.getJzyl());
-                yh =Arith.add(yh ,y.getYh());
-                jzl =Arith.add(jzl, y.getJzl());
-                zlc =Arith.add(zlc, y.getZlc());
+                if(y.getLp()==null){
+                	ccyl=Arith.add(ccyl, y.getCzyl());
+                    jcyl=Arith.add(jcyl, y.getJzyl());
+                    yh =Arith.add(yh ,y.getYh());
+                    jzl =Arith.add(jzl, y.getJzl());
+                    zlc =Arith.add(zlc, y.getZlc());
+                }else{
+                	if(y.getLp().equals(s.getLpName())){
+                		ccyl=Arith.add(ccyl, y.getCzyl());
+                        jcyl=Arith.add(jcyl, y.getJzyl());
+                        yh =Arith.add(yh ,y.getYh());
+                        jzl =Arith.add(jzl, y.getJzl());
+                        zlc =Arith.add(zlc, y.getZlc());
+                	}
+                }
+                
             }
         }else{
         	 type=1;
         	for (int i = 0; i < listDlb.size(); i++) {
 				Dlb d=listDlb.get(i);
-				ccyl=Arith.add(ccyl, d.getCzcd());
-                jcyl=Arith.add(jcyl, d.getJzcd());
-                yh =Arith.add(yh ,d.getHd());
-                jzl =Arith.add(jzl, d.getCdl());
-                zlc =Arith.add(zlc, d.getZlc());
+				if(d.getLp()==null){
+					ccyl=Arith.add(ccyl, d.getCzcd());
+	                jcyl=Arith.add(jcyl, d.getJzcd());
+	                yh =Arith.add(yh ,d.getHd());
+	                jzl =Arith.add(jzl, d.getCdl());
+	                zlc =Arith.add(zlc, d.getZlc());
+				}else{
+					if(d.getLp().equals(s.getLpName())){
+						ccyl=Arith.add(ccyl, d.getCzcd());
+		                jcyl=Arith.add(jcyl, d.getJzcd());
+		                yh =Arith.add(yh ,d.getHd());
+		                jzl =Arith.add(jzl, d.getCdl());
+		                zlc =Arith.add(zlc, d.getZlc());
+					}
+				}
+				
 			}
         }
-      
-        
         map.put("jzl", jzl);
         map.put("yh", yh);
         map.put("ccyl", ccyl);
@@ -4211,7 +4238,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
           if(cts != null && cts.size() > 0){
           	lists.add(s);
           }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
           }
@@ -39,6 +39,8 @@ public interface CulateMileageService {
 	 Map<String, Object> culateWdbcs(List<ScheduleRealInfo> lists);
 	 int culateDtfzbc(List<ScheduleRealInfo> lists,String type,String status,String item);
+	 
+
 	 //以下计算方法供新报表使用
 	 Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists);//计划内营运and计划外营运
 package com.bsth.service.report.impl;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
-import com.bsth.data.BasicData;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.Interval;
@@ -27,8 +7,18 @@ import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
 import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableJob;
-import com.bsth.util.ReportUtils;
-import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Service
 public class CulateMileageServiceImpl  implements CulateMileageService{
@@ -179,10 +169,12 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 	                while (it.hasNext()) {
 	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("service")){
-		                    if (childTaskPlan.isDestroy()) {
-		    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
-		                    } 
+	                    if(childTaskPlan.getCcId()==null){
+		                    if(childTaskPlan.getMileageType().equals("service")){
+			                    if (childTaskPlan.isDestroy()) {
+			    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+			                    } 
+		                    }
 	                    }
 	                }
 				}
@@ -198,30 +190,11 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-//				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-//				if(childTaskPlans.isEmpty()){
+				if(!scheduleRealInfo.isCcService()){
 					if(scheduleRealInfo.getStatus() == -1){
 						lbbc++;
 					}
-//				}
-				/*else{
-					if(scheduleRealInfo.getStatus() == -1){
-						boolean fage=true;
-						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-						if(it.hasNext()){
-							ChildTaskPlan childTaskPlan = it.next();
-							if(!childTaskPlan.isDestroy()){
-								if(childTaskPlan.getMileageType().equals("service")){
-									fage=false;
-								}
-							}
-							
-						}
-						if(fage){
-							lbbc++;
-						}
-					}
-				}*/
+				}
 			}
 		}
 		return lbbc;
@@ -378,7 +351,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 			                while (it.hasNext()) {
 			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if(childTaskPlan.getMileageType().equals("service")){
+			                    if(childTaskPlan.getMileageType().equals("service") && childTaskPlan.getCcId()==null){
 			                    	 if (!childTaskPlan.isDestroy()) {
 			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 			 	                    	ljgl=Arith.add(ljgl,jhgl);
@@ -399,11 +372,13 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 			                while (it.hasNext()) {
 			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
-			                    	 if (!childTaskPlan.isDestroy()) {
-			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-			 	                    	ljgl=Arith.add(ljgl,jhgl);
-			 	                    } 
+			                    if(childTaskPlan.getCcId()==null){
+				                    if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
+				                    	 if (!childTaskPlan.isDestroy()) {
+				 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+				 	                    	ljgl=Arith.add(ljgl,jhgl);
+				 	                    } 
+				                    }
 			                    }
 			                }
 						}
@@ -463,7 +438,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-				if(!scheduleRealInfo.isSflj()){
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					jhgl=Arith.add(jhgl,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
 				}
 			}
@@ -504,7 +479,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-				if(!scheduleRealInfo.isSflj()){
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
 					long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
 					if(item.equals("zgf")){
@@ -535,21 +510,23 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				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);
-									}
-									
+							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")&&"正常".equals(childTaskPlan.getType1())){
+			                    if(childTaskPlan.getMileageType().equals("service")
+			                    		&&"正常".equals(childTaskPlan.getType1())
+			                    		&& childTaskPlan.getCcId()==null){
 			                    	 if (!childTaskPlan.isDestroy()) {
 			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 			 	                    	sjgl=Arith.add(sjgl,jhgl);
@@ -649,8 +626,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				if(!scheduleRealInfo.isSflj()){
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					String time="";
 					if(item.equals("zgf") || item.equals("wgf")){
 						if(scheduleRealInfo.getFcsjActual()!=null){
@@ -681,62 +657,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							}
 						}
-						/*if(childTaskPlans.isEmpty()){
-							if(scheduleRealInfo.getStatus()!=-1){
-								if(item.equals("zgf")){
-									if(fcsj>=zgf1 && fcsj<=zgf2){
-										sjbc++;
-									}
-								}else if(item.equals("wgf")){
-									if(fcsj>=wgf1 && fcsj<=wgf2){
-										sjbc++;
-									}
-								}else{
-									sjbc++;
-								}
-								
-							}
-						}else{
-							if(scheduleRealInfo.getStatus() == -1){
-								boolean fage=false;
-								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-								while(it.hasNext()){
-									ChildTaskPlan childTaskPlan = it.next();
-									if(!childTaskPlan.isDestroy()){
-										if(childTaskPlan.getMileageType().equals("service")){
-											fage=true;
-										}
-									}
-									
-								}
-								if(fage){
-									if(item.equals("zgf")){
-										if(fcsj>=zgf1 && fcsj<=zgf2){
-											sjbc++;
-										}
-									}else if(item.equals("wgf")){
-										if(fcsj>=wgf1 && fcsj<=wgf2){
-											sjbc++;
-										}
-									}else{
-										sjbc++;
-									}
-								}
-								
-							}else{
-								if(item.equals("zgf")){
-									if(fcsj>=zgf1 && fcsj<=zgf2){
-										sjbc++;
-									}
-								}else if(item.equals("wgf")){
-									if(fcsj>=wgf1 && fcsj<=wgf2){
-										sjbc++;
-									}
-								}else{
-									sjbc++;
-								}
-							}
-						}*/
 					}
 				}
 			}
@@ -750,14 +670,13 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		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"))) {
+			if (!isInOut(scheduleRealInfo)) {
 				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.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
 	                    	 if (!childTaskPlan.isDestroy()) {
 	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 	 	                    	ksgl=Arith.add(ksgl,jhgl);
@@ -786,7 +705,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 	                while (it.hasNext()) {
 	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("empty")){
+	                    if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
 	                    	 if (!childTaskPlan.isDestroy()) {
 	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 	 	                    	jcclc=Arith.add(jcclc,jhgl);
@@ -907,7 +826,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double jcclc =0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if(!scheduleRealInfo.isSflj()){
+			if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 				if (scheduleRealInfo.getBcType().equals("in") 
 						|| scheduleRealInfo.getBcType().equals("out")|| scheduleRealInfo.getBcType().equals("ldks")) {
 					if(!scheduleRealInfo.isSflj()){
@@ -946,16 +865,17 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for(ChildTaskPlan c : cts){
-                	if(item.equals("其他")){
-                		if(c.isDestroy() && 
-                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
-                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
-                            sum = Arith.add(sum, c.getMileage());
-                	}else{
-                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
-                            sum = Arith.add(sum, c.getMileage());
+                	if(c.getCcId()==null){
+	                	if(item.equals("其他")){
+	                		if(c.isDestroy() && 
+	                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
+	                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
+	                            sum = Arith.add(sum, c.getMileage());
+	                	}else{
+	                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
+	                            sum = Arith.add(sum, c.getMileage());
+	                	}
                 	}
-                    
                 }
             }
             else if(isInOut(sch))
@@ -984,7 +904,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		int fzbc=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (scheduleRealInfo.getBcType().equals("venting")) {
+			if (scheduleRealInfo.getBcType().equals("venting")
+					|| scheduleRealInfo.getBcType().equals("major")) {
 //				if(!scheduleRealInfo.isSflj()){
 					String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
 					long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
@@ -1838,7 +1838,7 @@ public class ReportServiceImpl implements ReportService{
 					|| scheduleRealInfo.getBcType().equals("ldks"))) {
 //				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 //				if(childTaskPlans.isEmpty()){
-				if(scheduleRealInfo.isSflj()){
+				if(scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					Map<String, Object> newMap=new HashMap<String,Object>();
 					newMap.put("lp", scheduleRealInfo.getLpName());
 					newMap.put("nbbm", scheduleRealInfo.getClZbh());
@@ -1916,7 +1916,7 @@ public class ReportServiceImpl implements ReportService{
 	            if(cts != null && cts.size() > 0){
 	            	lists.add(s);
 	            }else{
-		            if(s.getZdsjActual()!=null){
+		            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 		            	lists.add(s);
 		            }
 	            }
@@ -2534,7 +2534,7 @@ public class ReportServiceImpl implements ReportService{
 			if(cts != null && cts.size() > 0){
 				lists.add(s);
 			}else{
-				if(s.getZdsjActual()!=null){
+				if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 					lists.add(s);
 				}
 			}
@@ -42,7 +42,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str = '"+date+"'";
 			if(line.length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -54,7 +54,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
@@ -80,6 +80,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setsGh(rs.getString("s_gh"));
 					schedule.setsName(rs.getString("s_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -175,7 +176,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		if(map.get("subCompany")!=null){
-			subCompany=map.get("subCompany").toString();
+			subCompany = map.get("subCompany").toString();
 		}
 		String line = map.get("line").toString();
 		String date = map.get("date").toString();
@@ -187,7 +188,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		try {
-			String sql = "select * from bsth_c_s_sp_info where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'";
+			String sql = "select * from bsth_c_s_sp_info where schedule_date = '"+date+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -364,7 +365,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			int jhsb = 0, sjsb = 0, jhmb = 0, sjmb = 0;
 			int jhzgf = 0, sjzgf = 0, jhwgf = 0, sjwgf = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
-//				schedule.setFcsjAll(schedule.getFcsj());
+				if(schedule.isCcService()){
+					continue;
+				}
+				
 				if(companyName.length() == 0 && schedule.getGsName() != null)
 					companyName = schedule.getGsName();
 				if(subCompanyName.length() == 0 && schedule.getFgsName() != null)
@@ -547,7 +551,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -565,7 +569,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setBcType(rs.getString("bc_type"));
 					schedule.setGsName(rs.getString("gs_name"));
@@ -579,6 +583,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setBcsj(rs.getInt("bcsj"));
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -636,6 +641,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		//分组计算 同时判断是否所选时刻信息
 		for(ScheduleRealInfo schedule : list){
+			if(schedule.isCcService()){
+				continue;
+			}
 			DO:{
 				if(model.length() != 0){
 					for(Long tt : ttList){
@@ -840,7 +848,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -862,7 +870,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setBcType(rs.getString("bc_type"));
@@ -878,6 +886,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setBcsj(rs.getInt("bcsj"));
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -973,6 +982,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		//按时间段分组
 		for(ScheduleRealInfo schedule : list){
+			if(schedule.isCcService()){
+				continue;
+			}
+			
 			if(companyName.length()==0&&schedule.getGsName()!=null
 					&&schedule.getGsName().trim().length()!=0){
 				companyName = schedule.getGsName();
@@ -1230,9 +1243,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			date = sdf.format(new Date());
 		try {
-			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
-					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
-					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'"
+			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
+					+ " a.cc_service, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
+					+ " where schedule_date_str = '"+date+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.trim().length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -1244,7 +1257,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setFcsj(rs.getString("fcsj"));
@@ -1257,6 +1270,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					int startOpt = 0;
 					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
@@ -1298,7 +1312,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String companyName = "", subCompanyName = "";
 		for(ScheduleRealInfo s : list){
-			if(lineSet.contains(s.getXlName())){
+			if(lineSet.contains(s.getXlName()) || s.isCcService()){
 				continue;
 			}
 			String xlName = s.getXlName();
@@ -1456,9 +1470,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		try {
-			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
-					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
-					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"
+			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
+					+ " a.cc_service, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
+					+ " where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -1470,7 +1484,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setFcsj(rs.getString("fcsj"));
@@ -1483,6 +1497,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					int startOpt = 0;
 					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
@@ -1524,7 +1539,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String companyName = "", subCompanyName = "";
 		for(ScheduleRealInfo s : list){
-			if(lineSet.contains(s.getXlName())){
+			if(lineSet.contains(s.getXlName()) || s.isCcService()){
 				continue;
 			}
 			String xlName = s.getXlName();
@@ -1716,7 +1731,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			String sql = 
 					"select r.id, r.schedule_date_str, r.xl_name, r.cl_zbh, r.j_gh, r.j_name, r.fcsj, d.timestamp, d.reply46, d.reply47, d.reply46time, d.reply47time, r.gs_name, r.fgs_name " +
-					"FROM bsth_c_s_sp_info_real as r left join bsth_v_directive_60 as d on r.id = d.sch and d.is_dispatch = 1 where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'";
+					"FROM bsth_c_s_sp_info_real as r left join bsth_v_directive_60 as d on r.id = d.sch and d.is_dispatch = 1 where schedule_date_str = '"+date+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -1728,7 +1743,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			}
 			sql += " union " +
 					"select r.id, r.schedule_date_str, r.xl_name, r.cl_zbh, r.j_gh, r.j_name, r.fcsj, d.timestamp, d.reply46, d.reply47, d.reply46time, d.reply47time, r.gs_name, r.fgs_name " +
-					"FROM bsth_c_s_sp_info_real as r right join bsth_v_directive_60 as d on r.id = d.sch where d.is_dispatch = 1 and DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'";
+					"FROM bsth_c_s_sp_info_real as r right join bsth_v_directive_60 as d on r.id = d.sch where d.is_dispatch = 1 and schedule_date_str = '"+date+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -45,6 +45,7 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
     private static String IP = "218.242.195.76:9091";
     private static String downTargetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
+    // 此地址作废
     private static String upTargetEndpoint = "http://" + IP +"/ygc.TransManager.BasicUpload?wsdl";
     private static String namespace = "http://service.shygc.com";
     private static String userName = "admin";
+/**
+ * Results.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.bsth.webService.trafficManage.up.org.tempuri;
+
+public class Results  implements java.io.Serializable {
+    private boolean success;
+
+    private java.lang.String message;
+
+    public Results() {
+    }
+
+    public Results(
+           boolean success,
+           java.lang.String message) {
+           this.success = success;
+           this.message = message;
+    }
+
+
+    /**
+     * Gets the success value for this Results.
+     * 
+     * @return success
+     */
+    public boolean isSuccess() {
+        return success;
+    }
+
+
+    /**
+     * Sets the success value for this Results.
+     * 
+     * @param success
+     */
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+
+    /**
+     * Gets the message value for this Results.
+     * 
+     * @return message
+     */
+    public java.lang.String getMessage() {
+        return message;
+    }
+
+
+    /**
+     * Sets the message value for this Results.
+     * 
+     * @param message
+     */
+    public void setMessage(java.lang.String message) {
+        this.message = message;
+    }
+
+    private java.lang.Object __equalsCalc = null;
+    public synchronized boolean equals(java.lang.Object obj) {
+        if (!(obj instanceof Results)) return false;
+        Results other = (Results) obj;
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (__equalsCalc != null) {
+            return (__equalsCalc == obj);
+        }
+        __equalsCalc = obj;
+        boolean _equals;
+        _equals = true && 
+            this.success == other.isSuccess() &&
+            ((this.message==null && other.getMessage()==null) || 
+             (this.message!=null &&
+              this.message.equals(other.getMessage())));
+        __equalsCalc = null;
+        return _equals;
+    }
+
+    private boolean __hashCodeCalc = false;
+    public synchronized int hashCode() {
+        if (__hashCodeCalc) {
+            return 0;
+        }
+        __hashCodeCalc = true;
+        int _hashCode = 1;
+        _hashCode += (isSuccess() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        if (getMessage() != null) {
+            _hashCode += getMessage().hashCode();
+        }
+        __hashCodeCalc = false;
+        return _hashCode;
+    }
+
+    // Type metadata
+    private static org.apache.axis.description.TypeDesc typeDesc =
+        new org.apache.axis.description.TypeDesc(Results.class, true);
+
+    static {
+        typeDesc.setXmlType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("success");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://tempuri.org/", "success"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("message");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://tempuri.org/", "message"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setMinOccurs(0);
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
+    }
+
+    /**
+     * Return type metadata object
+     */
+    public static org.apache.axis.description.TypeDesc getTypeDesc() {
+        return typeDesc;
+    }
+
+    /**
+     * Get Custom Serializer
+     */
+    public static org.apache.axis.encoding.Serializer getSerializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanSerializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+    /**
+     * Get Custom Deserializer
+     */
+    public static org.apache.axis.encoding.Deserializer getDeserializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanDeserializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+}
+/**
+ * WebService.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.bsth.webService.trafficManage.up.org.tempuri;
+
+public interface WebService extends javax.xml.rpc.Service {
+    public java.lang.String getWebServiceSoapAddress();
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap() throws javax.xml.rpc.ServiceException;
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
+}
+/**
+ * WebServiceLocator.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.bsth.webService.trafficManage.up.org.tempuri;
+
+public class WebServiceLocator extends org.apache.axis.client.Service implements com.bsth.webService.trafficManage.up.org.tempuri.WebService {
+
+    public WebServiceLocator() {
+    }
+
+
+    public WebServiceLocator(org.apache.axis.EngineConfiguration config) {
+        super(config);
+    }
+
+    public WebServiceLocator(java.lang.String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException {
+        super(wsdlLoc, sName);
+    }
+
+    // Use to get a proxy class for WebServiceSoap
+    private java.lang.String WebServiceSoap_address = "http://218.242.195.76:8411/WebService_test/WebService.asmx";
+
+    public java.lang.String getWebServiceSoapAddress() {
+        return WebServiceSoap_address;
+    }
+
+    // The WSDD service name defaults to the port name.
+    private java.lang.String WebServiceSoapWSDDServiceName = "WebServiceSoap";
+
+    public java.lang.String getWebServiceSoapWSDDServiceName() {
+        return WebServiceSoapWSDDServiceName;
+    }
+
+    public void setWebServiceSoapWSDDServiceName(java.lang.String name) {
+        WebServiceSoapWSDDServiceName = name;
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap() throws javax.xml.rpc.ServiceException {
+       java.net.URL endpoint;
+        try {
+            endpoint = new java.net.URL(WebServiceSoap_address);
+        }
+        catch (java.net.MalformedURLException e) {
+            throw new javax.xml.rpc.ServiceException(e);
+        }
+        return getWebServiceSoap(endpoint);
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
+        try {
+            com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoapStub _stub = new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoapStub(portAddress, this);
+            _stub.setPortName(getWebServiceSoapWSDDServiceName());
+            return _stub;
+        }
+        catch (org.apache.axis.AxisFault e) {
+            return null;
+        }
+    }
+
+    public void setWebServiceSoapEndpointAddress(java.lang.String address) {
+        WebServiceSoap_address = address;
+    }
+
+    /**
+     * For the given interface, get the stub implementation.
+     * If this service has no port for the given interface,
+     * then ServiceException is thrown.
+     */
+    public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
+        try {
+            if (com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap.class.isAssignableFrom(serviceEndpointInterface)) {
+                com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoapStub _stub = new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoapStub(new java.net.URL(WebServiceSoap_address), this);
+                _stub.setPortName(getWebServiceSoapWSDDServiceName());
+                return _stub;
+            }
+        }
+        catch (java.lang.Throwable t) {
+            throw new javax.xml.rpc.ServiceException(t);
+        }
+        throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface:  " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName()));
+    }
+
+    /**
+     * For the given interface, get the stub implementation.
+     * If this service has no port for the given interface,
+     * then ServiceException is thrown.
+     */
+    public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
+        if (portName == null) {
+            return getPort(serviceEndpointInterface);
+        }
+        java.lang.String inputPortName = portName.getLocalPart();
+        if ("WebServiceSoap".equals(inputPortName)) {
+            return getWebServiceSoap();
+        }
+        else  {
+            java.rmi.Remote _stub = getPort(serviceEndpointInterface);
+            ((org.apache.axis.client.Stub) _stub).setPortName(portName);
+            return _stub;
+        }
+    }
+
+    public javax.xml.namespace.QName getServiceName() {
+        return new javax.xml.namespace.QName("http://tempuri.org/", "WebService");
+    }
+
+    private java.util.HashSet ports = null;
+
+    public java.util.Iterator getPorts() {
+        if (ports == null) {
+            ports = new java.util.HashSet();
+            ports.add(new javax.xml.namespace.QName("http://tempuri.org/", "WebServiceSoap"));
+        }
+        return ports.iterator();
+    }
+
+    /**
+    * Set the endpoint address for the specified port name.
+    */
+    public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
+        
+if ("WebServiceSoap".equals(portName)) {
+            setWebServiceSoapEndpointAddress(address);
+        }
+        else 
+{ // Unknown Port Name
+            throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
+        }
+    }
+
+    /**
+    * Set the endpoint address for the specified port name.
+    */
+    public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
+        setEndpointAddress(portName.getLocalPart(), address);
+    }
+
+}
+/**
+ * WebServiceSoap.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.bsth.webService.trafficManage.up.org.tempuri;
+
+public interface WebServiceSoap extends java.rmi.Remote {
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setXL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setCL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setLD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setDDRB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setJHBC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setSKB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setSJ(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setLCYH(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setXLPC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setCS(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setFZCKGM(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setJJZD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException;
+}
+package com.bsth.webService.trafficManage.up.org.tempuri;
+
+public class WebServiceSoapProxy implements com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap {
+  private String _endpoint = null;
+  private com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap webServiceSoap = null;
+  
+  public WebServiceSoapProxy() {
+    _initWebServiceSoapProxy();
+  }
+  
+  public WebServiceSoapProxy(String endpoint) {
+    _endpoint = endpoint;
+    _initWebServiceSoapProxy();
+  }
+  
+  private void _initWebServiceSoapProxy() {
+    try {
+      webServiceSoap = (new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceLocator()).getWebServiceSoap();
+      if (webServiceSoap != null) {
+        if (_endpoint != null)
+          ((javax.xml.rpc.Stub)webServiceSoap)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
+        else
+          _endpoint = (String)((javax.xml.rpc.Stub)webServiceSoap)._getProperty("javax.xml.rpc.service.endpoint.address");
+      }
+      
+    }
+    catch (javax.xml.rpc.ServiceException serviceException) {}
+  }
+  
+  public String getEndpoint() {
+    return _endpoint;
+  }
+  
+  public void setEndpoint(String endpoint) {
+    _endpoint = endpoint;
+    if (webServiceSoap != null)
+      ((javax.xml.rpc.Stub)webServiceSoap)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint);
+    
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap getWebServiceSoap() {
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap;
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setXL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setXL(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setCL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setCL(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setLD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setLD(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setDDRB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setDDRB(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setJHBC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setJHBC(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setSKB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setSKB(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setSJ(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setSJ(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setLCYH(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setLCYH(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setXLPC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setXLPC(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setCS(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setCS(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setFZCKGM(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setFZCKGM(uName, uPass, sXml);
+  }
+  
+  public com.bsth.webService.trafficManage.up.org.tempuri.Results setJJZD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException{
+    if (webServiceSoap == null)
+      _initWebServiceSoapProxy();
+    return webServiceSoap.setJJZD(uName, uPass, sXml);
+  }
+  
+  
+}
 \ No newline at end of file
+/**
+ * WebServiceSoapStub.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.bsth.webService.trafficManage.up.org.tempuri;
+
+public class WebServiceSoapStub extends org.apache.axis.client.Stub implements com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap {
+    private java.util.Vector cachedSerClasses = new java.util.Vector();
+    private java.util.Vector cachedSerQNames = new java.util.Vector();
+    private java.util.Vector cachedSerFactories = new java.util.Vector();
+    private java.util.Vector cachedDeserFactories = new java.util.Vector();
+
+    static org.apache.axis.description.OperationDesc [] _operations;
+
+    static {
+        _operations = new org.apache.axis.description.OperationDesc[12];
+        _initOperationDesc1();
+        _initOperationDesc2();
+    }
+
+    private static void _initOperationDesc1(){
+        org.apache.axis.description.OperationDesc oper;
+        org.apache.axis.description.ParameterDesc param;
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setXL");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setXLResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[0] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setCL");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setCLResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[1] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setLD");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setLDResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[2] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setDDRB");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setDDRBResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[3] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setJHBC");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setJHBCResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[4] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setSKB");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setSKBResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[5] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setSJ");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setSJResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[6] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setLCYH");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setLCYHResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[7] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setXLPC");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setXLPCResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[8] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setCS");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setCSResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[9] = oper;
+
+    }
+
+    private static void _initOperationDesc2(){
+        org.apache.axis.description.OperationDesc oper;
+        org.apache.axis.description.ParameterDesc param;
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setFZCKGM");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setFZCKGMResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[10] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("setJJZD");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "uPass"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/", "sXml"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), java.lang.String.class, false, false);
+        param.setOmittable(true);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://tempuri.org/", "Results"));
+        oper.setReturnClass(com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/", "setJJZDResult"));
+        oper.setStyle(org.apache.axis.constants.Style.WRAPPED);
+        oper.setUse(org.apache.axis.constants.Use.LITERAL);
+        _operations[11] = oper;
+
+    }
+
+    public WebServiceSoapStub() throws org.apache.axis.AxisFault {
+         this(null);
+    }
+
+    public WebServiceSoapStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
+         this(service);
+         super.cachedEndpoint = endpointURL;
+    }
+
+    public WebServiceSoapStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
+        if (service == null) {
+            super.service = new org.apache.axis.client.Service();
+        } else {
+            super.service = service;
+        }
+        ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2");
+            java.lang.Class cls;
+            javax.xml.namespace.QName qName;
+            javax.xml.namespace.QName qName2;
+            java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
+            java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
+            java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
+            java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
+            java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
+            java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
+            java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
+            java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
+            java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
+            java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
+            qName = new javax.xml.namespace.QName("http://tempuri.org/", "Results");
+            cachedSerQNames.add(qName);
+            cls = com.bsth.webService.trafficManage.up.org.tempuri.Results.class;
+            cachedSerClasses.add(cls);
+            cachedSerFactories.add(beansf);
+            cachedDeserFactories.add(beandf);
+
+    }
+
+    protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
+        try {
+            org.apache.axis.client.Call _call = super._createCall();
+            if (super.maintainSessionSet) {
+                _call.setMaintainSession(super.maintainSession);
+            }
+            if (super.cachedUsername != null) {
+                _call.setUsername(super.cachedUsername);
+            }
+            if (super.cachedPassword != null) {
+                _call.setPassword(super.cachedPassword);
+            }
+            if (super.cachedEndpoint != null) {
+                _call.setTargetEndpointAddress(super.cachedEndpoint);
+            }
+            if (super.cachedTimeout != null) {
+                _call.setTimeout(super.cachedTimeout);
+            }
+            if (super.cachedPortName != null) {
+                _call.setPortName(super.cachedPortName);
+            }
+            java.util.Enumeration keys = super.cachedProperties.keys();
+            while (keys.hasMoreElements()) {
+                java.lang.String key = (java.lang.String) keys.nextElement();
+                _call.setProperty(key, super.cachedProperties.get(key));
+            }
+            // All the type mapping information is registered
+            // when the first call is made.
+            // The type mapping information is actually registered in
+            // the TypeMappingRegistry of the service, which
+            // is the reason why registration is only needed for the first call.
+            synchronized (this) {
+                if (firstCall()) {
+                    // must set encoding style before registering serializers
+                    _call.setEncodingStyle(null);
+                    for (int i = 0; i < cachedSerFactories.size(); ++i) {
+                        java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i);
+                        javax.xml.namespace.QName qName =
+                                (javax.xml.namespace.QName) cachedSerQNames.get(i);
+                        java.lang.Object x = cachedSerFactories.get(i);
+                        if (x instanceof Class) {
+                            java.lang.Class sf = (java.lang.Class)
+                                 cachedSerFactories.get(i);
+                            java.lang.Class df = (java.lang.Class)
+                                 cachedDeserFactories.get(i);
+                            _call.registerTypeMapping(cls, qName, sf, df, false);
+                        }
+                        else if (x instanceof javax.xml.rpc.encoding.SerializerFactory) {
+                            org.apache.axis.encoding.SerializerFactory sf = (org.apache.axis.encoding.SerializerFactory)
+                                 cachedSerFactories.get(i);
+                            org.apache.axis.encoding.DeserializerFactory df = (org.apache.axis.encoding.DeserializerFactory)
+                                 cachedDeserFactories.get(i);
+                            _call.registerTypeMapping(cls, qName, sf, df, false);
+                        }
+                    }
+                }
+            }
+            return _call;
+        }
+        catch (java.lang.Throwable _t) {
+            throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
+        }
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setXL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[0]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setXL");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setXL"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setCL(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[1]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setCL");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setCL"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setLD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[2]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setLD");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setLD"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setDDRB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[3]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setDDRB");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setDDRB"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setJHBC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[4]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setJHBC");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setJHBC"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setSKB(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[5]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setSKB");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setSKB"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setSJ(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[6]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setSJ");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setSJ"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setLCYH(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[7]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setLCYH");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setLCYH"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setXLPC(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[8]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setXLPC");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setXLPC"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setCS(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[9]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setCS");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setCS"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setFZCKGM(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[10]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setFZCKGM");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setFZCKGM"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+    public com.bsth.webService.trafficManage.up.org.tempuri.Results setJJZD(java.lang.String uName, java.lang.String uPass, java.lang.String sXml) throws java.rmi.RemoteException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[11]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("http://tempuri.org/setJJZD");
+        _call.setEncodingStyle(null);
+        _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE);
+        _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE);
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://tempuri.org/", "setJJZD"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        java.lang.Object _resp = _call.invoke(new java.lang.Object[] {uName, uPass, sXml});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) _resp;
+            } catch (java.lang.Exception _exception) {
+                return (com.bsth.webService.trafficManage.up.org.tempuri.Results) org.apache.axis.utils.JavaUtils.convert(_resp, com.bsth.webService.trafficManage.up.org.tempuri.Results.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+  throw axisFaultException;
+}
+    }
+
+}
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform=='win32';
 var sp = platform=='win32'?'\\':'/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'report'+sp+'oil']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'history_sch' ,'report'+sp+'oil']
 	,ep = new EventProxy()
 	,pName = 'bsth_control'
 	,path = process.cwd()
@@ -25,7 +25,7 @@ var FormWizard = function() {
 				rules : {
 					'parkNamebooxt' : {required : true,},// 停车场名称 必填项
 					'parkName' : {required : true,},// 停车场名称 必填项
-					'parkCode' : {required : true,alnum:true, remote : { 
+					'parkCode' : {required : true,rangelength:[8,8], alnum:true, remote : { 
                         type : "get",// 异步发送请求到服务器，验证parkCode
                         url : "/carpark/isHaveParkCode",//需要服务器controllor 中提供停车场编码检查的方法
                         cache:false,
@@ -40,7 +40,8 @@ var FormWizard = function() {
 					'descriptions' : {maxlength: 200,},// 描述/说明  最大长度200
 				},
 				messages:{
-					'parkCode':{remote:'停车场编码系统已存在,请您重新输入!',},
+					'parkCode':{remote:'停车场编码系统已存在,请您重新输入!',
+								rangelength:'请填写8位长度的编码！'},
 				},
 				/**
 				 * 类型：Callback。当未通过验证的表单提交时，可以在该回调函数中处理一些事情。