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

minhang

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into
minhang
娄高锋
2 parents 904a6b63 c34ebcc1
Showing 61 changed files with 1908 additions and 1272 deletions
src/main/java/com/bsth/controller/BaseController2.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/controller/schedule/RerunController.java
src/main/java/com/bsth/controller/schedule/TTInfoController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/controller/schedule/basicinfo/CarDeviceController.java
src/main/java/com/bsth/controller/schedule/basicinfo/EmployeeController.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
src/main/java/com/bsth/controller/schedule/core/RerunController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/entity/CarDevice.java
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/Personnel.java
src/main/java/com/bsth/entity/mcy_forms/Shifday.java
src/main/java/com/bsth/entity/mcy_forms/Shiftuehiclemanth.java
src/main/java/com/bsth/entity/mcy_forms/Vehicleloading.java
src/main/java/com/bsth/entity/mcy_forms/Waybillday.java
@@ -187,9 +187,11 @@ public class BaseController2&lt;T, ID extends Serializable&gt; {
         }
         System.out.println(outputfile.getName());
+        System.out.println(outputfile.getAbsolutePath());
+
         String filePath = outputfile.getAbsolutePath();
-        String fp[] = filePath.split(File.separator);
-        String fileName = fp[fp.length - 1];
+//        String fp[] = filePath.split(File.separator);
+//        String fileName = fp[fp.length - 1];
         // TODO：使用ktr获取导出数据
 package com.bsth.controller.realcontrol;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.data.BasicData;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 @RestController
 @RequestMapping("/basic")
 package com.bsth.controller.schedule;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
+import com.bsth.entity.schedule.BEntity;
+import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.BService;
 import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.sys.SysUserService;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpSession;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * 基础控制器。
@@ -21,12 +23,24 @@ import java.util.Map;
 public class BController<T, ID extends Serializable> {
     @Autowired
     protected BService<T, ID> bService;
+    @Autowired
+    private SysUserService sysUserService;
     // CRUD 操作
     // Create操作
     @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody T t) {
-        T t_saved = bService.save(t);
+    public Map<String, Object> save(@RequestBody T t, HttpSession httpSession) {
+        // 判定T是否是BEntity的子类，增加新的字段
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        BEntity t_b = null;
+        if (t instanceof BEntity) {
+            t_b = (BEntity) t;
+            t_b.setCreateBy(sysUser);
+            t_b.setCreateDate(new Date());
+        }
+
+        T t_saved = bService.save(t_b == null ? t : (T) t_b);
         Map<String, Object> rtn = new HashMap<>();
         rtn.put("status", ResponseCode.SUCCESS);
         rtn.put("data", t_saved);
@@ -34,8 +48,21 @@ public class BController&lt;T, ID extends Serializable&gt; {
     }
     // Update操作
     @RequestMapping(value="/{id}", method = RequestMethod.POST)
-    public Map<String, Object> update(@RequestBody T t) {
-        return save(t);
+    public Map<String, Object> update(@RequestBody T t, HttpSession httpSession) {
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+        BEntity t_b = null;
+        if (t instanceof BEntity) {
+            t_b = (BEntity) t;
+            t_b.setUpdateBy(sysUser);
+            t_b.setUpdateDate(new Date());
+        }
+
+        T t_updated = bService.save(t_b == null ? t : (T) t_b);
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", t_updated);
+        return rtn;
     }
     // Research操作
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@@ -97,9 +124,10 @@ public class BController&lt;T, ID extends Serializable&gt; {
     // Delete操作
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public Map<String, Object> delete(@PathVariable("id") ID id) {
+    public Map<String, Object> delete(@PathVariable("id") ID id, HttpSession httpSession) {
         Map<String, Object> rtn = new HashMap<>();
         try {
+            // 由于种种原因，这里不保存用户和操作时间了
             bService.delete(id);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (ScheduleException exp) {
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.repository.schedule.RerunRuleRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/10/20.
- */
-@RestController
-@RequestMapping("rms")
-public class RerunController extends BaseController<RerunRule, Long> {
-
-    @Autowired
-    private RerunRuleRepository rerunRuleRepository;
-
-    @Override
-    public RerunRule findById(@PathVariable("id") Long aLong) {
-        return rerunRuleRepository.findOneExtend(aLong);
-    }
-
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody RerunRule t){
-        return baseService.save(t);
-    }
-
-
-}
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController2;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
-import com.bsth.repository.schedule.TTInfoRepository;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/5/12.
- */
-@RestController
-@RequestMapping("tic")
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class TTInfoController extends BaseController2<TTInfo, Long> {
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
-    private TTInfoRepository ttInfoRepository;
-    @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
-
-    @Override
-    protected String getDataImportKtrClasspath() {
-        return dataToolsProperties.getTtinfoDatainputktr();
-    }
-
-    @Override
-    public TTInfo findById(@PathVariable("id") Long aLong) {
-        return ttInfoRepository.findOneExtend(aLong);
-    }
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较自编号是否重复
-        return baseService.validateEquale(map);
-    }
-
-    @Override
-    public Page<TTInfo> list(@RequestParam Map<String, Object> map, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "id") String order, @RequestParam(defaultValue = "DESC") String direction) {
-        // 如果有isCancel键值，将其值变成boolean
-        if (map.get("isCancel_eq") != null)
-            map.put("isCancel_eq", new Boolean(map.get("isCancel_eq").toString()));
-
-        return super.list(map, page, size, order, direction);
-    }
-}
@@ -113,6 +113,9 @@ public class TTInfoDetailController extends BaseController2&lt;TTInfoDetail, Long&gt; 
                                 p1.put("stationName_eq", cell_con.trim());
                                 p1.put("stationMark_eq", "B");
+
+                                // TODO：这里要修改（起点站有启用撤销的标志的）
+
                                 List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
                                 if (CollectionUtils.isEmpty(stationRouteList)) {
                                     rtn.put("status", ResponseCode.ERROR);
+package com.bsth.controller.schedule.basicinfo;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.CarDevice;
+import com.bsth.service.schedule.CarDeviceService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+@RestController(value = "carDeviceController_sc")
+@RequestMapping("cde_sc")
+public class CarDeviceController extends BController<CarDevice, Long> {
+    @Autowired
+    private CarDeviceService carDeviceService;
+
+    @RequestMapping(value = "/validate_qyrq", method = RequestMethod.GET)
+    public Map<String, Object> validate_qyrq(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            // 启用日期验证
+            CarDevice carDevice = new CarDevice(
+                    param.get("id_eq"),
+                    param.get("xl_eq"),
+                    param.get("cl_eq"),
+                    param.get("qyrq_eq")
+            );
+            carDeviceService.validate_qyrq(carDevice);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+}
+package com.bsth.controller.schedule.basicinfo;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.Personnel;
+import com.bsth.service.schedule.EmployeeService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 人员基础信息Controller
+ */
+@RestController
+@RequestMapping("ee")
+public class EmployeeController extends BController<Personnel, Integer> {
+    @Autowired
+    private EmployeeService employeeService;
+
+    @RequestMapping(value = "/validate_gh", method = RequestMethod.GET)
+    public Map<String, Object> validate_gh(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 工号验证
+            Personnel personnel = new Personnel(
+                    param.get("id_eq"),
+                    param.get("companyCode_eq"),
+                    param.get("jobCode_eq")
+            );
+            employeeService.validate_gh(personnel);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+}
@@ -48,8 +48,8 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
         return guideboardInfoRepository.findLpName(ttid);
     }
-    @RequestMapping(value = "/validate1", method = RequestMethod.GET)
-    public Map<String, Object> validate1(@RequestParam Map<String, Object> param) {
+    @RequestMapping(value = "/validate_lpno", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpno(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
         try {
             // 路牌编号验证
@@ -59,7 +59,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
                     param.get("lpNo_eq"),
                     null
             );
-            guideboardInfoService.validate(guideboardInfo);
+            guideboardInfoService.validate_lpno(guideboardInfo);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (ScheduleException exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -68,8 +68,8 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
         return rtn;
     }
-    @RequestMapping(value = "/validate2", method = RequestMethod.GET)
-    public Map<String, Object> validate2(@RequestParam Map<String, Object> param) {
+    @RequestMapping(value = "/validate_lpname", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpname(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
         try {
             // 路牌名称验证
@@ -79,7 +79,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
                     null,
                     param.get("lpName_eq")
             );
-            guideboardInfoService.validate(guideboardInfo);
+            guideboardInfoService.validate_lpname(guideboardInfo);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (ScheduleException exp) {
             rtn.put("status", ResponseCode.ERROR);
+package com.bsth.controller.schedule.core;
+
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.rule.RerunRule;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/10/20.
+ */
+@RestController
+@RequestMapping("rms")
+public class RerunController extends BController<RerunRule, Long> {
+
+
+}
+package com.bsth.controller.schedule.core;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.TTInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/20.
+ */
+@RestController(value = "tTInfoController_ec")
+@RequestMapping(value = "tic_ec")
+public class TTInfoController extends BController<TTInfo, Long> {
+    @Autowired
+    private TTInfoService ttInfoService;
+
+    @RequestMapping(value = "/validate_name", method = RequestMethod.GET)
+    public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 名字重复验证
+            TTInfo ttInfo = new TTInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("name_eq"),
+                    param.get("rule_days_eq"),
+                    param.get("special_days_eq")
+            );
+            ttInfoService.validate_name(ttInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_n_d", method = RequestMethod.GET)
+    public Map<String, Object> validate_n_d(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 常规有效日重复验证
+            TTInfo ttInfo = new TTInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("name_eq"),
+                    param.get("rule_days_eq"),
+                    param.get("special_days_eq")
+            );
+            ttInfoService.validate_n_d(ttInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_s_d", method = RequestMethod.GET)
+    public Map<String, Object> validate_s_d(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 特殊有效日重复判定
+            TTInfo ttInfo = new TTInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("name_eq"),
+                    param.get("rule_days_eq"),
+                    param.get("special_days_eq")
+            );
+            ttInfoService.validate_s_d(ttInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+}
+
+//
+//@Autowired
+//private DataToolsProperties dataToolsProperties;
+//@Autowired
+//private TTInfoRepository ttInfoRepository;
+//@Autowired
+//private TTInfoDetailRepository ttInfoDetailRepository;
+//
+//    @Override
+//    protected String getDataImportKtrClasspath() {
+//        return dataToolsProperties.getTtinfoDatainputktr();
+//    }
+//
+//    @Override
+//    public TTInfo findById(@PathVariable("id") Long aLong) {
+//        return ttInfoRepository.findOneExtend(aLong);
+//    }
+//
+//    /**
+//     * 验证。
+//     * @param map
+//     * @return
+//     */
+//    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
+//    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
+//        // 一般比较自编号是否重复
+//        return baseService.validateEquale(map);
+//    }
+//
+//    @Override
+//    public Page<TTInfo> list(@RequestParam Map<String, Object> map, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "id") String order, @RequestParam(defaultValue = "DESC") String direction) {
+//        // 如果有isCancel键值，将其值变成boolean
+//        if (map.get("isCancel_eq") != null)
+//            map.put("isCancel_eq", new Boolean(map.get("isCancel_eq").toString()));
+//
+//        return super.list(map, page, size, order, direction);
+//    }
 \ No newline at end of file
 package com.bsth.data.forecast;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
-import com.bsth.Application;
 import com.bsth.data.forecast.entity.ForecastResult;
 import com.bsth.data.forecast.entity.ForecastResult.ForecastResultItem;
 import com.bsth.data.forecast.entity.SimpleRoute;
@@ -23,6 +9,17 @@ import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * 
@@ -61,7 +58,7 @@ public class ForecastRealServer implements CommandLineRunner {
 	@Override
 	public void run(String... arg0) throws Exception {
 		//2小时更新一次站点间耗时数据
-//		Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
 	}
 	/**
@@ -3,6 +3,7 @@ package com.bsth.data.schedule;
 import com.bsth.data.LineConfigData;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
@@ -115,8 +116,11 @@ public class SchAttrCalculator {
 		ScheduleRealInfo prve = list.get(0), curr;
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
-			if(prve.getZdzName().equals(curr.getQdzName()))
+			if(prve.getZdzName().equals(curr.getQdzName())){
 				curr.setQdzArrDateJH(prve.getZdsj());
+				if(StringUtils.isNotEmpty(prve.getZdsjActual()) && StringUtils.isEmpty(curr.getQdzArrDatesj()))
+					curr.setQdzArrDatesj(prve.getZdsjActual());
+			}
 			prve = curr;
 		}
 package com.bsth.entity;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.BEntity;
+import org.joda.time.DateTime;
 import javax.persistence.*;
 import java.util.Date;
@@ -10,7 +11,7 @@ import java.util.Date;
  */
 @Entity
 @Table(name = "bsth_c_car_device")
-public class CarDevice {
+public class CarDevice extends BEntity {
     /** 主键 */
     @Id
@@ -62,18 +63,26 @@ public class CarDevice {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
+    public CarDevice() {}
+    public CarDevice(Object id, Object xlid, Object clid, Object qyrq) {
+        if (id != null) {
+            this.id = Long.valueOf(id.toString());
+        }
+        if (xlid != null) {
+            this.xl = Integer.valueOf(xlid.toString());
+        }
+        if (clid != null) {
+            this.cl = Integer.valueOf(clid.toString());
+        }
+        if (qyrq != null) {
+            try {
+                this.qyrq = new Date();
+                this.qyrq.setTime(Long.parseLong(qyrq.toString()));
+            } catch (Exception exp) {
+                this.qyrq = new DateTime(qyrq.toString()).toDate();
+            }
+        }
+    }
     public Long getId() {
         return id;
@@ -179,38 +188,6 @@ public class CarDevice {
         this.guaranteeDesc = guaranteeDesc;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Date getQyrq() {
         return qyrq;
     }
 package com.bsth.entity;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.BEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
@@ -24,7 +24,7 @@ import java.util.Date;
 @Entity
 @Table(name = "bsth_c_cars")
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class Cars implements Serializable {
+public class Cars extends BEntity implements Serializable {
 	/** 主键Id */
 	@Id
@@ -136,23 +136,6 @@ public class Cars implements Serializable {
     /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
     private String xlmc;
-
-	/** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-	private SysUser createBy;
-			
-	/** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-	private SysUser updateBy;
-		
-	/** 创建日期 */
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-		
-	/** 修改日期 */
-	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date updateDate;
-
     public Cars() {}
     public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
@@ -516,36 +499,4 @@ public class Cars implements Serializable {
     public void setXlmc(String xlmc) {
         this.xlmc = xlmc;
     }
-
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
 package com.bsth.entity;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.BEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
-import java.util.Date;
 /**
  * 
@@ -23,7 +22,7 @@ import java.util.Date;
 @Entity
 @Table(name = "bsth_c_personnel")
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class Personnel {
+public class Personnel extends BEntity {
     /** 主键Id */
 	@Id
@@ -59,6 +58,20 @@ public class Personnel {
     /** 身份证 */
     private String card;
+    public Personnel() {}
+
+    public Personnel(Object id, Object companyCode, Object gh) {
+        if (id != null) {
+            this.id = Integer.valueOf(id.toString());
+        }
+        if (companyCode != null) {
+            this.companyCode = companyCode.toString();
+        }
+        if (gh != null) {
+            this.jobCode = gh.toString();
+        }
+    }
+
 	public String getCard() {
 		return card;
 	}
@@ -78,23 +91,6 @@ public class Personnel {
     /** 描述（TODO：在原系统里没有，这里暂时留着） */
     private String descriptions;
-
-
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-	/** 创建日期 */
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-		
-	/** 修改日期 */
-	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date updateDate;
-
     public Integer getId() {
         return id;
     }
@@ -222,36 +218,4 @@ public class Personnel {
     public void setDescriptions(String descriptions) {
         this.descriptions = descriptions;
     }
-
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
@@ -34,7 +34,36 @@ public class Shifday {
 	private String sjbc;//实际班次
+	private String jgh;
+	private String zbh;
+	
+	private String rq;
+	
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getZbh() {
+		return zbh;
+	}
+
+	public void setZbh(String zbh) {
+		this.zbh = zbh;
+	}
+
 	public String getJhlc() {
 		return jhlc;
 	}
@@ -20,7 +20,24 @@ public class Shiftuehiclemanth {
 	private String sjbc;//实际班次
-	
+	private String jgh;
+	private String zbh;
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getZbh() {
+		return zbh;
+	}
+
+	public void setZbh(String zbh) {
+		this.zbh = zbh;
+	}
+
 	public String getCjbc() {
 		return cjbc;
 	}
@@ -24,6 +24,26 @@ public class Vehicleloading {
 	private String sjbc;//实际班次
+	private String jgh;//驾驶员工号
+	
+	private String zbh;//车辆自编号
+	
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getZbh() {
+		return zbh;
+	}
+
+	public void setZbh(String zbh) {
+		this.zbh = zbh;
+	}
+
 	public String getLs() {
 		return ls;
 	}
@@ -20,9 +20,29 @@ public class Waybillday {
 	private String zlc;//里程
+	public String getJgh() {
+		return jgh;
+	}
+
+	public void setJgh(String jgh) {
+		this.jgh = jgh;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
 	private String yl;//用油
 	private String nbbm;//机油 
+	
+	private String jgh;//员工号
+	
+	private String rq;//日期
 	public String getCarPlate() {
 		return carPlate;
 package com.bsth.entity.realcontrol;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.NamedEntityGraphs;
-import javax.persistence.Table;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import javax.persistence.*;
+import java.util.Date;
+
 /**
  * 
@@ -95,6 +88,10 @@ public class ChildTaskPlan {
 	 */
 	private String destroyReason;
+	/** 创建日期 */
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+
 	/**
 	 * 主排班计划
 	 */
@@ -233,4 +230,12 @@ public class ChildTaskPlan {
 	public boolean equals(Object obj) {
 		return this.id.equals(((ChildTaskPlan)obj).getId());
 	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
 }
@@ -163,7 +163,7 @@ public class ScheduleRealInfo {
 	private String qdzArrDatesj;
 	/** 子任务 */
-	@OneToMany(fetch = FetchType.LAZY/*, cascade = CascadeType.ALL*/)
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	private Set<ChildTaskPlan> cTasks = new HashSet<>();
 	/** 关联的公司名称 */
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * Created by xu on 16/12/14.
+ */
+@MappedSuperclass
+public class BEntity {
+
+    /** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser updateBy;
+
+    /** 创建日期 */
+    @Column(updatable = false, name = "create_date")
+    private Date createDate;
+    /** 修改日期 */
+    @Column(name = "update_date")
+    private Date updateDate;
+
+    public SysUser getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
+
+    public SysUser getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
@@ -2,7 +2,6 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
@@ -21,7 +20,7 @@ import java.util.Date;
         })
 })
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class CarConfigInfo implements Serializable {
+public class CarConfigInfo extends BEntity implements Serializable {
     /** 主健Id */
     @Id
@@ -59,20 +58,6 @@ public class CarConfigInfo implements Serializable {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public CarConfigInfo() {}
     public CarConfigInfo(Object id, Object xlid, Object xlname, Object clid) {
         if (id != null) {
@@ -164,38 +149,6 @@ public class CarConfigInfo implements Serializable {
         this.isSwitch = isSwitch;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -3,13 +3,12 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.hibernate.annotations.Formula;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
-import java.util.Date;
+import java.io.Serializable;
 /**
  * 人员配置信息。
@@ -24,7 +23,7 @@ import java.util.Date;
     })
 })
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class EmployeeConfigInfo {
+public class EmployeeConfigInfo extends BEntity implements Serializable {
     /** 主键Id */
     @Id
@@ -55,20 +54,6 @@ public class EmployeeConfigInfo {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public EmployeeConfigInfo() {}
     public EmployeeConfigInfo(Object id, Object xlid, Object xlname, Object jsyid, Object spyid) {
@@ -156,36 +141,4 @@ public class EmployeeConfigInfo {
     public void setIsCancel(Boolean isCancel) {
         this.isCancel = isCancel;
     }
-
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
 package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
-import java.util.Date;
 /**
  * 路牌信息。
@@ -18,7 +16,7 @@ import java.util.Date;
         })
 })
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class GuideboardInfo {
+public class GuideboardInfo extends BEntity {
     /** 主键Id */
     @Id
@@ -43,21 +41,6 @@ public class GuideboardInfo {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-
     public GuideboardInfo() {}
     public GuideboardInfo(Object id, Object xlid, Object lpNo, Object lpName) {
@@ -126,38 +109,6 @@ public class GuideboardInfo {
         this.lpType = lpType;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
 package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
 import javax.persistence.*;
 import java.util.Date;
@@ -18,7 +17,7 @@ import java.util.Date;
                 @NamedAttributeNode("updateBy")
         })
 })
-public class TTInfo {
+public class TTInfo extends BEntity {
     /** 主键Id */
     @Id
@@ -50,9 +49,9 @@ public class TTInfo {
     // TODO：还有很多判定条件，这里先不放
-    /** 路牌数 */
+    /** 路牌数（这两个字段暂时不用） */
     private int lpCount;
-    /** 圈数 */
+    /** 圈数（这两个字段暂时不倒） */
     private int loopCount;
     // TODO：原系统里的分别在，圈后圈进场，意思不知道，再议
@@ -62,19 +61,25 @@ public class TTInfo {
     /** 特殊有效日期（格式：2001-01-01，多个用逗号隔开） */
     private String special_days;
-    /** 操作人员关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 更新人员关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    // 创建日期
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    // 修改日期
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
+    public TTInfo() {}
+    public TTInfo(Object id, Object xlid, Object name, Object nds, Object sds) {
+        if (id != null) {
+            this.id = Long.parseLong(id.toString());
+        }
+        if (xlid != null) {
+            this.xl = new Line();
+            this.xl.setId(Integer.valueOf(xlid.toString()));
+        }
+        if (name != null) {
+            this.name = String.valueOf(name);
+        }
+        if (nds != null) {
+            this.rule_days = String.valueOf(nds);
+        }
+        if (sds != null) {
+            this.special_days = String.valueOf(sds);
+        }
+    }
     public Long getId() {
         return id;
@@ -164,38 +169,6 @@ public class TTInfo {
         this.special_days = special_days;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -3,10 +3,8 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
-import com.bsth.entity.sys.SysUser;
 import javax.persistence.*;
-import java.util.Date;
 /**
  * 时刻表明细
@@ -23,7 +21,7 @@ import java.util.Date;
                 @NamedAttributeNode("tcc")
         })
 })
-public class TTInfoDetail {
+public class TTInfoDetail extends BEntity {
     /** 主健Id */
     @Id
@@ -85,20 +83,6 @@ public class TTInfoDetail {
     /** 备注 */
     private String remark;
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -235,38 +219,6 @@ public class TTInfoDetail {
         this.remark = remark;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public CarPark getTcc() {
         return tcc;
     }
 package com.bsth.entity.schedule.rule;
 import com.bsth.entity.Line;
-import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.entity.schedule.EmployeeConfigInfo;
-import com.bsth.entity.schedule.GuideboardInfo;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.*;
 import javax.persistence.*;
-import java.util.Date;
 /**
  * 套跑规则。
@@ -41,7 +36,7 @@ import java.util.Date;
 })
-public class RerunRule {
+public class RerunRule extends BEntity {
     /** 主键Id */
     @Id
     @GeneratedValue
@@ -84,19 +79,6 @@ public class RerunRule {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -177,34 +159,6 @@ public class RerunRule {
         this.useEmployeeConfig = useEmployeeConfig;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -213,7 +167,4 @@ public class RerunRule {
         this.isCancel = isCancel;
     }
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
 package com.bsth.entity.sys;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import javax.persistence.*;
 import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-
 @Entity
 @Table(name = "bsth_c_sys_user")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class SysUser {
 	@Id
 package com.bsth.repository.realcontrol;
-import java.util.List;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.BaseRepository;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.repository.BaseRepository;
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.Map;
 @Repository
 public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealInfo, Long>{
@@ -35,11 +33,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
-	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,"
-			+ " d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 "
-			+ "d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
-			+ " DATE_FORMAT(r.schedule_date,'%Y-%m-%d') = ?2 and r.cl_zbh like %?3% order by d.timestamp",nativeQuery=true)
-	List<Object[]> historyMessage(String line,String date,String code);
+	@Query(value="select t.car_code,d.sender,d.txt_content,d.timestamp,0 as xlbm from  ("
+			+ "  select equipment_code,car_code  from bsth_c_cars where id in("
+			+ " select cl from bsth_c_s_ccinfo where  xl in ( "
+			+ " select id from bsth_c_line where line_code=?1 ))) t"
+			+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
+			+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like %?4% ",nativeQuery=true)
+	List<Object[]> historyMessage(String line,long d,long t,String code);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
 			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
@@ -113,12 +113,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 	List<ScheduleRealInfo> setLD(String date);
-	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,lpName,clZbh ORDER BY xlBm,lpName,clZbh")
-	List<ScheduleRealInfo> setLDGroup(String date);
+	@Query(value="select new map(xlBm as xlBm,lpName as lpName,clZbh as clZbh) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,lpName,clZbh ORDER BY xlBm,lpName,clZbh")
+	List<Map<String,Object>> setLDGroup(String date);
-	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,clZbh ORDER BY xlBm,clZbh")
-	List<ScheduleRealInfo> setLCYHGroup(String date);
+	@Query(value="select new map(xlBm as xlBm,clZbh as clZbh) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,clZbh ORDER BY xlBm,clZbh")
+	List<Map<String,Object>> setLCYHGroup(String date);
-	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
-	List<ScheduleRealInfo> setDDRBGroup(String date);
+	@Query(value="select new map(xlBm as xlBm) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
+	List<Map<String,Object>> setDDRBGroup(String date);
+
 }
+package com.bsth.service.forms;
+
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.BaseService;
+
+@Service
+public interface CommonService{
+
+    Map<String,Object> findKMBC1(String jName,String clZbh, String date,String enddate);
+		
+	Map<String,Object> findKMBC2(String jName,String clZbh,String date);
+}
+package com.bsth.service.forms.impl;
+
+import java.text.DecimalFormat;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.forms.CommonService;
+
+@Service
+public class CommonServiceImpl implements CommonService{
+
+
+	@Autowired 
+	ScheduleRealInfoRepository scheduleRealInfoRepository;
+	
+	@Override
+	public Map<String, Object> findKMBC1(String jName, String clZbh,
+			  String date, String enddate) {
+		
+		String sql=" select s from bsth_c_s_sp_info_real s "
+				 + " where s.j_gh ='" + jName + "' and s.cl_zbh ='" + clZbh + "' and  "
+				 + "  to_days(s.schedule_date) BETWEEN to_days('" + date + "') and to_days('" + enddate + "')"
+				 + " order by bcs";
+		
+		
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill4(jName, clZbh, date, enddate);
+		DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+		int jhbc = 0,cjbc = 0,ljbc = 0;
+		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0;
+		float addMileage = 0l,remMileage = 0l;
+		Map<String,Object> map = new HashMap<String, Object>();
+		for(ScheduleRealInfo scheduleRealInfo : list){
+			if(scheduleRealInfo != null){
+				//计划里程（主任务过滤掉临加班次），
+				//烂班里程（主任务烂班），
+				//临加里程（主任务临加），
+				//计划班次，烂班班次，增加班次
+				tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+				if(scheduleRealInfo.isSflj()){
+					addMileage += tempJhlc;
+					ljbc++;
+				}else{
+					jhlc += tempJhlc;
+					jhbc++;
+					if(scheduleRealInfo.getStatus() == -1){
+						remMileage += tempJhlc;
+						cjbc++;
+					}				
+				}
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				//计算营运里程，空驶里程
+				if(childTaskPlans.isEmpty()){
+					if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+							|| scheduleRealInfo.getBcType().equals("venting")){
+						ksgl += tempJhlc;
+					}else{
+						yygl += tempJhlc;
+					}	
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while(it.hasNext()){
+						ChildTaskPlan childTaskPlan = it.next();
+						if(childTaskPlan.getMileageType().equals("empty")){
+							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}else{
+							yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}
+					}
+				}
+			}
+		}
+		map.put("jhlc", format.format(jhlc));
+		map.put("remMileage", format.format(remMileage));
+		map.put("addMileage", format.format(addMileage));
+		map.put("yygl", format.format(yygl));
+		map.put("ksgl", format.format(ksgl));
+		map.put("realMileage", format.format(yygl+ksgl));
+		map.put("jhbc", jhbc);
+		map.put("cjbc", cjbc);
+		map.put("ljbc", ljbc);
+		map.put("sjbc", jhbc-cjbc+ljbc);
+		return map;
+	}
+
+	
+	@Override
+	public Map<String, Object> findKMBC2(String jName, String clZbh,String date) {
+		
+		String sql=" select s from bsth_c_s_sp_info_real s "
+				 + " where s.j_gh ='" + jName + "' and s.cl_zbh ='" + clZbh + "' and  "
+				 + "  to_days(s.schedule_date) =to_days('" + date + "')"
+				 + " order by bcs";
+		
+		
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh ,  date);
+
+		DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+		int jhbc = 0,cjbc = 0,ljbc = 0;
+		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0;
+		float addMileage = 0l,remMileage = 0l;
+		String j_Name="";
+		Map<String,Object> map = new HashMap<String, Object>();
+		for(ScheduleRealInfo scheduleRealInfo : list){
+			if(scheduleRealInfo != null){
+				j_Name=scheduleRealInfo.getjName();
+				//计划里程（主任务过滤掉临加班次），
+				//烂班里程（主任务烂班），
+				//临加里程（主任务临加），
+				//计划班次，烂班班次，增加班次
+				tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+				if(scheduleRealInfo.isSflj()){
+					addMileage += tempJhlc;
+					ljbc++;
+				}else{
+					jhlc += tempJhlc;
+					jhbc++;
+					if(scheduleRealInfo.getStatus() == -1){
+						remMileage += tempJhlc;
+						cjbc++;
+					}				
+				}
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				//计算营运里程，空驶里程
+				if(childTaskPlans.isEmpty()){
+					if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+							|| scheduleRealInfo.getBcType().equals("venting")){
+						ksgl += tempJhlc;
+					}else{
+						yygl += tempJhlc;
+					}	
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while(it.hasNext()){
+						ChildTaskPlan childTaskPlan = it.next();
+						if(childTaskPlan.getMileageType().equals("empty")){
+							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}else{
+							yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}
+					}
+				}
+			}
+		}
+		map.put("j_name", j_Name);
+		map.put("jhlc", format.format(jhlc));
+		map.put("remMileage", format.format(remMileage));
+		map.put("addMileage", format.format(addMileage));
+		map.put("yygl", format.format(yygl));
+		map.put("ksgl", format.format(ksgl));
+		map.put("realMileage", format.format(yygl+ksgl));
+		map.put("jhbc", jhbc);
+		map.put("cjbc", cjbc);
+		map.put("ljbc", ljbc);
+		map.put("sjbc", jhbc-cjbc+ljbc);
+		return map;
+	}
+
+
+
+	
+}
@@ -64,16 +64,22 @@ public class FormsServiceImpl implements FormsService {
 				// System.out.println(arg0.getObject("yl"));
 				// wbd.setYl(arg0.getString("yl"));
 				// wbd.setNbbm(arg0.getString("nbbm"));
-				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC2(arg0.getString("j_gh"), arg0.getString("cl_zbh"),
-						arg0.getString("schedule_date"));
-				wbd.setJzl1(maps.get("ksgl").toString());
-				wbd.setZlc(maps.get("realMileage").toString());
-
+				wbd.setRq(arg0.getString("schedule_date"));
+				wbd.setJgh(arg0.getString("j_gh"));
 				return wbd;
 			}
 		});
+		
+		for(int i=0;i<list.size();i++){
+			Waybillday w=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+			maps = scheduleRealInfoService.findKMBC2(w.getJgh(), w.getCarPlate(),
+					w.getRq());
+			w.setJzl1(maps.get("ksgl").toString());
+			w.setZlc(maps.get("realMileage").toString());
+
+		}
 		return list;
 	}
@@ -102,6 +108,9 @@ public class FormsServiceImpl implements FormsService {
 				return lin;
 			}
 		});
+		
+		
+		
 		return list;
 	}
@@ -111,12 +120,13 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Shiftuehiclemanth> shiftuehiclemanth(Map<String, Object> map) {
-		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
+		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
 		        + " from bsth_c_s_sp_info_real r "
 				+ " where  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') "
 				+ " and  to_days('" + map.get("endDate").toString() + "') " 
 				+ " and r.xl_bm='"+ map.get("line").toString() + "'" 
 				+ " AND r.gs_bm is not null"
+				+ " and r.bc_type not in('in','out')"
 			/*	+ " and r.gs_bm='"+map.get("gsdmManth").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmManth").toString()+"'"*/
 				+ " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name" 
@@ -130,26 +140,29 @@ public class FormsServiceImpl implements FormsService {
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shiftuehiclemanth shif = new Shiftuehiclemanth();
 				shif.setjName(arg0.getString("j_name"));
-                
-				Map<String, Object> maps = new HashMap<>();
-
-				maps = scheduleRealInfoService.findKMBC1(arg0.getString("j_name"), arg0.getString("cl_zbh"), startDate,
-						endDate);
-
-				shif.setJhlc(maps.get("jhlc").toString());
-				shif.setEmptMileage(maps.get("ksgl").toString());
-				shif.setRemMileage(maps.get("remMileage").toString());
-				shif.setAddMileage(maps.get("addMileage").toString());
-				shif.setTotalm(maps.get("realMileage").toString());
-				shif.setCjbc(maps.get("cjbc").toString());
-				shif.setLjbc(maps.get("ljbc").toString());
-				shif.setSjbc(maps.get("sjbc").toString());
-
+				shif.setJgh(arg0.getString("j_gh"));
+		        shif.setZbh(arg0.getString("cl_zbh"));
 				return shif;
-
 			}
 		});
+		
+		for(int i=0;i<list.size();i++){
+			Shiftuehiclemanth s=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+
+			maps = scheduleRealInfoService.findKMBC1(s.getjName(),s.getZbh(), startDate,
+					endDate);
+
+			s.setJhlc(maps.get("jhlc").toString());
+			s.setEmptMileage(maps.get("ksgl").toString());
+			s.setRemMileage(maps.get("remMileage").toString());
+			s.setAddMileage(maps.get("addMileage").toString());
+			s.setTotalm(maps.get("realMileage").toString());
+			s.setCjbc(maps.get("cjbc").toString());
+			s.setLjbc(maps.get("ljbc").toString());
+			s.setSjbc(maps.get("sjbc").toString());
+		}
 		return list;
 	}
@@ -157,10 +170,11 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Shifday> shifday(Map<String, Object> map) {
 		String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
-				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name   "
+				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type   "
 				+ " FROM bsth_c_s_sp_info_real r " 
 				+ " where to_days(r.schedule_date)=to_days('"
 				+  map.get("date").toString() + "') and r.xl_bm=" + map.get("line").toString()
+				+ " and r.bc_type not in('in','out')"
 				/*+ " and r.gs_bm='"+map.get("gsdmShif").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'"*/
 				+ " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
@@ -175,25 +189,34 @@ public class FormsServiceImpl implements FormsService {
 				shifday.setsName(arg0.getString("s_name") == null ? "" : arg0.getString("s_name").toString());
 				shifday.setLpName(arg0.getString("r.lp_name").toString());
 				shifday.setCarPlate(arg0.getString("cl_zbh").toString());
-
-				Map<String, Object> map = new HashMap<>();
-				map = scheduleRealInfoService.findKMBC2(arg0.getString("j_gh"), arg0.getString("cl_zbh"),
-						arg0.getString("schedule_date"));
-				shifday.setJhlc(map.get("jhlc").toString());// 计划里程
-				//shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程
-				shifday.setYygl(map.get("yygl").toString());// 营运里程
-				shifday.setEmptMileage(map.get("ksgl").toString());// 空驶里程
-				shifday.setRemMileage(map.get("remMileage").toString());// 抽减里程
-				shifday.setAddMileage(map.get("addMileage").toString());// 增加里程
-				shifday.setTotalm(map.get("realMileage").toString());// 总里程
-				shifday.setJhbc(map.get("jhbc").toString());// 计划班次
-				//shifday.setSjjhbc(map.get("sjjhbc").toString());//实际计划班次
-				shifday.setCjbc(map.get("cjbc").toString());// 抽减班次
-				shifday.setLjbc(map.get("ljbc").toString());// 增加班次
-				shifday.setSjbc(map.get("sjbc").toString());// 实际班次
+				shifday.setJgh(arg0.getString("j_gh"));
+				shifday.setZbh(arg0.getString("cl_zbh"));
+				shifday.setRq(arg0.getString("schedule_date"));
 				return shifday;
 			}
+			
 		});
+		
+		for(int i=0;i<list.size();i++){
+			Shifday shi=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+			maps = scheduleRealInfoService.findKMBC2(shi.getJgh(), shi.getCarPlate(),
+					shi.getRq());
+			shi.setJhlc(maps.get("jhlc").toString());// 计划里程
+			//shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程
+			shi.setYygl(maps.get("yygl").toString());// 营运里程
+			shi.setEmptMileage(maps.get("ksgl").toString());// 空驶里程
+			shi.setRemMileage(maps.get("remMileage").toString());// 抽减里程
+			shi.setAddMileage(maps.get("addMileage").toString());// 增加里程
+			shi.setTotalm(maps.get("realMileage").toString());// 总里程
+			shi.setJhbc(maps.get("jhbc").toString());// 计划班次
+			//shifday.setSjjhbc(map.get("sjjhbc").toString());//实际计划班次
+			shi.setCjbc(maps.get("cjbc").toString());// 抽减班次
+			shi.setLjbc(maps.get("ljbc").toString());// 增加班次
+			shi.setSjbc(maps.get("sjbc").toString());// 实际班次
+
+		}
+
 		return list;
 	}
@@ -240,20 +263,20 @@ public class FormsServiceImpl implements FormsService {
 				Changetochange chan = new Changetochange();
 				chan.setRq(rq);
-				chan.setGs(arg0.getString("gs").toString());
-				chan.setFgs(arg0.getString("fgs").toString());
-				chan.setXl(arg0.getString("xl").toString());
-				chan.setLp(arg0.getString("lp").toString());
-				chan.setFssj(arg0.getString("fssj").toString());
-				chan.setXgsj(arg0.getString("xgsj").toString());
-				chan.setPcch(arg0.getString("pcch").toString());
-				chan.setPcry(arg0.getString("pcry").toString());
-				chan.setJhch(arg0.getString("jhch").toString());
-				chan.setJhgh(arg0.getString("jhgh").toString());
-				chan.setSjch(arg0.getString("sjch").toString());
-				chan.setSjgh(arg0.getString("sjgh").toString());
-				chan.setYy(arg0.getString("yy").toString());
-				chan.setXgr(arg0.getString("xgr").toString());
+				chan.setGs(arg0.getString("gs"));
+				chan.setFgs(arg0.getString("fgs"));
+				chan.setXl(arg0.getString("xl"));
+				chan.setLp(arg0.getString("lp"));
+				chan.setFssj(arg0.getString("fssj"));
+				chan.setXgsj(arg0.getString("xgsj"));
+				chan.setPcch(arg0.getString("pcch"));
+				chan.setPcry(arg0.getString("pcry"));
+				chan.setJhch(arg0.getString("jhch"));
+				chan.setJhgh(arg0.getString("jhgh"));
+				chan.setSjch(arg0.getString("sjch"));
+				chan.setSjgh(arg0.getString("sjgh"));
+				chan.setYy(arg0.getString("yy"));
+				chan.setXgr(arg0.getString("xgr"));
 				return chan;
 			}
 		});
@@ -279,7 +302,7 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " SELECT r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name  " 
+		String sql = " SELECT r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
 		          + "  FROM bsth_c_s_sp_info_real r "
 		          + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
 		          + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
@@ -309,19 +332,23 @@ public class FormsServiceImpl implements FormsService {
 				sin.setJzl(arg0.getString("JZL"));
 				// sin.setJzl(arg0.getString(""));//非营业性用油
 				sin.setJhjl(arg0.getString("JZL"));
-				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC1(arg0.getString("j_name"), arg0.getString("cl_zbh"), startDate,
-						endDate);
-				//sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
-				sin.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
-				sin.setsName(maps.get("s_name") == null ? "" : maps.get("s_name").toString());
-				sin.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
-				sin.setEmptMileage(maps.get("ksgl") == null ? "" : maps.get("ksgl").toString());
-				sin.setJhjl(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
-
+				
 				return sin;
 			}
 		});
+			for(int i=0;i<list.size();i++){
+				Singledata si=list.get(i);
+				Map<String, Object> maps = new HashMap<>();
+				maps = scheduleRealInfoService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
+						endDate);
+				//sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
+				si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
+				si.setsName(maps.get("s_name") == null ? "" : maps.get("s_name").toString());
+				si.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
+				si.setEmptMileage(maps.get("ksgl") == null ? "" : maps.get("ksgl").toString());
+				si.setJhjl(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
+		
+		}
 		return list;
 	}
@@ -329,7 +356,7 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Operationservice> operationservice(Map<String, Object> map) {
-		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
+		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
 		        + "  FROM bsth_c_s_sp_info_real r "
 		       // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
 		        + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
@@ -338,6 +365,7 @@ public class FormsServiceImpl implements FormsService {
 				+ "  where r.schedule_date_str BETWEEN '"+ map.get("startDate").toString() 
 		        + "'" + "  and '" + map.get("endDate").toString() + "'"
 				+ "  and r.xl_bm='" + map.get("line").toString() + "'" 
+				+ " and r.bc_type not in('in','out')"
 			   /* + " and r.gs_bm='"+map.get("gsdmOperat").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'"*/
 				+ "  AND r.gs_bm is not null"
@@ -373,11 +401,12 @@ public class FormsServiceImpl implements FormsService {
 		return list;
 	}
+
 	// 车辆加注
 	@Override
 	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line, String date) {
-		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name  " 
+		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type  " 
 		        + "  FROM bsth_c_s_sp_info_real r "
 		        + " INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y "
 		        + " where to_days(y.RQ)=to_days('" + date + "')  and y.XLBM= '" + line + "'  GROUP BY  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH) y "
@@ -385,6 +414,7 @@ public class FormsServiceImpl implements FormsService {
 				+ "  where to_days(r.schedule_date_str)=to_days('" + date + "')" 
 		        + "  and r.xl_bm='" + line + "' "
 		        + " AND r.gs_bm is not null"
+		        + " and r.bc_type not in('in','out')"
 		        /* + " and r.gs_bm='"+gsdmVehic +"'"
 				+ " and r.fgs_bm='"+fgsdmVehic +"'"*/
 				+ "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
@@ -402,15 +432,21 @@ public class FormsServiceImpl implements FormsService {
 				ve.setHyl(arg0.getString("YH"));
 				ve.setJzl(arg0.getString("JZL"));
 				// ve.setLs(arg0.getString("").toString());//尿素
-				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC2(arg0.getString("j_gh"), arg0.getString("cl_zbh"),
-						arg0.getString("schedule_date_str"));
-				ve.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
-				ve.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
-				ve.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
+				ve.setJgh(arg0.getString("j_gh").toString());
 				return ve;
 			}
 		});
+		
+		for(int i=0;i<list.size();i++){
+			Vehicleloading v=list.get(i);
+			Map<String, Object> maps = new HashMap<>();
+			maps = scheduleRealInfoService.findKMBC2(v.getJgh(), line,
+					date);
+			v.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
+			v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
+			v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
+		}
+		
 		return list;
 	}
@@ -434,20 +470,22 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car 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"
+		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car,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 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("gsdmTurn").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"*/
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name ) a left JOIN ("
+				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
-				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl  from bsth_c_s_sp_info_real	 "
+				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
 				+ " 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 "
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name) b ON  t.company=b.gs_bm) b on "
+				+ " AND bc_type NOT IN ('in', 'out')"
+				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm) b on "
 				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
@@ -480,6 +518,7 @@ public class FormsServiceImpl implements FormsService {
 		});
+		
 		return list;
 	}
@@ -503,20 +542,20 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		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 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"
+		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 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"
+				+ 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() + "'"*/
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name ) a left JOIN ("
-				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
-				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl  from bsth_c_s_sp_info_real	 "
+				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl  "
+				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
 				+ "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 "
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name) b ON  t.company=b.gs_bm) b on "
+				+ "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
+				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm) b on "
 				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Executionrate> list = jdbcTemplate.query(sql, new RowMapper<Executionrate>() {
@@ -570,22 +609,27 @@ public class FormsServiceImpl implements FormsService {
 		String rq2 = sdf1.format(d);
 		String rq3 = sdf1.format(d1);
+		
+		
 		rq = rq2 + "-" + rq3;
-		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 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"
+		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 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"
+				+ 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() + "'"*/
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name ) a left JOIN ("
-				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
-				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl  from bsth_c_s_sp_info_real	 "
+				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+				+ "SELECT  COUNT(*"
+				+ ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b."
+				+ "xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
+				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
 				+ "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 "
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name) b ON  t.company=b.gs_bm) b on "
+				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get
+				("line").toString()
+				+ "' AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
+				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm) b on "
 				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Allline> list = jdbcTemplate.query(sql, new RowMapper<Allline>() {
@@ -610,14 +654,19 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcjh(arg0.getString("jbc").toString());
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
+				
 				// tu.setSm(arg0.getString("xl_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
 			}
+			
 		});
+		
+		
+		
 		return list;
 	}
-}
 \ No newline at end of file
+}
@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
 import java.io.BufferedOutputStream;
@@ -37,6 +36,8 @@ import java.sql.ResultSet;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
+
 /**
  *
  * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
@@ -102,9 +103,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private ScheduleRealInfoRepository scheduleRealInfoRepository;
-	@Autowired
-	NamedParameterJdbcTemplate jdbcTemplate;
-
 	// 运管处接口
 	private InternalPortType portType = new Internal().getInternalHttpSoap11Endpoint();
@@ -299,32 +297,38 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 */
 	public String setLD(){
 		String result = "failure";
+		Line line;
 		// 取昨天 的日期
 		String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
 		StringBuffer sf = new StringBuffer();
 		try {
 			sf.append("<DLDS>");
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
-			List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLDGroup(date);
+			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLDGroup(date);
 			Map<String,Object> map = new HashMap<String,Object>();
-			for(ScheduleRealInfo schRealInfo:listGroup){
+			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
 					//根据车辆自编号查询车牌号
-					map.put("insideCode_eq", schRealInfo.getClZbh());
+					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
 					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
+					// 获取线路是否使用标识，如果未使用，则不查该线路数据
+					line = lineRepository.findByLineCode(schRealInfo.get("xlBm")+"");
+					if(line.getInUse() == null || line.getInUse() == 0){
+						continue;
+					}
 					sf.append("<DLD>");
-					sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
-					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
-					sf.append("<LPBH>"+schRealInfo.getLpName()+"</LPBH>");
+					sf.append("<RQ>"+date+"</RQ>");
+					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm")+"")+"</XLBM>");
+					sf.append("<LPBH>"+schRealInfo.get("lpName")+"</LPBH>");
 					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
-					sf.append("<UPDT>"+sdfnyrsfm.format(schRealInfo.getUpdateDate())+"</UPDT>");
+					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
 					sf.append("<LDList>");
 					int seqNumber = 0;
 					for(ScheduleRealInfo scheduleRealInfo:list){
-						if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getLpName()
+						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
 								.equals(scheduleRealInfo.getLpName())
-								&& schRealInfo.getClZbh().equals(scheduleRealInfo.getClZbh())){
+								&& (schRealInfo.get("clZbh")+"").equals(scheduleRealInfo.getClZbh())){
 							if(scheduleRealInfo.getFcsjActual() == null ||scheduleRealInfo.getBcType().equals("in")
 									|| scheduleRealInfo.getBcType().equals("out")){
 								continue;
@@ -382,22 +386,22 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		StringBuffer sf = new StringBuffer();
 		try {
 			sf.append("<LCYHS>");
-			List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLCYHGroup(date);
+			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLCYHGroup(date);
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
 			Map<String,Object> map = new HashMap<String,Object>();
-			for(ScheduleRealInfo schRealInfo:listGroup){
+			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
 					//计算总公里和空驶公里，营运公里=总公里-空驶公里
 					double totalKilometers = 0,emptyKilometers =0;
 					sf.append("<LCYH>");
-					map.put("insideCode_eq", schRealInfo.getClZbh());
+					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
 					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
 //					Cars car = carsRepository.findCarByClzbh(schRealInfo.getClZbh());
-					sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
-					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
+					sf.append("<RQ>"+date+"</RQ>");
+					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
 					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
 					for(ScheduleRealInfo scheduleRealInfo:list){
-						if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getClZbh()
+						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("clZbh")+"")
 								.equals(scheduleRealInfo.getClZbh())){
 							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 							//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
@@ -428,7 +432,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sf.append("<YH>"+""+"</YH>");
 					sf.append("<JZYL>"+""+"</JZYL>");
 					sf.append("<DH>"+""+"</DH>");
-					sf.append("<UPDT>"+sdfnyrsfm.format(schRealInfo.getUpdateDate())+"</UPDT>");
+					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
 					sf.append("<BBSCBZ>"+0+"</BBSCBZ>");
 					sf.append("</LCYH>");
 				}
@@ -458,18 +462,18 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		StringBuffer sf = new StringBuffer();
 		try {
 			sf.append("<DDRBS>");
-			List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setDDRBGroup(date);
+			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setDDRBGroup(date);
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
-			for(ScheduleRealInfo schRealInfo:listGroup){
+			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
 					double jhlc = 0,zlc = 0,jhkslc = 0,sjkslc = 0;
 					int jhbc = 0,sjbc = 0,jhzgfbc = 0,sjzgfbc = 0,jhwgfbc = 0,sjwgfbc = 0;
 					sf.append("<DDRB>");
-					sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
-					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
+					sf.append("<RQ>"+date+"</RQ>");
+					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
 					for(ScheduleRealInfo scheduleRealInfo:list){
 						if(scheduleRealInfo != null){
-							if(scheduleRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm())){
+							if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm())){
 								//计划
 								if(!scheduleRealInfo.isSflj()){
 									jhlc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
@@ -532,7 +536,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sf.append("<SJZGFBC>"+sjzgfbc+"</SJZGFBC>");
 					sf.append("<JHWGFBC>"+jhwgfbc+"</JHWGFBC>");
 					sf.append("<SJWGFBC>"+sjwgfbc+"</SJWGFBC>");
-					sf.append("<UPDT>"+sdfnyrsfm.format(schRealInfo.getUpdateDate())+"</UPDT>");
+					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
 					sf.append("<RBSCBZ>"+0+"</RBSCBZ>");
 					sf.append("</DDRB>");
 				}
@@ -557,24 +561,30 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Override
 	public String setJHBC() {
 		String result = "failure";
+		Line line;
 		StringBuffer sBuffer =new StringBuffer();
 		try {
 			sBuffer.append("<JHBCs>");
 			// 声明变量
-			SchedulePlanInfo schedulePlanInfo = null;
-			String xlbm = "",zbh = "";
+			SchedulePlanInfo schedulePlanInfo;
+			String xlbm,zbh = "";
 			Long lp = 0L;
-			int startSerialNum = 0,endSerialNum = 0;;
 			// 取明天的日期
 			String tomorrow = sdfnyr.format(DateUtils.addDays(new Date(), +1));
 			// 查询所有班次
 			List<SchedulePlanInfo> schedulePlanList = schedulePlanInfoRepository.findLineScheduleBc(tomorrow);
+			int j = 0; // 初始化标识
 			if(schedulePlanList != null ){
 				int size = schedulePlanList.size();
 				for (int i = 0; i < size; i++) {
 					schedulePlanInfo = schedulePlanList.get(i);
-					if(i == 0){// 第一次，则初始化值
-						xlbm = schedulePlanInfo.getXlBm();
+					xlbm = schedulePlanInfo.getXlBm();
+					// 获取线路是否使用标识，如果未使用，则不查该线路数据
+					line = lineRepository.findByLineCode(xlbm);
+					if(line.getInUse() == null || line.getInUse() == 0){
+						continue;
+					}
+					if(++j == 1){// 第一次，则初始化值
 						zbh = schedulePlanInfo.getClZbh();
 						lp = schedulePlanInfo.getLp();
 						// 拼装XML
@@ -605,18 +615,28 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sBuffer.append("</JHBC>");
 						}
 					}else{
-						xlbm = schedulePlanInfo.getXlBm();
 						zbh = schedulePlanInfo.getClZbh();
 						lp = schedulePlanInfo.getLp();
 						sBuffer.append("</BCList>");
 						sBuffer.append("</JHBC>");
-						startSerialNum = 0;
-						endSerialNum = 0;
 						// 拼装XML
 						assembleJHBC(sBuffer, schedulePlanInfo, xlbm, zbh, lp);
 					}
 				}
 			}
+			// 判断XML是否以</BCList>结尾，如果不是，则加上
+			String regex = "^*</JHBC>$";
+			Pattern p = Pattern.compile(regex);
+			java.util.regex.Matcher m = p.matcher(sBuffer);
+			boolean isEndWithTrueFlag = false;
+			while (m.find()) {
+				isEndWithTrueFlag = true;
+			}
+			// 加上缺失的标签
+			if(!isEndWithTrueFlag){
+				sBuffer.append("</BCList>");
+				sBuffer.append("</JHBC>");
+			}
 			sBuffer.append("</JHBCs>");
 			if(ssop.setJHBC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
@@ -643,7 +663,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			StringBuffer sBufferA;
 			StringBuffer sBufferB;
 			TTInfo ttInfo;
-			TTInfoDetail ttInfoDetail = null;
+			TTInfoDetail ttInfoDetail;
 			Iterator<TTInfoDetail> ttInfoDetailIterator;
 			HashMap<String,Object> param = new HashMap<String, Object>();
 			String lineCode ;
@@ -1027,6 +1047,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			company = "浦东金高公交公司";
 		}else if(company.equals("南汇公司")){
 			company = "浦东南汇公交公司";
+		}else if(company.equals("青浦公交")){
+			company = "浦东青浦公交公司";
 		}
 	}
 	/**
 package com.bsth.service.realcontrol.impl;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.match.Arrival2Schedule;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ChildTaskPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.Map;
 @Service
 public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService{
 	/*@Autowired
 	ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
+
+	@Autowired
+	ScheduleRealInfoRepository scheduleRealInfoRepository;
 	@Autowired
 	ChildTaskPlanRepository childTaskPlanRepository;
@@ -30,6 +33,9 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
 	@Autowired
 	Arrival2Schedule arrival2Schedule;
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	@Transactional
 	@Override
@@ -62,10 +68,13 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
 		//解除和主任务关联
 		ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
 		sch.getcTasks().remove(cPlan);
+		//删除关联表数据
+		jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real="+sch.getId()+" and c_tasks="+cPlan.getId());
+
 		//删除子任务
 		rs = super.delete(id);
 		dayOfSchedule.save(sch);
-		
+
 		rs.put("t", sch);
 		return rs;
 	}
@@ -613,11 +613,32 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<Object[]> historyMessage(String line, String date, String code) {
+		
+		String sql="select t.car_code,d.sender,d.txt_content,d.timestamp from  ("
+				+ "  select equipment_code,car_code  from bsth_c_cars where id in("
+				+ " select cl from bsth_c_s_ccinfo where  xl in ( "
+				+ " select id from bsth_c_line where line_code=?1 ))) t"
+				+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
+				+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like '%?4%'";
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, date, code);
+		long d= 0;
+		long t=0;
+		if(date.length()>0){
+			try {
+				d=sdf.parse(date+" 00:00:00").getTime();
+				t=sdf.parse(date+" 23:59:59").getTime();
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+		}
+		
+		List<Object[]> list = scheduleRealInfoRepository.historyMessage(line,d,t, code);
 		for(Object[] obj:list){
 			if(obj != null){
-				obj[4] = sdf.format(new Date(Long.parseLong(obj[4].toString())));
+				obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
+				obj[4] = BasicData.lineCode2NameMap.get(line);
 			}
 		}
 		return list;
@@ -1129,10 +1150,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					addMileage += tempJhlc;
 					ljbc++;
 				}else{
-					if(scheduleRealInfo.getBcType().equals("normal")){
+					if( !(scheduleRealInfo.getBcType().equals("in")
+							||scheduleRealInfo.getBcType().equals("out")) ){
 						jhbc++;
+						jhlc += tempJhlc;
 					}
-					jhlc += tempJhlc;
+					
 					if(scheduleRealInfo.getStatus() == -1){
 						remMileage += tempJhlc;
 						cjbc++;
@@ -1143,11 +1166,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				if(childTaskPlans.isEmpty()){
 					if(scheduleRealInfo.getBcType().equals("in") || 
 							scheduleRealInfo.getBcType().equals("out")){
-						ksgl += tempJhlc;
 						jcclc +=tempJhlc;
-					}else if(scheduleRealInfo.getBcType().equals("venting")){
-						ksgl += tempJhlc;
-					}else{
+					}
+					//主任务 放空班次属于营运
+//					else if(scheduleRealInfo.getBcType().equals("venting")){
+//						ksgl += tempJhlc;
+//					}
+					else{
 						if(scheduleRealInfo.getStatus() != -1){
 							yygl += tempJhlc;
 						}
@@ -1160,8 +1185,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 						}else{
 							if(childTaskPlan.isDestroy()){
-								remMileage += tempJhlc;
-								cjbc++;
+								remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+//								cjbc++;
 							}else{
 								yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 							}
@@ -1175,12 +1200,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("addMileage", format.format(addMileage));
 		map.put("yygl", format.format(yygl));
 		map.put("ksgl", format.format(ksgl));
-		map.put("realMileage", format.format(yygl+ksgl));
+		map.put("realMileage", format.format(yygl+ksgl+jcclc));
 		map.put("jhbc", jhbc);
 		map.put("cjbc", cjbc);
 		map.put("ljbc", ljbc);
 		map.put("sjbc", jhbc-cjbc+ljbc);
 		map.put("jcclc", jcclc);
+		map.put("zkslc", ksgl+jcclc);
 		return map;
 	}
@@ -1259,115 +1285,121 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		Map<String,Object> map = new HashMap<String, Object>();
 		for(ScheduleRealInfo scheduleRealInfo: list){
 			if(scheduleRealInfo != null){
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				//计算实际里程，少驶里程，计划里程=实际里程+少驶里程
-				if(childTaskPlans.isEmpty()){
-					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-					jhlc += tempJhlc;
-					if(scheduleRealInfo.getStatus() == 2){
-						sjgl += tempJhlc;
-					}else if(scheduleRealInfo.getStatus() == -1){
-						ssgl += tempJhlc;
-						if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("路阻") != -1){
-							ssgl_lz += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1){
-							ssgl_dm += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("故障") != -1){
-							ssgl_gz += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1){
-							ssgl_jf += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("肇事") != -1){
-							ssgl_zs += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺人") != -1){
-							ssgl_qr += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺车") != -1){
-							ssgl_qc += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("客稀") != -1){
-							ssgl_kx += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("气候") != -1){
-							ssgl_qh += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("援外") != -1){
-							ssgl_yw += tempJhlc;
-						}else{
-							ssgl_other += tempJhlc;
-						}
-						
+				
+				if(!(scheduleRealInfo.getBcType().equals("in")
+							||scheduleRealInfo.getBcType().equals("out")) ){
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					//计算实际里程，少驶里程，计划里程=实际里程+少驶里程
+					if(childTaskPlans.isEmpty()){
+						tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
 						//临加公里
 						if(scheduleRealInfo.isSflj()){
 							ljgl += tempJhlc;
+						}else{
+							jhlc += tempJhlc;
 						}
-					}else{
-						ssgl += tempJhlc;
-						ssgl_other += tempJhlc;
-					}
-				}else{
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-					while(it.hasNext()){
-						ChildTaskPlan childTaskPlan = it.next();
-						childMileage = childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-						jhlc += childMileage;
-						if(childTaskPlan.isDestroy()){
-							ssgl += childMileage;
-							if(childTaskPlan.getDestroyReason().equals("路阻")){
-								ssgl_lz += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("吊慢")){
-								ssgl_dm += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("故障")){
-								ssgl_gz += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("纠纷")){
-								ssgl_jf += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("肇事")){
-								ssgl_zs += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("缺人")){
-								ssgl_qr += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("缺车")){
-								ssgl_qc += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("客稀")){
-								ssgl_kx += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("气候")){
-								ssgl_qh += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("援外")){
-								ssgl_yw += childTaskPlan.getMileage();
+						if(scheduleRealInfo.getStatus() == 2){
+							sjgl += tempJhlc;
+						}else if(scheduleRealInfo.getStatus() == -1){
+							ssgl += tempJhlc;
+							if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("路阻") != -1){
+								ssgl_lz += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1){
+								ssgl_dm += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("故障") != -1){
+								ssgl_gz += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1){
+								ssgl_jf += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("肇事") != -1){
+								ssgl_zs += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺人") != -1){
+								ssgl_qr += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺车") != -1){
+								ssgl_qc += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("客稀") != -1){
+								ssgl_kx += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("气候") != -1){
+								ssgl_qh += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("援外") != -1){
+								ssgl_yw += tempJhlc;
 							}else{
-								ssgl_other += childTaskPlan.getMileage();
+								ssgl_other += tempJhlc;
 							}
+							
+							
 						}else{
-							sjgl += childMileage;
+							ssgl += tempJhlc;
+							ssgl_other += tempJhlc;
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while(it.hasNext()){
+							ChildTaskPlan childTaskPlan = it.next();
+							childMileage = childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							jhlc += childMileage;
+							if(childTaskPlan.isDestroy()){
+								ssgl += childMileage;
+								if(childTaskPlan.getDestroyReason().equals("路阻")){
+									ssgl_lz += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("吊慢")){
+									ssgl_dm += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("故障")){
+									ssgl_gz += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("纠纷")){
+									ssgl_jf += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("肇事")){
+									ssgl_zs += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("缺人")){
+									ssgl_qr += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("缺车")){
+									ssgl_qc += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("客稀")){
+									ssgl_kx += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("气候")){
+									ssgl_qh += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("援外")){
+									ssgl_yw += childTaskPlan.getMileage();
+								}else{
+									ssgl_other += childTaskPlan.getMileage();
+								}
+							}else{
+								sjgl += childMileage;
+							}
 						}
 					}
-				}
-				
-				//班次
-				jhbc++;
-				String[] fcsj = scheduleRealInfo.getFcsj().split(":");
-				String[] fcsjActual = (scheduleRealInfo.getFcsjActual()==null?"0:00":scheduleRealInfo.getFcsjActual()).split(":");
-				if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_1){
-					jhbc_m++;
-				}else if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_3){
-					jhbc_a++;
-				}
-				if(scheduleRealInfo.getStatus() == 2){
-					sjbc++;
-					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-						sjbc_m++;
-					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-						sjbc_a++;
+					
+					//班次
+					jhbc++;
+					String[] fcsj = scheduleRealInfo.getFcsj().split(":");
+					String[] fcsjActual = (scheduleRealInfo.getFcsjActual()==null?"0:00":scheduleRealInfo.getFcsjActual()).split(":");
+					if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_1){
+						jhbc_m++;
+					}else if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_3){
+						jhbc_a++;
 					}
-				}
-				if(scheduleRealInfo.isSflj()){
-					ljbc++;
-					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-						ljbc_m++;
-					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-						ljbc_a++;
+					if(scheduleRealInfo.getStatus() == 2){
+						sjbc++;
+						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+							sjbc_m++;
+						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+							sjbc_a++;
+						}
 					}
-				}
-				if(scheduleRealInfo.getBcType().equals("venting")){
-					fzbc++;
-					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-						fzbc_m++;
-					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-						fzbc_a++;
+					if(scheduleRealInfo.isSflj()){
+						ljbc++;
+						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+							ljbc_m++;
+						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+							ljbc_a++;
+						}
+					}
+					if(scheduleRealInfo.getBcType().equals("venting")){
+						fzbc++;
+						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+							fzbc_m++;
+						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+							fzbc_a++;
+						}
 					}
 				}
 			}	
@@ -6,6 +6,6 @@ import com.bsth.entity.schedule.CarConfigInfo;
  * Created by xu on 16/5/9.
  */
 public interface CarConfigInfoService extends BService<CarConfigInfo, Long> {
-    public void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException;
-    public void toggleCancel(Long id) throws ScheduleException;
+    void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException;
+    void toggleCancel(Long id) throws ScheduleException;
 }
+package com.bsth.service.schedule;
+
+import com.bsth.entity.CarDevice;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+public interface CarDeviceService extends BService<CarDevice, Long> {
+    void validate_qyrq(CarDevice carDevice) throws ScheduleException;
+}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.Personnel;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+public interface EmployeeService extends BService<Personnel, Integer> {
+    public void validate_gh(Personnel personnel) throws ScheduleException;
+}
@@ -6,6 +6,8 @@ import com.bsth.entity.schedule.GuideboardInfo;
  * Created by xu on 16/5/11.
  */
 public interface GuideboardInfoService extends BService<GuideboardInfo, Long> {
-    public void validate(GuideboardInfo guideboardInfo) throws ScheduleException;
+    public void validate_lpno(GuideboardInfo guideboardInfo) throws ScheduleException;
+    public void validate_lpname(GuideboardInfo guideboardInfo) throws ScheduleException;
     public void toggleCancel(Long id) throws ScheduleException;
+
 }
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.service.BaseService;
 /**
  * Created by xu on 16/10/20.
  */
-public interface RerunService extends BaseService<RerunRule, Long> {
+public interface RerunService extends BService<RerunRule, Long> {
 }
-package com.bsth.service.schedule;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.repository.schedule.RerunRuleRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by xu on 16/10/20.
- */
-@Service
-public class RerunServiceImpl extends BaseServiceImpl<RerunRule, Long> implements RerunService {
-
-    @Autowired
-    private RerunRuleRepository rerunRuleRepository;
-
-    @Override
-    @Transactional
-    public Map<String, Object> delete(Long aLong) {
-        // 获取带作废的数据
-        RerunRule rerunRule = rerunRuleRepository.findOne(aLong);
-
-        toogleIsCancel(rerunRule);
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("status", ResponseCode.SUCCESS);
-
-        return map;
-
-    }
-
-    /**
-     * 撤销/作废切换。
-     * @param rerunRule
-     */
-    private void toogleIsCancel(RerunRule rerunRule) {
-        boolean isCancel = rerunRule.getIsCancel();
-        if (isCancel) {
-            rerunRule.setIsCancel(false);
-        } else {
-            rerunRule.setIsCancel(true);
-        }
-    }
-}
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.BaseService;
 /**
  * Created by xu on 16/5/12.
  */
-public interface TTInfoService extends BaseService<TTInfo, Long> {
+public interface TTInfoService extends BService<TTInfo, Long> {
+    void validate_name(TTInfo ttInfo) throws ScheduleException;
+    void validate_n_d(TTInfo ttInfo) throws ScheduleException;
+    void validate_s_d(TTInfo ttInfo) throws ScheduleException;
+    void toggleCancel(Long id) throws ScheduleException;
+
 }
-package com.bsth.service.schedule;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.repository.schedule.TTInfoRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by xu on 16/5/12.
- */
-@Service
-@Transactional
-public class TTInfoServiceImpl extends BaseServiceImpl<TTInfo, Long> implements TTInfoService {
-    @Autowired
-    private TTInfoRepository ttInfoRepository;
-
-    @Transactional
-    @Override
-    public Map<String, Object> delete(Long aLong) {
-        // 获取待作废的数据
-        TTInfo ttInfo = ttInfoRepository.findOne(aLong);
-
-        toogleIsCancel(ttInfo);
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("status", ResponseCode.SUCCESS);
-
-        return map;
-    }
-
-
-
-    private void toogleIsCancel(TTInfo ttInfo) {
-        boolean isCancel = ttInfo.getIsCancel();
-        if (isCancel) {
-            ttInfo.setIsCancel(false);
-        } else {
-            ttInfo.setIsCancel(true);
-        }
-    }
-}
@@ -36,12 +36,14 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
             throw new ScheduleException("线路未选择");
         } else {
 //            param.put("xl.id_eq", carConfigInfo.getXl().getId());
+            param.put("isCancel_eq", false);
             if (carConfigInfo.getCl() == null || carConfigInfo.getCl().getId() == null) {
                 throw new ScheduleException("车辆未选择");
             } else {
                 param.put("cl.id_eq", carConfigInfo.getCl().getId());
-                if (!CollectionUtils.isEmpty(list(param))) {
-                    throw new ScheduleException("车辆已经配置在" + carConfigInfo.getXl().getName() + "线路中！");
+                List<CarConfigInfo> carConfigInfos = list(param);
+                if (!CollectionUtils.isEmpty(carConfigInfos)) {
+                    throw new ScheduleException("车辆已经配置在" + carConfigInfos.get(0).getXl().getName() + "线路中！");
                 }
             }
         }
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.CarDevice;
+import com.bsth.entity.Cars;
+import com.bsth.service.CarsService;
+import com.bsth.service.schedule.CarDeviceService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+@Service(value = "carDeviceServiceImpl_sc")
+public class CarDeviceServiceImpl extends BServiceImpl<CarDevice, Long> implements CarDeviceService {
+    @Autowired
+    private CarsService carsService;
+
+    @Transactional
+    @Override
+    public CarDevice save(CarDevice carDevice) {
+        // 查找对应的车辆基础信息，更新设备编号数据
+        Cars cars = carsService.findById(carDevice.getCl());
+        cars.setEquipmentCode(carDevice.getNewDeviceNo());
+        return super.save(carDevice);
+    }
+
+    @Transactional
+    @Override
+    public void validate_qyrq(CarDevice carDevice) throws ScheduleException {
+        if (carDevice.getXl() == null) {
+            throw new ScheduleException("线路未选择");
+        }
+        if (carDevice.getCl() == null) {
+            throw new ScheduleException("车辆未选择");
+        }
+        Map<String, Object> param = new HashMap<>();
+        if (carDevice.getId() != null) {
+            param.put("id_ne", carDevice.getId());
+        }
+        param.put("xl_eq", carDevice.getXl());
+        param.put("cl_eq", carDevice.getCl());
+        param.put("qyrq_ge", carDevice.getQyrq());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("启用日期必须比历史的启用日期大");
+        }
+    }
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        toggleCancel(aLong);
+    }
+
+    @Transactional
+    public void toggleCancel(Long id) throws ScheduleException {
+        CarDevice carDevice = findById(id);
+        if (carDevice.getIsCancel()) {
+            carDevice.setIsCancel(false);
+        } else {
+            carDevice.setIsCancel(true);
+        }
+    }
+}
@@ -34,12 +34,15 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
                 employeeConfigInfo.getXl().getName() == null) {
             throw new ScheduleException("线路未选择");
         } else {
+//            param.put("xl.id_eq", employeeConfigInfo.getXl().getId());
+            param.put("isCancel_eq", false);
             if (employeeConfigInfo.getJsy() == null || employeeConfigInfo.getJsy().getId() == null) {
                 throw new ScheduleException("驾驶员未选择");
             } else {
                 param.put("jsy.id_eq", employeeConfigInfo.getJsy().getId());
+                List<EmployeeConfigInfo> employeeConfigInfos = list(param);
                 if (!CollectionUtils.isEmpty(list(param))) {
-                    throw new ScheduleException("驾驶员已经配置在" + employeeConfigInfo.getXl().getName() + "线路中！");
+                    throw new ScheduleException("驾驶员已经配置在" + employeeConfigInfos.get(0).getXl().getName() + "线路中！");
                 }
             }
         }
@@ -59,12 +62,14 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
                 employeeConfigInfo.getXl().getName() == null) {
             throw new ScheduleException("线路未选择");
         } else {
+//            param.put("xl.id_eq", employeeConfigInfo.getXl().getId());
             if (employeeConfigInfo.getSpy() == null || employeeConfigInfo.getSpy().getId() == null) {
                 throw new ScheduleException("售票员未选择");
             } else {
                 param.put("spy.id_eq", employeeConfigInfo.getSpy().getId());
+                List<EmployeeConfigInfo> employeeConfigInfos = list(param);
                 if (!CollectionUtils.isEmpty(list(param))) {
-                    throw new ScheduleException("售票员已经配置在" + employeeConfigInfo.getXl().getName() + "线路中！");
+                    throw new ScheduleException("售票员已经配置在" + employeeConfigInfos.get(0).getXl().getName() + "线路中！");
                 }
             }
         }
@@ -83,7 +88,9 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
         Map<String, Object> param = new HashMap<>();
         if (employeeConfigInfo.getIsCancel()) {
             validate_jsy(employeeConfigInfo);
-            validate_spy(employeeConfigInfo);
+            if (employeeConfigInfo.getSpy() != null) {
+                validate_spy(employeeConfigInfo);
+            }
             employeeConfigInfo.setIsCancel(false);
         } else {
             param.clear();
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.Personnel;
+import com.bsth.service.schedule.EmployeeService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+@Service
+public class EmployeeServiceImpl extends BServiceImpl<Personnel, Integer> implements EmployeeService {
+    @Override
+    @Transactional
+    public void validate_gh(Personnel personnel) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (personnel.getId() != null) {
+            param.put("id_ne", personnel.getId());
+        }
+        param.put("companyCode_eq", personnel.getCompanyCode());
+        param.put("jobCode_eq", personnel.getJobCode());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("相同公司工号重复");
+        }
+    }
+}
@@ -22,52 +22,44 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
-    // 验证方法
-    @Transactional
-    public void validate(GuideboardInfo guideboardInfo) throws ScheduleException {
+    @Override
+    public void validate_lpno(GuideboardInfo guideboardInfo) throws ScheduleException {
         // 查询条件
         Map<String, Object> param = new HashMap<>();
-        if (guideboardInfo.getId() != null)
+        if (guideboardInfo.getId() != null) {
             param.put("id_ne", guideboardInfo.getId());
+        }
         if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
             throw new ScheduleException("线路未选择");
         } else {
+            param.put("isCancel_eq", false); // 作废的也算入判定区
             param.put("xl.id_eq", guideboardInfo.getXl().getId());
+            param.put("lpNo_eq", guideboardInfo.getLpNo());
+            if (!CollectionUtils.isEmpty(list(param))) {
+                throw new ScheduleException("路牌编号重复");
+            }
+        }
+    }
-//            param.put("isCancel_eq", false); // 作废的也算入判定区
-            if (guideboardInfo.getLpNo() != null) {
-                if (guideboardInfo.getLpName() != null) {
-                    // 如果两个都写了，分开查询
-                    param.put("lpNo_eq", guideboardInfo.getLpNo());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌编号重复");
-                    }
-                    param.remove("lpNo_eq");
-                    param.put("lpName_eq", guideboardInfo.getLpName());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌名称重复");
-                    }
+    @Override
+    public void validate_lpname(GuideboardInfo guideboardInfo) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (guideboardInfo.getId() != null) {
+            param.put("id_ne", guideboardInfo.getId());
+        }
-                } else {
-                    param.put("lpNo_eq", guideboardInfo.getLpNo());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌编号重复");
-                    }
-                }
-            } else {
-                if (guideboardInfo.getLpName() != null) {
-                    param.put("lpName_eq", guideboardInfo.getLpName());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌名字重复");
-                    }
-                } else {
-                    // 都为空
-                    throw new ScheduleException("路牌编号名字都为空");
-                }
+        if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
+            throw new ScheduleException("线路未选择");
+        } else {
+            param.put("isCancel_eq", false); // 作废的也算入判定区
+            param.put("xl.id_eq", guideboardInfo.getXl().getId());
+            param.put("lpName_eq", guideboardInfo.getLpName());
+            if (!CollectionUtils.isEmpty(list(param))) {
+                throw new ScheduleException("路牌名字重复");
             }
         }
-
     }
     @Transactional
@@ -83,7 +75,8 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
         GuideboardInfo guideboardInfo = findById(id);
         Map<String, Object> param = new HashMap<>();
         if (guideboardInfo.getIsCancel()) {
-            validate(guideboardInfo);
+            validate_lpno(guideboardInfo);
+            validate_lpname(guideboardInfo);
             guideboardInfo.setIsCancel(false);
         } else {
             param.clear();
@@ -96,7 +89,7 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
             } else {
                 throw new ScheduleException("在时刻表" +
                         ttInfoDetailList.get(0).getTtinfo().getName() +
-                        "已使用，无法删除！");
+                        "已使用，无法作废！");
             }
         }
     }
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.schedule.rule.RerunRule;
+import com.bsth.service.schedule.RerunService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by xu on 16/10/20.
+ */
+@Service
+public class RerunServiceImpl extends BServiceImpl<RerunRule, Long> implements RerunService {
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        toggleCancel(aLong);
+    }
+
+    private void toggleCancel(Long id) throws ScheduleException {
+        RerunRule rerunRule = findById(id);
+        if (rerunRule.getIsCancel()) {
+            rerunRule.setIsCancel(false);
+        } else {
+            rerunRule.setIsCancel(true);
+        }
+    }
+}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.TTInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/20.
+ */
+@Service
+public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTInfoService {
+
+    @Override
+    public void validate_name(TTInfo ttInfo) throws ScheduleException {
+        // 名字重复验证
+        Map<String, Object> param = new HashMap<>();
+        if (ttInfo.getId() != null) {
+            param.put("id_ne", ttInfo.getId());
+        }
+        param.put("xl.id_eq", ttInfo.getXl().getId());
+        param.put("name_eq", ttInfo.getName());
+
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("名字重复");
+        }
+    }
+
+    @Override
+    public void validate_n_d(TTInfo ttInfo) throws ScheduleException {
+        // 常规有效日重复验证
+        // 找出所有未作废，已启用的时刻表，验证
+        Map<String, Object> param = new HashMap<>();
+        if (ttInfo.getId() != null) {
+            param.put("id_ne", ttInfo.getId());
+        }
+        param.put("xl.id_eq", ttInfo.getXl().getId());
+        param.put("isCancel_eq", false);
+        param.put("isEnableDisTemplate_eq", true);
+        List<TTInfo> ttInfos = list(param);
+        if (StringUtils.isEmpty(ttInfo.getRule_days())) {
+            throw new ScheduleException("常规有效日为空");
+        } else {
+            String[] nds = ttInfo.getRule_days().split(",");
+            for (TTInfo t : ttInfos) {
+                String[] nds_e = t.getRule_days().split(",");
+                for (int i = 0; i < 7; i++) {
+                    if ("0".equals(nds[i])) {
+                        //
+                    } else {
+                        if (nds[i].equals(nds_e[i])) {
+                            throw new ScheduleException("当前常规有效日期已经使用");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void validate_s_d(TTInfo ttInfo) throws ScheduleException {
+        // 特殊有效日重复验证
+        // 找出所有未作废，已启用的时刻表，验证
+        Map<String, Object> param = new HashMap<>();
+        if (ttInfo.getId() != null) {
+            param.put("id_ne", ttInfo.getId());
+        }
+
+        param.put("xl.id_eq", ttInfo.getXl().getId());
+        param.put("isCancel_eq", false);
+        param.put("isEnableDisTemplate_eq", true);
+        List<TTInfo> ttInfos = list(param);
+        if (StringUtils.isEmpty(ttInfo.getSpecial_days())) {
+            //
+        } else {
+            String[] sds = ttInfo.getSpecial_days().split(",");
+            for (TTInfo t : ttInfos) {
+                if (StringUtils.isEmpty(t.getSpecial_days())) {
+                    //
+                } else {
+                    for (String sd : sds) {
+                        if (t.getSpecial_days().indexOf(sd) != -1) {
+                            throw new ScheduleException("当前特殊日期已经使用");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        toggleCancel(aLong);
+    }
+
+    @Transactional
+    @Override
+    public void toggleCancel(Long id) throws ScheduleException {
+        TTInfo ttInfo = findById(id);
+        if (ttInfo.getIsCancel()) {
+            ttInfo.setIsCancel(false);
+        } else {
+            ttInfo.setIsCancel(true);
+        }
+    }
+}
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root
@@ -116,6 +116,27 @@
       <bordercolorblue>100</bordercolorblue>
       <drawshadow>Y</drawshadow>
     </notepad>
+    <notepad>
+      <note>&#x8fd9;&#x91cc;&#x6709;&#x4e9b;&#x95ee;&#x9898;&#xa;&#x5728;window2012&#x7684;&#x73af;&#x5883;&#x4e0b;&#xff0c;&#xa;MySql&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x4e2d;&#x5982;&#x679c;&#x8fd4;&#x56de;&#x4e2d;&#x6587;&#x5185;&#x5bb9;&#x7684;&#x5b57;&#x6bb5;&#xff0c;&#x8fd9;&#x4e2a;&#x5185;&#x5bb9;&#x4e71;&#x7801;&#xa;&#x89e3;&#x51b3;&#x529e;&#x6cd5;&#xff0c;&#x5c31;&#x662f;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x5168;&#x90e8;&#x7f13;&#x5b58;&#xff0c;&#x5c31;&#x4e0d;&#x4e71;&#x7801;&#xa;linux&#x73af;&#x5883;&#x4e0b;&#x6ca1;&#x95ee;&#x9898;</note>
+      <xloc>721</xloc>
+      <yloc>762</yloc>
+      <width>333</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
   </notepads>
   <connection>
     <name>bus_control_variable</name>
@@ -130,6 +151,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -437,7 +459,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var zdzname &#x3d; cc_groups&#x5b;gno&#x5d;&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#x662f;&#x4e0b;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x59cb;&#x7ad9;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var zdzname &#x3d; cc_groups&#x5b;gno&#x5d;&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#x662f;&#x4e0b;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x59cb;&#x7ad9;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;&#xa;var destory &#x3d; 0&#x3b; &#x2f;&#x2f; &#x672a;&#x64a4;&#x9500;flag</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>zdzname</name>
         <rename>zdzname</rename>
         <type>String</type>
@@ -450,6 +472,12 @@
         <length>-1</length>
         <precision>-1</precision>
         <replace>N</replace>
+      </field>      <field>        <name>destory</name>
+        <rename>destory</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
       <xloc>575</xloc>
@@ -1341,6 +1369,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>station</name>
         <rename>zdzid</rename>
@@ -1677,6 +1711,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>station_name</name>
         <rename>zdzname</rename>
@@ -1737,6 +1777,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>station</name>
         <rename>qdzid</rename>
@@ -1845,6 +1891,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>directions</name>
         <rename>sxx</rename>
@@ -1872,8 +1924,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
@@ -1899,6 +1951,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>station_name</name>
         <rename>zdzname_calcu</rename>
@@ -1953,6 +2011,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>directions</name>
         <rename>sxx2</rename>
@@ -1989,7 +2053,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var sendZdtype &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var sendZdtype &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;&#xa;var destory &#x3d; 0&#x3b; &#x2f;&#x2f; &#x672a;&#x64a4;&#x9500;flag</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>sendZdtype</name>
         <rename>sendZdtype</rename>
         <type>String</type>
@@ -2002,6 +2066,12 @@
         <length>-1</length>
         <precision>-1</precision>
         <replace>N</replace>
+      </field>      <field>        <name>destory</name>
+        <rename>destory</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
       <xloc>588</xloc>
@@ -2539,7 +2609,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var qdzname_calcu &#x3d; cc_groups&#x5b;gno - 2&#x5d;&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#x662f;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x8fd9;&#x91cc;&#x53ea;&#x6709;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#xff0c;&#x8fd8;&#x9700;&#x8981;&#x8ba1;&#x7b97;&#xa;var startZdtype_calcu &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype_calcu &#x3d; &#x27;E&#x27;&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var qdzname_calcu &#x3d; cc_groups&#x5b;gno - 2&#x5d;&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#x662f;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x8fd9;&#x91cc;&#x53ea;&#x6709;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#xff0c;&#x8fd8;&#x9700;&#x8981;&#x8ba1;&#x7b97;&#xa;var startZdtype_calcu &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype_calcu &#x3d; &#x27;E&#x27;&#x3b;&#xa;&#xa;var destory &#x3d; 0&#x3b; &#x2f;&#x2f; &#x672a;&#x64a4;&#x9500;flag</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname_calcu</name>
         <rename>qdzname_calcu</rename>
         <type>String</type>
@@ -2558,6 +2628,12 @@
         <length>-1</length>
         <precision>-1</precision>
         <replace>N</replace>
+      </field>      <field>        <name>destory</name>
+        <rename>destory</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
       <xloc>754</xloc>
@@ -74,6 +74,27 @@
     <is_key_private>N</is_key_private>
   </info>
   <notepads>
+    <notepad>
+      <note>&#x8fd9;&#x91cc;&#x6709;&#x4e9b;&#x95ee;&#x9898;&#xa;&#x5728;window2012&#x7684;&#x73af;&#x5883;&#x4e0b;&#xff0c;&#xa;MySql&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x4e2d;&#x5982;&#x679c;&#x8fd4;&#x56de;&#x4e2d;&#x6587;&#x5185;&#x5bb9;&#x7684;&#x5b57;&#x6bb5;&#xff0c;&#x8fd9;&#x4e2a;&#x5185;&#x5bb9;&#x4e71;&#x7801;&#xa;&#x89e3;&#x51b3;&#x529e;&#x6cd5;&#xff0c;&#x5c31;&#x662f;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x5168;&#x90e8;&#x7f13;&#x5b58;&#xff0c;&#x5c31;&#x4e0d;&#x4e71;&#x7801;&#xa;linux&#x73af;&#x5883;&#x4e0b;&#x6ca1;&#x95ee;&#x9898;</note>
+      <xloc>114</xloc>
+      <yloc>227</yloc>
+      <width>333</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
   </notepads>
   <connection>
     <name>bus_control_variable</name>
@@ -88,6 +109,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -243,6 +265,73 @@
   <hop> <from>&#x8def;&#x724c;&#x540d;&#x5b57;&#x67e5;&#x627e;</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
   </order>
   <step>
+    <name>Excel&#x8f93;&#x51fa;</name>
+    <type>ExcelOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <footer>N</footer>
+    <encoding/>
+    <append>N</append>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <file>
+      <name>&#x24;&#x7b;filepath&#x7d;</name>
+      <extention/>
+      <do_not_open_newfile_init>N</do_not_open_newfile_init>
+      <create_parent_folder>N</create_parent_folder>
+      <split>N</split>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <SpecifyFormat>N</SpecifyFormat>
+      <date_time_format/>
+      <sheetname>Sheet1</sheetname>
+      <autosizecolums>N</autosizecolums>
+      <nullisblank>N</nullisblank>
+      <protect_sheet>N</protect_sheet>
+      <password>Encrypted </password>
+      <splitevery>0</splitevery>
+      <usetempfiles>N</usetempfiles>
+      <tempdirectory/>
+      </file>
+    <template>
+      <enabled>N</enabled>
+      <append>N</append>
+      <filename>template.xls</filename>
+    </template>
+    <fields>
+    </fields>
+    <custom>
+    <header_font_name>arial</header_font_name>
+    <header_font_size>10</header_font_size>
+    <header_font_bold>N</header_font_bold>
+    <header_font_italic>N</header_font_italic>
+    <header_font_underline>no</header_font_underline>
+    <header_font_orientation>horizontal</header_font_orientation>
+    <header_font_color>black</header_font_color>
+    <header_background_color>none</header_background_color>
+    <header_row_height>255</header_row_height>
+    <header_alignment>left</header_alignment>
+    <header_image/>
+    <row_font_name>arial</row_font_name>
+    <row_font_size>10</row_font_size>
+    <row_font_color>black</row_font_color>
+    <row_background_color>none</row_background_color>
+      </custom>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>731</xloc>
+      <yloc>65</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x5217;&#x8f6c;&#x884c;</name>
     <type>Denormaliser</type>
     <description/>
@@ -368,6 +457,30 @@
     </step>
   <step>
+    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>      <field>        <name>lp_name</name>
+        <rename>&#x8def;&#x724c;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>        <select_unspecified>Y</select_unspecified>
+    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>534</xloc>
+      <yloc>243</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
     <type>SortRows</type>
     <description/>
@@ -434,97 +547,6 @@
     </step>
   <step>
-    <name>Excel&#x8f93;&#x51fa;</name>
-    <type>ExcelOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <header>Y</header>
-    <footer>N</footer>
-    <encoding/>
-    <append>N</append>
-    <add_to_result_filenames>Y</add_to_result_filenames>
-    <file>
-      <name>&#x24;&#x7b;filepath&#x7d;</name>
-      <extention/>
-      <do_not_open_newfile_init>N</do_not_open_newfile_init>
-      <create_parent_folder>N</create_parent_folder>
-      <split>N</split>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <SpecifyFormat>N</SpecifyFormat>
-      <date_time_format/>
-      <sheetname>Sheet1</sheetname>
-      <autosizecolums>N</autosizecolums>
-      <nullisblank>N</nullisblank>
-      <protect_sheet>N</protect_sheet>
-      <password>Encrypted </password>
-      <splitevery>0</splitevery>
-      <usetempfiles>N</usetempfiles>
-      <tempdirectory/>
-      </file>
-    <template>
-      <enabled>N</enabled>
-      <append>N</append>
-      <filename>template.xls</filename>
-    </template>
-    <fields>
-    </fields>
-    <custom>
-    <header_font_name>arial</header_font_name>
-    <header_font_size>10</header_font_size>
-    <header_font_bold>N</header_font_bold>
-    <header_font_italic>N</header_font_italic>
-    <header_font_underline>no</header_font_underline>
-    <header_font_orientation>horizontal</header_font_orientation>
-    <header_font_color>black</header_font_color>
-    <header_background_color>none</header_background_color>
-    <header_row_height>255</header_row_height>
-    <header_alignment>left</header_alignment>
-    <header_image/>
-    <row_font_name>arial</row_font_name>
-    <row_font_size>10</row_font_size>
-    <row_font_color>black</row_font_color>
-    <row_background_color>none</row_background_color>
-      </custom>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>731</xloc>
-      <yloc>65</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
-    <type>SelectValues</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <fields>      <field>        <name>lp_name</name>
-        <rename>&#x8def;&#x724c;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>        <select_unspecified>Y</select_unspecified>
-    </fields>     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>534</xloc>
-      <yloc>243</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
     <name>&#x8def;&#x724c;&#x540d;&#x5b57;&#x67e5;&#x627e;</name>
     <type>DBLookup</type>
     <description/>
@@ -536,8 +558,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
@@ -89,6 +89,27 @@
     <is_key_private>N</is_key_private>
   </info>
   <notepads>
+    <notepad>
+      <note>&#x8fd9;&#x91cc;&#x6709;&#x4e9b;&#x95ee;&#x9898;&#xa;&#x5728;window2012&#x7684;&#x73af;&#x5883;&#x4e0b;&#xff0c;&#xa;MySql&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x4e2d;&#x5982;&#x679c;&#x8fd4;&#x56de;&#x4e2d;&#x6587;&#x5185;&#x5bb9;&#x7684;&#x5b57;&#x6bb5;&#xff0c;&#x8fd9;&#x4e2a;&#x5185;&#x5bb9;&#x4e71;&#x7801;&#xa;&#x89e3;&#x51b3;&#x529e;&#x6cd5;&#xff0c;&#x5c31;&#x662f;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x5168;&#x90e8;&#x7f13;&#x5b58;&#xff0c;&#x5c31;&#x4e0d;&#x4e71;&#x7801;&#xa;linux&#x73af;&#x5883;&#x4e0b;&#x6ca1;&#x95ee;&#x9898;</note>
+      <xloc>165</xloc>
+      <yloc>402</yloc>
+      <width>333</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
   </notepads>
   <connection>
     <name>bus_control_variable</name>
@@ -103,6 +124,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -322,8 +344,8 @@
     </step>
   <step>
-    <name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x5206;&#x7ec4;&#x6570;&#x636e;</name>
-    <type>TableInput</type>
+    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
+    <type>SelectValues</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -332,24 +354,30 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <connection>bus_control_variable</connection>
-    <sql>select &#xa;fcno&#xa;, min&#x28;xl_dir&#x29; xl_dir&#xa;,min&#x28;qdz&#x29; qdz&#xa;,min&#x28;zdz&#x29; zdz&#xa;,bc_type &#xa;from bsth_c_s_ttinfo_detail&#xa;where ttinfo &#x3d; &#x24;&#x7b;ttinfoid&#x7d;&#xa;group by fcno,bc_type</sql>
-    <limit>0</limit>
-    <lookup/>
-    <execute_each_row>N</execute_each_row>
-    <variables_active>Y</variables_active>
-    <lazy_conversion_active>N</lazy_conversion_active>
-     <cluster_schema/>
+    <fields>      <field>        <name>fieldname</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>fieldtype</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>fcno</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>        <select_unspecified>N</select_unspecified>
+    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>56</xloc>
-      <yloc>185</yloc>
+      <xloc>533</xloc>
+      <yloc>325</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x8fc7;&#x6ee4;&#x8bb0;&#x5f55;</name>
-    <type>FilterRows</type>
+    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
+    <type>SortRows</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -358,27 +386,32 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-<send_true_to/>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <leftvalue>bc_type</leftvalue>
- <function>IS NOT NULL</function>
- <rightvalue/>
- </condition>
-    </compare>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>out</prefix>
+      <sort_size>1000000</sort_size>
+      <free_memory/>
+      <compress>N</compress>
+      <compress_variable/>
+      <unique_rows>N</unique_rows>
+    <fields>
+      <field>
+        <name>fcno</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+    </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>182</xloc>
-      <yloc>189</yloc>
+      <xloc>642</xloc>
+      <yloc>325</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x8ba1;&#x7b97;&#x7ad9;&#x70b9;</name>
-    <type>ScriptValueMod</type>
+    <name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x5206;&#x7ec4;&#x6570;&#x636e;</name>
+    <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -387,21 +420,17 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <compatible>N</compatible>
-    <optimizationLevel>9</optimizationLevel>
-    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
-        <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var zd&#x3b;&#xa;&#xa;if &#x28;bc_type &#x3d;&#x3d; &#x27;in&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;out&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; zdz&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;normal&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d;&#xa;</jsScript_script>
-      </jsScript>    </jsScripts>    <fields>      <field>        <name>zd</name>
-        <rename>zd</rename>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <replace>N</replace>
-      </field>    </fields>     <cluster_schema/>
+    <connection>bus_control_variable</connection>
+    <sql>select &#xa;fcno&#xa;, min&#x28;xl_dir&#x29; xl_dir&#xa;,min&#x28;qdz&#x29; qdz&#xa;,min&#x28;zdz&#x29; zdz&#xa;,bc_type &#xa;from bsth_c_s_ttinfo_detail&#xa;where ttinfo &#x3d; &#x24;&#x7b;ttinfoid&#x7d;&#xa;group by fcno,bc_type</sql>
+    <limit>0</limit>
+    <lookup/>
+    <execute_each_row>N</execute_each_row>
+    <variables_active>Y</variables_active>
+    <lazy_conversion_active>N</lazy_conversion_active>
+     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>300</xloc>
-      <yloc>190</yloc>
+      <xloc>56</xloc>
+      <yloc>185</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -418,8 +447,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
@@ -455,8 +484,8 @@
     </step>
   <step>
-    <name>&#x8ba1;&#x7b97;&#x53cd;&#x8303;&#x5f0f;&#x5143;&#x6570;&#x636e;</name>
-    <type>ScriptValueMod</type>
+    <name>&#x751f;&#x6210;&#x8def;&#x724c;&#x5b57;&#x6bb5;</name>
+    <type>RowGenerator</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -465,39 +494,53 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <compatible>N</compatible>
-    <optimizationLevel>9</optimizationLevel>
-    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
-        <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var targetfieldname&#x3b; &#x2f;&#x2f; &#x76ee;&#x6807;&#x5b57;&#x6bb5;&#x540d;&#xa;var targettype&#x3b; &#x2f;&#x2f; &#x76ee;&#x6807;&#x7c7b;&#x578b;&#xa;var valuefieldname&#x3b; &#x2f;&#x2f; &#x503c;&#x5b57;&#x6bb5;&#x540d;&#xa;var keyvalue&#x3b; &#x2f;&#x2f; &#x5173;&#x952e;&#x5b57;&#x503c;&#xa;&#xa;if &#x28;bc_type &#x3d;&#x3d; &#x27;in&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; &#x27;&#x8fdb;&#x573a;&#x27; &#x2b; fcno&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;out&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; &#x27;&#x51fa;&#x573a;&#x27; &#x2b; fcno&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;normal&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; zdname &#x2b; fcno&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	targetfieldname &#x3d; zdname &#x2b; fcno&#x3b;&#xa;&#x7d; &#xa;&#xa;targettype &#x3d; &#x27;String&#x27;&#x3b;&#xa;valuefieldname &#x3d; &#x27;fcsj&#x27;&#x3b;&#xa;keyvalue &#x3d; fcno&#x3b;&#xa;</jsScript_script>
-      </jsScript>    </jsScripts>    <fields>      <field>        <name>targetfieldname</name>
-        <rename>targetfieldname</rename>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <replace>N</replace>
-      </field>      <field>        <name>targettype</name>
-        <rename>targettype</rename>
+    <fields>
+      <field>
+        <name>fieldname</name>
         <type>String</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>&#x8def;&#x724c;</nullif>
         <length>-1</length>
         <precision>-1</precision>
-        <replace>N</replace>
-      </field>      <field>        <name>valuefieldname</name>
-        <rename>valuefieldname</rename>
+        <set_empty_string>N</set_empty_string>
+      </field>
+      <field>
+        <name>fieldtype</name>
         <type>String</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>String</nullif>
         <length>-1</length>
         <precision>-1</precision>
-        <replace>N</replace>
-      </field>      <field>        <name>keyvalue</name>
-        <rename>keyvalue</rename>
-        <type>String</type>
+        <set_empty_string>N</set_empty_string>
+      </field>
+      <field>
+        <name>fcno</name>
+        <type>Integer</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>0</nullif>
         <length>-1</length>
         <precision>-1</precision>
-        <replace>N</replace>
-      </field>    </fields>     <cluster_schema/>
+        <set_empty_string>N</set_empty_string>
+      </field>
+    </fields>
+    <limit>1</limit>
+    <never_ending>N</never_ending>
+    <interval_in_ms>5000</interval_in_ms>
+    <row_time_field>now</row_time_field>
+    <last_time_field>FiveSecondsAgo</last_time_field>
+     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>410</xloc>
-      <yloc>64</yloc>
+      <xloc>530</xloc>
+      <yloc>194</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -539,8 +582,8 @@
     </step>
   <step>
-    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
-    <type>SelectValues</type>
+    <name>&#x8ba1;&#x7b97;&#x53cd;&#x8303;&#x5f0f;&#x5143;&#x6570;&#x636e;</name>
+    <type>ScriptValueMod</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -549,30 +592,46 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <fields>      <field>        <name>fieldname</name>
-        <rename/>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>fieldtype</name>
-        <rename/>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>fcno</name>
-        <rename/>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>        <select_unspecified>N</select_unspecified>
-    </fields>     <cluster_schema/>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var targetfieldname&#x3b; &#x2f;&#x2f; &#x76ee;&#x6807;&#x5b57;&#x6bb5;&#x540d;&#xa;var targettype&#x3b; &#x2f;&#x2f; &#x76ee;&#x6807;&#x7c7b;&#x578b;&#xa;var valuefieldname&#x3b; &#x2f;&#x2f; &#x503c;&#x5b57;&#x6bb5;&#x540d;&#xa;var keyvalue&#x3b; &#x2f;&#x2f; &#x5173;&#x952e;&#x5b57;&#x503c;&#xa;&#xa;if &#x28;bc_type &#x3d;&#x3d; &#x27;in&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; &#x27;&#x8fdb;&#x573a;&#x27; &#x2b; fcno&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;out&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; &#x27;&#x51fa;&#x573a;&#x27; &#x2b; fcno&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;normal&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; zdname &#x2b; fcno&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	targetfieldname &#x3d; zdname &#x2b; fcno&#x3b;&#xa;&#x7d; &#xa;&#xa;targettype &#x3d; &#x27;String&#x27;&#x3b;&#xa;valuefieldname &#x3d; &#x27;fcsj&#x27;&#x3b;&#xa;keyvalue &#x3d; fcno&#x3b;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>targetfieldname</name>
+        <rename>targetfieldname</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>targettype</name>
+        <rename>targettype</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>valuefieldname</name>
+        <rename>valuefieldname</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>keyvalue</name>
+        <rename>keyvalue</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>533</xloc>
-      <yloc>325</yloc>
+      <xloc>410</xloc>
+      <yloc>64</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x751f;&#x6210;&#x8def;&#x724c;&#x5b57;&#x6bb5;</name>
-    <type>RowGenerator</type>
+    <name>&#x8ba1;&#x7b97;&#x7ad9;&#x70b9;</name>
+    <type>ScriptValueMod</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -581,60 +640,28 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <fields>
-      <field>
-        <name>fieldname</name>
-        <type>String</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>&#x8def;&#x724c;</nullif>
-        <length>-1</length>
-        <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-      <field>
-        <name>fieldtype</name>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var zd&#x3b;&#xa;&#xa;if &#x28;bc_type &#x3d;&#x3d; &#x27;in&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;out&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; zdz&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;normal&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>zd</name>
+        <rename>zd</rename>
         <type>String</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>String</nullif>
-        <length>-1</length>
-        <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-      <field>
-        <name>fcno</name>
-        <type>Integer</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>0</nullif>
         <length>-1</length>
         <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-    </fields>
-    <limit>1</limit>
-    <never_ending>N</never_ending>
-    <interval_in_ms>5000</interval_in_ms>
-    <row_time_field>now</row_time_field>
-    <last_time_field>FiveSecondsAgo</last_time_field>
-     <cluster_schema/>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>530</xloc>
-      <yloc>194</yloc>
+      <xloc>300</xloc>
+      <yloc>190</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
-    <type>SortRows</type>
+    <name>&#x8fc7;&#x6ee4;&#x8bb0;&#x5f55;</name>
+    <type>FilterRows</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -643,25 +670,20 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
-      <prefix>out</prefix>
-      <sort_size>1000000</sort_size>
-      <free_memory/>
-      <compress>N</compress>
-      <compress_variable/>
-      <unique_rows>N</unique_rows>
-    <fields>
-      <field>
-        <name>fcno</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-    </fields>
+<send_true_to/>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue>bc_type</leftvalue>
+ <function>IS NOT NULL</function>
+ <rightvalue/>
+ </condition>
+    </compare>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>642</xloc>
-      <yloc>325</yloc>
+      <xloc>182</xloc>
+      <yloc>189</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -89,6 +89,27 @@
     <is_key_private>N</is_key_private>
   </info>
   <notepads>
+    <notepad>
+      <note>&#x8fd9;&#x91cc;&#x6709;&#x4e9b;&#x95ee;&#x9898;&#xa;&#x5728;window2012&#x7684;&#x73af;&#x5883;&#x4e0b;&#xff0c;&#xa;MySql&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x4e2d;&#x5982;&#x679c;&#x8fd4;&#x56de;&#x4e2d;&#x6587;&#x5185;&#x5bb9;&#x7684;&#x5b57;&#x6bb5;&#xff0c;&#x8fd9;&#x4e2a;&#x5185;&#x5bb9;&#x4e71;&#x7801;&#xa;&#x89e3;&#x51b3;&#x529e;&#x6cd5;&#xff0c;&#x5c31;&#x662f;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x5168;&#x90e8;&#x7f13;&#x5b58;&#xff0c;&#x5c31;&#x4e0d;&#x4e71;&#x7801;&#xa;linux&#x73af;&#x5883;&#x4e0b;&#x6ca1;&#x95ee;&#x9898;</note>
+      <xloc>135</xloc>
+      <yloc>299</yloc>
+      <width>333</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
   </notepads>
   <connection>
     <name>bus_control_variable</name>
@@ -103,6 +124,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -4544,8 +4566,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
@@ -4598,8 +4620,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
+{
+  "name": "handsontable",
+  "description": "Spreadsheet-like data grid editor that provides copy/paste functionality compatible with Excel/Google Docs",
+  "version": "0.24.3",
+  "main": [
+    "./dist/handsontable.js",
+    "./dist/handsontable.css"
+  ],
+  "homepage": "http://handsontable.com/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/handsontable/handsontable.git"
+  },
+  "authors": [
+    "Handsoncode",
+    "Handsoncode <hello@handsontable.com>"
+  ],
+  "keywords": [
+    "data",
+    "grid",
+    "table",
+    "editor",
+    "grid-editor",
+    "data-grid",
+    "data-table",
+    "spreadsheet",
+    "excel",
+    "tabular-data",
+    "edit-cell",
+    "editable-table",
+    "data-spreadsheet"
+  ],
+  "ignore": [
+    "**/.*",
+    "components",
+    "demo",
+    "node_modules",
+    "src",
+    "test"
+  ],
+  "dependencies": {
+    "zeroclipboard": "^2.2.0",
+    "moment": "^2.9.0",
+    "pikaday": "^1.3.2"
+  },
+  "devDependencies": {
+    "chroma-js": "~0.5.6"
+  },
+  "_release": "0.24.3",
+  "_resolution": {
+    "type": "version",
+    "tag": "0.24.3",
+    "commit": "eb19e2e0a364f0f535380238ddb10a2dd4fc150a"
+  },
+  "_source": "https://github.com/handsontable/handsontable.git",
+  "_target": "~0.24.0",
+  "_originalSource": "handsontable"
+}
 \ No newline at end of file
+All releases are described at https://github.com/handsontable/handsontable/releases
+handsontable.com
+# Contributing to Handsontable
+
+Your contributions to the project are very welcome. If you would like to fix a bug or propose a new feature, you can submit a Pull Request.
+
+To help us merge your Pull Request, please make sure you follow these points:
+
+1. Please make your fix on a separate branch. This makes merging much easier.
+2. Do not edit files in `dist/` directory (e.g: `handsontable.js`, `handsontable.css`, `handsontable.full.js`, `handsontable.full.css`). Instead, try to edit files inside the `src/` directory and then use `grunt` to make a build. More information about this on wiki page [Building](https://github.com/handsontable/handsontable/wiki/Building).
+3. **Very important:** For any change that you make, **please try to also add a test case(s)** in `tests/jasmine/spec/` or `src/3rdparty/walkontable/test/jasmine/spec/`. This helps us understand the issue and make sure that it will stay fixed forever. See [Testing](https://github.com/handsontable/handsontable/wiki/Testing)
+4. **Very important:** Please review our [coding style](https://github.com/handsontable/handsontable/wiki/Coding-style) for instructions on how to maintain a fork and submit patches.
+5. Describe the problem in the Pull Request description (of course you would do it, why do I mention that?)
+
+Thank you for your commitment!
+
+## Team rules
+
+The Handsontable team utilizes Git-Flow. See [How we use Git-Flow](https://github.com/handsontable/handsontable/wiki/How-we-use-Git-Flow)