Merge branch 'minhang' into qingpu

潘钊
2 parents f7603ac9 c88a1206
Showing 31 changed files with 2384 additions and 1346 deletions
src/main/java/com/bsth/controller/DeviceGpsController.java
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/oil/CwjyController.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/RealChartsController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/sys/util/RSAUtils.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.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/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/thread/SubmitToTrafficManage.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/directive/D60.java
+package com.bsth.controller;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+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 org.springframework.web.multipart.MultipartFile;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.util.BeanUtil;
+
+@RestController
+@RequestMapping("devicegps")
+public class DeviceGpsController {
+
+	@Autowired
+	GpsRealData gpsRealData;
+
+	@RequestMapping(value = "/real/line/{lineCode}")
+	public List<GpsEntity> findByLineCode(@PathVariable("lineCode") String lineCode) {
+		return gpsRealData.getByLine(lineCode);
+	}
+
+	@RequestMapping(value = "/real/all")
+	public List<GpsEntity> findByLineCodes() {
+		return new ArrayList<>(gpsRealData.all());
+	}
+	
+	@RequestMapping(value = "/open", method = RequestMethod.POST)
+	public Map<String, Object> open(@RequestParam(value = "_txt_", required = false) MultipartFile file, HttpServletRequest request) {
+		Map<String, Object> res = new HashMap<>();
+		File rf = new File(request.getServletContext().getRealPath("/temp"), System.currentTimeMillis() + "");
+		File rd = rf.getParentFile();
+		if (!rd.exists()) {
+			rd.mkdirs();
+		}
+		
+		BufferedReader reader = null;
+		try {
+			file.transferTo(rf);
+			reader = new BufferedReader(new InputStreamReader(new FileInputStream(rf), "GBK"));
+			String line = null;
+			List<Map<String, Object>> data = new ArrayList<>();
+			while ((line = reader.readLine()) != null) {
+				if (!StringUtils.isEmpty(line)) {
+					String temp[] = line.split(",");
+					if (temp.length != 4) {
+						res.put("errCode", 1);
+						res.put("msg", "txt文档格式错误，请检查");
+						return res;
+					}
+					Map<String, Object> info = new HashMap<>();
+					info.put("lineName", temp[0]);
+					info.put("lineCode", temp[1]);
+					info.put("inCode", temp[2]);
+					info.put("deviceId", temp[3]);
+					info.put("detail", gpsRealData.get(temp[3]));
+					
+					data.add(info);
+				}
+			}
+			// 删除临时文件
+			rf.delete();
+			res.put("errCode", 0);
+			res.put("data", data);
+		} catch (IllegalStateException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+				try {
+					if (reader != null) reader.close();
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+		}
+		
+		return res;
+	}
+	
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/opened", method = RequestMethod.POST)
+	public Map<String, Object> opened(@RequestParam(value = "json")String json) {
+		json = StringEscapeUtils.unescapeHtml(json);
+		Map<String, Object> res = new HashMap<>();
+		List<Map<String, Object>> data = null;
+		try {
+			data = new ObjectMapper().readValue(json, List.class);
+			for (Map<String, Object> info : data) {
+				info.put("detail", gpsRealData.findByDeviceId((String)info.get("deviceId")));
+			}
+			
+			res.put("errCode", 0);
+			res.put("data", data);
+		} catch (JsonParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (JsonMappingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		return res;
+	}
+	
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/export", method = RequestMethod.POST)
+	public void export(@RequestParam(value = "json")String json, HttpServletResponse response) {
+		json = StringEscapeUtils.unescapeHtml(json);
+		List<Map<String, Object>> data = null;
+		OutputStream out = null;
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			data = new ObjectMapper().readValue(json, List.class);
+			for (Map<String, Object> info : data) {
+				Map<String, Object> detail = (Map<String, Object>)info.get("detail");
+				if (detail != null) {
+					info.put("lineId", detail.get("lineId"));
+					info.put("valid", (int)detail.get("valid") == 0 ? "有效" : "无效");
+					info.put("timestamp", sdf.format(new Date((Long)detail.get("timestamp"))));
+					info.put("version", detail.get("version"));
+				} else {
+					info.put("lineId", "");
+					info.put("valid", "");
+					info.put("timestamp", "");
+					info.put("version", "");
+				}
+			}
+			
+			List<Header> head = new ArrayList<>();
+			head.add(new Header("线路编码", "lineCode"));
+			head.add(new Header("线路名称", "lineName"));
+			head.add(new Header("内部编码", "inCode"));
+			head.add(new Header("识别码", "deviceId"));
+			head.add(new Header("线路ID", "lineId"));
+			head.add(new Header("GPS", "valid"));
+			head.add(new Header("report", "timestamp"));
+			head.add(new Header("版本", "version"));
+			
+			// 清空response  
+            response.reset();
+            // 设置response的Header
+            response.addHeader("Content-Disposition", "attachment;filename=" + System.currentTimeMillis() + ".xls");
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            out = new BufferedOutputStream(response.getOutputStream());
+            excel(head, data, out);
+            out.flush();
+		} catch (JsonParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (JsonMappingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			try {
+				if (out != null) out.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	private void excel(List<Header> head, List<Map<String, Object>> data, OutputStream out) throws IOException {
+		// 声明一个工作薄
+        HSSFWorkbook wb = new HSSFWorkbook();
+        // 生成一个表格
+        HSSFSheet sheet = wb.createSheet("1");
+        // 产生表格标题行
+        HSSFRow row = sheet.createRow(0);
+        for (int i = 0;i < head.size();i++) {
+            HSSFCell cell = row.createCell(i);
+            HSSFRichTextString text = new HSSFRichTextString(head.get(i).getDescribe());
+            cell.setCellValue(text);
+        }
+        
+        int rownum = 1;
+        for (Map<String, Object> map : data) {
+        	HSSFRow r = sheet.createRow(rownum);
+        	for (int i = 0;i < head.size();i++) {
+                HSSFCell cell = r.createCell(i);
+                HSSFRichTextString text = new HSSFRichTextString(String.valueOf(map.get(head.get(i).getField())));
+                cell.setCellValue(text);
+            }
+        	rownum++;
+        }
+        
+        wb.write(out);
+        wb.close();
+	}
+	
+	final class Header {
+		private String describe;
+		private String field;
+		
+		Header(){
+			
+		}
+		
+		Header(String describe, String field) {
+			this.describe = describe;
+			this.field = field;
+		}
+
+		public String getDescribe() {
+			return describe;
+		}
+
+		public void setDescribe(String describe) {
+			this.describe = describe;
+		}
+
+		public String getField() {
+			return field;
+		}
+
+		public void setField(String field) {
+			this.field = field;
+		}
+	}
+}
@@ -71,6 +71,30 @@ public class DirectiveController {
 		SysUser user = SecurityUtils.getCurrentUser();
 		return directiveService.lineChange(nbbm, lineId, user.getUserName());
 	}
+
+	/**
+	 *
+	 * @Title: lineChangeByDevice
+	 * @Description: TODO(切换线路)
+	 * @param @param deviceId 设备编码
+	 * @param @param lineId 新线路编码
+	 * @throws
+	 */
+	@RequestMapping(value = "/lineChangeByDevice", method = RequestMethod.POST)
+	public int lineChangeByDevice(@RequestParam String deviceId, @RequestParam String lineId){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.lineChangeByDeviceId(deviceId, lineId, user.getUserName());
+	}
+
+	/**
+	 * 刷新线路文件
+	 * @param deviceId 设备号
+	 * @return
+	 */
+	@RequestMapping(value = "/refreshLineFile", method = RequestMethod.POST)
+	public int refreshLineFile(@RequestParam String deviceId){
+		return directiveService.refreshLineFile(deviceId);
+	}
  
 	/**
 	 * 
@@ -4,10 +4,7 @@ import java.util.List;
 import java.util.Map;
  
 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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
  
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
@@ -46,6 +43,16 @@ public class GpsController {
 		return gpsRealData.get(Splitter.on(",").splitToList(lineCodes));
 	}
  
+	@RequestMapping(value = "/allDevices")
+	public Iterable<String> allDevices(){
+		return gpsRealData.allDevices();
+	}
+
+	@RequestMapping(value = "/removeRealGps", method = RequestMethod.POST)
+	public Map<String, Object> removeRealGps(@RequestParam String device){
+		return gpsService.removeRealGps(device);
+	}
+
 	/**
 	 * 
 	 * @Title: history @Description: TODO(这个方法给测试页面用) @throws
+package com.bsth.controller.oil;
+
+
+import java.util.Date;
+import java.util.Map;
+
+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 com.bsth.controller.BaseController;
+import com.bsth.entity.oil.Cwjy;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.oil.CwjyService;
+import com.bsth.util.PageObject;
+
+@RestController
+@RequestMapping("cwjy")
+public class CwjyController extends BaseController<Cwjy, Integer>{
+	@Autowired
+	private CwjyService service;
+	@RequestMapping(method = RequestMethod.POST)
+	public Map<String, Object> save(Cwjy t){
+		SysUser sysUser = SecurityUtils.getCurrentUser();
+		t.setCreateDate(new Date());
+		t.setXgr(sysUser.getUserName());
+		return service.save(t);
+	}
+	
+	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
+	public PageObject<Ylxxb> pagequery(@RequestParam Map<String, Object> map){
+		PageObject<Ylxxb> pagequery=null;
+		map.put("curPage", map.get("page").toString());
+		map.put("pageData","10");
+		pagequery=service.Pagequery(map);
+		return pagequery;
+	}
+	
+	@RequestMapping(value="/bynbbm",method = RequestMethod.GET)
+	public Ylxxb bynbbm(@RequestParam Map<String, Object> map){
+		
+		return service.bynbbm(map);
+	}
+	
+	/**
+	 * 
+	 * @Title: save 
+	 * @Description: TODO(持久化对象) 
+	 * @param @param t
+	 * @param @return    设定文件 
+	 * @return Map<String,Object>  {status: 1（成功），-1（失败）}
+	 * @throws
+	 */
+	@RequestMapping(value="/savejzl",method = RequestMethod.POST)
+	public Map<String, Object> savejzl(Ylxxb t){
+		Map<String, Object> map=service.savejzl(t);
+		return map;
+	}
+	
+	
+}
@@ -21,13 +21,13 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	LineConfigService lineConfigService;
  
 	@RequestMapping("/check")
-	public Map<String, Object> check(@RequestParam Integer[] codeArray){
+	public Map<String, Object> check(@RequestParam String[] codeArray){
 		return lineConfigService.check(codeArray);
 	}
  
 	@RequestMapping("/init/{lineCode}")
-	public Integer init(@PathVariable("lineCode") Integer lineCode) throws Exception{
-		return lineConfigService.inti(lineCode);
+	public Integer init(@PathVariable("lineCode") String lineCode) throws Exception{
+		return lineConfigService.init(lineCode);
 	}
  
 	@RequestMapping(value = "/editTime", method = RequestMethod.POST)
+package com.bsth.controller.realcontrol;
+
+import com.bsth.service.realcontrol.RealChartsService;
+import com.bsth.service.realcontrol.dto.CarOutRate;
+import com.bsth.service.realcontrol.dto.DeviceOnlineRate;
+import com.bsth.service.realcontrol.dto.StratEndPunctualityRate;
+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 java.util.List;
+
+/**
+ * 线路调度统计图
+ * Created by panzhao on 2016/11/9.
+ */
+@RestController
+@RequestMapping("realCharts")
+public class RealChartsController {
+
+    @Autowired
+    RealChartsService realChartsService;
+
+    @RequestMapping("deviceOnlineRate")
+    public List<DeviceOnlineRate> deviceOnlineRate(@RequestParam String idx, @RequestParam String month){
+        return realChartsService.deviceOnlineRate(month, idx);
+    }
+
+    @RequestMapping("carOutRate")
+    public List<CarOutRate> carOutRate(@RequestParam String idx, @RequestParam String month){
+        return realChartsService.carOutRate(month, idx);
+    }
+
+    @RequestMapping("stratEndPunctualityRate")
+    public List<StratEndPunctualityRate> stratEndPunctualityRate(@RequestParam String idx, @RequestParam String month){
+        return realChartsService.stratEndPunctualityRate(month, idx);
+    }
+}
+package com.bsth.controller.report;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.report.ReportService;
+
+@RestController
+@RequestMapping("report")
+public class ReportController {
+	
+	@Autowired
+	ReportService service;
+	
+	@RequestMapping(value="/queryListBczx" ,method = RequestMethod.POST)
+	public List<ScheduleRealInfo> queryListBczx(@RequestParam String clzbh,@RequestParam String line,@RequestParam String date){
+		return service.queryListBczx(line,date,clzbh);
+	}
+	
+	@RequestMapping(value="/queryListZdxx" ,method = RequestMethod.POST)
+	public List<ArrivalInfo> queryListZdxx(@RequestParam String clzbh,@RequestParam String line,
+			@RequestParam String date,@RequestParam String fcsj,@RequestParam String ddsj){
+		return service.queryListZdxx(line,date,clzbh,fcsj,ddsj);
+	}
+	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.POST)
+	public List<ArrivalInfo> queryListClzd(@RequestParam String zd,@RequestParam String line,
+			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
+		return service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
+	}
+	
+	@RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
+	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,@RequestParam String zd) {
+		return service.sreachZd(line,zdlx, zd);
+	}
+	
+	
+	
+	@RequestMapping(value = "/historyMessageCount", method = RequestMethod.GET)
+	public List<Object[]> historyMessageCount(@RequestParam String line, @RequestParam String date,
+			@RequestParam String code) {
+		return service.historyMessageCount(line, date, code);
+	}
+
+}
@@ -10,10 +10,14 @@ import java.security.interfaces.RSAPublicKey;
 import javax.crypto.Cipher;
  
 import org.apache.commons.net.util.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
  
 public class RSAUtils {
     private static final KeyPair keyPair = initKey();
-    
+
+    static Logger logger = LoggerFactory.getLogger(RSAUtils.class);
+
     private static KeyPair initKey(){
         try {
             Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
@@ -41,6 +45,7 @@ public class RSAUtils {
      * @return
      */
     public static String decryptBase64(String string) {
+        logger.info("decryptBase64 -[" + string + "]");
         return new String(decrypt(Base64.decodeBase64(string)));
     }
  
@@ -77,7 +77,7 @@ public class LineConfigData implements CommandLineRunner {
 	 * @Title: init 
 	 * @Description: TODO(初始化配置信息) 
 	 */
-	public void init(Integer lineCode) throws Exception{
+	public void init(String lineCode) throws Exception{
 		LineConfig conf = new LineConfig();
 		//线路
 		Line line = lineService.findByLineCode(lineCode);
@@ -50,8 +50,8 @@ public class ArrivalData_GPS implements CommandLineRunner{
  
 	@Override
 	public void run(String... arg0) throws Exception {
-		logger.info("ArrivalData_GPS,30,10");
-		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 10, TimeUnit.SECONDS);
+		logger.info("ArrivalData_GPS,100,10 @11-10");
+		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 100, 10, TimeUnit.SECONDS);
 	}
  
 	@Component
@@ -91,9 +91,11 @@ public class DayOfDirectives {
 			break;
 		case 1:
 			d60.setReply46((short) 0);// 发送成功
+			d60.setReply46Time(System.currentTimeMillis());
 			break;
 		case 2:
 			d60.setReply47((short) 0);// 驾驶员阅读
+			d60.setReply47Time(System.currentTimeMillis());
 			break;
 		}
 		// 入库
@@ -122,30 +122,33 @@ public class DirectiveCreator {
  
 	/**
 	 * 
-	 * @Title: createDirective64 
+	 * @Title: createD64
 	 * @Description: TODO(创建线路切换指令 64) 
 	 * @param @param nbbm 车辆内部编码
 	 * @param @param lineId 线路编码
 	 * @param @param t 时间戳
 	 * @throws
-	 */
+
 	public D64 createD64(String nbbm, String lineCode, long t){
 		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+		return create64(deviceId, lineCode, t);
+	}*/
  
+	public D64 create64(String deviceId, String lineCode, long t){
 		D64 change = new D64();
 		D64Data data = new D64Data();
 		data.setCityCode(cityCode);
 		data.setDeviceId(deviceId);
-		
+
 		//线路编码补满6位数
 		String lineCodeStr = padLeft(lineCode, 6, '0');
 		data.setLineId(lineCodeStr);
-		
+
 		change.setDeviceId(deviceId);
 		change.setOperCode((short) 0X64);
 		change.setTimestamp(t);
 		change.setData(data);
-		
+
 		return change;
 	}
  
@@ -61,7 +61,7 @@ public class ForecastRealServer implements CommandLineRunner {
 	@Override
 	public void run(String... arg0) throws Exception {
 		//2小时更新一次站点间耗时数据
-		//Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
 	}
  
 	/**
@@ -66,6 +66,10 @@ public class GpsEntity {
  
 	/** 是否异常数据 */
 	private boolean abnormal;
+	
+	private int valid;
+	
+	private int version;
  
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -218,4 +222,20 @@ public class GpsEntity {
 	public void setAbnormal(boolean abnormal) {
 		this.abnormal = abnormal;
 	}
+
+	public int getValid() {
+		return valid;
+	}
+
+	public void setValid(int valid) {
+		this.valid = valid;
+	}
+
+	public int getVersion() {
+		return version;
+	}
+
+	public void setVersion(int version) {
+		this.version = version;
+	}
 }
@@ -2,12 +2,7 @@ package com.bsth.data.gpsdata;
  
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableSet;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
  
 import org.apache.commons.lang3.StringUtils;
@@ -137,6 +132,10 @@ public class GpsRealData implements CommandLineRunner{
 			list.addAll(getByLine(code));
 		return list;
 	}
+
+	public Set<String> allDevices(){
+		return gpsMap.keySet();
+	}
  
 	public GpsEntity findByDeviceId(String deviceId) {
 		return gpsMap.get(deviceId);
@@ -145,7 +144,10 @@ public class GpsRealData implements CommandLineRunner{
 	public Collection<GpsEntity> all(){
 		return gpsMap.values();
 	}
-	
+
+	public void remove(String device){
+		gpsMap.remove(device);
+	}
 	@Component
 	public static class GpsDataLoader extends Thread{
  
@@ -85,13 +85,13 @@ public class PilotReport {
  
 				//下发调度指令
 				directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
-				d80.setRemarks("计划出场时间：" + outSch.getDfsj());
+/*				d80.setRemarks("计划出场时间：" + outSch.getDfsj());
 				//当前GPS位置
 				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
 				if(null != gps)
-					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));
+					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));*/
  
-				sendUtils.refreshSch(outSch);
+				//sendUtils.refreshSch(outSch);
 			}else
 				d80.setRemarks("没有出场计划");
  
-package com.bsth.data.schedule;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.bsth.Application;
-import com.bsth.data.LineConfigData;
-import com.bsth.data.directive.FirstScheduleCheckThread;
-import com.bsth.data.gpsdata.GpsRealData;
-import com.bsth.data.schedule.thread.ScheduleLateThread;
-import com.bsth.data.schedule.thread.SchedulePstThread;
-import com.bsth.data.schedule.thread.ScheduleRefreshThread;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.service.schedule.SchedulePlanInfoService;
-import com.bsth.util.BatchSaveUtils;
-import com.bsth.util.DateUtils;
-import com.bsth.websocket.handler.SendUtils;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.TreeMultimap;
-
-/**
- * 
- * @ClassName: DayOfSchedule
- * @Description: TODO(当日实际排班)
- * @author PanZhao
- * @date 2016年8月15日 上午10:16:12
- *
- */
-@Component
-public class DayOfSchedule implements CommandLineRunner {
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	// 按车辆分组的班次数据
-	private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
-
-	// 班次主键映射
-	private static Map<Long, ScheduleRealInfo> id2SchedulMap;
-
-	// 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
-	private static TreeMultimap<String, String> nbbm2SEStationMap;
-	
-	//车辆 ——> 当前执行班次
-	private static Map<String, ScheduleRealInfo> carExecutePlanMap;
-
-	// 持久化缓冲区
-	public static LinkedList<ScheduleRealInfo> pstBuffer;
-
-	// 排序器
-	private static ScheduleComparator.FCSJ schFCSJComparator;
-
-	@Autowired
-	LineConfigData lineConfigData;
-
-	@Autowired
-	ScheduleRealInfoRepository schRepository;
-
-	@Autowired
-	SchedulePlanInfoService schPlanService;
-
-	@Autowired
-	SchAttrCalculator schAttrCalculator;
-
-	@Autowired
-	SendUtils sendUtils;
-	
-	@Autowired
-	GpsRealData gpsRealData;
-
-	/** 线路当前使用的排班的日期 */
-	public static Map<String, String> currSchDateMap;
-
-	static {
-		nbbmScheduleMap = ArrayListMultimap.create();
-		id2SchedulMap = new HashMap<>();
-		pstBuffer = new LinkedList<>();
-		schFCSJComparator = new ScheduleComparator.FCSJ();
-		currSchDateMap = new HashMap<>();
-		nbbm2SEStationMap = TreeMultimap.create();
-		carExecutePlanMap = new HashMap<>();
-	}
-
-	@Autowired
-	ScheduleRefreshThread scheduleRefreshThread;
-	
-	@Autowired
-	SchedulePstThread schedulePstThread;
-	
-	@Autowired
-	FirstScheduleCheckThread firstScheduleCheckThread;
-	
-	@Autowired
-	ScheduleLateThread scheduleLateThread;
-
-	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
-				,fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-
-	@Override
-	public void run(String... arg0) throws Exception {
-		//翻班线程
-		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
-		//入库
-		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
-		//首班出场指令补发器
-		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
-		//班次误点扫描
-		//Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
-	}
-
-	public Map<String, String> getCurrSchDate() {
-		return currSchDateMap;
-	}
-
-	/**
-	 * 
-	 * @Title: calcSchDateB
-	 * @Description: TODO(计算线路当前应该使用的排班日期)
-	 */
-	public String calcSchDate(String lineCode) {
-		LineConfig conf = lineConfigData.get(lineCode);
-		long ct = System.currentTimeMillis();
-		
-		String schDate = fmtyyyyMMdd.print(ct);
-		// 小于当天起始运营时间,则取前一天的排班
-		if (ct < conf.getCurrStartTime())
-			schDate = DateUtils.subtractDay(schDate, 1);
-
-		return schDate;
-	}
-
-	/**
-	 * @Title: reloadSch
-	 * @Title: reloadSch
-	 * @Description: TODO(重新载入排班)
-	 * @param @param
-	 *            lineCode 线路编码
-	 * @param @param
-	 *            schDate 班次日期 yyyy-MM-dd
-	 * @param @param
-	 *            forcePlan 强制从计划调度重新抓取
-	 */
-	public int reloadSch(String lineCode, String schDate, boolean forcePlan) {
-		try {
-			List<ScheduleRealInfo> list;
-
-			if (forcePlan)
-				removeRealSch(lineCode, schDate);
-			else
-				clearRAMData(lineCode);
-
-			if (existRealSch(lineCode, schDate))
-				list = loadRealSch(lineCode, schDate);// 从实际排班表加载
-			else {
-				list = loadPlanSch(lineCode, schDate);// 从计划排班表加载
-				// 写入数据库
-				batchSave(list);
-			}
-
-			//更新线路和班次日期对照
-			currSchDateMap.put(lineCode, schDate);
-			//添加到缓存
-			putAll(list);
-			
-			Set<String> cars = searchAllCars(list);
-			//计算“起点站应到”时间
-			for(String nbbm : cars)
-				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-			
-			//是否是出站即出场
-			LineConfig conf = lineConfigData.get(lineCode);
-			if(conf.getOutConfig() == 2){
-				for(String nbbm : cars)
-					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
-			}
-			
-			// 页面 翻班通知
-			sendUtils.shiftSchedule(lineCode);
-		} catch (Exception e) {
-			logger.error("", e);
-			return -1;
-		}
-
-		return 0;
-	}
-
-	/**
-	 * 
-	 * @Title: searchAllCars 
-	 * @Description: TODO(搜索班次集合中的车辆) 
-	 */
-	private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
-		Set<String> cars = new HashSet<>();
-		for(ScheduleRealInfo sch : list)
-			cars.add(sch.getClZbh());
-		
-		return cars;
-	}
-
-	private void putAll(List<ScheduleRealInfo> list) {
-		for (ScheduleRealInfo sch : list) 
-			put(sch);
-	}
-
-	/**
-	 * @Title: removeRealSch
-	 * @Description: TODO(清除实际排班，包括数据库和内存数据)
-	 * @param @param
-	 *            lineCode 线路编码
-	 * @param @param
-	 *            schDate 班次日期 yyyy-MM-dd
-	 */
-	public void removeRealSch(String lineCode, String schDate) throws Exception {
-		try {
-			// 清理数据库数据
-			schRepository.deleteByLineCodeAndDate(lineCode + "", schDate);
-
-			// 清理内存数据
-			clearRAMData(lineCode + "");
-		} catch (Exception e) {
-			logger.error("removeRealSch error, " + lineCode + " -" + schDate, e);
-			throw e;
-		}
-	}
-
-	/**
-	 * 
-	 * @Title: clearRAMData
-	 * @Description: TODO(清理内存数据)
-	 */
-	public void clearRAMData(String lineCode) {
-		int count = 0;
-		List<ScheduleRealInfo> remList = new ArrayList<>();
-		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
-		for (ScheduleRealInfo sch : schs) {
-			if (sch.getXlBm().equals(lineCode))
-				remList.add(sch);
-		}
-		
-		for(ScheduleRealInfo sch : remList){
-			if(null != sch){
-				nbbmScheduleMap.remove(sch.getClZbh(), sch);
-				id2SchedulMap.remove(sch.getId());
-				count ++;
-			}
-		}
-		
-		logger.info(lineCode + "排班清理 " + count);
-	}
-
-	/**
-	 * @Title: existRealSch
-	 * @Description: TODO(实际排班是否已存在)
-	 */
-	public boolean existRealSch(String lineCode, String schDate) {
-		int count = schRepository.countByLineCodeAndDate(lineCode, schDate);
-		return count > 0;
-	}
-
-	/**
-	 * @Title: loadRealSch
-	 * @Description: TODO(从实际排班表加载数据)
-	 */
-	public List<ScheduleRealInfo> loadRealSch(String lineCode, String schDate) {
-		return schRepository.findByLineCodeAndDate(lineCode, schDate);
-	}
-
-	/**
-	 * @Title: loadPlanSch
-	 * @Description: TODO(从计划排班表加载数据)
-	 */
-	public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
-		logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
-		List<ScheduleRealInfo> realList = new ArrayList<>();
-
-		try {
-			Map<String, Object> data = new HashMap<>();
-
-			data.put("scheduleDate_eq", fmtyyyyMMdd.parseDateTime(schDate).toDate());
-			data.put("xlBm_eq", lineCode);
-
-			// 查询计划排班
-			List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
-
-			// 转换为实际排班
-			realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
-
-			for (ScheduleRealInfo sch : realList) {
-				sch.setScheduleDateStr(fmtyyyyMMdd.print(sch.getScheduleDate().getTime()));
-				sch.setRealExecDate(sch.getScheduleDateStr());
-				// 计划终点时间
-				if (sch.getBcsj() != null) {
-					sch.setZdsj(fmtHHmm.print(fmtHHmm.parseMillis(sch.getFcsj()) + (sch.getBcsj() * 60 * 1000)));
-					sch.setLate(false);
-				}
-				//计划里程为0，设置NULL
-				if(sch.getJhlc() != null && sch.getJhlc() == 0)
-					sch.setJhlc(null);
-			}
-		} catch (Exception e) {
-			logger.error("", e);
-		}
-		return realList;
-	}
-
-	/**
-	 * @Title: batchSave
-	 * @Description: TODO(批量入库)
-	 */
-	private void batchSave(List<ScheduleRealInfo> list) {
-		// 查询数据库最大ID
-		Long id = schRepository.getMaxId();
-		if (null == id)
-			id = 0L;
-		id++;
-
-		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
-		for (ScheduleRealInfo item : list) {
-			item.setSpId(item.getId());// 保留原始的计划ID
-			item.setId(id++);// 设置ID
-			item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
-		}
-
-		// 入库
-		new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
-	}
-
-	private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
-		List<SchedulePlanInfo> list = new ArrayList<>();
-
-		SchedulePlanInfo sp;
-		while (itrab.hasNext()) {
-			sp = itrab.next();
-			sp.setSchedulePlan(null);
-			list.add(sp);
-		}
-		return list;
-	}
-
-	/**
-	 * 
-	 * @Title: findByLineCode
-	 * @Description: TODO(lineCode 获取班次)
-	 */
-	public List<ScheduleRealInfo> findByLineCode(String lineCode) {
-		List<ScheduleRealInfo> rs = new ArrayList<>();
-
-		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
-		for (ScheduleRealInfo sch : schs) {
-			if (sch.getXlBm().equals(lineCode))
-				rs.add(sch);
-		}
-		return rs;
-	}
-	
-	/**
-	 * 
-	 * @Title: findCarByLineCode 
-	 * @Description: TODO(线路下运营的车辆) 
-	 */
-	public Set<String> findCarByLineCode(String lineCode){
-		Set<String> rs = new HashSet<>();
-
-		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
-		for (ScheduleRealInfo sch : schs) {
-			if (sch.getXlBm().equals(lineCode))
-				rs.add(sch.getClZbh());
-		}
-		
-		return rs;
-	}
-
-	public List<ScheduleRealInfo> findByNbbm(String nbbm) {
-		return nbbmScheduleMap.get(nbbm);
-	}
-
-	/**
-	 * 
-	 * @Title: findByLineAndUpDown
-	 * @Description: TODO(lineCode 和走向获取班次)
-	 */
-	public List<ScheduleRealInfo> findByLineAndUpDown(String lineCode, Integer upDown) {
-		List<ScheduleRealInfo> list = findByLineCode(lineCode), rs = new ArrayList<>();
-
-		for (ScheduleRealInfo sch : list) {
-			if (sch.getXlDir().equals(upDown + ""))
-				rs.add(sch);
-		}
-		return rs;
-	}
-
-	public ScheduleRealInfo get(long id) {
-		return id2SchedulMap.get(id);
-	}
-
-	public Set<String> getSEStationList(String nbbm) {
-		return nbbm2SEStationMap.get(nbbm);
-	}
-
-	/**
-	 * 
-	 * @Title: next
-	 * @Description: TODO(下一个班次)
-	 */
-	public ScheduleRealInfo next(ScheduleRealInfo sch) {
-
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		
-		boolean flag = false;
-		ScheduleRealInfo next = null;
-		for(ScheduleRealInfo temp : list){
-			if(temp.getId() == sch.getId()){
-				flag = true;
-				continue;
-			}
-			//忽略烂班
-			if(temp.isDestroy())
-				continue;
-			
-			if(flag){
-				next = temp;
-				break;
-			}
-		}
-		return next;
-	}
-
-	public void put(ScheduleRealInfo sch) {
-
-		schAttrCalculator
-			.calcRealDate(sch)
-			.calcAllTimeByFcsj(sch);
-
-		String nbbm = sch.getClZbh();
-		nbbmScheduleMap.put(nbbm, sch);
-		nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
-		nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
-		
-		//主键索引
-		id2SchedulMap.put(sch.getId(), sch);
-	}
-	
-	public void delete(ScheduleRealInfo sch) {
-		//ScheduleRealInfo sch = id2SchedulMap.get(id);
-		if(!sch.isSflj())
-			return;
-		
-		nbbmScheduleMap.remove(sch.getClZbh(), sch);
-		id2SchedulMap.remove(sch.getId());
-		//return sch;
-	}
-	
-//	public void calcQdzTimePlan(String nbbm){
-//		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-//	}
-	
-	public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm){
-		return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
-	}
-
-	/**
-	 * 
-	 * @Title: nextAll
-	 * @Description: TODO(之后的所有班次)
-	 */
-/*	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		// 排序
-		Collections.sort(list, schFCSJComparator);
-
-		List<ScheduleRealInfo> rs = new ArrayList<>();
-		ScheduleRealInfo temp;
-		for (int i = 0; i < list.size() - 1; i++) {
-			temp = list.get(i);
-			if(temp.getFcsjT() > sch.getFcsjT())
-				rs.add(temp);
-
-		}
-		return rs;
-	}*/
-
-	/**
-	 * 
-	 * @Title: doneSum
-	 * @Description: TODO(已完成班次总数)
-	 */
-	public int doneSum(String clZbh) {
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(clZbh);
-		int rs = 0;
-		
-		for(ScheduleRealInfo sch : list){
-			if(sch.getStatus() == 2 && !sch.isDestroy())
-				rs ++;
-		}
-		return rs;
-	}
-	
-	/**
-	 * 
-	 * @Title: prveNotExecNum 
-	 * @Description: TODO(班次之前未执行班次数量) 
-	 */
-	public int prveNotExecNum(ScheduleRealInfo sch){
-		int n = 0;
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		for(ScheduleRealInfo s : list){
-			if(s.getFcsjActual() == null && !s.isDestroy())
-				n ++;
-			
-			if(s.getId().equals(sch.getId()))
-				break;
-		}
-		return n;
-	}
-
-	/**
-	 * 
-	 * @Title: validEndTime
-	 * @Description: TODO(是否是有效的到达时间)
-	 */
-	public boolean validEndTime(ScheduleRealInfo sch, Long ts) {
-		if(sch.getFcsjActualTime() != null && sch.getFcsjActualTime() > ts)
-			return false;
-		
-		return validTime(sch, ts);
-	}
-
-	/**
-	 * 
-	 * @Title: validStartTime 
-	 * @Description: TODO(是否是合适的发车时间) 
-	 */
-	public boolean validStartTime(ScheduleRealInfo sch, Long ts) {
-		if(sch.getZdsjActualTime() != null && sch.getZdsjActualTime() < ts)
-			return false;
-		
-		return validTime(sch, ts);
-	}
-	
-	public boolean validTime(ScheduleRealInfo sch, Long ts){
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		int ci = list.indexOf(sch);
-		ScheduleRealInfo prve, next;
-		if(ci > 0){
-			//之前班次实际时间不能大于该时间
-			for(int i = ci - 1; i >= 0; i --){
-				prve = list.get(i);
-				if(prve.getZdsjActualTime() != null && prve.getZdsjActualTime() > ts )
-					return false;
-				
-				if(prve.getFcsjActualTime() != null && prve.getFcsjActualTime() > ts)
-					return false;
-			}
-		}
-		
-		if(ci < list.size() - 1){
-			//之后班次实际时间不能小于该时间
-			for(int i = ci + 1; i < list.size(); i ++){
-				next = list.get(i);
-				if(next.getFcsjActualTime() != null && next.getFcsjActualTime() < ts)
-					return false;
-				
-				if(next.getZdsjActualTime() != null && next.getZdsjActualTime() < ts)
-					return false;
-			}
-		}
-		return true;
-	}
-	
-	public void save(ScheduleRealInfo sch){
-		//schRepository.save(sch);
-		pstBuffer.add(sch);
-	}
-	
-	
-	/**
-	 * 
-	 * @Title: nextByBcType 
-	 * @Description: TODO(获取下一个指定班次类型的班次) 
-	 */
-	public ScheduleRealInfo nextByBcType(String nbbm, String bcType){
-		List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
-		
-		Collections.sort(list, schFCSJComparator);
-		ScheduleRealInfo sch = null;
-		for(ScheduleRealInfo temp : list){
-			if(temp.getFcsjActual() == null)
-				sch = temp;
-		}
-		
-		return sch;
-	}
-	
-	public List<ScheduleRealInfo> findByBcType(String nbbm, String bcType){
-		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
-				,outList = new ArrayList<>();
-	
-		for(ScheduleRealInfo sch : all){
-			if(sch.getBcType().equals(bcType))
-				outList.add(sch);
-		}
-		return outList;
-	}
-	
-	public Set<String> allCar(){
-		return nbbmScheduleMap.keySet();
-	}
-	
-	public Collection<ScheduleRealInfo> findAll(){
-		return nbbmScheduleMap.values();
-	}
-	
-	public void addExecPlan(ScheduleRealInfo sch){
-		carExecutePlanMap.put(sch.getClZbh(), sch);
-	}
-	
-	public void removeExecPlan(String clzbh){
-		carExecutePlanMap.remove(clzbh);
-	}
-	
-	public Map<String, ScheduleRealInfo> execPlamMap(){
-		return carExecutePlanMap;
-	}
-	
-	/**
-	 * @Title: changeCar 
-	 * @Description: TODO(班次换车) 返回有更新的班次
-	 * @param @param sch	
-	 * @param @param newClZbh    新的车辆自编号 
-	 */
-	public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch , String newClZbh){
-		List<ScheduleRealInfo> ups = new ArrayList<>();
-		String oldClzbh = sch.getClZbh();
-		if(oldClzbh.equals(newClZbh))
-			return ups;
-		
-		
-		//变更相关映射信息
-		nbbmScheduleMap.remove(sch.getClZbh(), sch);
-		
-		sch.setClZbh(newClZbh);
-		nbbmScheduleMap.put(newClZbh, sch);
-		nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
-		nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
-		
-		//重新计算班次应到时间
-		ups.addAll(updateQdzTimePlan(oldClzbh));
-		ups.addAll(updateQdzTimePlan(newClZbh));
-		return ups;
-	}
-
-	/**
-	 * 
-	 * @Title: linkToSchPlan 
-	 * @Description: TODO(车辆关联到班次) 
-	 */
-/*	public void linkToSchPlan(String nbbm) {
-		//当前GPS状态
-		GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
-		if(null == gps)
-			return;
-		
-		//班次集合
-		List<ScheduleRealInfo> schArr = nbbmScheduleMap.get(nbbm);
-		
-		for(ScheduleRealInfo sch : schArr){
-			if(sch.getStatus() == 2)
-				continue;
-			if(sch.isDestroy())
-				continue;
-			if(!sch.getXlBm().equals(gps.getLineId()) 
-					|| Integer.parseInt(sch.getXlDir()) != gps.getUpDown().intValue())
-				continue;
-			
-			addExecPlan(sch);
-			break;
-		}
-	}*/
-}
+package com.bsth.data.schedule;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import com.bsth.data.schedule.thread.SubmitToTrafficManage;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.Application;
+import com.bsth.data.LineConfigData;
+import com.bsth.data.directive.FirstScheduleCheckThread;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.schedule.thread.ScheduleLateThread;
+import com.bsth.data.schedule.thread.SchedulePstThread;
+import com.bsth.data.schedule.thread.ScheduleRefreshThread;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.schedule.SchedulePlanInfoService;
+import com.bsth.util.BatchSaveUtils;
+import com.bsth.util.DateUtils;
+import com.bsth.websocket.handler.SendUtils;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.TreeMultimap;
+
+/**
+ * 
+ * @ClassName: DayOfSchedule
+ * @Description: TODO(当日实际排班)
+ * @author PanZhao
+ * @date 2016年8月15日 上午10:16:12
+ *
+ */
+@Component
+public class DayOfSchedule implements CommandLineRunner {
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	// 按车辆分组的班次数据
+	private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
+
+	// 班次主键映射
+	private static Map<Long, ScheduleRealInfo> id2SchedulMap;
+
+	// 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
+	private static TreeMultimap<String, String> nbbm2SEStationMap;
+	
+	//车辆 ——> 当前执行班次
+	private static Map<String, ScheduleRealInfo> carExecutePlanMap;
+
+	// 持久化缓冲区
+	public static LinkedList<ScheduleRealInfo> pstBuffer;
+
+	// 排序器
+	private static ScheduleComparator.FCSJ schFCSJComparator;
+
+	@Autowired
+	LineConfigData lineConfigData;
+
+	@Autowired
+	ScheduleRealInfoRepository schRepository;
+
+	@Autowired
+	SchedulePlanInfoService schPlanService;
+
+	@Autowired
+	SchAttrCalculator schAttrCalculator;
+
+	@Autowired
+	SendUtils sendUtils;
+	
+	@Autowired
+	GpsRealData gpsRealData;
+
+	/** 线路当前使用的排班的日期 */
+	public static Map<String, String> currSchDateMap;
+
+	static {
+		nbbmScheduleMap = ArrayListMultimap.create();
+		id2SchedulMap = new HashMap<>();
+		pstBuffer = new LinkedList<>();
+		schFCSJComparator = new ScheduleComparator.FCSJ();
+		currSchDateMap = new HashMap<>();
+		nbbm2SEStationMap = TreeMultimap.create();
+		carExecutePlanMap = new HashMap<>();
+	}
+
+	@Autowired
+	ScheduleRefreshThread scheduleRefreshThread;
+	
+	@Autowired
+	SchedulePstThread schedulePstThread;
+	
+	@Autowired
+	FirstScheduleCheckThread firstScheduleCheckThread;
+	
+	@Autowired
+	ScheduleLateThread scheduleLateThread;
+
+	@Autowired
+	SubmitToTrafficManage submitToTrafficManage;
+
+	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
+				,fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+	@Override
+	public void run(String... arg0) throws Exception {
+		//翻班线程
+		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+		//入库
+		//Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+		//首班出场指令补发器
+		//Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
+		//班次误点扫描
+		//Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+
+		//每天凌晨1点40提交数据到运管处
+		long diff = (DateUtils.getTimestamp() + 1000*60*100) - System.currentTimeMillis();
+		if(diff < 0)
+			diff+=(1000*60*60*24);
+
+		logger.info(diff/1000/60 + "分钟之后提交到运管处");
+		//Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+	}
+
+	public Map<String, String> getCurrSchDate() {
+		return currSchDateMap;
+	}
+
+	/**
+	 * 
+	 * @Title: calcSchDateB
+	 * @Description: TODO(计算线路当前应该使用的排班日期)
+	 */
+	public String calcSchDate(String lineCode) {
+		LineConfig conf = lineConfigData.get(lineCode);
+		long ct = System.currentTimeMillis();
+		
+		String schDate = fmtyyyyMMdd.print(ct);
+		// 小于当天起始运营时间,则取前一天的排班
+		if (ct < conf.getCurrStartTime())
+			schDate = DateUtils.subtractDay(schDate, 1);
+
+		return schDate;
+	}
+
+	/**
+	 * @Title: reloadSch
+	 * @Title: reloadSch
+	 * @Description: TODO(重新载入排班)
+	 * @param @param
+	 *            lineCode 线路编码
+	 * @param @param
+	 *            schDate 班次日期 yyyy-MM-dd
+	 * @param @param
+	 *            forcePlan 强制从计划调度重新抓取
+	 */
+	public int reloadSch(String lineCode, String schDate, boolean forcePlan) {
+		try {
+			List<ScheduleRealInfo> list;
+
+			if (forcePlan)
+				removeRealSch(lineCode, schDate);
+			else
+				clearRAMData(lineCode);
+
+			if (existRealSch(lineCode, schDate))
+				list = loadRealSch(lineCode, schDate);// 从实际排班表加载
+			else {
+				list = loadPlanSch(lineCode, schDate);// 从计划排班表加载
+				// 写入数据库
+				batchSave(list);
+			}
+
+			//更新线路和班次日期对照
+			currSchDateMap.put(lineCode, schDate);
+			//添加到缓存
+			putAll(list);
+			
+			Set<String> cars = searchAllCars(list);
+			//计算“起点站应到”时间
+			for(String nbbm : cars)
+				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+			
+			//是否是出站即出场
+			LineConfig conf = lineConfigData.get(lineCode);
+			if(conf.getOutConfig() == 2){
+				for(String nbbm : cars)
+					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
+			}
+			
+			// 页面 翻班通知
+			sendUtils.shiftSchedule(lineCode);
+		} catch (Exception e) {
+			logger.error("", e);
+			return -1;
+		}
+
+		return 0;
+	}
+
+	/**
+	 * 
+	 * @Title: searchAllCars 
+	 * @Description: TODO(搜索班次集合中的车辆) 
+	 */
+	private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
+		Set<String> cars = new HashSet<>();
+		for(ScheduleRealInfo sch : list)
+			cars.add(sch.getClZbh());
+		
+		return cars;
+	}
+
+	private void putAll(List<ScheduleRealInfo> list) {
+		for (ScheduleRealInfo sch : list) 
+			put(sch);
+	}
+
+	/**
+	 * @Title: removeRealSch
+	 * @Description: TODO(清除实际排班，包括数据库和内存数据)
+	 * @param @param
+	 *            lineCode 线路编码
+	 * @param @param
+	 *            schDate 班次日期 yyyy-MM-dd
+	 */
+	public void removeRealSch(String lineCode, String schDate) throws Exception {
+		try {
+			// 清理数据库数据
+			schRepository.deleteByLineCodeAndDate(lineCode + "", schDate);
+
+			// 清理内存数据
+			clearRAMData(lineCode + "");
+		} catch (Exception e) {
+			logger.error("removeRealSch error, " + lineCode + " -" + schDate, e);
+			throw e;
+		}
+	}
+
+	/**
+	 * 
+	 * @Title: clearRAMData
+	 * @Description: TODO(清理内存数据)
+	 */
+	public void clearRAMData(String lineCode) {
+		int count = 0;
+		List<ScheduleRealInfo> remList = new ArrayList<>();
+		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+		for (ScheduleRealInfo sch : schs) {
+			if (sch.getXlBm().equals(lineCode))
+				remList.add(sch);
+		}
+		
+		for(ScheduleRealInfo sch : remList){
+			if(null != sch){
+				nbbmScheduleMap.remove(sch.getClZbh(), sch);
+				id2SchedulMap.remove(sch.getId());
+				count ++;
+			}
+		}
+		
+		logger.info(lineCode + "排班清理 " + count);
+	}
+
+	/**
+	 * @Title: existRealSch
+	 * @Description: TODO(实际排班是否已存在)
+	 */
+	public boolean existRealSch(String lineCode, String schDate) {
+		int count = schRepository.countByLineCodeAndDate(lineCode, schDate);
+		return count > 0;
+	}
+
+	/**
+	 * @Title: loadRealSch
+	 * @Description: TODO(从实际排班表加载数据)
+	 */
+	public List<ScheduleRealInfo> loadRealSch(String lineCode, String schDate) {
+		return schRepository.findByLineCodeAndDate(lineCode, schDate);
+	}
+
+	/**
+	 * @Title: loadPlanSch
+	 * @Description: TODO(从计划排班表加载数据)
+	 */
+	public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
+		logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
+		List<ScheduleRealInfo> realList = new ArrayList<>();
+
+		try {
+			Map<String, Object> data = new HashMap<>();
+
+			data.put("scheduleDate_eq", fmtyyyyMMdd.parseDateTime(schDate).toDate());
+			data.put("xlBm_eq", lineCode);
+
+			// 查询计划排班
+			List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
+
+			// 转换为实际排班
+			realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
+
+			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+			String fcsj;
+			for (ScheduleRealInfo sch : realList) {
+				sch.setScheduleDateStr(fmtyyyyMMdd.print(sch.getScheduleDate().getTime()));
+				sch.setRealExecDate(sch.getScheduleDateStr());
+
+				if(StringUtils.isEmpty(sch.getFcsj()))
+					sch.setFcsj("00:00");
+
+				fcsj=sch.getFcsj().trim();
+				//处理一下发车时间格式没有:号的问题
+				if(fcsj.indexOf(":") == -1 && fcsj.length() >= 4){
+					sch.setFcsj(fcsj.substring(0, 2) + ":" + fcsj.substring(2, 4));
+				}
+
+				try {
+					sdf.parse(sch.getFcsj());
+				} catch (ParseException e) {
+					//发车时间仍然校验不过的，直接写成00:00
+					sch.setFcsj("00:00");
+				}
+
+				// 计划终点时间
+				if (sch.getBcsj() != null) {
+					sch.setZdsj(fmtHHmm.print(fmtHHmm.parseMillis(sch.getFcsj()) + (sch.getBcsj() * 60 * 1000)));
+					sch.setLate(false);
+				}
+				//计划里程为0，设置NULL
+				if(sch.getJhlc() != null && sch.getJhlc() == 0)
+					sch.setJhlc(null);
+			}
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+		return realList;
+	}
+
+	/**
+	 * @Title: batchSave
+	 * @Description: TODO(批量入库)
+	 */
+	private void batchSave(List<ScheduleRealInfo> list) {
+		// 查询数据库最大ID
+		Long id = schRepository.getMaxId();
+		if (null == id)
+			id = 0L;
+		id++;
+
+		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+		for (ScheduleRealInfo item : list) {
+			item.setSpId(item.getId());// 保留原始的计划ID
+			item.setId(id++);// 设置ID
+			item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
+		}
+
+		// 入库
+		new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
+	}
+
+	private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
+		List<SchedulePlanInfo> list = new ArrayList<>();
+
+		SchedulePlanInfo sp;
+		while (itrab.hasNext()) {
+			sp = itrab.next();
+			sp.setSchedulePlan(null);
+			list.add(sp);
+		}
+		return list;
+	}
+
+	/**
+	 * 
+	 * @Title: findByLineCode
+	 * @Description: TODO(lineCode 获取班次)
+	 */
+	public List<ScheduleRealInfo> findByLineCode(String lineCode) {
+		List<ScheduleRealInfo> rs = new ArrayList<>();
+
+		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+		for (ScheduleRealInfo sch : schs) {
+			if (sch.getXlBm().equals(lineCode))
+				rs.add(sch);
+		}
+		return rs;
+	}
+	
+	/**
+	 * 
+	 * @Title: findCarByLineCode 
+	 * @Description: TODO(线路下运营的车辆) 
+	 */
+	public Set<String> findCarByLineCode(String lineCode){
+		Set<String> rs = new HashSet<>();
+
+		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+		for (ScheduleRealInfo sch : schs) {
+			if (sch.getXlBm().equals(lineCode))
+				rs.add(sch.getClZbh());
+		}
+		
+		return rs;
+	}
+
+	public List<ScheduleRealInfo> findByNbbm(String nbbm) {
+		return nbbmScheduleMap.get(nbbm);
+	}
+
+	/**
+	 * 
+	 * @Title: findByLineAndUpDown
+	 * @Description: TODO(lineCode 和走向获取班次)
+	 */
+	public List<ScheduleRealInfo> findByLineAndUpDown(String lineCode, Integer upDown) {
+		List<ScheduleRealInfo> list = findByLineCode(lineCode), rs = new ArrayList<>();
+
+		for (ScheduleRealInfo sch : list) {
+			if (sch.getXlDir().equals(upDown + ""))
+				rs.add(sch);
+		}
+		return rs;
+	}
+
+	public ScheduleRealInfo get(long id) {
+		return id2SchedulMap.get(id);
+	}
+
+	public Set<String> getSEStationList(String nbbm) {
+		return nbbm2SEStationMap.get(nbbm);
+	}
+
+	/**
+	 * 
+	 * @Title: next
+	 * @Description: TODO(下一个班次)
+	 */
+	public ScheduleRealInfo next(ScheduleRealInfo sch) {
+
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		
+		boolean flag = false;
+		ScheduleRealInfo next = null;
+		for(ScheduleRealInfo temp : list){
+			if(temp.getId() == sch.getId()){
+				flag = true;
+				continue;
+			}
+			//忽略烂班
+			if(temp.isDestroy())
+				continue;
+			
+			if(flag){
+				next = temp;
+				break;
+			}
+		}
+		return next;
+	}
+
+	public void put(ScheduleRealInfo sch) {
+
+		schAttrCalculator
+			.calcRealDate(sch)
+			.calcAllTimeByFcsj(sch);
+
+		String nbbm = sch.getClZbh();
+		nbbmScheduleMap.put(nbbm, sch);
+		nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
+		nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
+		
+		//主键索引
+		id2SchedulMap.put(sch.getId(), sch);
+	}
+	
+	public void delete(ScheduleRealInfo sch) {
+		//ScheduleRealInfo sch = id2SchedulMap.get(id);
+		if(!sch.isSflj())
+			return;
+		
+		nbbmScheduleMap.remove(sch.getClZbh(), sch);
+		id2SchedulMap.remove(sch.getId());
+		//return sch;
+	}
+	
+//	public void calcQdzTimePlan(String nbbm){
+//		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+//	}
+	
+	public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm){
+		return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
+	}
+
+	/**
+	 * 
+	 * @Title: nextAll
+	 * @Description: TODO(之后的所有班次)
+	 */
+/*	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		// 排序
+		Collections.sort(list, schFCSJComparator);
+
+		List<ScheduleRealInfo> rs = new ArrayList<>();
+		ScheduleRealInfo temp;
+		for (int i = 0; i < list.size() - 1; i++) {
+			temp = list.get(i);
+			if(temp.getFcsjT() > sch.getFcsjT())
+				rs.add(temp);
+
+		}
+		return rs;
+	}*/
+
+	/**
+	 * 
+	 * @Title: doneSum
+	 * @Description: TODO(已完成班次总数)
+	 */
+	public int doneSum(String clZbh) {
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(clZbh);
+		int rs = 0;
+		
+		for(ScheduleRealInfo sch : list){
+			if(sch.getStatus() == 2 && !sch.isDestroy())
+				rs ++;
+		}
+		return rs;
+	}
+	
+	/**
+	 * 
+	 * @Title: prveNotExecNum 
+	 * @Description: TODO(班次之前未执行班次数量) 
+	 */
+	public int prveNotExecNum(ScheduleRealInfo sch){
+		int n = 0;
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		for(ScheduleRealInfo s : list){
+			if(s.getFcsjActual() == null && !s.isDestroy())
+				n ++;
+			
+			if(s.getId().equals(sch.getId()))
+				break;
+		}
+		return n;
+	}
+
+	/**
+	 * 
+	 * @Title: validEndTime
+	 * @Description: TODO(是否是有效的到达时间)
+	 */
+	public boolean validEndTime(ScheduleRealInfo sch, Long ts) {
+		if(sch.getFcsjActualTime() != null && sch.getFcsjActualTime() > ts)
+			return false;
+		
+		return validTime(sch, ts);
+	}
+
+	/**
+	 * 
+	 * @Title: validStartTime 
+	 * @Description: TODO(是否是合适的发车时间) 
+	 */
+	public boolean validStartTime(ScheduleRealInfo sch, Long ts) {
+		if(sch.getZdsjActualTime() != null && sch.getZdsjActualTime() < ts)
+			return false;
+		
+		return validTime(sch, ts);
+	}
+	
+	public boolean validTime(ScheduleRealInfo sch, Long ts){
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		int ci = list.indexOf(sch);
+		ScheduleRealInfo prve, next;
+		if(ci > 0){
+			//之前班次实际时间不能大于该时间
+			for(int i = ci - 1; i >= 0; i --){
+				prve = list.get(i);
+				if(prve.getZdsjActualTime() != null && prve.getZdsjActualTime() > ts )
+					return false;
+				
+				if(prve.getFcsjActualTime() != null && prve.getFcsjActualTime() > ts)
+					return false;
+			}
+		}
+		
+		if(ci < list.size() - 1){
+			//之后班次实际时间不能小于该时间
+			for(int i = ci + 1; i < list.size(); i ++){
+				next = list.get(i);
+				if(next.getFcsjActualTime() != null && next.getFcsjActualTime() < ts)
+					return false;
+				
+				if(next.getZdsjActualTime() != null && next.getZdsjActualTime() < ts)
+					return false;
+			}
+		}
+		return true;
+	}
+	
+	public void save(ScheduleRealInfo sch){
+		//schRepository.save(sch);
+		pstBuffer.add(sch);
+	}
+	
+	
+	/**
+	 * 
+	 * @Title: nextByBcType 
+	 * @Description: TODO(获取下一个指定班次类型的班次) 
+	 */
+	public ScheduleRealInfo nextByBcType(String nbbm, String bcType){
+		List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
+		
+		Collections.sort(list, schFCSJComparator);
+		ScheduleRealInfo sch = null;
+		for(ScheduleRealInfo temp : list){
+			if(temp.getFcsjActual() == null)
+				sch = temp;
+		}
+		
+		return sch;
+	}
+	
+	public List<ScheduleRealInfo> findByBcType(String nbbm, String bcType){
+		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
+				,outList = new ArrayList<>();
+	
+		for(ScheduleRealInfo sch : all){
+			if(sch.getBcType().equals(bcType))
+				outList.add(sch);
+		}
+		return outList;
+	}
+	
+	public Set<String> allCar(){
+		return nbbmScheduleMap.keySet();
+	}
+	
+	public Collection<ScheduleRealInfo> findAll(){
+		return nbbmScheduleMap.values();
+	}
+	
+	public void addExecPlan(ScheduleRealInfo sch){
+		carExecutePlanMap.put(sch.getClZbh(), sch);
+	}
+	
+	public void removeExecPlan(String clzbh){
+		carExecutePlanMap.remove(clzbh);
+	}
+	
+	public Map<String, ScheduleRealInfo> execPlamMap(){
+		return carExecutePlanMap;
+	}
+	
+	/**
+	 * @Title: changeCar 
+	 * @Description: TODO(班次换车) 返回有更新的班次
+	 * @param @param sch	
+	 * @param @param newClZbh    新的车辆自编号 
+	 */
+	public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch , String newClZbh){
+		List<ScheduleRealInfo> ups = new ArrayList<>();
+		String oldClzbh = sch.getClZbh();
+		if(oldClzbh.equals(newClZbh))
+			return ups;
+		
+		
+		//变更相关映射信息
+		nbbmScheduleMap.remove(sch.getClZbh(), sch);
+		
+		sch.setClZbh(newClZbh);
+		nbbmScheduleMap.put(newClZbh, sch);
+		nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
+		nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
+		
+		//重新计算班次应到时间
+		ups.addAll(updateQdzTimePlan(oldClzbh));
+		ups.addAll(updateQdzTimePlan(newClZbh));
+		return ups;
+	}
+
+	/**
+	 * 
+	 * @Title: linkToSchPlan 
+	 * @Description: TODO(车辆关联到班次) 
+	 */
+/*	public void linkToSchPlan(String nbbm) {
+		//当前GPS状态
+		GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+		if(null == gps)
+			return;
+		
+		//班次集合
+		List<ScheduleRealInfo> schArr = nbbmScheduleMap.get(nbbm);
+		
+		for(ScheduleRealInfo sch : schArr){
+			if(sch.getStatus() == 2)
+				continue;
+			if(sch.isDestroy())
+				continue;
+			if(!sch.getXlBm().equals(gps.getLineId()) 
+					|| Integer.parseInt(sch.getXlDir()) != gps.getUpDown().intValue())
+				continue;
+			
+			addExecPlan(sch);
+			break;
+		}
+	}*/
+}
 \ No newline at end of file
+package com.bsth.data.schedule.thread;
+
+import com.bsth.service.TrafficManageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 运营数据提交到运管处
+ * Created by panzhao on 2016/11/9.
+ */
+@Component
+public class SubmitToTrafficManage extends Thread{
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    TrafficManageService trafficManageService;
+
+    @Override
+    public void run() {
+        logger.info("开始提交数据到运管处...");
+        try {
+            //路单
+            trafficManageService.setLD();
+        } catch (Exception e) {
+            logger.error("提交路单到运管处失败", e);
+        }
+        try {
+            //车辆里程、油耗
+            trafficManageService.setLCYH();
+        } catch (Exception e) {
+            logger.error("提交车辆里程、油耗到运管处失败", e);
+        }
+        try {
+            //线路调度日报
+            trafficManageService.setDDRB();
+        } catch (Exception e) {
+            logger.error("提交线路调度日报到运管处失败", e);
+        }
+        try {
+            //线路计划班次表
+            trafficManageService.setJHBC();
+        } catch (Exception e) {
+            logger.error("提交线路计划班次表到运管处失败", e);
+        }
+        logger.info("提交数据到运管处结束！");
+    }
+}
@@ -116,6 +116,12 @@ public class Line implements Serializable {
 	/** 普通车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
 	private Integer ordCarNumber;
  
+	/** 权证车辆数量  报表需要的字段值 */
+	private Integer warrantCar;
+	
+	/** 权证配车启用日期  报表需要的字段值 */
+	private Integer warrantDate;
+	
 	/** 停车场编码   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
 	private String carParkCode;
  
@@ -139,6 +145,22 @@ public class Line implements Serializable {
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
  
+	public Integer getWarrantCar() {
+		return warrantCar;
+	}
+
+	public void setWarrantCar(Integer warrantCar) {
+		this.warrantCar = warrantCar;
+	}
+
+	public Integer getWarrantDate() {
+		return warrantDate;
+	}
+
+	public void setWarrantDate(Integer warrantDate) {
+		this.warrantDate = warrantDate;
+	}
+
 	public Integer getLinePlayType() {
 		return linePlayType;
 	}
@@ -17,251 +17,276 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
  
  
 /**
- * 
- * @ClassName: D60 
- * @Description: TODO(调度指令) 
  * @author PanZhao
- * @date 2016年6月7日 上午10:21:59 
- *
+ * @ClassName: D60
+ * @Description: TODO(调度指令)
+ * @date 2016年6月7日 上午10:21:59
  */
 @Entity
 @Table(name = "bsth_v_directive_60")
 @NamedEntityGraphs({
-	@NamedEntityGraph(name = "directive60_sch", attributeNodes = {
-			@NamedAttributeNode("sch")
-	})
+        @NamedEntityGraph(name = "directive60_sch", attributeNodes = {
+                @NamedAttributeNode("sch")
+        })
 })
-public class D60 extends Directive{
+public class D60 extends Directive {
  
-	@Id
+    @Id
     @GeneratedValue
-	private Integer id;
-	
-	/**
-	 * 数据
-	 */
-	private D60Data data;
-	
-	/**
-	 * 唯一标识
-	 */
-	@Transient
-	private Integer msgId;
-	
-	/**
-	 * 46上行
-	 */
-	private Short reply46 = -1;
-	
-	/**
-	 * 47上行
-	 */
-	private Short reply47 = -1;
-	
-	/**
-	 * 是否是调度指令
-	 * 目前调度指令和消息短语都是短语下发，所以从协议上无法区分
-	 */
-	private boolean isDispatch;
-	
-	/**
-	 * 相关联的班次
-	 */
-	@JsonIgnore
-	@ManyToOne(fetch = FetchType.LAZY)
-	private ScheduleRealInfo sch;
-	
-	@Embeddable
-	public static class D60Data {
-		// 公司代码
-		private short companyCode;
-
-		// 设备号
-		@Transient
-		private String deviceId;
-
-		// 时间戳
-		@Transient
-		private Long timestamp;
-
-		// 保留 默认0
-		private short instructType = 0;
-
-		/*
-		 * 调度指令 调度指令。
-		 *  0X00表示信息短语 
-		 *  0X01表示取消上次指令+调度指令(闹钟有效) 
-		 *  0x02表示为调度指令(闹钟有效)
-		 *  0x03表示运营状态指令(闹钟无效) 
-		 *  0x04表示其他指令
-		 */
-		private Short dispatchInstruct;
-
-		// 唯一标识
-		private int msgId;
-
-		// 闹钟
-		private Long alarmTime;
-
-		// 多个运营状态字节
-		private Long serviceState;
-
-		// 消息文本
-		private String txtContent;
-
-		public short getCompanyCode() {
-			return companyCode;
-		}
-
-		public void setCompanyCode(short companyCode) {
-			this.companyCode = companyCode;
-		}
-
-		public String getDeviceId() {
-			return deviceId;
-		}
-
-		public void setDeviceId(String deviceId) {
-			this.deviceId = deviceId;
-		}
-
-		public Long getTimestamp() {
-			return timestamp;
-		}
-
-		public void setTimestamp(Long timestamp) {
-			this.timestamp = timestamp;
-		}
-
-		public short getInstructType() {
-			return instructType;
-		}
-
-		public void setInstructType(short instructType) {
-			this.instructType = instructType;
-		}
-
-		public Short getDispatchInstruct() {
-			return dispatchInstruct;
-		}
-
-		public void setDispatchInstruct(Short dispatchInstruct) {
-			this.dispatchInstruct = dispatchInstruct;
-		}
-
-		public int getMsgId() {
-			return msgId;
-		}
-
-		public void setMsgId(int msgId) {
-			this.msgId = msgId;
-		}
-
-		public Long getAlarmTime() {
-			return alarmTime;
-		}
-
-		public void setAlarmTime(Long alarmTime) {
-			this.alarmTime = alarmTime;
-		}
-
-		public Long getServiceState() {
-			return serviceState;
-		}
-
-		public void setServiceState(Long serviceState) {
-			this.serviceState = serviceState;
-		}
-
-		public String getTxtContent() {
-			return txtContent;
-		}
-
-		public void setTxtContent(String txtContent) {
-			this.txtContent = txtContent;
-		}
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public short getOperCode() {
-		return operCode;
-	}
-
-	public void setOperCode(short operCode) {
-		this.operCode = operCode;
-	}
-
-	public D60Data getData() {
-		return data;
-	}
-
-	public void setData(D60Data data) {
-		this.data = data;
-	}
-
-	public Integer getMsgId() {
-		if(this.msgId != null)
-			return this.msgId;
-		else
-			return this.getData().getMsgId();
-	}
-
-	public void setMsgId(Integer msgId) {
-		this.msgId = msgId;
-	}
-	
-	@Override
-	public void setTimestamp(Long timestamp) {
-		if(this.data != null)
-			this.data.setTimestamp(timestamp);
-		
-		this.timestamp = timestamp;
-	}
-	
-	@Override
-	public void setDeviceId(String deviceId) {
-		if(this.data != null)
-			this.data.setDeviceId(deviceId);
-		
-		this.deviceId = deviceId;
-	}
-
-	public Short getReply46() {
-		return reply46;
-	}
-
-	public void setReply46(Short reply46) {
-		this.reply46 = reply46;
-	}
-
-	public Short getReply47() {
-		return reply47;
-	}
-
-	public void setReply47(Short reply47) {
-		this.reply47 = reply47;
-	}
-
-	public boolean isDispatch() {
-		return isDispatch;
-	}
-
-	public void setDispatch(boolean isDispatch) {
-		this.isDispatch = isDispatch;
-	}
-
-	public ScheduleRealInfo getSch() {
-		return sch;
-	}
-
-	public void setSch(ScheduleRealInfo sch) {
-		this.sch = sch;
-	}
+    private Integer id;
+
+    /**
+     * 数据
+     */
+    private D60Data data;
+
+    /**
+     * 唯一标识
+     */
+    @Transient
+    private Integer msgId;
+
+    /**
+     * 46上行
+     */
+    private Short reply46 = -1;
+    /**
+     * 46收到时间
+     */
+    private Long reply46Time;
+
+    /**
+     * 47上行
+     */
+    private Short reply47 = -1;
+
+    /**
+     * 47收到时间
+     */
+    private Long reply47Time;
+
+    /**
+     * 是否是调度指令
+     * 目前调度指令和消息短语都是短语下发，所以从协议上无法区分
+     */
+    private boolean isDispatch;
+
+    /**
+     * 相关联的班次
+     */
+    @JsonIgnore
+    @ManyToOne(fetch = FetchType.LAZY)
+    private ScheduleRealInfo sch;
+
+    public Long getReply46Time() {
+        return reply46Time;
+    }
+
+    public void setReply46Time(Long reply46Time) {
+        this.reply46Time = reply46Time;
+    }
+
+    public Long getReply47Time() {
+        return reply47Time;
+    }
+
+    public void setReply47Time(Long reply47Time) {
+        this.reply47Time = reply47Time;
+    }
+
+    @Embeddable
+    public static class D60Data {
+        // 公司代码
+        private short companyCode;
+
+        // 设备号
+        @Transient
+        private String deviceId;
+
+        // 时间戳
+        @Transient
+        private Long timestamp;
+
+        // 保留 默认0
+        private short instructType = 0;
+
+        /*
+         * 调度指令 调度指令。
+         *  0X00表示信息短语
+         *  0X01表示取消上次指令+调度指令(闹钟有效)
+         *  0x02表示为调度指令(闹钟有效)
+         *  0x03表示运营状态指令(闹钟无效)
+         *  0x04表示其他指令
+         */
+        private Short dispatchInstruct;
+
+        // 唯一标识
+        private int msgId;
+
+        // 闹钟
+        private Long alarmTime;
+
+        // 多个运营状态字节
+        private Long serviceState;
+
+        // 消息文本
+        private String txtContent;
+
+        public short getCompanyCode() {
+            return companyCode;
+        }
+
+        public void setCompanyCode(short companyCode) {
+            this.companyCode = companyCode;
+        }
+
+        public String getDeviceId() {
+            return deviceId;
+        }
+
+        public void setDeviceId(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        public Long getTimestamp() {
+            return timestamp;
+        }
+
+        public void setTimestamp(Long timestamp) {
+            this.timestamp = timestamp;
+        }
+
+        public short getInstructType() {
+            return instructType;
+        }
+
+        public void setInstructType(short instructType) {
+            this.instructType = instructType;
+        }
+
+        public Short getDispatchInstruct() {
+            return dispatchInstruct;
+        }
+
+        public void setDispatchInstruct(Short dispatchInstruct) {
+            this.dispatchInstruct = dispatchInstruct;
+        }
+
+        public int getMsgId() {
+            return msgId;
+        }
+
+        public void setMsgId(int msgId) {
+            this.msgId = msgId;
+        }
+
+        public Long getAlarmTime() {
+            return alarmTime;
+        }
+
+        public void setAlarmTime(Long alarmTime) {
+            this.alarmTime = alarmTime;
+        }
+
+        public Long getServiceState() {
+            return serviceState;
+        }
+
+        public void setServiceState(Long serviceState) {
+            this.serviceState = serviceState;
+        }
+
+        public String getTxtContent() {
+            return txtContent;
+        }
+
+        public void setTxtContent(String txtContent) {
+            this.txtContent = txtContent;
+        }
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public short getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(short operCode) {
+        this.operCode = operCode;
+    }
+
+    public D60Data getData() {
+        return data;
+    }
+
+    public void setData(D60Data data) {
+        this.data = data;
+    }
+
+    public Integer getMsgId() {
+        if (this.msgId != null)
+            return this.msgId;
+        else
+            return this.getData().getMsgId();
+    }
+
+    public void setMsgId(Integer msgId) {
+        this.msgId = msgId;
+    }
+
+    @Override
+    public void setTimestamp(Long timestamp) {
+        if (this.data != null)
+            this.data.setTimestamp(timestamp);
+
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public void setDeviceId(String deviceId) {
+        if (this.data != null)
+            this.data.setDeviceId(deviceId);
+
+        this.deviceId = deviceId;
+    }
+
+    public Short getReply46() {
+        return reply46;
+    }
+
+    public void setReply46(Short reply46) {
+        this.reply46 = reply46;
+    }
+
+    public Short getReply47() {
+        return reply47;
+    }
+
+    public void setReply47(Short reply47) {
+        this.reply47 = reply47;
+    }
+
+    public boolean isDispatch() {
+        return isDispatch;
+    }
+
+    public void setDispatch(boolean isDispatch) {
+        this.isDispatch = isDispatch;
+    }
+
+    public ScheduleRealInfo getSch() {
+        return sch;
+    }
+
+    public void setSch(ScheduleRealInfo sch) {
+        this.sch = sch;
+    }
+
+
 }
+package com.bsth.entity.excep;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.bsth.data.BasicData;
+
+/**
+ * 
+ * @ClassName: ArrivalEntity 
+ * @Description: TODO(进出站实体) 
+ * @author PanZhao 
+ * @date 2016年8月19日 上午9:32:20 
+ *
+ */
+public class ArrivalInfo {
+	
+	/** 设备号*/
+	private String deviceId;
+	
+	private String nbbm;
+	
+	/** 站点名称 */
+	private String stopName;
+	
+	/** 时间戳*/
+	private Long ts;
+	
+	/** 线路编码*/
+	private String lineCode;
+
+	/** 上下行*/
+	private Integer upDown;
+
+	/**站点编码*/
+	private String stopNo;
+	
+	/** 0: 进 1：出*/
+	private Integer inOut;
+
+	private Long createDate;
+	
+	/** 是否有效 */
+	private boolean enable;
+	
+	/**分区字段，当年的第几周*/
+	private Integer weeksYear;
+	
+	private boolean tcc;
+	
+	//是否被纠正
+	private boolean correct;
+	
+	private String correctText;
+	
+	
+	private String czsj;
+	
+	private String jzsj;
+	/** -1 则信号有效，但程序标记为不使用 */
+	private int flag = 0;
+	
+	public ArrivalInfo(){}
+	
+	public ArrivalInfo(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
+			int weeksYear, String stopName) {
+		
+		this.deviceId = deviceId;
+		this.ts = ts;
+		this.lineCode = lineCode;
+		this.upDown = upDown;
+		this.stopNo = stopNo;
+		this.stopName = stopName;
+		this.inOut = inOut;
+		this.createDate = createDate;
+	}
+
+/*	@Override
+	public boolean equals(Object obj) {
+		ArrivalEntity a2 = (ArrivalEntity)obj;
+		
+		return this.toString().equals(a2.toString())
+				&& Math.abs(this.ts - a2.ts) < EQ_RANGE;
+	}
+	
+	@Override
+	public int hashCode() {
+		return this.toString().hashCode();
+	}*/
+	
+	
+	@Override
+	public String toString() {
+		try {
+			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+			return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+"， "+sdfHHmm.format(new Date(this.ts))
+			+"，"+(this.getUpDown()==0?"上行":"下行")+"，"+(this.inOut==0?"进":"出")+"，"+this.stopNo+" （"+this.stopName+"）]";
+		} catch (Exception e) {
+			return "";
+		}
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public Integer getUpDown() {
+		return upDown;
+	}
+
+	public void setUpDown(Integer upDown) {
+		this.upDown = upDown;
+	}
+
+	public String getStopNo() {
+		return stopNo;
+	}
+
+	public void setStopNo(String stopNo) {
+		this.stopNo = stopNo;
+	}
+
+	public Integer getInOut() {
+		return inOut;
+	}
+
+	public void setInOut(Integer inOut) {
+		this.inOut = inOut;
+	}
+
+	public Long getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Long createDate) {
+		this.createDate = createDate;
+	}
+
+	public Integer getWeeksYear() {
+		return weeksYear;
+	}
+
+	public void setWeeksYear(Integer weeksYear) {
+		this.weeksYear = weeksYear;
+	}
+
+	public String getDeviceId() {
+		return deviceId;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public Long getTs() {
+		return ts;
+	}
+
+	public void setTs(Long ts) {
+		this.ts = ts;
+	}
+
+	public String getStopName() {
+		return stopName;
+	}
+
+	public void setStopName(String stopName) {
+		this.stopName = stopName;
+	}
+	
+	public String getId(){
+		return this.deviceId + "_" + this.ts;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public boolean isEnable() {
+		return enable;
+	}
+
+	public void setEnable(boolean enable) {
+		this.enable = enable;
+	}
+
+	public boolean isTcc() {
+		return tcc;
+	}
+
+	public void setTcc(boolean tcc) {
+		this.tcc = tcc;
+	}
+
+	public boolean isOutTcc() {
+		return isTcc() && inOut == 1;
+	}
+
+	public boolean isCorrect() {
+		return correct;
+	}
+
+	public void setCorrect(boolean correct) {
+		this.correct = correct;
+	}
+
+	public String getCorrectText() {
+		return correctText;
+	}
+
+	public void setCorrectText(String correctText) {
+		this.correctText = correctText;
+	}
+
+	public Integer getFlag() {
+		return flag;
+	}
+
+	public void setFlag(Integer flag) {
+		this.flag = flag;
+	}
+
+	public String getCzsj() {
+		return czsj;
+	}
+
+	public void setCzsj(String czsj) {
+		this.czsj = czsj;
+	}
+
+	public String getJzsj() {
+		return jzsj;
+	}
+
+	public void setJzsj(String jzsj) {
+		this.jzsj = jzsj;
+	}
+	
+	
+	
+}
+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;
+
+@Entity
+@Table(name = "bsth_c_cwjy")
+public class Cwjy {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	private String gsdm;
+	
+	private String fgsdm;
+	
+	private String nbbm;
+	
+	private String xgr;
+	
+	private Date createDate;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getGsdm() {
+		return gsdm;
+	}
+
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+
+	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 getXgr() {
+		return xgr;
+	}
+
+	public void setXgr(String xgr) {
+		this.xgr = xgr;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	
+	
+}
@@ -43,6 +43,6 @@ public class DBHelper implements CommandLineRunner{
  
 	@Override
 	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(fixedTimeThread, fixedMinute, fixedMinute, TimeUnit.MINUTES);
+		//Application.mainServices.scheduleWithFixedDelay(fixedTimeThread, fixedMinute, fixedMinute, TimeUnit.MINUTES);
 	}
 }
+package com.bsth.repository.oil;
+
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.Cwjy;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface CwjyRepository extends BaseRepository<Cwjy, Integer>{
+	/**
+	 * 当天手动添加的加油信息 
+	 * @param rq
+	 * @return
+	 */
+	@Transactional
+	@Modifying
+	@Query(value="SELECT a.gsdm as gsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
+			+ "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
+   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days(?1) and jylx=1) b " +
+  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  from bsth_c_ylb where  to_days(rq)= to_days(?1 ) group by nbbm "+
+   " ) c on a.nbbm=c.nbbm  where  a.nbbm like %?2% ",nativeQuery=true)
+	List<Object[]> obtainCwjycl(String rq,String nbbm);
+	
+}
@@ -29,12 +29,24 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
  
-	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh")
+	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,"
+			+ "sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
+			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
  
-	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm = ?1 AND r.schedule_date = ?2 and r.cl_zbh = ?3 order by d.timestamp",nativeQuery=true)
+	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,"
+			+ " d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 "
+			+ "d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
+			+ "r.schedule_date like %?2% and r.cl_zbh like %?3% order by d.timestamp",nativeQuery=true)
 	List<Object[]> historyMessage(String line,String date,String code);
  
+	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
+			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
+			+ " ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
+			+ " r.schedule_date like %?2% and r.cl_zbh like %?3% group by "
+			+ " lp_name,xl_name,cl_zbh order by d.timestamp",nativeQuery=true)
+	List<Object[]> historyMessageCount(String line,String date,String code);
+	
 	@Query(value = "select max(id) from ScheduleRealInfo")
 	Long getMaxId();
  
@@ -45,6 +57,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value = "select s from ScheduleRealInfo s where s.scheduleDateStr = ?1")
 	List<ScheduleRealInfo> findByDate(String dateStr);
  
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and cl_zbh=?3 order by bcs")
+	List<ScheduleRealInfo> findByDate2(String line,String date,String clzbh);
+	
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.status = -1")
 	int findCjbc(String jName,String clZbh,String lpName);
  
@@ -54,8 +70,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T') FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code = ?3",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
  
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName = ?4 order by s.fcsj")
-	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName);
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
+			+ " and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName like  %?4% "
+			+ " and clZbh like %?5% order by s.fcsj")
+	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
  
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') order by bcs")
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
@@ -63,6 +81,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and bcType='normal' order by bcs")
 	List<ScheduleRealInfo> queryListWaybill2(String jName,String clZbh,String lpName,String date);
  
+	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and bcType='normal' order by bcs")
+	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String lpName,String date);
+	
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleDaily(String line,String date);
  
@@ -78,7 +99,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value = "delete ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2")
 	void deleteByLineCodeAndDate(String xlBm, String schDate);
  
-	@Query(value="select s from ScheduleRealInfo s where (s.xlBm = ?1 or s.xlBm is not null) and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
+	//去掉了 xlBm is not null 
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleByDateAndLine(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 = ?1 or s.xlBm is not null) and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh ORDER BY xlBm,clZbh,realExecDate,fcsjActual")
@@ -26,5 +26,5 @@ public interface LineService extends BaseService&lt;Line, Integer&gt; {
 	 */
 	long selectMaxIdToLineCode();
  
-	Line findByLineCode(Integer lineCode);
+	Line findByLineCode(String lineCode);
 }
@@ -55,8 +55,10 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	 * @throws
 	 */
 	int lineChange(String nbbm, String lineId, String sender);
-	
-	/**
+
+    int lineChangeByDeviceId(String deviceId, String lineCode, String sender);
+
+    /**
 	 * 
 	 * @Title: upDownChange 
 	 * @Description: TODO(切换上下行) 
@@ -89,4 +91,6 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	int sendC0A3(DC0_A3 c0a4);
  
 	int sendC0A5(String json);
+
+    int refreshLineFile(String deviceId);
 }
@@ -222,18 +222,23 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	 */
 	@Override
 	public int lineChange(String nbbm, String lineCode, String sender) {
+		return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender);
+	}
+
+
+	@Override
+	public int lineChangeByDeviceId(String deviceId, String lineCode, String sender){
 		DirectiveCreator crt = new DirectiveCreator();
-		
 		Long t = System.currentTimeMillis();
 		//生成64数据包
-		D64 d64 = crt.createD64(nbbm, lineCode, t);
-		
+		D64 d64 = crt.create64(deviceId, lineCode, t);
+
 		if(null != sender)
 			d64.setSender(sender);
 		else
 			d64.setSender("系统");
  
-		String deviceId = d64.getDeviceId();
+		//String deviceId = d64.getDeviceId();
 		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
 		// 入库
 		d64.setHttpCode(code);
@@ -332,6 +337,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 			Map<String, Object> sockMap = new HashMap<>();
 			sockMap.put("fn", "d80Confirm");
 			sockMap.put("id", d80.getId());
+			sockMap.put("lineId", d80.getData().getLineId());
 			socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
 		}
  
@@ -463,7 +469,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
  
 		Map<String, Object> rsMap = new HashMap<>();
 		rsMap.put("list", rs);
-		rsMap.put("totalPages", count % size == 0 ? count / size : count / size + 1);
+		rsMap.put("totalPages", count % size == 0 ? count / size -1 : count / size);
 		rsMap.put("page", page);
  
 		return rsMap;
@@ -501,4 +507,13 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	public int sendC0A5(String json) {
 		return GatewayHttpUtils.postJson(json);
 	}
+
+	@Override
+	public int refreshLineFile(String deviceId) {
+		GpsEntity gps = gpsRealDataBuffer.get(deviceId);
+		if(gps == null)
+			return -1;
+
+		return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
+	}
 }
@@ -12,4 +12,6 @@ public interface GpsService {
 	Map<String, Object> findBuffAeraByCode(String code, String type);
  
 	Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction);
+
+    Map<String,Object> removeRealGps(String device);
 }
@@ -14,6 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,372 +33,398 @@ import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
  
 @Service
-public class GpsServiceImpl implements GpsService{
-	/** 历史gps查询最大范围 24小时 */
-	final static Long GPS_RANGE = 60 * 60 * 24L;
-
-	/** jdbc */
-	Connection conn = null;
-	PreparedStatement ps = null;
-	ResultSet rs = null;
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-	
-	@Autowired
-	GpsRealData gpsRealData;
-
-	// 历史gps查询
-	@Override
-	public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
-		Calendar sCal = Calendar.getInstance();
-		sCal.setTime(new Date(startTime));
-
-		Calendar eCal = Calendar.getInstance();
-		eCal.setTime(new Date(endTime));
-
-		int dayOfYear = sCal.get(Calendar.DAY_OF_YEAR);
-		/*
+public class GpsServiceImpl implements GpsService {
+    /**
+     * 历史gps查询最大范围 24小时
+     */
+    final static Long GPS_RANGE = 60 * 60 * 24L;
+
+    /**
+     * jdbc
+     */
+    Connection conn = null;
+    PreparedStatement ps = null;
+    ResultSet rs = null;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    GpsRealData gpsRealData;
+
+    // 历史gps查询
+    @Override
+    public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
+        Calendar sCal = Calendar.getInstance();
+        sCal.setTime(new Date(startTime));
+
+        Calendar eCal = Calendar.getInstance();
+        eCal.setTime(new Date(endTime));
+
+        int dayOfYear = sCal.get(Calendar.DAY_OF_YEAR);
+        /*
 		 * if(dayOfYear != eCal.get(Calendar.DAY_OF_YEAR)){
 		 * System.out.println("暂时不支持跨天查询..."); return null; }
 		 */
  
-		String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO from bsth_c_gps_info where days_year=? and device_id=? and ts > ? and ts < ?";
-		Connection conn = null;
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		List<Map<String, Object>> list = new ArrayList<>();
-		Map<String, Object> map = null;
-		try {
-			conn = DBUtils_MS.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setInt(1, dayOfYear);
-			ps.setString(2, device);
-			ps.setLong(3, startTime);
-			ps.setLong(4, endTime);
-
-			rs = ps.executeQuery();
-			Float lon, lat;
-			Location location;
-			int upDown;
-			while (rs.next()) {
-				upDown = getUpOrDown(rs.getLong("SERVICE_STATE"));
-				if (upDown != directions)
-					continue;
-
-				// to 百度坐标
-				lon = rs.getFloat("LON");
-				lat = rs.getFloat("LAT");
-				location = TransGPS.LocationMake(lon, lat);
-				location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
-
-				map = new HashMap<>();
-				map.put("device", rs.getString("DEVICE_ID"));
-				map.put("lon", location.getLng());
-				map.put("lat", location.getLat());
-				map.put("ts", rs.getLong("TS"));
-				map.put("stopNo", rs.getString("STOP_NO"));
-				map.put("inout_stop", rs.getInt("INOUT_STOP"));
-				// 上下行
-				map.put("upDown", upDown);
-				list.add(map);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			DBUtils_MS.close(rs, ps, conn);
-		}
-		return list;
-	}
-
-	/**
-	 * 王通 2016/6/29 9:23:24 获取车辆线路上下行
-	 * 
-	 * @return -1无效 0上行 1下行
-	 */
-	public static byte getUpOrDown(long serviceState) {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
-				|| (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
-			return -1;
-		return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
-	}
-
-	@Override
-	public List<Map<String, Object>> history(String[] nbbmArray, Long st, Long et) {
-		List<Map<String, Object>> list = new ArrayList<>();
-		// 超过最大查询范围，直接忽略
-		if (et - st > GPS_RANGE)
-			return list;
-
-		// 车辆编码转换成设备号
-		String[] devices = new String[nbbmArray.length];
-		for (int i = 0; i < nbbmArray.length; i++) {
-			devices[i] = BasicData.deviceId2NbbmMap.inverse().get(nbbmArray[i]);
-		}
-		// day_of_year
-		Calendar sCal = Calendar.getInstance();
-		sCal.setTime(new Date(st * 1000));
-		int sDayOfYear = sCal.get(Calendar.DAY_OF_YEAR)/* 200 */;
-
-		Calendar eCal = Calendar.getInstance();
-		eCal.setTime(new Date(et * 1000));
-		int eDayOfYear = eCal.get(Calendar.DAY_OF_YEAR)/* 200 */;
-
-		Calendar weekCal = Calendar.getInstance();
-
-		// 如果是同一天
-		if (sDayOfYear == eDayOfYear) {
-			weekCal.setTimeInMillis(st * 1000);
-			list = findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), sDayOfYear, st, et, devices);
-		} else {
-			// 跨天
-			Long tempSt = 0L, tempEt = 0L;
-			for (int i = sDayOfYear; i <= eDayOfYear; i++) {
-
-				if (i == sDayOfYear) {
-					tempSt = st;
-					tempEt = DateUtils.getTimesnight(sCal);
-				} else if (i == eDayOfYear) {
-					tempSt = DateUtils.getTimesmorning(sCal);
-					tempEt = et;
-				} else {
-					tempSt = DateUtils.getTimesmorning(sCal);
-					tempEt = DateUtils.getTimesnight(sCal);
-				}
-
-				weekCal.setTimeInMillis(tempSt * 1000);
-				list.addAll(findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), i, tempSt, tempEt, devices));
-				// 加一天
-				sCal.add(Calendar.DATE, 1);
-			}
-		}
-
-		// 按时间排序
-		Collections.sort(list, new Comparator<Map<String, Object>>() {
-
-			@Override
-			public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-				return (int) (Long.parseLong(o1.get("ts").toString()) - Long.parseLong(o2.get("ts").toString()));
-			}
-		});
-		;
-		return list;
-	}
-
-	public List<Map<String, Object>> findByTs(int weekOfYear, int dayOfYear, Long st, Long et, String[] devices) {
-		List<Map<String, Object>> list = new ArrayList<>();
-		Map<String, Object> map = null;
-
-		// setArray 不好用，直接拼 in 语句
-		String inv = "";
-		for (String device : devices)
-			inv += ("'" + device + "',");
-		inv = inv.substring(0, inv.length() - 1);
-
-		// 查询到离站数据
-		Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
-
-		String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO from bsth_c_gps_info where days_year=? and device_id in ("
-				+ inv + ") and ts > ? and ts < ?";
-		try {
-			conn = DBUtils_MS.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setInt(1, dayOfYear);
+        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO from bsth_c_gps_info where days_year=? and device_id=? and ts > ? and ts < ?";
+        Connection conn = null;
+        PreparedStatement ps = null;
+        ResultSet rs = null;
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> map = null;
+        try {
+            conn = DBUtils_MS.getConnection();
+            ps = conn.prepareStatement(sql);
+            ps.setInt(1, dayOfYear);
+            ps.setString(2, device);
+            ps.setLong(3, startTime);
+            ps.setLong(4, endTime);
+
+            rs = ps.executeQuery();
+            Float lon, lat;
+            Location location;
+            int upDown;
+            while (rs.next()) {
+                upDown = getUpOrDown(rs.getLong("SERVICE_STATE"));
+                if (upDown != directions)
+                    continue;
+
+                // to 百度坐标
+                lon = rs.getFloat("LON");
+                lat = rs.getFloat("LAT");
+                location = TransGPS.LocationMake(lon, lat);
+                location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
+
+                map = new HashMap<>();
+                map.put("device", rs.getString("DEVICE_ID"));
+                map.put("lon", location.getLng());
+                map.put("lat", location.getLat());
+                map.put("ts", rs.getLong("TS"));
+                map.put("stopNo", rs.getString("STOP_NO"));
+                map.put("inout_stop", rs.getInt("INOUT_STOP"));
+                // 上下行
+                map.put("upDown", upDown);
+                list.add(map);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            DBUtils_MS.close(rs, ps, conn);
+        }
+        return list;
+    }
+
+    /**
+     * 王通 2016/6/29 9:23:24 获取车辆线路上下行
+     *
+     * @return -1无效 0上行 1下行
+     */
+    public static byte getUpOrDown(long serviceState) {
+        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+                || (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
+            return -1;
+        return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
+    }
+
+    @Override
+    public List<Map<String, Object>> history(String[] nbbmArray, Long st, Long et) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        // 超过最大查询范围，直接忽略
+        if (et - st > GPS_RANGE)
+            return list;
+
+        // 车辆编码转换成设备号
+        String[] devices = new String[nbbmArray.length];
+        for (int i = 0; i < nbbmArray.length; i++) {
+            devices[i] = BasicData.deviceId2NbbmMap.inverse().get(nbbmArray[i]);
+        }
+        // day_of_year
+        Calendar sCal = Calendar.getInstance();
+        sCal.setTime(new Date(st * 1000));
+        int sDayOfYear = sCal.get(Calendar.DAY_OF_YEAR)/* 200 */;
+
+        Calendar eCal = Calendar.getInstance();
+        eCal.setTime(new Date(et * 1000));
+        int eDayOfYear = eCal.get(Calendar.DAY_OF_YEAR)/* 200 */;
+
+        Calendar weekCal = Calendar.getInstance();
+
+        // 如果是同一天
+        if (sDayOfYear == eDayOfYear) {
+            weekCal.setTimeInMillis(st * 1000);
+            list = findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), sDayOfYear, st, et, devices);
+        } else {
+            // 跨天
+            Long tempSt = 0L, tempEt = 0L;
+            for (int i = sDayOfYear; i <= eDayOfYear; i++) {
+
+                if (i == sDayOfYear) {
+                    tempSt = st;
+                    tempEt = DateUtils.getTimesnight(sCal);
+                } else if (i == eDayOfYear) {
+                    tempSt = DateUtils.getTimesmorning(sCal);
+                    tempEt = et;
+                } else {
+                    tempSt = DateUtils.getTimesmorning(sCal);
+                    tempEt = DateUtils.getTimesnight(sCal);
+                }
+
+                weekCal.setTimeInMillis(tempSt * 1000);
+                list.addAll(findByTs(weekCal.get(Calendar.WEEK_OF_YEAR), i, tempSt, tempEt, devices));
+                // 加一天
+                sCal.add(Calendar.DATE, 1);
+            }
+        }
+
+        // 按时间排序
+        Collections.sort(list, new Comparator<Map<String, Object>>() {
+
+            @Override
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                return (int) (Long.parseLong(o1.get("ts").toString()) - Long.parseLong(o2.get("ts").toString()));
+            }
+        });
+        ;
+        return list;
+    }
+
+    public List<Map<String, Object>> findByTs(int weekOfYear, int dayOfYear, Long st, Long et, String[] devices) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> map = null;
+
+        // 直接拼 in 语句
+        String inv = "";
+        for (String device : devices)
+            inv += ("'" + device + "',");
+        inv = inv.substring(0, inv.length() - 1);
+
+        // 查询到离站数据
+        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
+
+        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO from bsth_c_gps_info where days_year=? and device_id in ("
+                + inv + ") and ts > ? and ts < ?";
+        try {
+            conn = DBUtils_MS.getConnection();
+            ps = conn.prepareStatement(sql);
+            ps.setInt(1, dayOfYear);
 			/* ps.setArray(2, conn.createArrayOf("VARCHAR", devices)); */
-			ps.setLong(2, st * 1000);
-			ps.setLong(3, et * 1000);
-
-			rs = ps.executeQuery();
-			Float lon, lat;
-			Location bdLoc, gdLoc;
-			int upDown, inOutStop;
-			ArrivalEntity arrival;
-			while (rs.next()) {
-				upDown = getUpOrDown(rs.getLong("SERVICE_STATE"));
-				map = new HashMap<>();
-
-				lon = rs.getFloat("LON");
-				lat = rs.getFloat("LAT");
-				// 高德坐标
-				gdLoc = TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(lon, lat));
-				map.put("gcj_lon", gdLoc.getLng());
-				map.put("gcj_lat", gdLoc.getLat());
-				// 百度坐标
-				bdLoc = TransGPS.bd_encrypt(gdLoc);
-				map.put("bd_lon", bdLoc.getLng());
-				map.put("bd_lat", bdLoc.getLat());
-
-				map.put("deviceId", rs.getString("DEVICE_ID"));
-				map.put("ts", rs.getLong("TS"));
-				map.put("timestamp", rs.getLong("TS"));
-				map.put("stopNo", rs.getString("STOP_NO"));
-
-				inOutStop = rs.getInt("INOUT_STOP");
-				map.put("inout_stop", inOutStop);
-
-				arrival = arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS"));
-				if (arrival != null) {
-					map.put("inout_stop_info",arrival);
-					map.put("inout_stop", arrival.getInOut());
-				}
-				map.put("nbbm", BasicData.deviceId2NbbmMap.get(rs.getString("DEVICE_ID")));
-				map.put("state", 0);
-				// 上下行
-				map.put("upDown", upDown);
-				list.add(map);
-			}
-		} catch (Exception e) {
-			logger.error("", e);
-		} finally {
-			DBUtils_MS.close(rs, ps, conn);
-		}
-		return list;
-	}
-
-	public Map<String, ArrivalEntity> findArrivalByTs(int weekOfYear, Long st, Long et, String devicesInSql) {
-		Map<String, ArrivalEntity> map = new HashMap<>();
-
-		String sql = "SELECT DEVICE_ID,LINE_ID,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM bsth_c_arrival_info where weeks_year=? and device_id in ("
-				+ devicesInSql + ") and ts > ? and ts < ?";
-		try {
-			conn = DBUtils_MS.getConnection();
-			ps = conn.prepareStatement(sql);
-			ps.setInt(1, weekOfYear);
-			ps.setLong(2, st * 1000);
-			ps.setLong(3, et * 1000);
-
-			rs = ps.executeQuery();
-			ArrivalEntity arr;
-			int inOut;
-			while (rs.next()) {
-				arr = new ArrivalEntity(rs.getString("DEVICE_ID"), rs.getLong("TS"), rs.getString("LINE_ID"),
-						rs.getInt("UP_DOWN"), rs.getString("STOP_NO"), rs.getInt("IN_OUT"), rs.getLong("CREATE_DATE"),
-						rs.getInt("WEEKS_YEAR"), BasicData.stationCode2NameMap.get(rs.getString("STOP_NO")));
-
-				// 设备号_时间戳_进出状态 为key
-				// 反转进出状态
-				inOut = arr.getInOut() == 0 ? 1 : 0;
-				map.put(arr.getDeviceId() + "_" + arr.getTs(), arr);
-			}
-		} catch (Exception e) {
-			logger.error("", e);
-		} finally {
-			DBUtils_MS.close(rs, ps, conn);
-		}
-		return map;
-	}
-
-	
-	@Autowired
-	StationRepository stationRepository;
-	
-	@Autowired
-	CarParkRepository carParkRepository;
-	
-	@Override
-	public Map<String, Object> findBuffAeraByCode(String code, String type) {
-		Object[][] obj = null;
-		if(type.equals("station"))
-			obj = stationRepository.bufferAera(code);
-		else if(type.equals("park"))
-			obj = carParkRepository.bufferAera(code);
-		
-		Map<String, Object> rs = new HashMap<>();
-		
-		Object[] subObj = obj[0];
-		if(subObj != null && subObj.length == 6){
-			rs.put("polygon", subObj[0]);
-			rs.put("type", subObj[1]);
-			rs.put("cPoint", subObj[2]);
-			rs.put("radius", subObj[3]);
-			rs.put("code", subObj[4]);
-			rs.put("text", subObj[5]);
-		}
-		
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction) {
-		Map<String, Object> rsMap = new HashMap<>();
-		try{
-			//全量
-			Collection<GpsEntity> list = gpsRealData.all();
-			//过滤后的
-			List<GpsEntity> rs = new ArrayList<>();
-			Field[] fields = GpsEntity.class.getDeclaredFields();
-			//排序字段
-			Field orderField = null;
-			//参与过滤的字段
-			List<Field> fs = new ArrayList<>();
-			for(Field f : fields){
-				f.setAccessible(true);
-				if(map.containsKey(f.getName()))
-					fs.add(f);
-				
-				if(f.getName().equals(order))
-					orderField = f;
-			}
-			//过滤数据
-			for(GpsEntity gps : list){
-				if(fieldEquals(fs, gps, map))
-					rs.add(gps);
-			}
-			
-			//排序
-			if(null != orderField)
-				sortGpsList(orderField, rs);
-			
-			//分页
-			int count = rs.size()
-				,s = page * size, e = s + size;
-			if (e > count)
-				e = count;
-			
-			rsMap.put("list", rs.subList(s, e));
-			rsMap.put("totalPages", count % size == 0 ? count / size : count / size + 1);
-			rsMap.put("page", page);
-			rsMap.put("status", ResponseCode.SUCCESS);
-		}catch(Exception e){
-			logger.error("", e);
-			rsMap.put("status", ResponseCode.ERROR);
-		}
-		return rsMap;
-	}
-	
-	private void sortGpsList(final Field f, List<GpsEntity> rs) {
-		Collections.sort(rs, new Comparator<GpsEntity>() {
-
-			@Override
-			public int compare(GpsEntity o1, GpsEntity o2) {
-				try {
-					if(f.get(o1) == f.get(o2))
-						return 0;
-					
-					if(null == f.get(o1))
-						return 1;
-					
-					if(null == f.get(o2))
-						return -1;
-					
-					return f.get(o1).toString().compareTo(f.get(o2).toString());
-				} catch (Exception e) {
-					logger.error("", e);
-					return -1;
-				}
-			}
-		});
-	}
-
-	public boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map){
-		try{
-			for(Field f : fs){
-				if(f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
-					return false;
-			}
-		}catch(Exception e){
-			logger.error("", e);
-			return false;
-		}
-		return true;
-	}
+            ps.setLong(2, st * 1000);
+            ps.setLong(3, et * 1000);
+
+            rs = ps.executeQuery();
+            Float lon, lat;
+            Location bdLoc, gdLoc;
+            int upDown, inOutStop;
+            ArrivalEntity arrival;
+            while (rs.next()) {
+                upDown = getUpOrDown(rs.getLong("SERVICE_STATE"));
+                map = new HashMap<>();
+
+                lon = rs.getFloat("LON");
+                lat = rs.getFloat("LAT");
+                // 高德坐标
+                gdLoc = TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(lon, lat));
+                map.put("gcj_lon", gdLoc.getLng());
+                map.put("gcj_lat", gdLoc.getLat());
+                // 百度坐标
+                bdLoc = TransGPS.bd_encrypt(gdLoc);
+                map.put("bd_lon", bdLoc.getLng());
+                map.put("bd_lat", bdLoc.getLat());
+
+                map.put("deviceId", rs.getString("DEVICE_ID"));
+                map.put("ts", rs.getLong("TS"));
+                map.put("timestamp", rs.getLong("TS"));
+                map.put("stopNo", rs.getString("STOP_NO"));
+
+                inOutStop = rs.getInt("INOUT_STOP");
+                map.put("inout_stop", inOutStop);
+
+                arrival = arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS"));
+                if (arrival != null) {
+                    map.put("inout_stop_info", arrival);
+                    map.put("inout_stop", arrival.getInOut());
+                }
+                map.put("nbbm", BasicData.deviceId2NbbmMap.get(rs.getString("DEVICE_ID")));
+                map.put("state", 0);
+                // 上下行
+                map.put("upDown", upDown);
+                list.add(map);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        } finally {
+            DBUtils_MS.close(rs, ps, conn);
+        }
+        return list;
+    }
+
+    public Map<String, ArrivalEntity> findArrivalByTs(int weekOfYear, Long st, Long et, String devicesInSql) {
+        Map<String, ArrivalEntity> map = new HashMap<>();
+
+        String sql = "SELECT DEVICE_ID,LINE_ID,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM bsth_c_arrival_info where weeks_year=? and device_id in ("
+                + devicesInSql + ") and ts > ? and ts < ?";
+        try {
+            conn = DBUtils_MS.getConnection();
+            ps = conn.prepareStatement(sql);
+            ps.setInt(1, weekOfYear);
+            ps.setLong(2, st * 1000);
+            ps.setLong(3, et * 1000);
+
+            rs = ps.executeQuery();
+            ArrivalEntity arr;
+            int inOut;
+            while (rs.next()) {
+                arr = new ArrivalEntity(rs.getString("DEVICE_ID"), rs.getLong("TS"), rs.getString("LINE_ID"),
+                        rs.getInt("UP_DOWN"), rs.getString("STOP_NO"), rs.getInt("IN_OUT"), rs.getLong("CREATE_DATE"),
+                        rs.getInt("WEEKS_YEAR"), BasicData.stationCode2NameMap.get(rs.getString("STOP_NO")));
+
+                // 设备号_时间戳_进出状态 为key
+                // 反转进出状态
+                inOut = arr.getInOut() == 0 ? 1 : 0;
+                map.put(arr.getDeviceId() + "_" + arr.getTs(), arr);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        } finally {
+            DBUtils_MS.close(rs, ps, conn);
+        }
+        return map;
+    }
+
+
+    @Autowired
+    StationRepository stationRepository;
+
+    @Autowired
+    CarParkRepository carParkRepository;
+
+    @Override
+    public Map<String, Object> findBuffAeraByCode(String code, String type) {
+        Object[][] obj = null;
+        if (type.equals("station"))
+            obj = stationRepository.bufferAera(code);
+        else if (type.equals("park"))
+            obj = carParkRepository.bufferAera(code);
+
+        Map<String, Object> rs = new HashMap<>();
+
+        Object[] subObj = obj[0];
+        if (subObj != null && subObj.length == 6) {
+            rs.put("polygon", subObj[0]);
+            rs.put("type", subObj[1]);
+            rs.put("cPoint", subObj[2]);
+            rs.put("radius", subObj[3]);
+            rs.put("code", subObj[4]);
+            rs.put("text", subObj[5]);
+        }
+
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction) {
+        Map<String, Object> rsMap = new HashMap<>();
+        try {
+            //全量
+            List<GpsEntity> list = new ArrayList<>(gpsRealData.all());
+            //过滤后的
+            List<GpsEntity> rs = new ArrayList<>();
+            Field[] fields = GpsEntity.class.getDeclaredFields();
+            //排序字段
+            Field orderField = null;
+            //参与过滤的字段
+            List<Field> fs = new ArrayList<>();
+            for (Field f : fields) {
+                f.setAccessible(true);
+                if (map.containsKey(f.getName()))
+                    fs.add(f);
+
+                if (f.getName().equals(order))
+                    orderField = f;
+            }
+            //过滤数据
+            for (GpsEntity gps : list) {
+                if (fieldEquals(fs, gps, map))
+                    rs.add(gps);
+            }
+
+            //排序
+/*            if (null != orderField)
+                sortGpsList(orderField, rs);*/
+            //时间戳排序
+            Collections.sort(rs, new Comparator<GpsEntity>() {
+                @Override
+                public int compare(GpsEntity o1, GpsEntity o2) {
+                    return o2.getTimestamp().intValue() - o1.getTimestamp().intValue();
+                }
+            });
+
+            //分页
+            int count = rs.size(), s = page * size, e = s + size;
+            if (e > count)
+                e = count;
+
+            rsMap.put("list", rs.subList(s, e));
+            rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
+            rsMap.put("page", page);
+            rsMap.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rsMap.put("status", ResponseCode.ERROR);
+        }
+        return rsMap;
+    }
+
+    @Override
+    public Map<String, Object> removeRealGps(String device) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+
+            gpsRealData.remove(device);
+            rs.put("status", ResponseCode.SUCCESS);
+        }catch (Exception e){
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    private void sortGpsList(final Field f, List<GpsEntity> rs) {
+        Collections.sort(rs, new Comparator<GpsEntity>() {
+
+            @Override
+            public int compare(GpsEntity o1, GpsEntity o2) {
+                try {
+                    if (f.get(o1) == f.get(o2))
+                        return 0;
+
+                    if (null == f.get(o1))
+                        return 1;
+
+                    if (null == f.get(o2))
+                        return -1;
+
+                    return f.get(o1).toString().compareTo(f.get(o2).toString());
+                } catch (Exception e) {
+                    logger.error("", e);
+                    return -1;
+                }
+            }
+        });
+    }
+
+    public boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
+        try {
+            for (Field f : fs) {
+                if (StringUtils.isEmpty(map.get(f.getName()).toString()))
+                    continue;
+
+                if (f.get(obj) == null || f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
+                    return false;
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            return false;
+        }
+        return true;
+    }
 }
@@ -40,8 +40,8 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 	}
  
 	@Override
-	public Line findByLineCode(Integer lineCode) {
-		return repository.findByLineCode(lineCode + "");
+	public Line findByLineCode(String lineCode) {
+		return repository.findByLineCode(lineCode);
 	}
  
 }