Merge branch 'minhang' into qingpu

# Conflicts: # src/main/resources/static/real_control_v2/main.html

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/resources/static/real_control_v2/main.html
潘钊
2 parents d8501753 fb086f82
Showing 77 changed files with 2738 additions and 593 deletions
pom.xml
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/PageForwardingController.java
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanController.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/controller/sys/RealControAuthorityController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/ArrivalInfo.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/AbnormalStateHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
@@ -246,7 +246,7 @@
                 <groupId>org.drools</groupId>
                 <artifactId>drools-bom</artifactId>
                 <type>pom</type>
-                <version>6.2.0.Final</version>
+                <version>6.3.0.Final</version>
                 <scope>import</scope>
             </dependency>
         </dependencies>
@@ -20,6 +20,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;  
 import org.springframework.web.bind.annotation.RequestMapping;
+import com.google.protobuf.UnknownFieldSet.Field;
 import com.mysql.fabric.Response;  
 /** 
@@ -39,9 +40,8 @@ public class DownloadController
 	@RequestMapping("download2")    
     public ResponseEntity<byte[]> download2(String fileName) throws IOException {
-//    	fileName = fileName+".xls";
     	String fileNames=URLDecoder.decode(fileName,"UTF-8");
-    	fileNames =fileNames + ".xls";
+    	fileNames = fileNames + ".xls";
     	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileNames; 
     	System.out.println(moudelPath);
 //       String path="D:\\export\\target\\"+jName+".xls";  
@@ -75,5 +75,29 @@ public class DownloadController
         os.write(buffer);// 输出文件
         os.flush();
         os.close();
+        file.delete();
+    }  
+    
+    @RequestMapping("downloadList")    
+    public void downloadList(HttpServletResponse response,String fileName) 
+    		throws IOException {
+//    	String fileNames=URLDecoder.decode(fileName,"UTF-8");
+    	fileName = fileName + ".zip";
+    	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName; 
+    	File file = new File(moudelPath);// path是根据日志路径和文件名拼接出来的
+//        String filename = file.getName();// 获取日志文件名称
+        InputStream fis = new BufferedInputStream(new FileInputStream(moudelPath));
+        byte[] buffer = new byte[fis.available()];
+        fis.read(buffer);
+        fis.close();
+        response.reset();
+        response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.replaceAll(" ", "").getBytes("utf-8"),"iso8859-1"));
+        response.addHeader("Content-Length", "" + file.length());
+        OutputStream os = new BufferedOutputStream(response.getOutputStream());
+        response.setContentType("application/octet-stream");
+        os.write(buffer);// 输出文件
+        os.flush();
+        os.close();
+        file.delete();
     }  
 }
+package com.bsth.controller.oil;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.bsth.controller.BaseController;
+import com.bsth.entity.oil.Dlb;
+
+@RestController
+@RequestMapping("dlb")
+public class DlbController extends BaseController<Dlb, Integer>{
+	
+}
@@ -2,8 +2,13 @@ package com.bsth.controller.realcontrol;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
+import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.RestController;
 import java.util.HashMap;
@@ -14,6 +19,13 @@ import java.util.Map;
 @RequestMapping("/basic")
 public class BasicDataController {
+	@Autowired
+	BasicData.BasicDataLoader dataLoader;
+
+	@Autowired
+	BasicData basicData;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@RequestMapping("/cars")
 	public Iterable<String> findAllNbbm(Map<String, Object> map){
@@ -53,10 +65,6 @@ public class BasicDataController {
 	@RequestMapping("/all_personnel")
 	public Map<String, String> all_personnel(){
-		//Map<String, Object> rs = new HashMap<>();
-		//PersonnelFieldFilter filter=new PersonnelFieldFilter();
-		
-		//rs.put("list", JSON.parse(JSON.toJSONString(BasicData.jsyMap.values(), filter)));
 		return BasicData.allPerson;
 	}
@@ -72,6 +80,50 @@ public class BasicDataController {
 			}
 			return false;
 		}
-		
+	}
+
+	/**
+	 * 刷新车辆和设备号对照数据
+	 * @return
+	 */
+	@RequestMapping(value = "/refresh_nbbm2Device", method = RequestMethod.POST)
+	public Map<String, Object> refreshNbbm2DeviceId(){
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			dataLoader.loadDeviceInfo();
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+			logger.error("", e);
+		}
+		return rs;
+	}
+
+	/**
+	 * 刷新员工对照数据
+	 * @return
+	 */
+	@RequestMapping(value = "/refresh_person_data", method = RequestMethod.POST)
+	public Map<String, Object> refreshPersonData(){
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			dataLoader.loadPersonnelInfo();
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+			logger.error("", e);
+		}
+		return rs;
+	}
+
+	/**
+	 * 车辆自编号和车牌号对照
+	 * @return
+	 */
+	@RequestMapping("/nbbm2PlateNo")
+	public Map<String, String> nbbm2PlateNo(){
+		return basicData.getNbbm2PlateNo();
 	}
 }
-package com.bsth.controller.realcontrol;
-
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * 线调登入页面转发
- * Created by panzhao on 2017/1/21.
- */
-@Controller
-@RequestMapping("real_control")
-public class PageForwardingController {
-
-    @RequestMapping("/v2")
-    public ModelAndView v2(){
-        ModelAndView mv = new ModelAndView();
-        SysUser user = SecurityUtils.getCurrentUser();
-
-        //班次管理员
-        if(user.getUserName().equals("bcgly")){
-            mv.setViewName("/real_control_v2/sch_manage/sch_imitate.html");
-        }
-        //正常线调主页
-        else
-            mv.setViewName("/real_control_v2/main.html");
-        return mv;
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * 线调登入页面转发
+ * Created by panzhao on 2017/1/21.
+ */
+@Controller
+@RequestMapping("real_control")
+public class PageForwardingController {
+
+    @RequestMapping("/v2")
+    public ModelAndView v2(){
+        ModelAndView mv = new ModelAndView();
+        SysUser user = SecurityUtils.getCurrentUser();
+
+        //班次管理员
+        if(user.getUserName().equals("bcgly")){
+            mv.setViewName("/real_control_v2/sch_manage/sch_imitate.html");
+        }
+        //正常线调主页
+        else
+            mv.setViewName("/real_control_v2/main.html");
+        return mv;
+    }
+}
@@ -49,6 +49,11 @@ public class RealMapController {
         return realMapService.findRouteByLine(lineCode);
     }
+    @RequestMapping(value = "/multiRouteByLine")
+    public Map<String, Object> multiRouteByLine(@RequestParam String codeStr) {
+        return realMapService.multiRouteByLine(codeStr);
+    }
+
     /**
      * 获取线路的路段路由 和 站点路由信息 （为前端站间距计算提供数据源）
@@ -7,6 +7,7 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.joda.time.format.DateTimeFormat;
@@ -429,4 +430,23 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.scheduleDailyQp(line,date);
 	}
+
+	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.scheduleDailyExport(map);
+	}
+	
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.POST)
+	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.exportWaybillMore(map);
+	}
+
+	/**
+	 * 获取当日计划排班 ， 从计划表抓取数据
+	 * @return
+	 */
+	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
+	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
+		return scheduleRealInfoService.currentSchedulePlan(lineCode);
+	}
 }
@@ -40,9 +40,12 @@ public class BController&lt;T, ID extends Serializable&gt; {
         SysUser sysUser = sysUserService.findByUserName(userName);
         BEntity t_b = null;
         if (t instanceof BEntity) {
+            Date cdate = new Date();
             t_b = (BEntity) t;
             t_b.setCreateBy(sysUser);
-            t_b.setCreateDate(new Date());
+            t_b.setCreateDate(cdate);
+            t_b.setUpdateBy(sysUser);
+            t_b.setUpdateDate(cdate);
         }
         T t_saved = bService.save(t_b == null ? t : (T) t_b);
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.schedule.SchedulePlanService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/6/16.
- */
-@RestController
-@RequestMapping("spc")
-public class SchedulePlanController extends BaseController<SchedulePlan, Long> {
-    @Autowired
-    private SchedulePlanService schedulePlanService;
-
-    /**
-     * 覆写方法，因为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 SchedulePlan t){
-
-        return baseService.save(t);
-    }
-
-    /**
-     * 获取明天的一歌排班计划。
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/tommorw", method = RequestMethod.GET)
-    public SchedulePlan getTommorwPlan() throws Exception {
-        try {
-            return schedulePlanService.findSchedulePlanTommorw();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-}
@@ -27,22 +27,10 @@ import java.util.Map;
 public class GuideboardInfoController extends BController<GuideboardInfo, Long> {
     @Autowired
     private GuideboardInfoService guideboardInfoService;
-//    @Autowired
-//    private DataToolsProperties dataToolsProperties;
+
     @Autowired
     private GuideboardInfoRepository guideboardInfoRepository;
-//
-//    @Override
-//    protected String getDataImportKtrClasspath() {
-//        return dataToolsProperties.getGuideboardsDatainputktr();
-//    }
-//
-//    @Override
-//    public GuideboardInfo findById(@PathVariable("id") Long aLong) {
-//        return guideboardInfoRepository.findOneExtend(aLong);
-//    }
-//
-//
+
     @RequestMapping(value = "/ttlpnames", method = RequestMethod.GET)
     public List<Map<String, Object>> findLpName(Long ttid) {
         return guideboardInfoRepository.findLpName(ttid);
+package com.bsth.controller.schedule.core;
+
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.schedule.SchedulePlanService;
+import com.bsth.service.sys.SysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/6/16.
+ */
+@RestController
+@RequestMapping("spc")
+public class SchedulePlanController extends BController<SchedulePlan, Long> {
+    @Autowired
+    private SchedulePlanService schedulePlanService;
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Override
+    public Map<String, Object> save(@RequestBody SchedulePlan schedulePlan, HttpSession httpSession) {
+        // 用户信息
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+
+        Date cdate = new Date();
+        schedulePlan.setCreateBy(sysUser);
+        schedulePlan.setCreateDate(cdate);
+        schedulePlan.setUpdateBy(sysUser);
+        schedulePlan.setUpdateDate(cdate);
+
+        // 如果多个公司，选第一个，以后改成页面控制
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) httpSession.getAttribute(Constants.COMPANY_AUTHORITYS);
+        if (cmyAuths == null || cmyAuths.size() == 0)
+            schedulePlanService.save(schedulePlan, new CompanyAuthority());
+        else
+            schedulePlanService.save(schedulePlan, cmyAuths.get(0));
+
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", new Object());
+        return rtn;
+    }
+
+    /**
+     * 获取明天的一歌排班计划。
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tommorw", method = RequestMethod.GET)
+    public SchedulePlan getTommorwPlan() throws Exception {
+        try {
+            return schedulePlanService.findSchedulePlanTommorw();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    /**
+     * 创建指定线路，指定时间范围内的排班计划，使用的时刻表情况
+     * @param xlid 线路id
+     * @param from 开始时间
+     * @param to 结束时间
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/valttinfo/{xlid}/{from}/{to}", method = RequestMethod.GET)
+    public Map<String, Object> validateTTInfo(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "from") Date from,
+            @PathVariable(value = "to") Date to
+    ) throws Exception {
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", schedulePlanService.validateTTInfo(xlid, from, to));
+        return rtn;
+    }
+
+}
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 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;
@@ -87,5 +88,16 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
         }
         return rtn;
     }
-
+    
+    /**
+     * 时刻表明细批量插入
+     * 
+     * @param entities
+     * 
+     * @return
+     */
+    @RequestMapping(value = "/skbDetailMxSave" ,method = RequestMethod.POST)
+    public Map<String, Object> skbDetailMxSave(@RequestParam Map<String, Object> entities){
+    	return ttInfoDetailService.skbDetailMxSave(entities);
+    }
 }
+package com.bsth.controller.sys;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.sys.RealControAuthorityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+@RestController
+@RequestMapping("realControAuthority")
+public class RealControAuthorityController extends BaseController<RealControAuthority, Integer> {
+
+    @Autowired
+    RealControAuthorityService realControAuthorityService;
+
+    @RequestMapping("findByUserId")
+    public RealControAuthority findByUserId(@RequestParam Integer userId){
+
+        return realControAuthorityService.findByUserId(userId);
+    }
+
+    @RequestMapping("findByCurrentUser")
+    public RealControAuthority findByUserId(HttpServletRequest request){
+        return realControAuthorityService.findByUserId(SecurityUtils.getCurrentUser().getId());
+    }
+}
@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -89,6 +90,18 @@ public class BasicData implements CommandLineRunner {
         return name != null? name: stationCode2NameMap.get(prefix + code);
     }
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+    public Map<String, String> getNbbm2PlateNo(){
+        List<Map<String, Object>> list = jdbcTemplate.queryForList("select CAR_CODE,CAR_PLATE from bsth_c_cars where CAR_CODE is not null and CAR_PLATE is not null");
+
+        Map<String, String> rs = new HashMap<>();
+        for(Map<String, Object> map : list){
+            rs.put(map.get("CAR_CODE").toString(), map.get("CAR_PLATE").toString());
+        }
+        return rs;
+    }
+
     @Component
     public static class BasicDataLoader extends Thread {
@@ -309,9 +322,6 @@ public class BasicData implements CommandLineRunner {
                 if (StringUtils.isEmpty(jobCode))
                     continue;
-                /*if (jobCode.indexOf("-") != -1) {
-                    jobCode = jobCode.split("-")[1];
-                }*/
                 if (p.getPosts() != null) {
                     if (p.getPosts().equals("1"))
                         jsyTempMap.put(jobCode, p);
@@ -88,6 +88,9 @@ public class GpsEntity {
 	/** 越界距离 */
 	private double outOfBoundDistance;
+	/** gps是否有效 设备端发送的状态 */
+	private int valid;
+
 	public Integer getCompanyCode() {
 		return companyCode;
 	}
@@ -280,4 +283,12 @@ public class GpsEntity {
 	public void setOutOfBoundDistance(double outOfBoundDistance) {
 		this.outOfBoundDistance = outOfBoundDistance;
 	}
+
+	public int getValid() {
+		return valid;
+	}
+
+	public void setValid(int valid) {
+		this.valid = valid;
+	}
 }
@@ -3,6 +3,7 @@ package com.bsth.data.gpsdata;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
+import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.TreeMultimap;
@@ -35,6 +36,9 @@ public class GpsRealData implements CommandLineRunner {
     GpsDataLoaderThread gpsDataLoader;
     @Autowired
+    OfflineMonitorThread offlineMonitorThread;
+
+    @Autowired
     DayOfSchedule dayOfSchedule;
     @Autowired
@@ -54,9 +58,10 @@ public class GpsRealData implements CommandLineRunner {
         //定时从网关获取GPS数据
         //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
         //定时扫描掉离线
-
+        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
     }
+
     public void put(GpsEntity gps) {
         String device = gps.getDeviceId();
         GpsEntity old = gpsMap.get(device);
@@ -19,10 +19,22 @@ public abstract class SignalHandle {
         return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
     }
-    protected boolean isDriftSignal(GpsEntity gps) {
+/*    protected boolean isDriftSignal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }*/
+
+    /**
+     * gps掉线
+     * @param gps
+     * @return
+     */
+    protected boolean isGpsOffline(GpsEntity gps){
         return gps.getLat() == 0 || gps.getLon() == 0;
     }
+    protected boolean isOffline(GpsEntity gps){
+        return gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline");
+    }
     /**
      * 是不是异常信号
      *
@@ -34,7 +46,7 @@ public abstract class SignalHandle {
     /**
      * 连续异常信号个数统计
      *
-     * @param prevs
+     * @param
      * @return protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
      * int count = 0;
      * <p>
@@ -78,9 +90,9 @@ public abstract class SignalHandle {
             return false;
         GpsEntity prev = prevs.getTail();
-        //从漂移状态恢复
-        if (isDriftSignal(prev)
-                && !isDriftSignal(gps)) {
+        //从异常状态恢复
+        if (isGpsOffline(prev)
+                && !isGpsOffline(gps)) {
             return true;
         }
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 到离站信息
+ * Created by panzhao on 2017/2/20.
+ */
+public class ArrivalInfo {
+
+    private String lineCode;
+
+    private String deviceId;
+
+    /** 时间戳 */
+    private Long ts;
+
+    private String stop;
+
+    private Integer upDown;
+
+    private int inOut;
+
+
+}
@@ -30,6 +30,9 @@ public class AbnormalStateHandle extends SignalHandle{
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if(isOffline(gps))
+            return false;
+
         if(overspeed(gps))
             return true;
@@ -46,10 +46,13 @@ public class InOutStationSignalHandle extends SignalHandle{
     private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
+    //最大的班次时间差，防止异常的GPS时间打乱数据
+    private final static int MAX_NORMAL_DIFF = 1000 * 60 * 60 * 12;
+
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //忽略漂移信号
-        if(isDriftSignal(gps))
+        //忽略掉线信号
+        if(isGpsOffline(gps))
             return false;
         //从异常状态恢复的第一个信号
@@ -106,8 +109,14 @@ public class InOutStationSignalHandle extends SignalHandle{
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         String qdzCode = sch.getQdzCode();
+        int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
+
         //首班出场最多提前1.2小时
-        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+        if(dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME)
+            return;
+
+        //正常班次最大时间差
+        if(Math.abs(diff) > MAX_NORMAL_DIFF)
             return;
         //起点发车
@@ -169,8 +178,13 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(gps.getStopNo().equals(sch.getZdzCode())){
+            int diff = (int) (sch.getZdsjT() - gps.getTimestamp());
             //进场最多提前1.2小时
-            if(sch.getBcType().equals("in") && sch.getZdsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+            if(sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME)
+                return;
+
+            //正常班次最大时间差
+            if(Math.abs(diff) > MAX_NORMAL_DIFF)
                 return;
             //实达时间不覆盖
@@ -195,7 +209,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 //进站既进场
                 inStationAndInPark(sch, next);
                 //将gps转换为下一个班次走向的站内信号
-                transformUpdown(gps, sch);
+                transformUpdown(gps, next);
             }
         }
         else if(sch.getFcsjActual() == null){
@@ -217,6 +231,11 @@ public class InOutStationSignalHandle extends SignalHandle{
             sendUtils.refreshSch(next);
             dayOfSchedule.save(next);
+
+            //分班的时候，需要再跳过1个班次
+            next = dayOfSchedule.next(next);
+            if(next != null)
+                dayOfSchedule.addExecPlan(next);
         }
     }
@@ -21,9 +21,10 @@ public class OfflineSignalHandle extends SignalHandle{
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //漂移信号不管
-        if(isDriftSignal(gps)){
+        //掉线信号不管
+        if(isGpsOffline(gps)){
             gps.setSignalState("drift");
+            gps.setAbnormalStatus("gps-offline");
             return true;
         }
@@ -88,6 +88,7 @@ public class GpsDataLoaderThread extends Thread {
                 String nbbm;
                 GpsEntity old;
                 for (GpsEntity gps : list) {
+
                     //没有设备号
                     if (StringUtils.isBlank(gps.getDeviceId()))
                         continue;
@@ -2,7 +2,11 @@ package com.bsth.data.gpsdata.thread;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import java.util.Collection;
@@ -10,35 +14,45 @@ import java.util.Collection;
  * GPS掉离线监控
  * Created by panzhao on 2017/1/11.
  */
+@Component
 public class OfflineMonitorThread extends Thread{
     @Autowired
     GpsRealData gpsRealData;
-    //有任务时 掉线阈值
-    private final static int LOSE_TIME = 1000 * 60 * 2;
+    //掉线阈值
+    private final static int LOSE_TIME = 1000 * 60 * 10;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    SendUtils sendUtils;
     //无任务时 离线阈值
-    private final static int OFFLINE_TIME = 1000 * 60 * 10;
+    //private final static int OFFLINE_TIME = 1000 * 60 * 10;
     @Override
     public void run() {
-        long t = System.currentTimeMillis();
-        Collection<GpsEntity> list = gpsRealData.all();
-
-        String state;
-        for(GpsEntity gps : list){
-            state = gps.getAbnormalStatus();
-
-            if(state.equals("offline"))
-                continue;
-
-
-            //if(state.equals("lose"))
-            //if(!state.equals("lose"))
-            //if(state.equals(""))
-            //if(gps.getTimestamp())
-            //if(gps.getAbnormalStatus().equals("lose"))
+        try{
+            long t = System.currentTimeMillis();
+            Collection<GpsEntity> list = gpsRealData.all();
+
+            String state;
+            for(GpsEntity gps : list){
+                state = gps.getAbnormalStatus();
+
+                if(state != null && state.equals("offline"))
+                    continue;
+
+                if (t - gps.getTimestamp() > LOSE_TIME){
+                    gps.setAbnormalStatus("offline");
+
+                    //通知页面有设备掉线
+                    sendUtils.deviceOffline(gps);
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
         }
     }
 }
@@ -49,6 +49,9 @@ public class DayOfSchedule implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(this.getClass());
+    //按线路分组的 “计划” 排班数据
+    public static Map<String, List<SchedulePlanInfo>> schedulePlanMap;
+
     // 按车辆分组的班次数据
     private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
@@ -101,6 +104,8 @@ public class DayOfSchedule implements CommandLineRunner {
         currSchDateMap = new HashMap<>();
         nbbm2SEStationMap = TreeMultimap.create();
         carExecutePlanMap = new HashMap<>();
+
+        schedulePlanMap = new HashMap<>();
     }
     @Autowired
@@ -328,6 +333,8 @@ public class DayOfSchedule implements CommandLineRunner {
             // 查询计划排班
             List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
+            //保存一份原始计划排班数据
+            schedulePlanMap.put(lineCode, planItr);
             // 转换为实际排班
             realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
@@ -341,6 +348,13 @@ public class DayOfSchedule implements CommandLineRunner {
                 if (StringUtils.isEmpty(sch.getFcsj()))
                     sch.setFcsj("00:00");
+                if(sch.getFcsj().equals("24:00"))
+                    sch.setFcsj("23:59");
+
+                if(sch.getFcsj().substring(0, 2).equals("24")){
+                    sch.setFcsj("00" + sch.getFcsj().substring(2));
+                }
+
                 fcsj = sch.getFcsj().trim();
                 //处理一下发车时间格式没有:号的问题
                 if (fcsj.indexOf(":") == -1 && fcsj.length() >= 4) {
@@ -367,6 +381,7 @@ public class DayOfSchedule implements CommandLineRunner {
         } catch (Exception e) {
             logger.error("", e);
         }
+
         return realList;
     }
@@ -392,7 +407,7 @@ public class DayOfSchedule implements CommandLineRunner {
         new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
     }
-    private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
+    public List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
         List<SchedulePlanInfo> list = new ArrayList<>();
         SchedulePlanInfo sp;
@@ -823,8 +838,8 @@ public class DayOfSchedule implements CommandLineRunner {
                     first = executeCurr(nbbm);
             if(first.getBcType().equals("out")
-                && first.getDfsjT() < second.getDfsjT()
-                && doneSum(nbbm) == 0 && second.getDfsjT() > time)
+                    && first.getDfsjT() < second.getDfsjT()
+                    && doneSum(nbbm) == 0 && second.getDfsjT() > time)
                 return true;
         } catch (Exception e) {
             logger.error("", e);
@@ -840,10 +855,10 @@ public class DayOfSchedule implements CommandLineRunner {
     public int stopTimePlan(Object task) {
-        ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
+    ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
-        sch.getzdsj
-        return -1;
+    sch.getzdsj
+    return -1;
     }*/
     /**
@@ -52,7 +52,7 @@ public class SectionRoute {
 	// 是否撤销
 	private Integer destroy;
-	/** 是否有路段限速数据  <0：无；1：有>*/
+	/** 是否有路段限速数据  <0：未分段；1：分段>*/
 	private Integer isRoadeSpeed;
 	// 描述
+package com.bsth.entity.oil;
+
+import java.text.DecimalFormat;
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.bsth.data.BasicData;
+
+@Entity
+@Table(name = "bsth_c_dlb")
+public class Dlb {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date rq;
+	private String xlbm;
+	private String ssgsdm;
+	private String fgsdm;
+	private String nbbm;
+	private String jsy;
+	private Double czlc=0.0;
+	private Double jzlc=0.0;
+	//出站存电
+	private Double czcd=0.0;
+	//进站存电
+	private Double jzcd=0.0;
+	//充电量
+	private Double cdl;
+	private int sfkt;
+	private String jhsj;
+	//耗电
+	private Double hd=0.0;
+	private Double sh=0.0;
+	private String shyy;
+	private Double zlc=0.0;
+	private int yhlx;
+	
+	private Double ns=0.0;
+	private Double fyylc=0.0;
+	private Double jhzlc=0.0;
+	private Double jhfyylc=0.0;
+	private int jhzbc;
+	private int jhbc;
+	private int sjzbc;
+	private int sjbc;
+	private String edituser;
+	private Date edittime;
+	private Date createtime;
+	private int nylx;
+	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
+	private int jcsx;
+	
+	@Transient
+	private String bglyh;
+	
+	@Transient
+	private String xlname;
+	
+	@Transient
+	private String gsname;
+	
+	
+	
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Date getRq() {
+		return rq;
+	}
+
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+
+	public String getXlbm() {
+		return xlbm;
+	}
+
+	public void setXlbm(String xlbm) {
+		this.xlbm = xlbm;
+	}
+
+	public String getSsgsdm() {
+		return ssgsdm;
+	}
+
+	public void setSsgsdm(String ssgsdm) {
+		this.ssgsdm = ssgsdm;
+	}
+
+	public String getFgsdm() {
+		return fgsdm;
+	}
+
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public Double getCzlc() {
+		return czlc;
+	}
+
+	public void setCzlc(Double czlc) {
+		this.czlc = czlc;
+	}
+
+	public Double getJzlc() {
+		return jzlc;
+	}
+
+	public void setJzlc(Double jzlc) {
+		this.jzlc = jzlc;
+	}
+
+	public Double getCzcd() {
+		return czcd;
+	}
+
+	public void setCzcd(Double czcd) {
+		this.czcd = czcd;
+	}
+
+	public Double getJzcd() {
+		return jzcd;
+	}
+
+	public void setJzcd(Double jzcd) {
+		this.jzcd = jzcd;
+	}
+
+	public Double getCdl() {
+		return cdl;
+	}
+
+	public void setCdl(Double cdl) {
+		this.cdl = cdl;
+	}
+
+	public int getSfkt() {
+		return sfkt;
+	}
+
+	public void setSfkt(int sfkt) {
+		this.sfkt = sfkt;
+	}
+
+	public String getJhsj() {
+		return jhsj;
+	}
+
+	public void setJhsj(String jhsj) {
+		this.jhsj = jhsj;
+	}
+
+	public Double getHd() {
+		return hd;
+	}
+
+	public void setHd(Double hd) {
+		this.hd = hd;
+	}
+
+	public Double getSh() {
+		return sh;
+	}
+
+	public void setSh(Double sh) {
+		this.sh = sh;
+	}
+
+	public String getShyy() {
+		return shyy;
+	}
+
+	public void setShyy(String shyy) {
+		this.shyy = shyy;
+	}
+
+	public Double getZlc() {
+		return zlc;
+	}
+
+	public void setZlc(Double zlc) {
+		this.zlc = zlc;
+	}
+
+	public int getYhlx() {
+		return yhlx;
+	}
+
+	public void setYhlx(int yhlx) {
+		this.yhlx = yhlx;
+	}
+
+	public Double getNs() {
+		return ns;
+	}
+
+	public void setNs(Double ns) {
+		this.ns = ns;
+	}
+
+	public Double getFyylc() {
+		return fyylc;
+	}
+
+	public void setFyylc(Double fyylc) {
+		this.fyylc = fyylc;
+	}
+
+	public Double getJhzlc() {
+		return jhzlc;
+	}
+
+	public void setJhzlc(Double jhzlc) {
+		this.jhzlc = jhzlc;
+	}
+
+	public Double getJhfyylc() {
+		return jhfyylc;
+	}
+
+	public void setJhfyylc(Double jhfyylc) {
+		this.jhfyylc = jhfyylc;
+	}
+
+	public int getJhzbc() {
+		return jhzbc;
+	}
+
+	public void setJhzbc(int jhzbc) {
+		this.jhzbc = jhzbc;
+	}
+
+	public int getJhbc() {
+		return jhbc;
+	}
+
+	public void setJhbc(int jhbc) {
+		this.jhbc = jhbc;
+	}
+
+	public int getSjzbc() {
+		return sjzbc;
+	}
+
+	public void setSjzbc(int sjzbc) {
+		this.sjzbc = sjzbc;
+	}
+
+	public int getSjbc() {
+		return sjbc;
+	}
+
+	public void setSjbc(int sjbc) {
+		this.sjbc = sjbc;
+	}
+
+	public String getEdituser() {
+		return edituser;
+	}
+
+	public void setEdituser(String edituser) {
+		this.edituser = edituser;
+	}
+
+	public Date getEdittime() {
+		return edittime;
+	}
+
+	public void setEdittime(Date edittime) {
+		this.edittime = edittime;
+	}
+
+	public Date getCreatetime() {
+		return createtime;
+	}
+
+	public void setCreatetime(Date createtime) {
+		this.createtime = createtime;
+	}
+
+	public int getNylx() {
+		return nylx;
+	}
+
+	public void setNylx(int nylx) {
+		this.nylx = nylx;
+	}
+
+	public int getJcsx() {
+		return jcsx;
+	}
+
+	public void setJcsx(int jcsx) {
+		this.jcsx = jcsx;
+	}
+
+	public String getBglyh() {
+		if(this.getZlc()==0){
+			return "0.00";
+		}else{
+			DecimalFormat df = new DecimalFormat("0.00");
+			return df.format(this.getHd()/this.getZlc()*100);
+		}
+	}
+
+	public void setBglyh(String bglyh) {
+		this.bglyh = bglyh;
+	}
+
+	public String getXlname() {
+		return BasicData.lineCode2NameMap.get(this.xlbm);
+	}
+
+	public void setXlname(String xlname) {
+		this.xlname = xlname;
+	}
+
+	public String getGsname() {
+		return 	BasicData.businessCodeNameMap.get(this.ssgsdm);
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+	
+	
+}
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Entity
+@Table(name = "bsth_c_jdl")
+public class Jdl {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date rq;
+	private String gsBm;
+	private String gsName;
+	private String fgsBm;
+	private String fgsName;
+	private String clZbh;
+	private Double jdl = 0.0;
+	private String jdz;
+	private String remarks;
+	
+	
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Date getRq() {
+		return rq;
+	}
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+	public String getGsBm() {
+		return gsBm;
+	}
+	public void setGsBm(String gsBm) {
+		this.gsBm = gsBm;
+	}
+	public String getGsName() {
+		return gsName;
+	}
+	public void setGsName(String gsName) {
+		this.gsName = gsName;
+	}
+	public String getFgsBm() {
+		return fgsBm;
+	}
+	public void setFgsBm(String fgsBm) {
+		this.fgsBm = fgsBm;
+	}
+	public String getFgsName() {
+		return fgsName;
+	}
+	public void setFgsName(String fgsName) {
+		this.fgsName = fgsName;
+	}
+	public String getClZbh() {
+		return clZbh;
+	}
+	public void setClZbh(String clZbh) {
+		this.clZbh = clZbh;
+	}
+	public Double getJdl() {
+		return jdl;
+	}
+	public void setJdl(Double jdl) {
+		this.jdl = jdl;
+	}
+	public String getJdz() {
+		return jdz;
+	}
+	public void setJdz(String jdz) {
+		this.jdz = jdz;
+	}
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	
+}
@@ -344,6 +344,8 @@ public class ScheduleRealInfo {
 	}
 	public String getsGh() {
+		if(sGh == null)
+			return "";
 		return sGh;
 	}
@@ -352,6 +354,8 @@ public class ScheduleRealInfo {
 	}
 	public String getsName() {
+		if(sGh == null)
+			return "";
 		return sName;
 	}
@@ -2,7 +2,6 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.rule.ScheduleRule1;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
@@ -21,7 +20,7 @@ import java.util.List;
             @NamedAttributeNode("ttInfo")
         })
 })
-public class SchedulePlan {
+public class SchedulePlan extends BEntity {
     /** 主键Id */
     @Id
@@ -60,19 +59,6 @@ public class SchedulePlan {
     @OneToMany(mappedBy = "schedulePlan", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<SchedulePlanInfo> schedulePlanInfoList = new ArrayList<>();
-    /** 创建人 */
-    @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;
     }
@@ -129,38 +115,6 @@ public class SchedulePlan {
         this.schedulePlanInfoList = schedulePlanInfoList;
     }
-    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 String getTtInfoNames() {
         return ttInfoNames;
     }
@@ -157,6 +157,7 @@ public class SchedulePlanInfo {
             Line xl,
             ScheduleResult_output scheduleResult_output,
             TTInfoDetail ttInfoDetail,
+            Boolean isFb,
             CarConfigInfo carConfigInfo,
             List<EmployeeConfigInfo> employeeConfigInfoList,
             SchedulePlan schedulePlan) {
@@ -191,7 +192,7 @@ public class SchedulePlanInfo {
         // TODO：报道时间，出场时间没有
         // 关联的驾驶员
         EmployeeConfigInfo employeeConfigInfo = null;
-        if (ttInfoDetail.getIsFB()) {
+        if (isFb) {
             if (employeeConfigInfoList.size() > 1) {
                 employeeConfigInfo = employeeConfigInfoList.get(1);
             } else {
+package com.bsth.entity.sys;
+
+import javax.persistence.*;
+
+/**
+ * 线调权限配置
+ * Created by panzhao on 2017/2/14.
+ */
+@Entity
+@Table(name = "bsth_c_real_control_authority")
+public class RealControAuthority {
+
+    @Id
+    private Integer userId;
+
+    /**
+     * 可调度的线路 , 分隔多个
+     */
+    private String lineCodeStr;
+
+    /**
+     * 调度模式 0: 监控模式  1：主调模式
+     */
+    private int pattern;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getLineCodeStr() {
+        return lineCodeStr;
+    }
+
+    public void setLineCodeStr(String lineCodeStr) {
+        this.lineCodeStr = lineCodeStr;
+    }
+
+    public int getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(int pattern) {
+        this.pattern = pattern;
+    }
+}
 package com.bsth.entity.sys;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.bsth.entity.Line;
+import javax.persistence.*;
+
 /**
  * 
  * @ClassName: Line(用户线路分配实体类)
@@ -20,6 +15,8 @@ import com.bsth.entity.Line;
  * @Date 2016年8月26日 09:03:33
  *
  * @Version 公交调度系统BS版 0.1
+ *
+ * PS：这个类缺少主调监控模式的配置，暂不使用
  * 
  */
 package com.bsth.filter;
-import java.io.File;
-import java.io.IOException;
+import com.bsth.util.RequestUtils;
+import org.apache.commons.lang3.StringUtils;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.bsth.util.RequestUtils;
+import java.io.File;
+import java.io.IOException;
 /**
- * 
+ * @author PanZhao
  * @ClassName: ResourceFilter
  * @Description: TODO(HTML片段过滤器)
- * @author PanZhao
  * @date 2016年3月19日 下午10:10:11
- *
  */
 public class ResourceFilter extends BaseFilter {
-	
-	String[] params = new String[]{"no"};
-	@Override
-	public void doFilter(HttpServletRequest request,
-			HttpServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
-		
-		String uri = request.getRequestURI();
-		int len = uri.length();
-		if (RequestUtils.isAjaxRequest(request) || 
-				!uri.substring(len - 5, len).equals(".html")) {
-			super.doFilter(request, response, chain);
-		} else {
-			
-			String fPath = this.getClass().getResource("/").getPath()
-					+ "static/" + uri;
-			
-			File f = new File(fPath);
-			
-			
-			if (f.exists() && f.isFile() ){
-				request.getRequestDispatcher("/?initFragment=" + joinParam(request)).forward(request, response);;
-			}else
-				response.sendRedirect("/");
-		}
-	}
-	
-	/**
-	 * 拼接参数
-	 * @param request
-	 * @return
-	 */
-	public String joinParam(HttpServletRequest request){
-		
-		StringBuilder sb = new StringBuilder();
-		
-		String v
-			,url = request.getRequestURI();
-		for(String p : params){
-			v = request.getParameter(p);
-			if(!StringUtils.isEmpty(v))
-				sb.append("&" + p + "=" + v);
-		}
-		
-		if(sb.length() > 0)
-			url += "?" + sb.substring(1, sb.length());
-		return url;
-	}
+    String[] params = new String[]{"no"};
+
+    @Override
+    public void doFilter(HttpServletRequest request,
+                         HttpServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+
+        String uri = request.getRequestURI();
+        String origin = request.getParameter("origin");
+        int len = uri.length();
+        if (RequestUtils.isAjaxRequest(request)
+                || (origin != null && origin.equals("real_control_iframe"))//来自线调 iframe 的请求
+                || !uri.substring(len - 5, len).equals(".html")) {
+            super.doFilter(request, response, chain);
+        } else {
+
+            String fPath = this.getClass().getResource("/").getPath()
+                    + "static/" + uri;
+
+            File f = new File(fPath);
+
+
+            if (f.exists() && f.isFile()) {
+                request.getRequestDispatcher("/?initFragment=" + joinParam(request)).forward(request, response);
+                ;
+            } else
+                response.sendRedirect("/");
+        }
+    }
+
+    /**
+     * 拼接参数
+     *
+     * @param request
+     * @return
+     */
+    public String joinParam(HttpServletRequest request) {
+
+        StringBuilder sb = new StringBuilder();
+
+        String v, url = request.getRequestURI();
+        for (String p : params) {
+            v = request.getParameter(p);
+            if (!StringUtils.isEmpty(v))
+                sb.append("&" + p + "=" + v);
+        }
+
+        if (sb.length() > 0)
+            url += "?" + sb.substring(1, sb.length());
+        return url;
+    }
 }
+package com.bsth.repository.oil;
+
+import org.springframework.stereotype.Repository;
+import com.bsth.entity.oil.Dlb;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface DlbRepository extends BaseRepository<Dlb, Integer>{
+	
+}
@@ -28,9 +28,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
-	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
+	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName,s.sGh,s.sName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName,s.sGh,s.sName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
-	
+
 	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh ")
 	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
@@ -119,6 +119,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
+
+	//按月统计
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date);
 	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY realExecDate,fcsj,xlBm,clZbh")
 	List<Map<String,Object>> yesterdayDataList(String line,String date);
@@ -3,6 +3,7 @@ package com.bsth.repository.schedule;
 import java.util.List;
 import java.util.Map;
+import com.bsth.entity.Line;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.repository.BaseRepository;
@@ -37,4 +38,8 @@ public interface GuideboardInfoRepository extends BaseRepository&lt;GuideboardInfo,
             "where td.ttinfo.id=?1 " +
             "group by td.ttinfo.id, td.lp.id, td.lp.lpName")
     List<Map<String, Object>> findLpName(Long ttid);
+    
+    @Query(value = "SELECT g FROM GuideboardInfo g  where g.xl =?1 and g.lpName = ?2 and g.lpNo = ?3 and lpType =?4 and isCancel = 0")
+    List<GuideboardInfo> validateLp(Line xl,String lpName , int lpNo,String lpType);
+   
 }
@@ -33,17 +33,18 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "lp_name as lpName, " +
             "cl as clId, " +
             "cl_zbh as clZbh, " +
-            "group_concat(distinct fcsj) ccsj, " +
+            "group_concat(fcsj) ccsj, " +
+            "group_concat(bc_type) bctype, " +
             "group_concat(distinct j) jsyId, " +
             "group_concat(distinct j_gh) jsyGh, " +
             "group_concat(distinct j_name) jsyName, " +
             "group_concat(distinct s) spyId, " +
             "group_concat(distinct s_gh) spyGh, " +
             "group_concat(distinct s_name) spyName, " +
-            "max(create_date) as createDate " +
+            "max(create_date) as createDate, " +
+            "group_concat(fcno) fcno " +
             "from bsth_c_s_sp_info " +
-            "where bc_type = 'out' and " +
-            "xl = ?1 and " +
+            "where xl = ?1 and " +
             "schedule_date = ?2 " +
             "group by xl_name, schedule_date, lp, lp_name, cl, cl_zbh " +
             "order by xl_name, schedule_date, lp ", nativeQuery = true)
@@ -71,14 +72,16 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "scpinfo.scheduleDate = :p3 and " +
             "scpinfo.lpName = :p4 and " +
             "scpinfo.fcsj = :p5 and " +
-            "scpinfo.bcType = :p6 ")
+            "scpinfo.bcType = :p6 and " +
+            "scpinfo.fcno = :p7 " )
     int updateGroupInfo_type_2_4(
             @Param("p1") String fcsj,
             @Param("p2") Integer xlid,
             @Param("p3") Date scheduleDate,
             @Param("p4") String lpName,
             @Param("p5") String fcsj_src,
-            @Param("p6") String bcType);
+            @Param("p6") String bcType,
+            @Param("p7") Integer fcno);
     @Modifying
     @Query(value = "update " +
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+@Repository
+public interface RealControAuthorityRepository extends BaseRepository<RealControAuthority, Integer>{
+
+    @Query("select t from RealControAuthority t where t.userId=?1")
+    RealControAuthority findByUserId(Integer userId);
+}
@@ -54,14 +54,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 //指定登录页
                 .loginPage(Constants.LOGIN_PAGE)
                 .loginProcessingUrl(Constants.LOGIN).permitAll()
-                //.failureUrl(Constants.LOGIN_PAGE + "?error=true")登录失败跳转的链接
-                //.successHandler(loginSuccessHandler())登录成功后处理
                 .and().logout()
-                //.addLogoutHandler(logoutHandler())
                 //禁用CXRF
                 .and().csrf().disable()
                 //禁用匿名用户功能
-                .anonymous().disable();
+                .anonymous().disable()
+                //允许同源 iframe
+                .headers().frameOptions().sameOrigin().httpStrictTransportSecurity().disable();
         // 同时只保持一个回话
         http.sessionManagement().maximumSessions(1)
@@ -477,8 +477,8 @@ public class GpsServiceImpl implements GpsService {
                 sqlBefore += (k + ",");
                 sqlValues += "?,";
             }
-            sqlBefore = sqlBefore.substring(0, sqlBefore.length() - 1) + ")";
-            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ")";
+            sqlBefore = sqlBefore.substring(0, sqlBefore.length() - 1) + ", create_ts)";
+            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ", "+System.currentTimeMillis()+")";
             sql = sqlBefore + " " + sqlValues;
             Connection conn = DBUtils_MS.getConnection();
@@ -11,6 +11,8 @@ import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationRouteService;
 import com.bsth.util.FTPClientUtils;
 import com.bsth.util.PackTarGZUtils;
+import com.bsth.util.Geo.GeoUtils;
+import com.bsth.util.Geo.Point;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -556,9 +558,15 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
-				/** 行单文件内容 @param：<objects：站点路由；lineId：线路ID>*/
-				String textStr = newTextFileToFTP(objects,lineId);
+				String textStr = "";
+				boolean tempTag = ishxType(objects);
+				
+				if(tempTag)
+					textStr = hxTextFileToFtp(objects,lineId);// 环线行单文件内容
+				else
+					textStr = newTextFileToFTP(objects,lineId);/** 双向行单文件内容 @param：<objects：站点路由；lineId：线路ID>*/
+					
 				/*textStr = line.getName() + "\t" + "2" + "\r" + textStr;*/
 				textStr = line.getName() + " " + "2" + "\r" + textStr;
@@ -574,9 +582,6 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				/** 获取txt文件 */
 				File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
-				/*File[] sources = new File[] {textFile};*/
-				//File[] sources = new File[] {textFile};
-				
 				File target = new File(odlGzFileName);
 				// 将txt文件打包
@@ -603,6 +608,24 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}  
 		return resultMap;
 	}
+	public boolean ishxType(List<Object[]> listObj) {
+		boolean tag = true;
+		String pointBStr[] = null,pointEStr[] = null;
+		int numzd = 0;
+		for(int i =0;i<listObj.size();i++) {
+			if(listObj.get(i)[3].equals("B") && Integer.valueOf(listObj.get(i)[8].toString())==0)
+				pointBStr = listObj.get(i)[2].toString().split(" ");
+			else if(listObj.get(i)[3].equals("E") && Integer.valueOf(listObj.get(i)[8].toString())==0)
+				pointEStr = listObj.get(i)[2].toString().split(" ");
+			if(Integer.valueOf(listObj.get(i)[8].toString())==1)
+				numzd++;
+		}
+		Point p1 = new Point(Double.valueOf(pointBStr[0]),Double.valueOf(pointBStr[1])); 
+		Point p2 = new Point(Double.valueOf(pointEStr[0]),Double.valueOf(pointEStr[1]));
+		if(GeoUtils.getDistance(p1, p2)>100 && numzd>2) 
+			tag = false;
+		return tag;
+	}
 	/**
 	 * @Description : TODO(形成行单文件内容)
@@ -717,31 +740,79 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 						}
 					}
-					
-					/*
-					String bdJWPointStr = objects.get(i)[2].toString();
-					
-					String bdJWPointA[] = bdJWPointStr.split(" ");
-					
-					Map<String, Object> pointsM = new HashMap<String,Object>();
-					
-					pointsM.put("lng", bdJWPointA[0]);
-					
-					pointsM.put("lat", bdJWPointA[1]);
-					
-					System.out.println(objects.get(i)[7].toString());
-					
-					sleepStr = sleepStr + GetFormPointOnPolylineSeleepLimit(pointsM,sobje);*/
 				}
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
-				
 			}
 		}
-		
 		return stationRStr;
-		
+	}
+	
+	public String hxTextFileToFtp(List<Object[]> objects,Integer lineId) {
+		String restStr = "";
+		// windows下的文本文件换行符
+		//String enterStr = "\r\n";
+		// linux/unix下的文本文件换行符
+		String enterStr = "\r";
+		int xh = 1 ;
+		for(int x =0;x<2;x++) {
+			for(int i = 0; i<objects.size();i++) {
+				if(Integer.valueOf(objects.get(i)[8].toString())==0) {
+					// 经度
+					String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+					// 纬度
+					String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+					lat = "\t" +  lat;
+					// 站点类型
+					String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
+					String stationMake = "";
+					if(stationMakeStr.equals("E")) {
+						stationMake = "\t2";
+					}else {
+						stationMake ="\t1";
+					}
+					// 站点序号 
+					// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+					String stationNo = "\t" + xh;
+					// 站点编码
+					String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+					stationCode =  "\t" +stationCode;
+					double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
+					String tempDistc = String.valueOf((int) dis);
+					// 站点距离
+					String staitondistance = "\t" + tempDistc;
+					// 站点名称
+					String stationName =  objects.get(i)[7].equals("") ? "" : objects.get(i)[7].toString();
+					stationName = "\t" +stationName;
+					// 限速
+					String sleepStr = "";
+					// 方向
+					int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
+					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
+					List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
+					if(sobje.size()==1) {
+						double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
+						sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
+					}else if(sobje.size()>1){
+						/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
+						for(int j =0;j<sobje.size();j++) {
+							String sectionName = sobje.get(j)[3].toString();
+							String sectionNameA[] = sectionName.split("至");
+							if(stationName.equals(sectionNameA[0])){
+								/*sleepStr = sobje.get(j)[2].toString();*/
+								double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+								sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
+							}
+						}
+					}
+					xh++;
+					restStr = restStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
+				}
+			}
+		}
+		System.out.println(restStr);
+		return restStr;
 	}
 	public String GetFormPointOnPolylineSeleepLimit(Map<String, Object> p,List<Object[]> listObjArra) {
@@ -328,10 +328,21 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
 								.equals(scheduleRealInfo.getLpName())
 								&& (schRealInfo.get("clZbh")+"").equals(scheduleRealInfo.getClZbh())){
-							if(scheduleRealInfo.getFcsjActual() == null ||scheduleRealInfo.getBcType().equals("in")
+
+							if(scheduleRealInfo.isDestroy()){
+								if(scheduleRealInfo.isReissue()){
+									scheduleRealInfo.setFcsjActualAll(scheduleRealInfo.getDfsj());
+									scheduleRealInfo.setZdsjActualAll(scheduleRealInfo.getZdsj());
+								}
+								else
+									continue;
+							}
+
+							if(scheduleRealInfo.getBcType().equals("in")
 									|| scheduleRealInfo.getBcType().equals("out")){
 								continue;
 							}
+
 							scheduleRealInfo.getQdzCode();
 							sf.append("<LD>");
 							sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
+package com.bsth.service.oil;
+
+import com.bsth.entity.oil.Dlb;
+import com.bsth.service.BaseService;
+
+public interface DlbService extends BaseService<Dlb, Integer>{
+}
+package com.bsth.service.oil.impl;
+
+
+
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.oil.Dlb;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.oil.DlbService;
+
+@Service
+public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{
+	
+
+}
@@ -15,4 +15,6 @@ public interface RealMapService {
     Map<String,Object> findRouteAndStationByLine(String lineCode);
     Map<String,Object> multiSectionRoute(String codeIdx);
+
+    Map<String,Object> multiRouteByLine(String codeStr);
 }
@@ -3,6 +3,7 @@ package com.bsth.service.realcontrol;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -144,4 +145,10 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> addRemarks(Long id, String remarks);
 	List<Map<String, Object>> scheduleDailyQp(String line ,String date);
+	
+	List<Map<String, Object>> scheduleDailyExport(Map<String, Object> map);
+	
+	Map<String, Object> exportWaybillMore(Map<String, Object> map);
+
+	List<SchedulePlanInfo> currentSchedulePlan(String lineCode);
 }
@@ -159,6 +159,17 @@ public class RealMapServiceImpl implements RealMapService {
         return rs;
     }
+    @Override
+    public Map<String, Object> multiRouteByLine(String codeStr) {
+        List<String> codeArray = Splitter.on(",").splitToList(codeStr);
+        Map<String, Object> rs = new HashMap<>();
+
+        for(String code : codeArray){
+            rs.put(code + "_route" ,findRouteByLine(code));
+        }
+        return rs;
+    }
+
     /**
      * wgs 坐标数组转 百度
      *
 package com.bsth.service.realcontrol.impl;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
@@ -23,6 +24,7 @@ import com.bsth.entity.realcontrol.SvgAttribute;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.LineRepository;
@@ -37,6 +39,7 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.SectionRouteService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
@@ -54,10 +57,13 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.io.*;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 @Service
 public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Long>
@@ -124,6 +130,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
     private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
+
+	private static int BUF_SIZE = 1024;
+	
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
     @Override
@@ -1340,29 +1349,52 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
                                                    String lpName, String date,String line) {
+    	List<ScheduleRealInfo> listSchedule=new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> list = null;
             list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date,line);
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s = list.get(i);
+            s.setAdjustExps(i+1+"");
             String remarks = "";
             if (s.getRemarks() != null) {
                 remarks += s.getRemarks();
             }
+            
             Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
-            if (!childTaskPlans.isEmpty()) {
-                Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                while (it.hasNext()) {
-                    ChildTaskPlan c = it.next();
-                    if (c.getRemarks() != null && c.getRemarks().length() > 0) {
-                        remarks += c.getRemarks();
-                    }
-
-                }
+            if (childTaskPlans.isEmpty()) {
+            	if(s.getStatus()==-1){
+            		if(remarks.indexOf("烂班")>-1){
+            			remarks +="(烂班)";
+            		}
+            		 s.setRemarks(remarks);
+            	}
+            	
+            }else{
+            	s.setFcsjActual("");
+            	s.setZdsjActual("");
             }
-            s.setRemarks(remarks);
+            listSchedule.add(s);
+            if(!childTaskPlans.isEmpty()){
+            	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                 while (it.hasNext()) {
+                     ChildTaskPlan c = it.next();
+                     if(!c.isDestroy()){
+                    	 ScheduleRealInfo t=new ScheduleRealInfo();
+                    	 t.setFcsjActual(c.getStartDate());
+                    	 t.setZdsjActual(c.getEndDate());
+                    	 t.setQdzName(c.getStartStationName());
+                    	 t.setZdzName(c.getEndStationName());
+                    	 t.setJhlc( Double.parseDouble(String.valueOf(c.getMileage())));
+                    	 t.setRemarks(c.getRemarks());
+                    	 t.setAdjustExps("子");
+                    	 listSchedule.add(t);
+                     }
+                 }
+            }
+           
         }
-        return list;
+        return listSchedule;
     }
     @Override
@@ -1386,13 +1418,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<Map<String, Object>> statisticsDaily(String line, String date,
                                                      String xlName, String type) {
-        List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+    	List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+    	if(date.length() == 10)
+    		list = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+    	else if(date.length() == 7)
+    		list = scheduleRealInfoRepository.scheduleByDateAndLine3(line, date);
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         DecimalFormat format = new DecimalFormat("0.00");
         double jhlc = 0, tempJhlc = 0, childMileage = 0;
         float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
         //班次
+        int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;
         int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60;
         int jhbc = 0, jhbc_m = 0, jhbc_a = 0;
         int sjbc = 0, sjbc_m = 0, sjbc_a = 0;
@@ -1406,6 +1443,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         		ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f, 
         		ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f;
         //班次
+        int ssbcZ = 0, ssbc_lzZ = 0, ssbc_dmZ = 0, ssbc_gzZ = 0, ssbc_jfZ = 0, ssbc_zsZ = 0, ssbc_qrZ = 0, ssbc_qcZ = 0, ssbc_kxZ = 0, ssbc_qhZ = 0, ssbc_ywZ = 0, ssbc_otherZ = 0;
         int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0;
         int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0;
         int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0;
@@ -1431,39 +1469,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                      if (scheduleRealInfo.getStatus() == -1) {
                         ssgl += tempJhlc;
                         ssglZ += tempJhlc;
+                        ssbc++;
+                        ssbcZ++;
                         if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) {
                             ssgl_lz += tempJhlc;
                             ssgl_lzZ += tempJhlc;
+                            ssbc_lz++;
+                            ssbc_lzZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) {
                             ssgl_dm += tempJhlc;
                             ssgl_dmZ += tempJhlc;
+                            ssbc_dm++;
+                            ssbc_dmZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) {
                             ssgl_gz += tempJhlc;
                             ssgl_gzZ += tempJhlc;
+                            ssbc_gz++;
+                            ssbc_gzZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) {
                             ssgl_jf += tempJhlc;
                             ssgl_jfZ += tempJhlc;
+                            ssbc_jf++;
+                            ssbc_jfZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) {
                             ssgl_zs += tempJhlc;
                             ssgl_zsZ += tempJhlc;
+                            ssbc_zs++;
+                            ssbc_zsZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) {
                             ssgl_qr += tempJhlc;
                             ssgl_qrZ += tempJhlc;
+                            ssbc_qr++;
+                            ssbc_qrZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) {
                             ssgl_qc += tempJhlc;
                             ssgl_qcZ += tempJhlc;
+                            ssbc_qc++;
+                            ssbc_qcZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) {
                             ssgl_kx += tempJhlc;
                             ssgl_kxZ += tempJhlc;
+                            ssbc_kx++;
+                            ssbc_kxZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) {
                             ssgl_qh += tempJhlc;
                             ssgl_qhZ += tempJhlc;
+                            ssbc_qh++;
+                            ssbc_qhZ++;
                         } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) {
                             ssgl_yw += tempJhlc;
                             ssgl_ywZ += tempJhlc;
+                            ssbc_yw++;
+                            ssbc_ywZ++;
                         } else {
                             ssgl_other += tempJhlc;
                             ssgl_otherZ += tempJhlc;
+                            ssbc_other++;
+                            ssbc_otherZ++;
                         }
                     }else {
                         sjgl += tempJhlc;
@@ -1479,39 +1541,63 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         if (childTaskPlan.isDestroy()) {
                             ssgl += childMileage;
                             ssglZ += childMileage;
+                            ssbc++;
+                            ssbcZ++;
                             if (childTaskPlan.getDestroyReason().equals("路阻")) {
                                 ssgl_lz += childTaskPlan.getMileage();
                                 ssgl_lzZ += childTaskPlan.getMileage();
+                                ssbc_lzZ++;
+                                ssbc_lzZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {
                                 ssgl_dm += childTaskPlan.getMileage();
                                 ssgl_dmZ += childTaskPlan.getMileage();
+                                ssbc_dm++;
+                                ssbc_dmZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("故障")) {
                                 ssgl_gz += childTaskPlan.getMileage();
                                 ssgl_gzZ += childTaskPlan.getMileage();
+                                ssbc_gz++;
+                                ssbc_gzZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {
                                 ssgl_jf += childTaskPlan.getMileage();
                                 ssgl_jfZ += childTaskPlan.getMileage();
+                                ssbc_jf++;
+                                ssbc_jfZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("肇事")) {
                                 ssgl_zs += childTaskPlan.getMileage();
                                 ssgl_zsZ += childTaskPlan.getMileage();
+                                ssbc_zs++;
+                                ssbc_zsZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("缺人")) {
                                 ssgl_qr += childTaskPlan.getMileage();
                                 ssgl_qrZ += childTaskPlan.getMileage();
+                                ssbc_qr++;
+                                ssbc_qrZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("缺车")) {
                                 ssgl_qc += childTaskPlan.getMileage();
                                 ssgl_qcZ += childTaskPlan.getMileage();
+                                ssbc_qc++;
+                                ssbc_qcZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("客稀")) {
                                 ssgl_kx += childTaskPlan.getMileage();
                                 ssgl_kxZ += childTaskPlan.getMileage();
+                                ssbc_kx++;
+                                ssbc_kxZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("气候")) {
                                 ssgl_qh += childTaskPlan.getMileage();
                                 ssgl_qhZ += childTaskPlan.getMileage();
+                                ssbc_qh++;
+                                ssbc_qhZ++;
                             } else if (childTaskPlan.getDestroyReason().equals("援外")) {
                                 ssgl_yw += childTaskPlan.getMileage();
                                 ssgl_ywZ += childTaskPlan.getMileage();
+                                ssbc_yw++;
+                                ssbc_ywZ++;
                             } else {
                                 ssgl_other += childTaskPlan.getMileage();
                                 ssgl_otherZ += childTaskPlan.getMileage();
+                                ssbc_other++;
+                                ssbc_otherZ++;
                             }
                         } else {
                             sjgl += childMileage;
@@ -1522,6 +1608,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 //班次
                 jhbc++;
+                jhbcZ++;
                 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) {
@@ -1584,6 +1671,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
                         map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
                         map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+                        map.put("ssbc", ssbc);
+                        map.put("ssbc_lz", ssbc_lz);
+                        map.put("ssbc_dm", ssbc_dm);
+                        map.put("ssbc_gz", ssbc_gz);
+                        map.put("ssbc_jf", ssbc_jf);
+                        map.put("ssbc_zs", ssbc_zs);
+                        map.put("ssbc_qr", ssbc_qr);
+                        map.put("ssbc_qc", ssbc_qc);
+                        map.put("ssbc_kx", ssbc_kx);
+                        map.put("ssbc_qh", ssbc_qh);
+                        map.put("ssbc_yw", ssbc_yw);
+                        map.put("ssbc_other", ssbc_other);
                         map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
                         map.put("jhbc", jhbc);
                         map.put("jhbc_m", jhbc_m);
@@ -1634,6 +1733,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
                     map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
                     map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+                    map.put("ssbc", ssbc);
+                    map.put("ssbc_lz", ssbc_lz);
+                    map.put("ssbc_dm", ssbc_dm);
+                    map.put("ssbc_gz", ssbc_gz);
+                    map.put("ssbc_jf", ssbc_jf);
+                    map.put("ssbc_zs", ssbc_zs);
+                    map.put("ssbc_qr", ssbc_qr);
+                    map.put("ssbc_qc", ssbc_qc);
+                    map.put("ssbc_kx", ssbc_kx);
+                    map.put("ssbc_qh", ssbc_qh);
+                    map.put("ssbc_yw", ssbc_yw);
+                    map.put("ssbc_other", ssbc_other);
                     map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
                     map.put("jhbc", jhbc);
                     map.put("jhbc_m", jhbc_m);
@@ -1685,6 +1796,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ));
         map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ));
         map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ));
+        map.put("ssbc", ssbcZ);
+        map.put("ssbc_lz", ssbc_lzZ);
+        map.put("ssbc_dm", ssbc_lzZ);
+        map.put("ssbc_gz", ssbc_gzZ);
+        map.put("ssbc_jf", ssbc_jfZ);
+        map.put("ssbc_zs", ssbc_zsZ);
+        map.put("ssbc_qr", ssbc_qrZ);
+        map.put("ssbc_qc", ssbc_qcZ);
+        map.put("ssbc_kx", ssbc_qcZ);
+        map.put("ssbc_qh", ssbc_qhZ);
+        map.put("ssbc_yw", ssbc_ywZ);
+        map.put("ssbc_other", ssbc_otherZ);
         map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ));
         map.put("jhbc", jhbcZ);
         map.put("jhbc_m", jhbc_mZ);
@@ -2054,7 +2177,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         for (ChangePersonCar cpc : cpcs) {
-            if (map.get(cpc.getClZbh()) == null) {
+            if (cpc.getClZbh() != null && map.get(cpc.getClZbh()) == null) {
                 rs.put("msg", "车辆 " + cpc.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
                 rs.put("status", ResponseCode.ERROR);
                 return rs;
@@ -2476,7 +2599,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 								map.put("fast", "");
 								map.put("slow", "");
 							}
-						listMap.add(map);
+							System.out.println(map);
+							listMap.add(map);
 						} catch (Exception e) {
 							e.printStackTrace();
 						} 
@@ -2504,13 +2628,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("jzl", jzl);
 		map.put("jhlc", format.format(jhlc+jcclc));
 		map.put("yygljh", format.format(jhlc));
-		map.put("ssgl", format.format(remgl));
+		map.put("ssgl", format.format(remMileage));
 		map.put("ksgl", format.format(ksgl));
 		map.put("yyglsj", format.format(yygl));
 		map.put("jhbc", jhbc);
 		map.put("jcclc", jcclc);
-		map.put("ljgl", format.format(addgl));
+		map.put("ljgl", format.format(addMileage));
 		map.put("ssbc", cjbc);
 		map.put("ysgl", format.format(yygl));
 		map.put("sjbc", jhbc-cjbc+ljbc);
@@ -2646,13 +2770,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		}
 		map.put("jhlc", format.format(jhlc+jcclc));
 		map.put("yygljh", format.format(jhlc));
-		map.put("ssgl", format.format(remgl));
+		map.put("ssgl", format.format(remMileage));
 		map.put("ksgl", format.format(ksgl));
 		map.put("yyglsj", format.format(yygl));
 		map.put("jhbc", jhbc);
 		map.put("jcclc", jcclc);
-		map.put("ljgl", format.format(addgl));
+		map.put("ljgl", format.format(addMileage));
 		map.put("ssbc", cjbc);
 		map.put("ysgl", format.format(yygl));
 		map.put("sjbc", jhbc-cjbc+ljbc);
@@ -2913,4 +3037,214 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		return list;
 	}
+
+	@Override
+	public List<Map<String, Object>> scheduleDailyExport(Map<String, Object> map){
+		String line = map.get("line").toString();
+		String date = map.get("date").toString();
+		String xlName = map.get("xlName").toString();
+		String state = map.get("state").toString();
+		String type = map.get("type").toString();
+		
+		List<Map<String, Object>> dataList2 = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> dataList3 = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list1 = this.statisticsDaily(line, date, xlName, null);
+		List<ScheduleRealInfo> list2 = this.queryUserInfo(line, date, state);
+		List<ScheduleRealInfo> list3 = this.realScheduleList(line, date);
+		
+		for(Map<String, Object> m : list1){
+//			m.put("ssgl", m.get("ssgl"));
+//			m.put("ssbc", m.get("ssbc"));
+//			m.put("ssgl_lz", m.get("ssgl_lz") + " / " + m.get("ssbc_lz"));
+//			m.put("ssgl_dm", m.get("ssgl_dm") + " / " + m.get("ssbc_dm"));
+//			m.put("ssgl_gz", m.get("ssgl_gz") + " / " + m.get("ssbc_gz"));
+//			m.put("ssgl_jf", m.get("ssgl_jf") + " / " + m.get("ssbc_jf"));
+//			m.put("ssgl_zs", m.get("ssgl_zs") + " / " + m.get("ssbc_zs"));
+//			m.put("ssgl_qr", m.get("ssgl_qr") + " / " + m.get("ssbc_qr"));
+//			m.put("ssgl_qc", m.get("ssgl_qc") + " / " + m.get("ssbc_qc"));
+//			m.put("ssgl_kx", m.get("ssgl_kx") + " / " + m.get("ssbc_kx"));
+//			m.put("ssgl_qh", m.get("ssgl_qh") + " / " + m.get("ssbc_qh"));
+//			m.put("ssgl_yw", m.get("ssgl_yw") + " / " + m.get("ssbc_yw"));
+//			m.put("ssgl_other", m.get("ssgl_other") + " / " + m.get("ssbc_other"));
+		}
+		
+		int size = 0;
+		Map<String, Object> tempMap = new HashMap<String, Object>();
+		for(int i = 0; i < list2.size(); i++){
+			Object obj = (Object)list2.get(i);
+			Object[] objs = (Object[])obj;
+			if(size == 5){
+				size = 0;
+				dataList2.add(tempMap);
+				tempMap = new HashMap<String, Object>();
+			}
+			tempMap.put("lp" + size, objs[3]);
+			tempMap.put("ch" + size, objs[2]);
+			tempMap.put("jz" + size, objs[1] + "/" + objs[4]);
+			tempMap.put("sz" + size, "");
+			tempMap.put("jw" + size, "");
+			tempMap.put("sw" + size, "");
+			
+			size++;
+		}
+		if(size < 5){
+			for(;size < 5; size++){
+				tempMap.put("lp" + size, "");
+				tempMap.put("ch" + size, "");
+				tempMap.put("jz" + size, "");
+				tempMap.put("sz" + size, "");
+				tempMap.put("jw" + size, "");
+				tempMap.put("sw" + size, "");
+			}
+		}
+		
+		dataList2.add(tempMap);
+		
+		size = 0;
+		tempMap = new HashMap<String, Object>();
+		for(ScheduleRealInfo schedule : list3){
+			if(size == 3){
+				size = 0;
+				dataList3.add(tempMap);
+				tempMap = new HashMap<String, Object>();
+			}
+			tempMap.put("lpName" + size, schedule.getLpName());
+			tempMap.put("qdzName" + size, schedule.getQdzName());
+			tempMap.put("zdsj" + size, schedule.getZdsj());
+			tempMap.put("zdsjActual" + size, schedule.getZdsjActual()!=null?schedule.getZdsjActual():"");
+			tempMap.put("zdsjk" + size, "");
+			tempMap.put("zdsjm" + size, "");
+			tempMap.put("fcsj" + size, schedule.getFcsj());
+			tempMap.put("fcsjActual" + size, schedule.getFcsjActual()!=null?schedule.getFcsjActual():"");
+			tempMap.put("fcsjk" + size, "");
+			tempMap.put("fcsjm" + size, "");
+			tempMap.put("remarks" + size, schedule.getRemarks()!=null?schedule.getRemarks():"");
+			
+			size++;
+		}
+		if(size < 3){
+			for(; size < 3; size++){
+				tempMap.put("lpName" + size, "");
+				tempMap.put("qdzName" + size, "");
+				tempMap.put("zdsj" + size, "");
+				tempMap.put("zdsjActual" + size, "");
+				tempMap.put("zdsjk" + size, "");
+				tempMap.put("zdsjm" + size, "");
+				tempMap.put("fcsj" + size, "");
+				tempMap.put("fcsjActual" + size, "");
+				tempMap.put("fcsjk" + size, "");
+				tempMap.put("fcsjm" + size, "");
+				tempMap.put("remarks" + size, "");
+			}
+		}
+		
+		dataList3.add(tempMap);
+
+        if (type.equals("export")) {
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			Map<String, Object> m = new HashMap<String, Object>();
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(list1.iterator());
+				listI.add(dataList2.iterator());
+				listI.add(dataList3.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				String sourcePath = path+"mould/scheduleDaily.xls";
+				if(date.length() == 7){
+					sdfMonth = new SimpleDateFormat("yyyy-MM");
+					sdfSimple = new SimpleDateFormat("yyyyMM");
+					sourcePath = path+"mould/scheduleDaily_m.xls";
+				}
+				ee.excelReplace(listI, new Object[] { m }, sourcePath,
+						path+"export/调度日报" + sdfSimple.format(sdfMonth.parse(date))+".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+        }
+        
+		return new ArrayList<Map<String, Object>>();
+	}
+
+	@Override
+	public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
+		String date = map.get("date").toString();
+		String line = map.get("line").toString();
+		List<List> lists = JSON.parseArray(map.get("strs").toString(), List.class);
+		String path = this.getClass().getResource("/").getPath()+"static/pages/forms/export/";
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		int num = 0;
+		File file = null;
+		try {
+			while (true) {
+				String fileUrl = path+"行车路单"+sdfSimple.format(sdfMonth.parse(date));
+				file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/"));
+				if(file.exists()){
+					num++;
+				} else {
+					break;
+				}
+			}
+			file.mkdirs();
+			
+			for(List<String> list : lists){
+				String jName = list.get(0);
+				String clZbh = list.get(1);
+				String lpName = list.get(2);
+				this.exportWaybill(jName, clZbh, lpName, date, line);
+				File temp = new File(path+date+"-"+jName+"-"+clZbh+"-"+lpName+"-行车路单.xls");
+				String fileName = file.getName();
+				temp.renameTo(new File(path + fileName + "/" + temp.getName()));
+				
+				File[] listFiles = file.listFiles();
+				ZipOutputStream zos = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(path+file.getName()+".zip")));
+//				zos.setEncoding("gbk");
+//				zos.putNextEntry(new ZipEntry(fileName + "/"));
+				for(int i = 0; i < listFiles.length; i++){
+					zos.putNextEntry(new ZipEntry(fileName+"/"+listFiles[i].getName()));
+					BufferedInputStream bis = new BufferedInputStream(new FileInputStream(listFiles[i]));
+					BufferedOutputStream bos = new BufferedOutputStream(zos);
+					int bytesRead = 0;
+					for(byte[] buffer = new byte[BUF_SIZE]; ((bytesRead = bis.read(buffer, 0, BUF_SIZE)) != -1);){
+//						zos.write(buffer, 0, bytesRead);
+//						zos.flush();
+						bos.write(buffer, 0, bytesRead);
+						bos.flush();
+					}
+				}
+				zos.close();
+			}
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+		
+		map.put("fileName", file.getName());
+		return map;
+	}
+
+    @Autowired
+    SchedulePlanInfoService schPlanService;
+    @Override
+    public List<SchedulePlanInfo> currentSchedulePlan(String lineCode) {
+        List<SchedulePlanInfo> rs = dayOfSchedule.schedulePlanMap.get(lineCode);
+
+        if(rs==null || rs.size()==0){
+            //尝试刷新内存
+            Map<String, Object> data = new HashMap<>();
+            data.put("scheduleDate_eq", dayOfSchedule.currSchDateMap.get(lineCode));
+            data.put("xlBm_eq", lineCode);
+            List<SchedulePlanInfo> planItr = dayOfSchedule.cleanSchPlanItr(schPlanService.list(data).iterator());
+
+            if(planItr.size() > 0){
+                dayOfSchedule.schedulePlanMap.put(lineCode, planItr);
+                return planItr;
+            }
+        }
+        return rs;
+    }
 }
 \ No newline at end of file
@@ -4,6 +4,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
 import org.joda.time.DateTime;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -117,6 +118,11 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         /** 创建时间 */
         private Date createDate;
+        /** 出场班次1发车的顺序号 */
+        private Integer fcno1;
+        /** 出场班次2发车的顺序号 */
+        private Integer fcno2;
+
         public GroupInfo() {}
         public GroupInfo(Object[] datas) {
@@ -132,19 +138,40 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             this.clId = Integer.valueOf(String.valueOf(datas[4]));
             // 车辆自编号
             this.clZbh = String.valueOf(datas[5]);
-            // 出场时间，如果有多个，需要分开
+            // 出场时间，出场班次，如果有多个，需要分开
             Object ccsj = datas[6];
+            Object bctype = datas[7];
+            Object fcno = datas[15];
+
             if (ccsj != null) {
                 String[] ccsj_array = ((String) ccsj).split(",");
-                if (ccsj_array.length > 1) {
-                    this.ccsj1 = String.valueOf(ccsj_array[0]);
-                    this.ccsj2 = String.valueOf(ccsj_array[1]);
-                } else {
-                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                String[] bctype_array = ((String) bctype).split(",");
+                String[] fcno_array = ((String) fcno).split(",");
+                List<Integer> bctype_index = new ArrayList<>();
+
+                for (int i = 0; i < bctype_array.length; i++) {
+                    if (bctype_index.size() == 2) { // 只记录2个出场
+                        break;
+                    }
+                    if (bctype_array[i].equals("out")) {
+                        bctype_index.add(i);
+                    }
+                }
+
+                if (bctype_index.size() == 1) {
+                    this.ccsj1 = String.valueOf(ccsj_array[bctype_index.get(0)]);
+                    this.fcno1 = Integer.valueOf(fcno_array[bctype_index.get(0)]);
+                } else if (bctype_index.size() == 2) {
+                    this.ccsj1 = String.valueOf(ccsj_array[bctype_index.get(0)]);
+                    this.ccsj2 = String.valueOf(ccsj_array[bctype_index.get(1)]);
+
+                    this.fcno1 = Integer.valueOf(fcno_array[bctype_index.get(0)]);
+                    this.fcno2 = Integer.valueOf(fcno_array[bctype_index.get(1)]);
                 }
+
             }
             // 驾驶员id，如果有多个，需要分开
-            Object jsyId = datas[7];
+            Object jsyId = datas[8];
             if (jsyId != null) {
                 String[] jsyId_array = ((String) jsyId).split(",");
                 if (jsyId_array.length > 1) {
@@ -155,7 +182,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 驾驶员工号，如果有多个，需要分开
-            Object jsyGh = datas[8];
+            Object jsyGh = datas[9];
             if (jsyGh != null) {
                 String[] jsyGh_array = ((String) jsyGh).split(",");
                 if (jsyGh_array.length > 1) {
@@ -166,7 +193,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 驾驶员名字，如果有多个，需要分开
-            Object jsyName = datas[9];
+            Object jsyName = datas[10];
             if (jsyName != null) {
                 String[] jsyName_array = ((String) jsyName).split(",");
                 if (jsyName_array.length > 1) {
@@ -178,7 +205,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             }
             // 售票员id，如果有多个，需要分开
-            Object spyId = datas[10];
+            Object spyId = datas[11];
             if (spyId != null) {
                 String[] spyId_array = ((String) spyId).split(",");
                 if (spyId_array.length > 1) {
@@ -190,7 +217,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             }
             // 售票员工号，如果有多个，需要分开
-            Object spyGh = datas[11];
+            Object spyGh = datas[12];
             if (spyGh != null) {
                 String[] spyGh_array = ((String) spyGh).split(",");
                 if (spyGh_array.length > 1) {
@@ -201,7 +228,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 售票员名字，如果有多个，需要分开
-            Object spyName = datas[12];
+            Object spyName = datas[13];
             if (spyName != null) {
                 String[] spyName_array = ((String) spyName).split(",");
                 if (spyName_array.length > 1) {
@@ -212,7 +239,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 创建时间
-            this.createDate = new DateTime(datas[13]).toDate();
+            this.createDate = new DateTime(datas[14]).toDate();
             // TODO：可能还有其他字段
         }
@@ -384,5 +411,21 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         public void setXlId(Integer xlId) {
             this.xlId = xlId;
         }
+
+        public Integer getFcno1() {
+            return fcno1;
+        }
+
+        public void setFcno1(Integer fcno1) {
+            this.fcno1 = fcno1;
+        }
+
+        public Integer getFcno2() {
+            return fcno2;
+        }
+
+        public void setFcno2(Integer fcno2) {
+            this.fcno2 = fcno2;
+        }
     }
 }
@@ -55,7 +55,8 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
                         groupInfoUpdate.getUpdate().getScheduleDate(),
                         groupInfoUpdate.getSrc().getLpName(),
                         groupInfoUpdate.getSrc().getCcsj1(),
-                        "out"
+                        "out",
+                        groupInfoUpdate.getSrc().getFcno1()
                 );
             }
@@ -94,7 +95,8 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
                         groupInfoUpdate.getUpdate().getScheduleDate(),
                         groupInfoUpdate.getSrc().getLpName(),
                         groupInfoUpdate.getSrc().getCcsj2(),
-                        "out"
+                        "out",
+                        groupInfoUpdate.getSrc().getFcno2()
                 );
             }
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.BaseService;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.service.schedule.rules.ttinfo2.Result;
+
+import java.util.Date;
 /**
  * Created by xu on 16/6/16.
  */
-public interface SchedulePlanService extends BaseService<SchedulePlan, Long> {
+public interface SchedulePlanService extends BService<SchedulePlan, Long> {
+
+    SchedulePlan save(SchedulePlan schedulePlan, CompanyAuthority companyAuthority);
+
     /**
      * 获取有明日排班的计划。
      * @return
      */
     SchedulePlan findSchedulePlanTommorw();
-}
+
+    /**
+     * 验证使用的时刻表。
+     * @param xlid 线路id
+     * @param from 开始时间
+     * @param to 结束时间
+     * @return
+     */
+    Result validateTTInfo(Integer xlid, Date from, Date to);
+}
 \ No newline at end of file
@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 /**
  * Created by xu on 16/7/2.
@@ -52,7 +53,7 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
             this.xldir = xldir;
             if ("N".equals(isfb))
                 this.isfb = false;
-            else if ("Y".equals(isfb))
+            else if ("Y".equals(isfb) || "true".equals(isfb))
                 this.isfb = true;
             else
                 this.isfb = false;
@@ -200,5 +201,5 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
     // TODO：这个方法可以用通用方法解决，以后改
     List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId);
-
+    Map<String, Object> skbDetailMxSave(Map<String, Object> map);
 }
@@ -7,4 +7,7 @@ public class ScheduleException extends Exception {
     public ScheduleException(String message) {
         super("计划调度业务错误==>>" + message);
     }
+    public ScheduleException(Throwable throwable) {
+        super(throwable);
+    }
 }
@@ -5,6 +5,12 @@ import com.bsth.repository.BaseRepository;
 import com.bsth.service.schedule.BService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsService;
+import jxl.Cell;
+import jxl.Sheet;
+import jxl.Workbook;
+import jxl.write.Label;
+import jxl.write.WritableSheet;
+import jxl.write.WritableWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -118,7 +124,30 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
     @Override
     public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
-        return dataToolsService.uploadFile(filename, filedata);
+        try {
+            // 对上传的excel文件做处理，将第一个sheet名字设定为工作表1
+            File file = dataToolsService.uploadFile(filename, filedata);
+            Workbook workbook = Workbook.getWorkbook(file);
+            Sheet sheet = workbook.getSheet(0);
+
+            File fileCal = new File(file.getAbsolutePath() + "_sheetChange.xls");
+            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
+            WritableSheet writableSheet = writableWorkbook.createSheet("工作表1", 0);
+            for (int i = 0; i < sheet.getRows(); i++) {
+                Cell[] cells = sheet.getRow(i);
+                for (int j = 0; j < cells.length; j++) {
+                    writableSheet.addCell(new Label(j, i, cells[j].getContents()));
+                }
+            }
+            writableWorkbook.write();
+            writableWorkbook.close();
+
+            return fileCal;
+
+        } catch (Exception exp) {
+            throw new ScheduleException(exp);
+        }
+
     }
     @Override
@@ -3,13 +3,20 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.GuideboardInfoService;
-import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import javax.transaction.Transactional;
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,8 +24,15 @@ import java.util.Map;
 /**
  * 路牌信息服务。
  */
+@EnableConfigurationProperties(DataToolsProperties.class)
 @Service
 public class GuideboardInfoServiceImpl extends BServiceImpl<GuideboardInfo, Long> implements GuideboardInfoService {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(GuideboardInfoServiceImpl.class);
+
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
+
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
@@ -94,4 +108,62 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
         }
     }
+    @Override
+    public void importData(File file, Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导入路牌信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getGuideboardsDatainputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filepath", file.getAbsolutePath());
+            ktrParms.put("erroroutputdir", dataToolsProperties.getTransErrordir());
+
+            super.importData(file, ktrParms);
+
+            LOGGER.info("//---------------- 导入路牌信息 success... ----------------//");
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导入路牌信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
+    @Override
+    public File exportData(Map<String, Object> params) throws ScheduleException {
+        try {
+            LOGGER.info("//---------------- 导出路牌信息 start... ----------------//");
+            // 创建ktr转换所需参数
+            Map<String, Object> ktrParms = new HashMap<>();
+            File ktrFile = new File(this.getClass().getResource(
+                    dataToolsProperties.getGuideboardsDataoutputktr()).toURI());
+
+            // 通用参数，转换文件路径，excel输出文件名
+            ktrParms.put("transpath", ktrFile.getAbsolutePath());
+            ktrParms.put("filename", "路牌信息_download-");
+
+            File file = super.exportData(ktrParms);
+
+            LOGGER.info("//---------------- 导出路牌信息 success... ----------------//");
+
+            return file;
+
+        } catch (Exception exp) {
+            LOGGER.info("//---------------- 导出路牌信息 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
+        }
+    }
+
 }
-package com.bsth.service.schedule;
+package com.bsth.service.schedule.impl;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.*;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanRepository;
-import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.LineService;
+import com.bsth.service.schedule.SchedulePlanService;
+import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.strategy.IStrategy;
+import com.bsth.service.schedule.rules.ttinfo2.CalcuParam;
+import com.bsth.service.schedule.rules.ttinfo2.Result;
 import com.google.common.collect.Multimap;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -28,7 +36,7 @@ import java.util.*;
  * Created by xu on 16/6/16.
  */
 @Service
-public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long> implements SchedulePlanService {
+public class SchedulePlanServiceImpl extends BServiceImpl<SchedulePlan, Long> implements SchedulePlanService {
     @Autowired
     private KieBase kieBase;
     @Autowired
@@ -37,10 +45,18 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
     private SchedulePlanRepository schedulePlanRepository;
     @Autowired
     private SchedulePlanInfoRepository schedulePlanInfoRepository;
+    @Autowired
+    private LineService lineService;
+    @Autowired
+    private TTInfoService ttInfoService;
+    @Autowired
+    private TTInfoDetailService ttInfoDetailService;
+
+    /** 日志记录器 */
+    private Logger logger = LoggerFactory.getLogger(SchedulePlanServiceImpl.class);
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    @Override
-    public Map<String, Object> save(SchedulePlan schedulePlan) {
+    public SchedulePlan save(SchedulePlan schedulePlan, CompanyAuthority companyAuthority) {
         // 1-1、查找线路具体信息
         Line xl = strategy.getLine(schedulePlan.getXl().getId());
         // 1-2、查出指定线路的所有规则
@@ -106,18 +122,41 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
                 employeeConfigInfoList.add(employeeConfigMaps.get(Long.valueOf(eid)));
             }
             // 排班明细（这个要迭代的）
-            Collection<TTInfoDetail> ttInfoDetails = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
+            Collection<TTInfoDetail> ttInfoDetails_ = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
                     Long.parseLong(scheduleResult_output.getGuideboardId()));
+            List<TTInfoDetail> ttInfoDetails = new ArrayList<>(ttInfoDetails_);
+
+            // 排序ttInfoDetails
+            Collections.sort(ttInfoDetails, new Comparator<TTInfoDetail>() {
+                @Override
+                public int compare(TTInfoDetail o1, TTInfoDetail o2) {
+                    return o1.getFcno().compareTo(o2.getFcno());
+                }
+            });
+
+            Boolean isFb = false; // 是否分班
             for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
+                if (ttInfoDetail.getIsFB())
+                    isFb = ttInfoDetail.getIsFB();
+
                 SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo(
                         xl,
                         scheduleResult_output,
                         ttInfoDetail,
+                        isFb,
                         configInfo,
                         employeeConfigInfoList,
                         schedulePlan);
+
+                // 公司，分公司编码
+                schedulePlanInfo.setGsBm(companyAuthority.getCompanyCode());
+                schedulePlanInfo.setGsName(companyAuthority.getCompanyName());
+                schedulePlanInfo.setFgsBm(companyAuthority.getSubCompanyCode());
+                schedulePlanInfo.setFgsName(companyAuthority.getSubCompanyName());
+
                 schedulePlanInfos.add(schedulePlanInfo);
                 ttInfoMap.put(ttInfoDetail.getTtinfo().getId(), ttInfoDetail.getTtinfo().getName());
+
             }
         }
@@ -126,7 +165,9 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         // 3-2、保存生成的排班和明细
         schedulePlan.getSchedulePlanInfoList().addAll(schedulePlanInfos); // 关联的排班明细信息
-        return super.save(schedulePlan);
+        super.save(schedulePlan);
+
+        return new SchedulePlan();
     }
     @Override
@@ -142,4 +183,36 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         }
         return null;
     }
+
+    @Override
+    public Result validateTTInfo(Integer xlid, Date from, Date to) {
+        // 构造drools session->载入数据->启动规则->计算->销毁session
+        // 创建session，内部配置的是stateful
+        KieSession session = kieBase.newKieSession();
+        // 设置gloable对象，在drl中通过别名使用
+        session.setGlobal("log", logger);
+        session.setGlobal("lineService", lineService);
+        session.setGlobal("ttInfoDetailService", ttInfoDetailService);
+
+        Result rs = new Result(); // 输出gloable对象
+        session.setGlobal("rs", rs);
+
+        // 载入数据
+        CalcuParam calcuParam = new CalcuParam(
+                new DateTime(from), new DateTime(to), xlid);
+        session.insert(calcuParam);
+        List<TTInfo> ttInfos = ttInfoService.findAll();
+        for (TTInfo ttInfo: ttInfos)
+                session.insert(ttInfo);
+
+
+        // 执行rule
+        session.fireAllRules();
+
+        // 执行完毕销毁，有日志的也要关闭
+        session.dispose();
+
+
+        return rs;
+    }
 }
 package com.bsth.service.schedule.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.CarPark;
+import com.bsth.entity.Line;
 import com.bsth.entity.LineInformation;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.repository.CarParkRepository;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.StationRepository;
+import com.bsth.repository.schedule.GuideboardInfoRepository;
 import com.bsth.repository.schedule.TTInfoDetailRepository;
+import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.service.CarParkService;
 import com.bsth.service.LineInformationService;
 import com.bsth.service.StationRouteService;
@@ -13,6 +22,7 @@ import com.bsth.service.schedule.GuideboardInfoService;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsProperties;
+import com.bsth.service.schedule.utils.DataToolsService;
 import jxl.Cell;
 import jxl.Sheet;
 import jxl.Workbook;
@@ -24,6 +34,7 @@ import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -56,6 +67,19 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     private TTInfoDetailRepository ttInfoDetailRepository;
     @Autowired
     private DataToolsProperties dataToolsProperties;
+    @Autowired
+    private LineRepository lineRepository;
+    @Autowired
+    private TTInfoRepository infoRepository;
+    @Autowired
+    private StationRepository staRepository;
+    @Autowired
+    private CarParkRepository carParkRepository;
+    @Autowired
+    private GuideboardInfoRepository guideboardInfoRepository;
+    @Autowired
+    @Qualifier(value = "dataToolsServiceImpl")
+    private DataToolsService dataToolsService;
     @Override
     public TTInfoDetail findById(Long aLong) {
@@ -63,6 +87,12 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     }
     @Override
+    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+
+        return dataToolsService.uploadFile(filename, filedata);
+    }
+
+    @Override
     public void importData(
             File file,
             Map<String, Object> params) throws ScheduleException {
@@ -417,20 +447,23 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                     }
                     // 班次时间验证，正则表达式，格式hh:mm或者hhmm
-                    String el = "^(([0-1]\\d)|(2[0-4])):[0-5]\\d$"; // hh:mm格式
-                    String el2 = "^(([0-1]\\d)|(2[0-4]))[0-5]\\d$"; // hhmm格式
-                    Pattern p = Pattern.compile(el);
-                    Pattern p2 = Pattern.compile(el2);
+                    String rex1 = "^([01]?[0-9]|2[0-3]):[0-5][0-9]$"; // hh:mm格式
+                    String rex2 = "^([01]?[0-9]|2[0-3]),[0-5][0-9]$"; // hh,mm格式
+                    String rex3 = "^([01]?[0-9]|2[0-3])[0-5][0-9]$"; // hhmm格式
+                    Pattern p1 = Pattern.compile(rex1);
+                    Pattern p2 = Pattern.compile(rex2);
+                    Pattern p3 = Pattern.compile(rex3);
                     for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
                         Cell[] bcells = sheet.getRow(i);
                         for (int j = 1; j < bcells.length; j++) { // 从第2列开始
                             String bcell_con = bcells[j].getContents();
                             if (StringUtils.isNotEmpty(bcell_con)) {
-                                Matcher m = p.matcher(bcell_con.trim());
+                                Matcher m1 = p1.matcher(bcell_con.trim());
                                 Matcher m2 = p2.matcher(bcell_con.trim());
-                                if ((!m.matches()) && (!m2.matches())) {
-                                    throw new Exception(String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hhmm", i + 1, j + 1));
+                                Matcher m3 = p3.matcher(bcell_con.trim());
+                                if ((!m1.matches()) && (!m2.matches()) && (!m3.matches())) {
+                                    throw new Exception(String.format("第%d行，第%d列的发车时间格式不正确，格式应为hh:mm或hh,mm或hhmm", i + 1, j + 1));
                                 }
                             }
                         }
@@ -497,4 +530,84 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
         return ttInfoDetailRepository.findBcdetails(xlId, ttinfoId, lpId);
     }
+    
+    @Override
+   	public Map<String, Object> skbDetailMxSave(Map<String, Object> map) {
+   		Map<String, Object> rs_m = new HashMap<String,Object>();
+   		try {
+   			String d = map.get("d") == null ? null : map.get("d").toString();
+   	    	if(d!=null)
+   	    		ttInfoDetailRepository.save(jsonArrayToListEntity(d));
+   		} catch (Exception e) {
+   			e.printStackTrace();
+   			rs_m.put("status", ResponseCode.ERROR);
+   		}
+   		rs_m.put("status", ResponseCode.SUCCESS);
+   		return rs_m;
+   	}
+   	
+   	public List<TTInfoDetail> jsonArrayToListEntity(String jsonStr) throws Exception {
+   		List<TTInfoDetail> listTd = new ArrayList<TTInfoDetail>();
+   		JSONArray jsonArray = JSONArray.parseArray(jsonStr);
+   		for(int i =0; i<jsonArray.size();i++) {
+   			JSONObject jsonObj = jsonArray.getJSONObject(i);
+   			if(jsonObj.getString("bcType").equals("bd") || jsonObj.getString("bcType").equals("lc") || jsonObj.getString("bcType").equals("cf"))
+   				continue;
+   			listTd.add(objToEntity(jsonObj));
+   		}
+   		return listTd;
+   	}
+   	
+   	public TTInfoDetail objToEntity(JSONObject obj) throws Exception {
+   		TTInfoDetail td = new TTInfoDetail();
+   		Line xl = lineRepository.findOne(Integer.parseInt(obj.getString("xl"))); 
+   		td.setXl(xl);
+   		td.setTtinfo(obj.getString("ttinfo") == null ? null : infoRepository.findOne(Long.parseLong(obj.getString("ttinfo"))));
+   		td.setLp(getLp(xl,obj.getString("lp"),Integer.parseInt(obj.getString("lp")),obj.getString("lpType")));
+   		td.setFcno(Integer.parseInt(obj.getString("fcno")));
+   		td.setXlDir(dirToCod(obj.get("xlDir").toString()));
+   		td.setQdz( obj.getString("qdz") ==null? null : staRepository.findOne(Integer.parseInt(obj.getString("qdz"))));
+   		td.setZdz(obj.getString("zdz") ==null ? null :staRepository.findOne(Integer.parseInt(obj.getString("zdz"))));
+   		td.setTcc(carParkRepository.findOne(Integer.parseInt(obj.getString("tcc"))));
+   		td.setFcsj(obj.getString("fcsj"));
+   		td.setBcs(Integer.parseInt(obj.getString("bcs")));
+   		td.setJhlc(Double.parseDouble(obj.getString("jhlc")));
+   		td.setBcsj(Integer.parseInt(obj.getString("bcsj")));
+   		td.setBcType(obj.getString("bcType"));
+   		td.setIsFB(false);
+   		td.setIsSwitchXl(false);
+   		td.setSwitchXl(null);
+   		td.setSwitchXlDesc(null);
+   		td.setRemark(null);
+   		td.setCreateBy(null);
+   		td.setUpdateBy(null);
+   		return td;
+   	}
+   	
+   	public GuideboardInfo getLp(Line xl,String name, int code, String lpType) throws Exception {
+   		GuideboardInfo entity = new GuideboardInfo();
+   		List<GuideboardInfo> lgi = guideboardInfoRepository.validateLp(xl, name, code,lpType);
+   		if(lgi.size()>0) {
+   			entity = lgi.get(0);
+   		}else{
+   			entity.setXl(xl);
+   			entity.setLpNo(code);
+   			entity.setLpName(name);
+   			entity.setLpType(lpType);
+   			entity.setIsCancel(false);
+   			entity.setCreateBy(null);
+   			entity.setUpdateBy(null);
+   			guideboardInfoRepository.save(entity);
+   		} 
+   		return entity;
+   	}
+   	
+   	public String dirToCod(String str) throws Exception {
+   		String c = "";
+   		if(str.equals("relationshipGraph-up"))
+   			c = "0";
+   		else if(str.equals("relationshipGraph-down"))
+   			c = "1";
+   		return c;
+   	}
 }
@@ -52,6 +52,9 @@ public class MyDroolsConfiguration {
         // 3.2、写入drl（写法超多，有点混乱）
         // 这里使用文件的形式写入，TODO：以后考虑从数据库中读drl写入
         // 注意kfs写的时候如果指定path，强制为src/main/resources/加上文件名，还有就是文件名不要重复否则会覆盖的
+        kfs.write("src/main/resources/functions.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/functions.drl"), "UTF-8"));
         kfs.write("src/main/resources/HelloWorld.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/HelloWorld.drl"), "UTF-8"));
@@ -61,6 +64,9 @@ public class MyDroolsConfiguration {
         kfs.write("src/main/resources/ttinfo.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/ttinfo.drl"), "UTF-8"));
+        kfs.write("src/main/resources/ttinfo2.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/ttinfo2.drl"), "UTF-8"));
         // TODO：还有其他drl....
         // 4、创建KieBuilder，使用KieFileSystem构建
+package com.bsth.service.schedule.rules.ttinfo2;
+
+import org.joda.time.DateTime;
+
+/**
+ * 时刻表计算参数。
+ */
+public class CalcuParam {
+    /** 开始计算时间 */
+    private DateTime fromDate;
+    /** 结束计算时间 */
+    private DateTime toDate;
+    /** 线路id */
+    private Integer xlId;
+
+    public CalcuParam() {}
+    public CalcuParam(
+            DateTime fromDate,
+            DateTime toDate,
+            Integer xlId) {
+        this.fromDate = fromDate;
+        this.toDate = toDate;
+        this.xlId = xlId;
+    }
+
+    public DateTime getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(DateTime fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public DateTime getToDate() {
+        return toDate;
+    }
+
+    public void setToDate(DateTime toDate) {
+        this.toDate = toDate;
+    }
+
+    public Integer getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(Integer xlId) {
+        this.xlId = xlId;
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo2;
+
+import com.bsth.entity.schedule.TTInfoDetail;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+
+/**
+ * Created by xu on 17/2/28.
+ */
+public class ErrorBcCountFunction implements AccumulateFunction {
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    protected static class ErrorCountData implements Externalizable {
+        public long errorcount = 0;
+        public TTInfoDetail ttInfoDetail;
+
+        public ErrorCountData() {
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            errorcount = in.readLong();
+            ttInfoDetail = (TTInfoDetail) in.readObject();
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeLong(errorcount);
+            out.writeObject(ttInfoDetail);
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new ErrorCountData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        ErrorCountData errorCountData = (ErrorCountData) context;
+        errorCountData.errorcount = 0;
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        ErrorCountData errorCountData = (ErrorCountData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        if (ttInfoDetail.getTtinfo() == null) {
+            errorCountData.errorcount ++;
+            return;
+        }
+
+        if ("in".equals(ttInfoDetail.getBcType())) {
+            if (ttInfoDetail.getQdz() == null || ttInfoDetail.getTcc() == null) {
+                errorCountData.errorcount ++;
+            }
+        } else if ("out".equals(ttInfoDetail.getBcType())) {
+            if (ttInfoDetail.getTcc() == null || ttInfoDetail.getZdz() == null) {
+                errorCountData.errorcount ++;
+            }
+        } else {
+            if (ttInfoDetail.getQdz() == null || ttInfoDetail.getZdz() == null) {
+                errorCountData.errorcount ++;
+            }
+        }
+    }
+
+    @Override
+    public void reverse(Serializable context, Object value) throws Exception {
+        ErrorCountData errorCountData = (ErrorCountData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        if (ttInfoDetail.getTtinfo() == null) {
+            errorCountData.errorcount --;
+            return;
+        }
+
+        if ("in".equals(ttInfoDetail.getBcType())) {
+            if (ttInfoDetail.getQdz() == null || ttInfoDetail.getTcc() == null) {
+                errorCountData.errorcount --;
+            }
+        } else if ("out".equals(ttInfoDetail.getBcType())) {
+            if (ttInfoDetail.getTcc() == null || ttInfoDetail.getZdz() == null) {
+                errorCountData.errorcount --;
+            }
+        } else {
+            if (ttInfoDetail.getQdz() == null || ttInfoDetail.getZdz() == null) {
+                errorCountData.errorcount --;
+            }
+        }
+
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        ErrorCountData errorCountData = (ErrorCountData) context;
+        return errorCountData.errorcount;
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return true;
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return Number.class;
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 输出结果值。
+ */
+public class Result {
+    private List<StatInfo> infos = new ArrayList<>();
+
+    public List<StatInfo> getInfos() {
+        return infos;
+    }
+
+    public void setInfos(List<StatInfo> infos) {
+        this.infos = infos;
+    }
+
+    public static class StatInfo {
+        /** 时刻表id */
+        private Long ttid;
+        /** 时刻表名字 */
+        private String ttname;
+
+        /** 所有班次数 */
+        private Long allbc;
+        /** 进场班次数 */
+        private Long inbc;
+        /** 出场班次数 */
+        private Long outbc;
+        /** 营运班次数 */
+        private Long yybc;
+
+        /** 错误班次数 */
+        private Long errorbc;
+
+        public Long getTtid() {
+            return ttid;
+        }
+
+        public void setTtid(Long ttid) {
+            this.ttid = ttid;
+        }
+
+        public String getTtname() {
+            return ttname;
+        }
+
+        public void setTtname(String ttname) {
+            this.ttname = ttname;
+        }
+
+        public Long getAllbc() {
+            return allbc;
+        }
+
+        public void setAllbc(Long allbc) {
+            this.allbc = allbc;
+        }
+
+        public Long getInbc() {
+            return inbc;
+        }
+
+        public void setInbc(Long inbc) {
+            this.inbc = inbc;
+        }
+
+        public Long getOutbc() {
+            return outbc;
+        }
+
+        public void setOutbc(Long outbc) {
+            this.outbc = outbc;
+        }
+
+        public Long getYybc() {
+            return yybc;
+        }
+
+        public void setYybc(Long yybc) {
+            this.yybc = yybc;
+        }
+
+        public Long getErrorbc() {
+            return errorbc;
+        }
+
+        public void setErrorbc(Long errorbc) {
+            this.errorbc = errorbc;
+        }
+    }
+}
@@ -170,4 +170,175 @@ public class DataImportExportServiceImpl implements DataImportExportService, Ini
         return new File(filepath);
     }
+
+
+    // TODO：以后改成下面的样子
+//    import java.io.FileInputStream;
+//    import java.io.FileOutputStream;
+//    import java.io.IOException;
+//    import java.io.InputStream;
+//    import java.util.Iterator;
+//
+//    import org.apache.poi.hssf.usermodel.HSSFCell;
+//    import org.apache.poi.hssf.usermodel.HSSFRow;
+//    import org.apache.poi.hssf.usermodel.HSSFSheet;
+//    import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+//
+//    import org.apache.poi.xssf.usermodel.XSSFCell;
+//    import org.apache.poi.xssf.usermodel.XSSFRow;
+//    import org.apache.poi.xssf.usermodel.XSSFSheet;
+//    import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+//
+//    public class ReadWriteExcelFile {
+//
+//        public static void readXLSFile() throws IOException
+//        {
+//            InputStream ExcelFileToRead = new FileInputStream("C:/Test.xls");
+//            HSSFWorkbook wb = new HSSFWorkbook(ExcelFileToRead);
+//
+//            HSSFSheet sheet=wb.getSheetAt(0);
+//            HSSFRow row;
+//            HSSFCell cell;
+//
+//            Iterator rows = sheet.rowIterator();
+//
+//            while (rows.hasNext())
+//            {
+//                row=(HSSFRow) rows.next();
+//                Iterator cells = row.cellIterator();
+//
+//                while (cells.hasNext())
+//                {
+//                    cell=(HSSFCell) cells.next();
+//
+//                    if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
+//                    {
+//                        System.out.print(cell.getStringCellValue()+" ");
+//                    }
+//                    else if(cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
+//                    {
+//                        System.out.print(cell.getNumericCellValue()+" ");
+//                    }
+//                    else
+//                    {
+//                        //U Can Handel Boolean, Formula, Errors
+//                    }
+//                }
+//                System.out.println();
+//            }
+//
+//        }
+//
+//        public static void writeXLSFile() throws IOException {
+//
+//            String excelFileName = "C:/Test.xls";//name of excel file
+//
+//            String sheetName = "Sheet1";//name of sheet
+//
+//            HSSFWorkbook wb = new HSSFWorkbook();
+//            HSSFSheet sheet = wb.createSheet(sheetName) ;
+//
+//            //iterating r number of rows
+//            for (int r=0;r < 5; r++ )
+//            {
+//                HSSFRow row = sheet.createRow(r);
+//
+//                //iterating c number of columns
+//                for (int c=0;c < 5; c++ )
+//                {
+//                    HSSFCell cell = row.createCell(c);
+//
+//                    cell.setCellValue("Cell "+r+" "+c);
+//                }
+//            }
+//
+//            FileOutputStream fileOut = new FileOutputStream(excelFileName);
+//
+//            //write this workbook to an Outputstream.
+//            wb.write(fileOut);
+//            fileOut.flush();
+//            fileOut.close();
+//        }
+//
+//        public static void readXLSXFile() throws IOException
+//        {
+//            InputStream ExcelFileToRead = new FileInputStream("C:/Test.xlsx");
+//            XSSFWorkbook  wb = new XSSFWorkbook(ExcelFileToRead);
+//
+//            XSSFWorkbook test = new XSSFWorkbook();
+//
+//            XSSFSheet sheet = wb.getSheetAt(0);
+//            XSSFRow row;
+//            XSSFCell cell;
+//
+//            Iterator rows = sheet.rowIterator();
+//
+//            while (rows.hasNext())
+//            {
+//                row=(XSSFRow) rows.next();
+//                Iterator cells = row.cellIterator();
+//                while (cells.hasNext())
+//                {
+//                    cell=(XSSFCell) cells.next();
+//
+//                    if (cell.getCellType() == XSSFCell.CELL_TYPE_STRING)
+//                    {
+//                        System.out.print(cell.getStringCellValue()+" ");
+//                    }
+//                    else if(cell.getCellType() == XSSFCell.CELL_TYPE_NUMERIC)
+//                    {
+//                        System.out.print(cell.getNumericCellValue()+" ");
+//                    }
+//                    else
+//                    {
+//                        //U Can Handel Boolean, Formula, Errors
+//                    }
+//                }
+//                System.out.println();
+//            }
+//
+//        }
+//
+//        public static void writeXLSXFile() throws IOException {
+//
+//            String excelFileName = "C:/Test.xlsx";//name of excel file
+//
+//            String sheetName = "Sheet1";//name of sheet
+//
+//            XSSFWorkbook wb = new XSSFWorkbook();
+//            XSSFSheet sheet = wb.createSheet(sheetName) ;
+//
+//            //iterating r number of rows
+//            for (int r=0;r < 5; r++ )
+//            {
+//                XSSFRow row = sheet.createRow(r);
+//
+//                //iterating c number of columns
+//                for (int c=0;c < 5; c++ )
+//                {
+//                    XSSFCell cell = row.createCell(c);
+//
+//                    cell.setCellValue("Cell "+r+" "+c);
+//                }
+//            }
+//
+//            FileOutputStream fileOut = new FileOutputStream(excelFileName);
+//
+//            //write this workbook to an Outputstream.
+//            wb.write(fileOut);
+//            fileOut.flush();
+//            fileOut.close();
+//        }
+//
+//        public static void main(String[] args) throws IOException {
+//
+//            writeXLSFile();
+//            readXLSFile();
+//
+//            writeXLSXFile();
+//            readXLSXFile();
+//
+//        }
+//
+//    }
 }
@@ -99,6 +99,9 @@ public class DataToolsProperties {
     @NotNull
     /** 人员配置信息导出ktr转换 */
     private String employeesconfigDataoutputktr;
+    @NotNull
+    /** 路牌信息导出 */
+    private String guideboardsDataoutputktr;
     // TODO：
@@ -309,4 +312,12 @@ public class DataToolsProperties {
     public void setEmployeesconfigDataoutputktr(String employeesconfigDataoutputktr) {
         this.employeesconfigDataoutputktr = employeesconfigDataoutputktr;
     }
+
+    public String getGuideboardsDataoutputktr() {
+        return guideboardsDataoutputktr;
+    }
+
+    public void setGuideboardsDataoutputktr(String guideboardsDataoutputktr) {
+        this.guideboardsDataoutputktr = guideboardsDataoutputktr;
+    }
 }
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+public interface RealControAuthorityService extends BaseService<RealControAuthority, Integer> {
+    RealControAuthority findByUserId(Integer userId);
+}
+package com.bsth.service.sys.impl;
+
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.repository.sys.RealControAuthorityRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.RealControAuthorityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+@Service
+public class RealControAuthorityServiceImpl extends BaseServiceImpl<RealControAuthority, Integer> implements RealControAuthorityService {
+
+    @Autowired
+    RealControAuthorityRepository realControAuthorityRepository;
+
+    @Override
+    public RealControAuthority findByUserId(Integer userId) {
+        return realControAuthorityRepository.findByUserId(userId);
+    }
+}
@@ -27,9 +27,11 @@ public class SHCJ2BDJW {
 		/*String sqlSelect = "SELECT b.SHAPESTRING as SHAPE , b.id as ID FROM jjwgps_t_gjldb b where  SHAPESTRING is not null order by b.ldbh asc  ";*/
 		/*String sqlSelect = "select s.id,s.descriptions from bsth_c_station s order by s.id asc  ";*/
-		String sqlSelect = "SELECT s.id,s.descriptions FROM bsth_c_section s order by s.id asc ";
+		String sqlSelect = "select s.id,s.x,s.y from bsth_c_station s where id >=26882  order by s.id asc";
+		/*String sqlSelect = "SELECT s.id,s.descriptions FROM bsth_c_section s order by s.id asc ";*/
-		String sqlUpdate = "UPDATE bsth_c_section SET csection_vector = ST_GeomFromText(?) , bsection_vector=ST_GeomFromText(?) , gsection_vector=ST_GeomFromText(?) where id = ?";
+		/*String sqlUpdate = "UPDATE bsth_c_section SET csection_vector = ST_GeomFromText(?) , bsection_vector=ST_GeomFromText(?) , gsection_vector=ST_GeomFromText(?) where id = ?";*/
+		String sqlUpdate = "UPDATE bsth_c_station SET b_jwpoints= ? , g_lonx=? , g_laty=? where id = ?";
 		List<Map<String, Object>> list = new ArrayList<>();
@@ -44,8 +46,9 @@ public class SHCJ2BDJW {
 				Map<String, Object> map = new HashMap<String, Object>();
-				map.put("descriptions", rs.getString("descriptions"));
-				
+				/*map.put("descriptions", rs.getString("descriptions"));*/
+				map.put("x", rs.getString("x"));
+				map.put("y", rs.getString("y"));
 				map.put("id", rs.getInt("id"));
 				list.add(map);
@@ -55,10 +58,21 @@ public class SHCJ2BDJW {
 				Map<String, Object> temp = list.get(i);
 				// POINT (8229.30921617 -933.16425265)
-				String lineString = temp.get("descriptions").toString();
-				int id = Integer.parseInt(temp.get("id").toString());
+				//String lineString = temp.get("descriptions").toString();
+				
+				Double lng = Double.parseDouble(temp.get("x").toString());
+				Double lat = Double.parseDouble(temp.get("y").toString());
+				Map map_2 = JWDUtil.ConvertSHToJW(lng,lat);
-				String arrayP[] = lineString.substring(lineString.indexOf("(")+1, lineString.length()-1).split(", ");
+				String b_jwpoints = "";
+				Float g_lonx=0.0f,g_laty=0.0f;
+				int id = Integer.parseInt(temp.get("id").toString());
+				g_lonx = Float.parseFloat(map_2.get("x").toString());
+				g_laty = Float.parseFloat(map_2.get("y").toString());
+				Location location = TransGPS.LocationMake(Float.parseFloat(map_2.get("x").toString()), Float.parseFloat(map_2.get("y").toString()));
+				location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
+				b_jwpoints = (location.getLng()+0.000727) + " " + (location.getLat() - 0.0000624);
+				//String arrayP[] = lineString.substring(lineString.indexOf("(")+1, lineString.length()-1).split(", ");
 				/*String arrayP[] = lineString.substring(lineString.indexOf("(")+1, lineString.length()-1).split(" ");
 				String b_jwpoints = "";
 				Float g_lonx=0.0f,g_laty=0.0f,x=0.0f,y=0.0f;*/
@@ -76,7 +90,7 @@ public class SHCJ2BDJW {
 				b_jwpoints = (location.getLng()+0.000727) + " " + (location.getLat() - 0.0000624);*/
 				//b_jwpoints = (location.getLng()) + " " + (location.getLat());
-				String csection_vector="",bsection_vector="",gsection_vector="";
+			/*	String csection_vector="",bsection_vector="",gsection_vector="";
 				for(int k =0;k<arrayP.length;k++) {
@@ -103,20 +117,20 @@ public class SHCJ2BDJW {
 					}
-				}
+				}*/
 				ps = null;
-				bsection_vector = "LINESTRING(" + bsection_vector +")";
-				csection_vector = "LINESTRING(" + csection_vector +")";
-				gsection_vector = "LINESTRING(" + gsection_vector +")";
+				//bsection_vector = "LINESTRING(" + bsection_vector +")";
+				//csection_vector = "LINESTRING(" + csection_vector +")";
+				//gsection_vector = "LINESTRING(" + gsection_vector +")";
 				ps = conn.prepareStatement(sqlUpdate);
 				// String sqlUpdate = "UPDATE bsth_c_section SET csection_vector = ? , bsection_vector=? , gsection_vector=? where id = ?";
-				ps.setString(1, csection_vector);
-				ps.setString(2, bsection_vector);
-				ps.setString(3, gsection_vector);
-				ps.setInt(4, id);
+				//ps.setString(1, csection_vector);
+				//ps.setString(2, bsection_vector);
+				//ps.setString(3, gsection_vector);
+				//ps.setInt(4, id);
 				//int stauts = ps.executeUpdate();
 				// String sqlUpdate = "UPDATE bsth_c_station SET b_jwpoints = ?1 , g_lonx=?2 , g_laty=?3 , x = ?4 , y = ?5 where id = ?6";
@@ -126,6 +140,11 @@ public class SHCJ2BDJW {
 				ps.setFloat(4, x);
 				ps.setFloat(5, y);
 				ps.setFloat(6, id);*/
+				
+				ps.setString(1, b_jwpoints);
+				ps.setFloat(2, g_lonx);
+				ps.setFloat(3, g_laty);
+				ps.setFloat(4, id);
 				int stauts = ps.executeUpdate();
 				System.out.println(stauts);
 			}
@@ -3,6 +3,7 @@ package com.bsth.websocket.handler;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.SignalState;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -170,4 +171,17 @@ public class SendUtils{
 		list.add(sch);
 		refreshSch(list);
 	}
+
+	public void deviceOffline(GpsEntity gps){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "deviceOffline");
+		map.put("gps", gps);;
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToLine(gps.getLineId().toString(), mapper.writeValueAsString(map));
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
+	}
 }
@@ -65,6 +65,9 @@ datatools.carsconfig_dataoutputktr=/datatools/ktrs/carsConfigDataOutput.ktr
 # 人员配置信息导出ktr转换
 datatools.employeesconfig_dataoutputktr=/datatools/ktrs/employeesConfigDataOutput.ktr
+# 路牌信息导出
+datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
+
 # TODO：
@@ -66,5 +66,8 @@ datatools.carsconfig_dataoutputktr=/datatools/ktrs/carsConfigDataOutput.ktr
 # 人员配置信息导出ktr转换
 datatools.employeesconfig_dataoutputktr=/datatools/ktrs/employeesConfigDataOutput.ktr
+# 路牌信息导出
+datatools.guideboards_dataoutputktr=/datatools/ktrs/guideboardDataOutput.ktr
+
 # TODO：
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
-    <name>carsConfigDataInput</name>
+    <name>&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</name>
     <description>&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</description>
     <extended_description>&#x914d;&#x8f66;&#x4fe1;&#x606f;</extended_description>
     <trans_version/>
@@ -469,40 +469,46 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>isCancel</name>
+        <field>is_cancel</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>xl</name>
         <rename>xlId</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>cl</name>
         <rename>clId</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>is_switch</name>
         <rename>isswitch</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>tcd</name>
         <rename>&#x505c;&#x8f66;&#x70b9;</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>zzrq</name>
         <rename>&#x7ec8;&#x7ed3;&#x65e5;&#x671f;</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>qyrq</name>
         <rename>&#x542f;&#x7528;&#x65e5;&#x671f;</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>is_cancel</name>
         <rename>isCancel</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
     </lookup>
      <cluster_schema/>
 <?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
-    <name>carsConfigDataOutput</name>
+    <name>&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x5bfc;&#x51fa;</name>
     <description/>
     <extended_description/>
     <trans_version/>
@@ -271,8 +271,8 @@
   <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</from><to>Excel&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
   </order>
   <step>
-    <name>&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#xff08;&#x6ca1;&#x6709;&#x4f5c;&#x5e9f;&#xff09;</name>
-    <type>TableInput</type>
+    <name>Excel&#x8f93;&#x51fa;</name>
+    <type>ExcelOutput</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -281,24 +281,90 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <connection>bus_control_variable</connection>
-    <sql>select &#x2a; from bsth_c_s_ccinfo where is_cancel &#x3d; 0</sql>
-    <limit>0</limit>
-    <lookup/>
-    <execute_each_row>N</execute_each_row>
-    <variables_active>N</variables_active>
-    <lazy_conversion_active>N</lazy_conversion_active>
+    <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>yyyyMMddHHmmss</date_time_format>
+      <sheetname>&#x5de5;&#x4f5c;&#x8868;1</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>
+      <field>
+        <name>&#x7ebf;&#x8def;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x7ec8;&#x7ed3;&#x65e5;&#x671f;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>&#x505c;&#x8f66;&#x70b9;</name>
+        <type>String</type>
+        <format/>
+      </field>
+    </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>106</xloc>
-      <yloc>68</yloc>
+      <xloc>596</xloc>
+      <yloc>265</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x7ebf;&#x8def;&#x67e5;&#x8be2;</name>
-    <type>DBLookup</type>
+    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
+    <type>SelectValues</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -307,40 +373,38 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <connection>bus_control_variable</connection>
-    <cache>Y</cache>
-    <cache_load_all>Y</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_line</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
-        <name>xl</name>
-        <field>id</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>name</name>
-        <rename>xlmc</rename>
-        <default/>
-        <type>String</type>
-      </value>
-    </lookup>
-     <cluster_schema/>
+    <fields>      <field>        <name>xlmc</name>
+        <rename>&#x7ebf;&#x8def;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>zbh</name>
+        <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>qyrq</name>
+        <rename>&#x542f;&#x7528;&#x65e5;&#x671f;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>zzrq</name>
+        <rename>&#x7ec8;&#x7ed3;&#x65e5;&#x671f;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>tcd</name>
+        <rename>&#x505c;&#x8f66;&#x70b9;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>        <select_unspecified>N</select_unspecified>
+    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>248</xloc>
-      <yloc>67</yloc>
+      <xloc>595</xloc>
+      <yloc>167</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x8f66;&#x8f86;&#x67e5;&#x8be2;</name>
-    <type>DBLookup</type>
+    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
+    <type>SortRows</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -349,33 +413,37 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
-    <cache_size>0</cache_size>
-    <lookup>
-      <schema/>
-      <table>bsth_c_cars</table>
-      <orderby/>
-      <fail_on_multiple>N</fail_on_multiple>
-      <eat_row_on_failure>N</eat_row_on_failure>
-      <key>
-        <name>cl</name>
-        <field>id</field>
-        <condition>&#x3d;</condition>
-        <name2/>
-      </key>
-      <value>
-        <name>inside_code</name>
-        <rename>zbh</rename>
-        <default/>
-        <type>String</type>
-      </value>
-    </lookup>
+      <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>xlmc</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>zbh</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+      <field>
+        <name>qyrq</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+    </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>361</xloc>
-      <yloc>67</yloc>
+      <xloc>592</xloc>
+      <yloc>66</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -431,8 +499,8 @@
     </step>
   <step>
-    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
-    <type>SortRows</type>
+    <name>&#x7ebf;&#x8def;&#x67e5;&#x8be2;</name>
+    <type>DBLookup</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -441,44 +509,40 @@
            <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>xlmc</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-      <field>
-        <name>zbh</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-      <field>
-        <name>qyrq</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-    </fields>
+    <connection>bus_control_variable</connection>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_line</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xl</name>
+        <field>id</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>name</name>
+        <rename>xlmc</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>592</xloc>
-      <yloc>66</yloc>
+      <xloc>248</xloc>
+      <yloc>67</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
-    <type>SelectValues</type>
+    <name>&#x8f66;&#x8f86;&#x67e5;&#x8be2;</name>
+    <type>DBLookup</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -487,38 +551,40 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <fields>      <field>        <name>xlmc</name>
-        <rename>&#x7ebf;&#x8def;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>zbh</name>
-        <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>qyrq</name>
-        <rename>&#x542f;&#x7528;&#x65e5;&#x671f;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>zzrq</name>
-        <rename>&#x7ec8;&#x7ed3;&#x65e5;&#x671f;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>tcd</name>
-        <rename>&#x505c;&#x8f66;&#x70b9;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>        <select_unspecified>N</select_unspecified>
-    </fields>     <cluster_schema/>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_cars</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>cl</name>
+        <field>id</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>inside_code</name>
+        <rename>zbh</rename>
+        <default/>
+        <type>String</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>595</xloc>
-      <yloc>167</yloc>
+      <xloc>361</xloc>
+      <yloc>67</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
   <step>
-    <name>Excel&#x8f93;&#x51fa;</name>
-    <type>ExcelOutput</type>
+    <name>&#x8f66;&#x8f86;&#x914d;&#x7f6e;&#xff08;&#x6ca1;&#x6709;&#x4f5c;&#x5e9f;&#xff09;</name>
+    <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -527,83 +593,17 @@
            <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>yyyyMMddHHmmss</date_time_format>
-      <sheetname>&#x5de5;&#x4f5c;&#x8868;1</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>
-      <field>
-        <name>&#x7ebf;&#x8def;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>&#x542f;&#x7528;&#x65e5;&#x671f;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>&#x7ec8;&#x7ed3;&#x65e5;&#x671f;</name>
-        <type>String</type>
-        <format/>
-      </field>
-      <field>
-        <name>&#x505c;&#x8f66;&#x70b9;</name>
-        <type>String</type>
-        <format/>
-      </field>
-    </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>
+    <connection>bus_control_variable</connection>
+    <sql>select &#x2a; from bsth_c_s_ccinfo where is_cancel &#x3d; 0</sql>
+    <limit>0</limit>
+    <lookup/>
+    <execute_each_row>N</execute_each_row>
+    <variables_active>N</variables_active>
+    <lazy_conversion_active>N</lazy_conversion_active>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>596</xloc>
-      <yloc>265</yloc>
+      <xloc>106</xloc>
+      <yloc>68</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
 <?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
-    <name>carsDataInput</name>
+    <name>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</name>
     <description>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</description>
     <extended_description>&#x8f66;&#x8f86;&#x57fa;&#x7840;&#x4fe1;&#x606f;</extended_description>
     <trans_version/>
@@ -119,6 +119,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>
@@ -1016,6 +1017,12 @@
       <schema/>
       <table>bsth_c_cars</table>
       <key>
+        <name>businessCode</name>
+        <field>business_code</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
         <name>insideCode</name>
         <field>inside_code</field>
         <condition>&#x3d;</condition>
 <?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
-    <name>carsDataOutput</name>
+    <name>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x51fa;</name>
     <description>&#x8f66;&#x8f86;&#x4fe1;&#x606f;&#x5bfc;&#x51fa;</description>
     <extended_description>&#x8f66;&#x8f86;&#x57fa;&#x7840;&#x4fe1;&#x606f;</extended_description>
     <trans_version/>
@@ -93,6 +93,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>
 <?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
-    <name>employeesConfigDataInput</name>
+    <name>&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</name>
     <description>&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</description>
     <extended_description>&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;</extended_description>
     <trans_version/>
@@ -514,30 +514,36 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>isCancel</name>
+        <field>is_cancel</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>xl</name>
         <rename>xlid</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>dbbm</name>
         <rename>&#x642d;&#x73ed;&#x7f16;&#x7801;</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>jsy</name>
         <rename>jid</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>spy</name>
         <rename>sid</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
       <value>
         <name>is_cancel</name>
         <rename>isCancel</rename>
-        <update>Y</update>
+        <update>N</update>
       </value>
     </lookup>
      <cluster_schema/>
 <?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
-    <name>employeesConfigDataOutput</name>
+    <name>&#x4eba;&#x5458;&#x914d;&#x7f6e;&#x4fe1;&#x606f;&#x5bfc;&#x51fa;</name>
     <description/>
     <extended_description/>
     <trans_version/>
 <?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
-    <name>employeesDataInput</name>
+    <name>&#x4eba;&#x5458;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</name>
     <description>&#x4eba;&#x5458;&#x57fa;&#x7840;&#x4fe1;&#x606f;&#x5bfc;&#x5165;</description>
     <extended_description>&#x4eba;&#x5458;&#x57fa;&#x7840;&#x4fe1;&#x606f;</extended_description>
     <trans_version/>
@@ -119,6 +119,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>
@@ -679,14 +680,14 @@
       <schema/>
       <table>bsth_c_personnel</table>
       <key>
-        <name>jobCode</name>
-        <field>job_code</field>
+        <name>companyCode</name>
+        <field>company_code</field>
         <condition>&#x3d;</condition>
         <name2/>
       </key>
       <key>
-        <name>companyCode</name>
-        <field>company_code</field>
+        <name>jobCode</name>
+        <field>job_code</field>
         <condition>&#x3d;</condition>
         <name2/>
       </key>
 <?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
-    <name>employeesDataOutput</name>
+    <name>&#x4eba;&#x5458;&#x4fe1;&#x606f;&#x5bfc;&#x51fa;</name>
     <description/>
     <extended_description/>
     <trans_version/>
@@ -93,6 +93,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>