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

sgz
2 parents 171db36e ee338482
Showing 52 changed files with 2377 additions and 574 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationRouteController.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/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlxxbController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/safe_driv/SafeDriv.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -2,10 +2,6 @@ package com.bsth;
  
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -13,10 +9,13 @@ import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
  
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
  
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(12);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(13);
  
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -100,4 +100,29 @@ public class DownloadController
         os.close();
         file.delete();
     }  
+    
+    
+    @RequestMapping("downloadModel")
+    public void downloadModel(HttpServletResponse response,String fileName)
+    		throws IOException {
+//    	String fileNames=URLDecoder.decode(fileName,"UTF-8");
+    	fileName =fileName + ".xls";
+    	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName; 
+    	File file = new File(moudelPath);// path是根据日志路径和文件名拼接出来的
+//        String filename = file.getName();// 获取日志文件名称
+        InputStream fis = new BufferedInputStream(new FileInputStream(moudelPath));
+        byte[] buffer = new byte[fis.available()];
+        fis.read(buffer);
+        fis.close();
+        response.reset();
+        response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.replaceAll(" ", "").getBytes("utf-8"),"iso8859-1"));
+        response.addHeader("Content-Length", "" + file.length());
+        OutputStream os = new BufferedOutputStream(response.getOutputStream());
+        response.setContentType("application/octet-stream");
+        os.write(buffer);// 输出文件
+        os.flush();
+        os.close();
+    }
+    
+    
 }
@@ -72,4 +72,14 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	public List<Map<String, Object>> findUpStationRouteCode(@RequestParam Map<String, Object> map) {
 		return routeService.findUpSectionRouteCode(map);
 	}
+	
+	/**
+	 * @Description :TODO(引用路段)
+	 * 
+	 * @return List<Map<String, Object>> 
+	 */
+	@RequestMapping(value = "/quoteSection" , method = RequestMethod.POST)
+	public Map<String, Object> quoteSection(@RequestParam Map<String, Object> map) {
+		return routeService.quoteSection(map);
+	}
 }
@@ -111,7 +111,6 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 	 */
 	@RequestMapping(value = "/findStationRouteInfo",method = RequestMethod.GET)
 	public List<Map<String, Object>> findStationRouteInfo(@RequestParam Map<String, Object> map) {
-		
 		return service.findStationRouteInfo(map);
 	}
  
@@ -127,8 +126,26 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
      */
     @RequestMapping(value = "/multiLine", method = RequestMethod.GET)
     public Map<String, Object> findByMultiLine(@RequestParam String lineIds){
-    	
     	return service.findByMultiLine(lineIds);
     }
  
+    /**
+     * 
+     * @Title: updSwitchDir 
+     * @Description: TODO(上下行切换) 
+     */
+    @RequestMapping(value = "/updSwitchDir", method = RequestMethod.POST)
+    public Map<String, Object> updSwitchDir(@RequestParam String lineIds){
+    	return service.updSwitchDir(lineIds);
+    }
+	
+    /**
+     * 
+     * @Title: upddis 
+     * @Description: TODO(更新站距) 
+     */
+    @RequestMapping(value = "/upddis",method = RequestMethod.POST)
+	public Map<String, Object> upddis(@RequestParam Map<String, Object> map) {
+		return service.upddis(map);
+	}
 }
@@ -96,4 +96,16 @@ public class GpsController {
     public Map<String, Object> gpsCompletion(@RequestParam long schId) {
         return gpsService.gpsCompletion(schId);
     }
+
+    /**
+     * 历史GPS查询 ，第二版轨迹回放用
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v2/{nbbm}")
+    public Map<String, Object> history_v2(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
+        return gpsService.history_v2(nbbm, st, et);
+    }
 }
@@ -2,6 +2,8 @@ package com.bsth.controller.oil;
  
  
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
  
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,9 +33,9 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
 		return service.save(t);
 	}
  
-	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
-	public PageObject<Ylxxb> pagequery(@RequestParam Map<String, Object> map){
-		PageObject<Ylxxb> pagequery=null;
+	@RequestMapping(value = "/queryList",method = RequestMethod.GET)
+	public List<Ylxxb> queryList(@RequestParam Map<String, Object> map){
+		List<Ylxxb> pagequery=null;
 		map.put("curPage", map.get("page").toString());
 		map.put("pageData","10");
 		pagequery=service.Pagequery(map);
@@ -56,9 +58,15 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
 	 * @throws
 	 */
 	@RequestMapping(value="/savejzl",method = RequestMethod.POST)
-	public Map<String, Object> savejzl(Ylxxb t){
-		Map<String, Object> map=service.savejzl(t);
-		return map;
+	public Map<String, Object> savejzl(@RequestParam Map<String, Object> map){
+		Map<String, Object> maps=new HashMap<>();
+		try {
+			maps = service.savejzl(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return maps;
 	}
  
 }
 package com.bsth.controller.oil;
  
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
  
@@ -16,6 +20,7 @@ import com.bsth.controller.BaseController;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.service.oil.DlbService;
+import com.bsth.util.ReportUtils;
 import com.google.common.base.Splitter;
  
 @RestController
@@ -70,11 +75,17 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
         List<String> list = Splitter.on(",").trimResults().splitToList(order);
         return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
 	}
+	@RequestMapping(value = "/dlbList",method = RequestMethod.GET)
+	public List<Dlb> dlbList(@RequestParam Map<String, Object> map){
+		List<Dlb> list=service.listDlb(map);
+		return list;
+	}
+	
+	
  
 	@RequestMapping(value = "/obtain",method = RequestMethod.GET)
 	public Map<String, Object> obtain(@RequestParam Map<String, Object> map){
 		Map<String, Object> list=service.obtain(map);
-		System.out.println();
 		return list;
 	}
  
@@ -99,4 +110,75 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 		Map<String, Object> list=service.checkDl(map);
 		return list;
 	}
+	
+	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
+	public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=service.sumYlb(map);
+		return list;
+	}
+	
+	@RequestMapping(value = "/saveDlbList",method = RequestMethod.POST)
+	public Map<String, Object> saveDlbList(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list = service.saveDlbList(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return list;
+	}
+	
+
+	@RequestMapping(value = "/listExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Dlb> dlb= service.listDlb(map);
+//		(new CustomerSpecs<Ylb>(map)).iterator();
+		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
+		for (Dlb y : dlb) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("rq", y.getRq());
+			m.put("gsname",y.getGsname() );
+			m.put("xlname", y.getXlname());
+			m.put("nbbm", y.getNbbm());
+			m.put("jsy", y.getJsy());
+			m.put("cdl", y.getCdl());
+			m.put("czcd", y.getCzcd()+"%");
+			m.put("jzcd", y.getJzcd()+"%");
+			m.put("hd", y.getHd());
+			String shyy ="无";
+			if(y.getShyy()!=null){
+				 if(shyy.equals("1")){shyy="票务用油";}
+				 else if(shyy.equals("2")){shyy="保养用油";}
+				 else if(shyy.equals("3")){shyy="报废车用油";}
+				 else if(shyy.equals("4")){shyy="其它用油";}
+				 else if(shyy.equals("5")){shyy="人保部";}
+				 else if(shyy.equals("6")){shyy="车队";}
+				 else if(shyy.equals("7")){shyy="车间(高保)";}
+				 else if(shyy.equals("8")){shyy="车间(小修)";}
+				 else{shyy ="无";}
+			}
+			m.put("shyy", shyy);
+			m.put("sh", y.getSh());
+			m.put("zlc", y.getZlc());
+			m.put("bglyh", y.getBglyh());
+			resList.add(m);
+		}
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls",
+				path+"export/"+map.get("rq").toString()+ "进出场存电量.xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+			
+		return resList;
+		
+	}
+	
 }
 package com.bsth.controller.oil;
  
+import java.util.HashMap;
 import java.util.Map;
  
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,9 +34,15 @@ public class YlxxbController extends BaseController&lt;Ylxxb, Integer&gt;{
 	 * @param map
 	 * @return
 	 */
-	@RequestMapping(value = "/check",method = RequestMethod.GET)
+	@RequestMapping(value = "/check",method = RequestMethod.POST)
 	public Map<String, Object> check(@RequestParam Map<String, Object> map){
-		Map<String, Object> list=service.checkJsy(map);
+		Map<String, Object> list=new HashMap<>();
+		try {
+			list = service.checkJsy(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		return list;
 	}
 }
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.entity.Line;
+import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,9 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
  
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
  
 @RestController
 @RequestMapping("/basic")
@@ -126,4 +126,23 @@ public class BasicDataController {
 	public Map<String, String> nbbm2PlateNo(){
 		return basicData.getNbbm2PlateNo();
 	}
+
+
+	/**
+	 * 获取线路配车信息
+	 * @return
+	 */
+	@RequestMapping("/ccInfo")
+	public Map<String, Collection<String>> ccInfo(){
+
+		ArrayListMultimap<String, String> listMultimap = ArrayListMultimap.create();
+		Set<String> ks = BasicData.nbbm2LineMap.keySet();
+
+		Line line;
+		for(String nbbm : ks){
+			line = BasicData.nbbm2LineMap.get(nbbm);
+			listMultimap.put(line.getLineCode(), nbbm);
+		}
+		return listMultimap.asMap();
+	}
 }
@@ -14,39 +14,91 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
  
 	@Autowired
 	LineConfigService lineConfigService;
-	
+
+	/**
+	 * 检查是否有线路配置信息
+	 * @param codeArray
+	 * @return
+	 */
 	@RequestMapping("/check")
 	public Map<String, Object> check(@RequestParam String[] codeArray){
 		return lineConfigService.check(codeArray);
 	}
-	
+
+	/**
+	 * 初始化线路配置
+	 * @param lineCode
+	 * @return
+	 * @throws Exception
+	 */
 	@RequestMapping("/init/{lineCode}")
 	public Integer init(@PathVariable("lineCode") String lineCode) throws Exception{
 		return lineConfigService.init(lineCode);
 	}
-	
+
+	/**
+	 * 修改班次刷新时间
+	 * @param time
+	 * @param lineCode
+	 * @return
+	 */
 	@RequestMapping(value = "/editTime", method = RequestMethod.POST)
 	public Map<String, Object> editStartOptTime(@RequestParam String time,@RequestParam String lineCode){
 		return lineConfigService.editStartOptTime(time, lineCode);
 	}
-	
+
+	/**
+	 * 修改出场时间类型
+	 * @param lineCode
+	 * @param type
+	 * @return
+	 */
 	@RequestMapping(value = "/editOutTimeType", method = RequestMethod.POST)
-	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type){
-		return lineConfigService.editOutTimeType(lineCode, type);
+	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type,@RequestParam String parkCode,@RequestParam String stationCode){
+		return lineConfigService.editOutTimeType(lineCode, type, parkCode, stationCode);
 	}
  
+	/**
+	 * 启用原线路回场
+	 * @param lineCode
+	 * @param enable
+	 * @return
+	 */
 	@RequestMapping(value = "/enableInParkForSource", method = RequestMethod.POST)
 	public Map<String, Object> enableInParkForSource(@RequestParam String lineCode, @RequestParam int enable){
 		return lineConfigService.enableInParkForSource(lineCode, enable);
 	}
  
+	/**
+	 * 根据线路编码获取配置信息
+	 * @param lineCode
+	 * @return
+	 */
 	@RequestMapping(value = "/getByLineCode")
 	public LineConfig getByLineCode(@RequestParam String lineCode){
 		return lineConfigService.getByLineCode(lineCode);
 	}
  
+	/**
+	 * 到站缓冲区设置
+	 * @param lineCode
+	 * @param field
+	 * @param value
+	 * @return
+	 */
 	@RequestMapping(value = "/bufferTimeDiff", method = RequestMethod.POST)
 	public Map<String, Object> bufferTimeDiff(@RequestParam String lineCode, @RequestParam String field,@RequestParam String value){
 		return lineConfigService.bufferTimeDiff(lineCode, field, value);
 	}
+
+	/**
+	 * 应急停靠设置
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping(value = "/yjtkSet", method = RequestMethod.POST)
+	public Map<String, Object> yjtkSet(@RequestParam Map<String, String> map){
+		//System.out.println(map);
+		return lineConfigService.yjtkSet(map);
+	}
 }
 package com.bsth.controller.realcontrol;
  
 import com.alibaba.fastjson.JSONArray;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
@@ -368,9 +369,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
  
 	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam String line, @RequestParam String date,
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam String gsdm,@RequestParam String fgsdm, @RequestParam String line, @RequestParam String date,
 			@RequestParam String date2,@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDailyTj(line, date,date2, xlName, type);
+		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
  
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
@@ -486,4 +487,33 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> lpChangeMulti(@RequestParam String leftIdx, @RequestParam String rightIdx,@RequestParam int type){
 		return scheduleRealInfoService.lpChangeMulti(leftIdx, rightIdx, type);
 	}
+
+	/**
+	 * 删除当日实际排班
+	 * @return
+	 */
+	@RequestMapping(value = "deleteRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> deleteRealSchedule(@RequestParam String lineCode){
+		return dayOfSchedule.deleteRealSchedule(lineCode);
+	}
+
+	/**
+	 * 从计划表重新加载当日排班
+	 * @param lineCode
+	 * @return
+	 */
+	@RequestMapping(value = "reLoadRealSchedule", method = RequestMethod.POST)
+	public Map<String, Object> reLoadRealSchedule(@RequestParam String lineCode){
+		Map<String, Object> rs = new HashMap<>();
+		List<ScheduleRealInfo> list = dayOfSchedule.findByLineCode(lineCode);
+		if(list != null && list.size() > 0){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", "失败，" + list.get(0).getXlName() + "当日存在实际排班，无法重新加载。");
+			return rs;
+		}
+
+		int code = dayOfSchedule.reloadSch(lineCode);
+		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
+		return rs;
+	}
 }
@@ -21,17 +21,17 @@ public class ReportController {
 	@Autowired
 	ReportService service;
  
-	@RequestMapping(value="/queryListBczx" ,method = RequestMethod.POST)
+	@RequestMapping(value="/queryListBczx" ,method = RequestMethod.GET)
 	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)
+	@RequestMapping(value="/queryListZdxx" ,method = RequestMethod.GET)
 	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)
+	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.GET)
 	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);
@@ -108,4 +108,9 @@ public class ReportController {
 		return service.carList(map);
 	}
  
+	@RequestMapping(value="/userList",method = RequestMethod.GET)
+	public List<Map<String,String>> userList(@RequestParam Map<String, Object> map){
+		return service.userList(map);
+	}
+	
 }
@@ -68,6 +68,8 @@ public class BasicData implements CommandLineRunner {
     public static Map<String, Personnel> jsyMap;
     //售票员工号 和 personnel 对象映射
     public static Map<String, Personnel> spyMap;
+    //所以员工和personnerl 对象映射
+    public static Map<String, Personnel> perMap;
     //全量员工 工号和姓名对照
     public static Map<String, String> allPerson;
  
@@ -310,7 +312,7 @@ public class BasicData implements CommandLineRunner {
         public void loadPersonnelInfo() {
             Iterator<Personnel> iterator = personnelRepository.findAll().iterator();
  
-            Map<String, Personnel> jsyTempMap = new HashMap<>(), spyTempMap = new HashMap<>();
+            Map<String, Personnel> jsyTempMap = new HashMap<>(), spyTempMap = new HashMap<>(),perTempMap=new HashMap<>();
             Map<String, String> allPersonMap = new HashMap<>();
  
             Personnel p;
@@ -328,13 +330,15 @@ public class BasicData implements CommandLineRunner {
                     else if (p.getPosts().equals("2"))
                         spyTempMap.put(jobCode, p);
                 }
-
+                
+                perTempMap.put(jobCode, p);
                 allPersonMap.put(jobCode, p.getPersonnelName());
             }
  
             jsyMap = jsyTempMap;
             spyMap = spyTempMap;
             allPerson = allPersonMap;
+            perMap = perTempMap;
         }
     }
 }
 package com.bsth.data;
  
+import com.bsth.Application;
 import com.bsth.entity.Line;
 import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.oplog.normal.OpLogger;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.LineService;
 import com.bsth.service.realcontrol.LineConfigService;
 import org.slf4j.Logger;
@@ -14,101 +15,151 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
  
 import java.util.*;
+import java.util.concurrent.TimeUnit;
  
 /**
- * 
+ * @author PanZhao
  * @ClassName: LineConfigData
  * @Description: TODO(线路配置数据管理)
- * @author PanZhao
  * @date 2016年8月15日 下午2:50:19
- *
  */
 @Component
 @Order(value = 2)
 public class LineConfigData implements CommandLineRunner {
-	
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	// 线路编码和配置
-	private Map<String, LineConfig> lineConfMap;
-
-	@Autowired
-	LineConfigService lineConfigService;
-	
-	@Autowired
-	LineService lineService;
-	
-	@Autowired
-	OpLogger opLog;
-
-	@Override
-	public void run(String... arg0) throws Exception {
-		lineConfMap = new HashMap<>();
-
-		Iterator<LineConfig> itr = lineConfigService.findAll().iterator();
-		while (itr.hasNext()) 
-			setBuffer(itr.next());
-		
-		opLog.info("Line_config_data");
-	}
-	
-	public LineConfig get(String lineCode){
-		return lineConfMap.get(lineCode);
-	}
-	
-	public Collection<LineConfig> getAll(){
-		return lineConfMap.values();
-	}
-	
-	public void set(LineConfig conf){
-		lineConfigService.save(conf);
-		setBuffer(conf);
-	}
-	
-	public void setBuffer(LineConfig conf){
-		lineConfMap.put(conf.getLine().getLineCode(), conf);
-	}
-
-	/**
-	 * 
-	 * @Title: init 
-	 * @Description: TODO(初始化配置信息) 
-	 */
-	public void init(String lineCode) throws Exception{
-		LineConfig conf = new LineConfig();
-		//线路
-		Line line = lineService.findByLineCode(lineCode);
-		if(null == line)
-			throw new NullPointerException("异常的lineCode");
-		
-		conf.setLine(line);
-		//开始运营时间
-		conf.setStartOpt("02:00");
-		//托管状态
-		conf.setTrust(true);
-		//出场时间类型
-		conf.setOutConfig(0);
-		//进场时间类型
-		//conf.setInConfig(1);
-		//短语模板
-		conf.setPhraseTemps("");
-		//调度指令模板 
-		conf.setSchDirectiveTemp("");
-		
-		//80指令回复
-		D80ReplyTemp t50 = new D80ReplyTemp(conf, (short)0x50, "同意，回电详谈", "不同意，请回电")
-				,t60 =  new D80ReplyTemp(conf, (short)0x60, "同意，回电详谈", "不同意，请回电")
-				,tA2 = new D80ReplyTemp(conf, (short)0xA2, "同意，回电详谈", "不同意，请回电")
-				,t70 = new D80ReplyTemp(conf, (short)0x70, "同意，回电详谈", "不同意，请回电")
-				,t11 = new D80ReplyTemp(conf, (short)0x11, "同意，回电详谈", "不同意，请回电");
-		
-		Set<D80ReplyTemp> temps = conf.getD80Temps();
-		temps.add(t50);
-		temps.add(t60);
-		temps.add(tA2);
-		temps.add(t70);
-		temps.add(t11);
-		
-		set(conf);
-	}
+
+    static Logger logger = LoggerFactory.getLogger(LineConfigData.class);
+
+    // 线路编码和配置
+    private Map<String, LineConfig> lineConfMap;
+
+    @Autowired
+    LineConfigService lineConfigService;
+
+    @Autowired
+    LineService lineService;
+
+    //入库缓冲
+    static LinkedList<LineConfig> saveBuffers = new LinkedList<>();
+
+    @Autowired
+    LineConfigPersistThread configPersistThread;
+
+    @Override
+    public void run(String... arg0) throws Exception {
+        lineConfMap = new HashMap<>();
+
+        Iterator<LineConfig> itr = lineConfigService.findAll().iterator();
+        while (itr.hasNext())
+            setBuffer(itr.next());
+
+        //异步入库
+        Application.mainServices.scheduleWithFixedDelay(configPersistThread, 60, 60, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 起点发出，应用缓冲区设置参数
+     * @param sch
+     * @param timestamp
+     * @return
+     */
+    public long applyOut(ScheduleRealInfo sch, Long timestamp) {
+        LineConfig config = lineConfMap.get(sch.getXlBm());
+        int diff = sch.getXlDir()=="0"?config.getUpOutDiff():config.getDownOutDiff();
+        return timestamp - (diff * 1000);
+    }
+
+    /**
+     * 终点到达，应用缓冲区设置参数
+     * @param sch
+     * @param timestamp
+     * @return
+     */
+    public long applyIn(ScheduleRealInfo sch, Long timestamp){
+        LineConfig config = lineConfMap.get(sch.getXlBm());
+        int diff = sch.getXlDir()=="0"?config.getUpInDiff():config.getDownInDiff();
+        return timestamp - (diff * 1000);
+    }
+
+    @Component
+    private static class LineConfigPersistThread extends Thread {
+
+        @Autowired
+        LineConfigService lineConfigService;
+
+        @Override
+        public void run() {
+            LineConfig config;
+            for (int i = 0; i < 800; i++) {
+                config = saveBuffers.poll();
+                if (config == null)
+                    break;
+
+                try {
+                    lineConfigService.save(config);
+                }catch (Exception e){
+                    logger.error("", e);
+                }
+            }
+        }
+    }
+
+    public LineConfig get(String lineCode) {
+        return lineConfMap.get(lineCode);
+    }
+
+    public Collection<LineConfig> getAll() {
+        return lineConfMap.values();
+    }
+
+    public void set(LineConfig conf) {
+        //lineConfigService.save(conf);
+        saveBuffers.add(conf);
+        setBuffer(conf);
+    }
+
+    public void setBuffer(LineConfig conf) {
+        lineConfMap.put(conf.getLine().getLineCode(), conf);
+    }
+
+    /**
+     * @Title: init
+     * @Description: TODO(初始化配置信息)
+     */
+    public void init(String lineCode) throws Exception {
+        LineConfig conf = new LineConfig();
+        //线路
+        Line line = lineService.findByLineCode(lineCode);
+        if (null == line)
+            throw new NullPointerException("异常的lineCode");
+
+        conf.setLine(line);
+        //开始运营时间
+        conf.setStartOpt("02:00");
+        //托管状态
+        conf.setTrust(true);
+        //出场时间类型
+        conf.setOutConfig(0);
+        //进场时间类型
+        //conf.setInConfig(1);
+        //短语模板
+        conf.setPhraseTemps("");
+        //调度指令模板
+        conf.setSchDirectiveTemp("");
+
+        //80指令回复  闵行用
+        D80ReplyTemp t50 = new D80ReplyTemp(conf, (short) 0x50, "同意，回电详谈", "不同意，请回电"), t60 = new D80ReplyTemp(conf, (short) 0x60, "同意，回电详谈", "不同意，请回电"), tA2 = new D80ReplyTemp(conf, (short) 0xA2, "同意，回电详谈", "不同意，请回电"), t70 = new D80ReplyTemp(conf, (short) 0x70, "同意，回电详谈", "不同意，请回电"), t11 = new D80ReplyTemp(conf, (short) 0x11, "同意，回电详谈", "不同意，请回电");
+
+        //应急停靠默认值
+        conf.setYjtkStart("00:00");
+        conf.setYjtkEnd("23:59");
+
+        Set<D80ReplyTemp> temps = conf.getD80Temps();
+        temps.add(t50);
+        temps.add(t60);
+        temps.add(tA2);
+        temps.add(t70);
+        temps.add(t11);
+
+        set(conf);
+    }
 }
@@ -6,6 +6,9 @@ import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.directive.DirectiveService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
@@ -18,6 +21,10 @@ public class CorrectSignalHandle extends SignalHandle {
  
     @Autowired
     DayOfSchedule dayOfSchedule;
+    @Autowired
+    DirectiveService directiveService;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
  
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
@@ -41,6 +48,11 @@ public class CorrectSignalHandle extends SignalHandle {
             gps.setState(0);
         }
  
+        /*if(gps.getState() != 0){
+            logger.info(gps.getNbbm() + " 纠正状态到营运");
+            //切换到营运状态
+            directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "纠正@系统");
+        }*/
  
         return true;
     }
@@ -135,8 +135,11 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(StringUtils.isNotEmpty(sch.getFcsjActual()))
                 return;
  
+            //应用到离站缓冲区设置参数
+            long rsT = lineConfigData.applyOut(sch, gps.getTimestamp());
+
             //实发时间
-            sch.setFcsjActualAll(gps.getTimestamp());
+            sch.setFcsjActualAll(rsT);
             //通知客户端
             sendUtils.sendFcsj(sch);
             //持久化
@@ -215,7 +218,10 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(StringUtils.isNotEmpty(sch.getZdsjActual()))
                 return;
  
-            sch.setZdsjActualAll(gps.getTimestamp());
+            //应用到离站缓冲区设置参数
+            long rsT = lineConfigData.applyIn(sch, gps.getTimestamp());
+
+            sch.setZdsjActualAll(rsT);
             //已完成班次数
             int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
             ScheduleRealInfo next = dayOfSchedule.next(sch);
+package com.bsth.data.safe_driv;
+
+/**
+ * 安全驾驶
+ * Created by panzhao on 2017/4/6.
+ */
+public class SafeDriv {
+
+    /**
+     * 时间
+     * 2017-04-06 08:00:00.0
+     */
+    private String Startime;
+
+    /**
+     * 时间戳
+     */
+    private Long ts;
+
+    /**
+     * 设备编号
+     */
+    private String sbbh;
+
+    /**
+     * 线路名称
+     */
+    private String xlmc;
+
+    /**
+     * 车辆自编号
+     */
+    private String clzbh;
+
+    /**
+     * 车牌号
+     */
+    private String cph;
+
+    /**
+     * 检查属性
+     * 双脱手 0 单脱手 1 其他为0都是异常
+     */
+    private String jctype;
+
+    /**
+     * 异常种类
+     * 手部检测: 1
+     * 脸部检测: 5
+     * 摄像头检测: 2
+     * 安全带检测: 3
+     * 袖章检测: 4
+     */
+    private String yczltype;
+
+    @Override
+    public int hashCode() {
+        return ("safe_" + (this.getClzbh() + this.getStartime())).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        SafeDriv s2 = (SafeDriv)obj;
+        return (this.getClzbh() + this.getStartime()).equals(s2.getClzbh() + s2.getStartime());
+    }
+
+    public String getStartime() {
+        return Startime;
+    }
+
+    public void setStartime(String startime) {
+        Startime = startime;
+    }
+
+    public String getSbbh() {
+        return sbbh;
+    }
+
+    public void setSbbh(String sbbh) {
+        this.sbbh = sbbh;
+    }
+
+    public String getXlmc() {
+        return xlmc;
+    }
+
+    public void setXlmc(String xlmc) {
+        this.xlmc = xlmc;
+    }
+
+    public String getClzbh() {
+        return clzbh;
+    }
+
+    public void setClzbh(String clzbh) {
+        this.clzbh = clzbh;
+    }
+
+    public String getCph() {
+        return cph;
+    }
+
+    public void setCph(String cph) {
+        this.cph = cph;
+    }
+
+    public String getJctype() {
+        return jctype;
+    }
+
+    public void setJctype(String jctype) {
+        this.jctype = jctype;
+    }
+
+    public String getYczltype() {
+        return yczltype;
+    }
+
+    public void setYczltype(String yczltype) {
+        this.yczltype = yczltype;
+    }
+
+    public Long getTs() {
+        return ts;
+    }
+
+    public void setTs(Long ts) {
+        this.ts = ts;
+    }
+}
+package com.bsth.data.safe_driv;
+
+import com.bsth.Application;
+import com.bsth.websocket.handler.SendUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 安全驾驶
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware {
+
+    private static Set<SafeDriv> data;
+
+    @Autowired
+    SafeDrivDataLoadThread safeDrivDataLoadThread;
+
+    static SendUtils sendUtils;
+
+    /**
+     * 车辆自编号 和 最新一条数据对照
+     */
+    private static Map<String, SafeDriv> safeMap;
+
+    static {
+        data = new HashSet<>();
+        safeMap = new HashMap<>();
+    }
+
+    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
+    public static void put(SafeDriv sd){
+        sd.setTs(fmt.parseMillis(sd.getStartime()));
+        data.add(sd);
+
+        if(sd.getYczltype().indexOf("A") == -1)
+            sd.setYczltype("A" + sd.getYczltype());
+
+        SafeDriv old = safeMap.get(sd.getClzbh());
+        if(old == null || sd.getTs() > old.getTs()){
+            //通知客户端
+            sendUtils.sendSafeDriv(sd);
+        }
+
+        safeMap.put(sd.getClzbh(), sd);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        //定时加载安全驾驶数据
+        Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 5, TimeUnit.SECONDS);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        sendUtils = applicationContext.getBean(SendUtils.class);
+    }
+}
+package com.bsth.data.safe_driv;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.List;
+
+/**
+ * 安全驾驶数据加载线程
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivDataLoadThread extends Thread{
+
+    private final static String url = "http://180.166.5.82:9988//bsth-safedriving/Crlcxb/realtimeInterface.do";
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        List<SafeDriv> list = null;
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpGet get = new HttpGet(url);
+
+            response = httpClient.execute(get);
+
+            HttpEntity entity = response.getEntity();
+            if (null != entity) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                StringBuffer stringBuffer = new StringBuffer();
+                String str = "";
+                while ((str = br.readLine()) != null)
+                    stringBuffer.append(str);
+
+
+                list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
+                /**
+                 * 模拟数据
+
+                SafeDriv sd1 = new SafeDriv();
+                sd1.setYczltype("1");
+                sd1.setClzbh("W2B-001");
+                sd1.setStartime("2017-04-07 08:00:00.0");
+
+                SafeDriv sd2 = new SafeDriv();
+                sd2.setYczltype("2");
+                sd2.setClzbh("W2B-002");
+                sd2.setStartime("2017-04-07 08:02:00.0");
+
+                SafeDriv sd3 = new SafeDriv();
+                sd3.setYczltype("3");
+                sd3.setClzbh("W2B-003");
+                sd3.setStartime("2017-04-07 08:03:00.0");
+
+                SafeDriv sd4 = new SafeDriv();
+                sd4.setYczltype("4");
+                sd4.setClzbh("W2B-004");
+                sd4.setStartime("2017-04-07 08:04:00.0");
+
+                SafeDriv sd5 = new SafeDriv();
+                sd5.setYczltype("5");
+                sd5.setClzbh("W2B-005");
+                sd5.setStartime("2017-04-07 08:05:00.0");
+
+                list.add(sd1);
+                list.add(sd2);
+                list.add(sd3);
+                list.add(sd4);
+                list.add(sd5);
+                 */
+                for(SafeDriv sd : list){
+                    SafeDrivCenter.put(sd);
+                }
+            }
+
+            httpClient.close();
+            response.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+}
@@ -3,6 +3,7 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DirectivesPstThread;
@@ -18,7 +19,6 @@ 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;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -56,7 +56,7 @@ public class DayOfSchedule implements CommandLineRunner {
     private static Map<Long, ScheduleRealInfo> id2SchedulMap;
  
     // 车辆和排班起终点站对照（包括进出的停车场，区间起终点）
-    private static TreeMultimap<String, String> nbbm2SEStationMap;
+    //private static TreeMultimap<String, String> nbbm2SEStationMap;
  
     //车辆 ——> 当前执行班次
     private static Map<String, ScheduleRealInfo> carExecutePlanMap;
@@ -99,7 +99,7 @@ public class DayOfSchedule implements CommandLineRunner {
         pstBuffer = new LinkedList<>();
         schFCSJComparator = new ScheduleComparator.FCSJ();
         currSchDateMap = new HashMap<>();
-        nbbm2SEStationMap = TreeMultimap.create();
+        //nbbm2SEStationMap = TreeMultimap.create();
         carExecutePlanMap = new HashMap<>();
  
         schedulePlanMap = new HashMap<>();
@@ -244,6 +244,10 @@ public class DayOfSchedule implements CommandLineRunner {
         return 0;
     }
  
+    public int reloadSch(String lineCode){
+        return reloadSch(lineCode, calcSchDate(lineCode), true);
+    }
+
     /**
      * @Title: searchAllCars
      * @Description: TODO(搜索班次集合中的车辆)
@@ -480,9 +484,9 @@ public class DayOfSchedule implements CommandLineRunner {
         return id2SchedulMap.get(id);
     }
  
-    public Set<String> getSEStationList(String nbbm) {
+   /* public Set<String> getSEStationList(String nbbm) {
         return nbbm2SEStationMap.get(nbbm);
-    }
+    }*/
  
     /**
      * @Title: next
@@ -610,8 +614,8 @@ public class DayOfSchedule implements CommandLineRunner {
  
         String nbbm = sch.getClZbh();
         nbbmScheduleMap.put(nbbm, sch);
-        nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
-        nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
+        //nbbm2SEStationMap.put(nbbm, sch.getQdzCode());
+        //nbbm2SEStationMap.put(nbbm, sch.getZdzCode());
  
         //主键索引
         id2SchedulMap.put(sch.getId(), sch);
@@ -630,9 +634,6 @@ public class DayOfSchedule implements CommandLineRunner {
         //return sch;
     }
  
-//	public void calcQdzTimePlan(String nbbm){
-//		schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-//	}
  
     public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
         Collections.sort(nbbmScheduleMap.get(nbbm), schFCSJComparator);
@@ -640,27 +641,6 @@ public class DayOfSchedule implements CommandLineRunner {
     }
  
     /**
-     *
-     * @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(已完成班次总数)
      */
@@ -828,8 +808,8 @@ public class DayOfSchedule implements CommandLineRunner {
  
         sch.setClZbh(newClZbh);
         nbbmScheduleMap.put(newClZbh, sch);
-        nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
-        nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
+        //nbbm2SEStationMap.put(newClZbh, sch.getQdzCode());
+        //nbbm2SEStationMap.put(newClZbh, sch.getZdzCode());
  
         //重新计算班次应到时间
         ups.addAll(updateQdzTimePlan(oldClzbh));
@@ -876,43 +856,50 @@ public class DayOfSchedule implements CommandLineRunner {
     }
  
     /**
-     * 获取班次的计划停站时间
-     * @param sch
+     * 删除实际排班
+     * @param lineCode
      * @return
+     */
+    public Map<String, Object> deleteRealSchedule(String lineCode) {
+        Map<String, Object> rs = new HashMap<>();
  
-    public int stopTimePlan(Object task) {
+        try {
+            String rq = currSchDateMap.get(lineCode);
+            if(StringUtils.isNotEmpty(rq)){
+                //解除gps 和班次之间的关联
+                List<ScheduleRealInfo> unions = calcUnion(findByLineCode(lineCode), carExecutePlanMap.values());
+                for(ScheduleRealInfo sch : unions){
+                    removeExecPlan(sch.getClZbh());
+                }
  
-    ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
+                //删除班次数据
+                removeRealSch(lineCode, rq);
+                //删除相关班次修正记录
+            }
+            rs.put("status", ResponseCode.SUCCESS);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
  
-    sch.getzdsj
-    return -1;
-    }*/
+        return rs;
+    }
  
     /**
+     * 计算并集
      *
-     * @Title: linkToSchPlan
-     * @Description: TODO(车辆关联到班次)
+     * @param all
+     * @param sub
+     * @return
      */
-/*	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;
-		}
-	}*/
+    public List<ScheduleRealInfo> calcUnion(Collection<ScheduleRealInfo> c1, Collection<ScheduleRealInfo> c2) {
+        List<ScheduleRealInfo> rs = new ArrayList<>();
+
+        for (ScheduleRealInfo sch : c1) {
+            if(c2.contains(sch)){
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
 }
 \ No newline at end of file
@@ -2,7 +2,6 @@ package com.bsth.data.schedule.thread;
  
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.arrival.ArrivalData_GPS;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
@@ -29,8 +28,8 @@ public class ScheduleRefreshThread extends Thread{
 	@Autowired
 	DayOfSchedule dayOfSchedule;
  
-	@Autowired
-	ArrivalData_GPS arrivalData;
+	/*@Autowired
+	ArrivalData_GPS arrivalData;*/
  
 	@Autowired
 	LineConfigData lineConfs;
@@ -59,7 +58,7 @@ public class ScheduleRefreshThread extends Thread{
  
 					logger.info(lineCode + "开始翻班， " + currSchDate);
 					//清除进出站数据
-					arrivalData.clearRAMData(lineCode);
+					//arrivalData.clearRAMData(lineCode);
 					//清除指令数据
 					Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
 					for(String car : cars)
@@ -55,7 +55,7 @@ public class Dlb {
 	private Date edittime;
 	private Date createtime;
 	private int nylx;
-	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
+	//进场顺序（根据最先出场和最后进场来关联车辆的存电量）
 	private int jcsx;
  
 	@Transient
@@ -50,6 +50,9 @@ public class LineConfig {
 	/** 出站既出场 对应的停车场 */
 	private String twinsPark;
  
+	/** 出站既出场 对应的起点站 */
+	private String twinsStation;
+
 	/** 短语模板 , 号分隔多个 */
 	private String phraseTemps;
  
@@ -75,6 +78,15 @@ public class LineConfig {
 	//下行出站
 	private int downOutDiff;
  
+	/**
+	 * 应急停靠
+	 */
+	private boolean enableYjtk;
+	private String yjtkStart;
+	private String yjtkEnd;
+	private int upStopMinute;
+	private int downStopMinute;
+
  
 	@OneToMany(cascade = CascadeType.ALL)
 	private Set<D80ReplyTemp> d80Temps = new HashSet<>();
@@ -219,4 +231,52 @@ public class LineConfig {
 	public void setTwinsPark(String twinsPark) {
 		this.twinsPark = twinsPark;
 	}
+
+	public String getYjtkStart() {
+		return yjtkStart;
+	}
+
+	public void setYjtkStart(String yjtkStart) {
+		this.yjtkStart = yjtkStart;
+	}
+
+	public String getYjtkEnd() {
+		return yjtkEnd;
+	}
+
+	public void setYjtkEnd(String yjtkEnd) {
+		this.yjtkEnd = yjtkEnd;
+	}
+
+	public int getUpStopMinute() {
+		return upStopMinute;
+	}
+
+	public void setUpStopMinute(int upStopMinute) {
+		this.upStopMinute = upStopMinute;
+	}
+
+	public int getDownStopMinute() {
+		return downStopMinute;
+	}
+
+	public void setDownStopMinute(int downStopMinute) {
+		this.downStopMinute = downStopMinute;
+	}
+
+	public boolean isEnableYjtk() {
+		return enableYjtk;
+	}
+
+	public void setEnableYjtk(boolean enableYjtk) {
+		this.enableYjtk = enableYjtk;
+	}
+
+	public String getTwinsStation() {
+		return twinsStation;
+	}
+
+	public void setTwinsStation(String twinsStation) {
+		this.twinsStation = twinsStation;
+	}
 }
@@ -41,6 +41,13 @@ public class SchedulePlan extends BEntity {
     /** 使用的时刻表id列表（用逗号连接） */
     private String ttInfoIds;
  
+    /** 是否 排班计划优先 */
+    private Boolean isHistoryPlanFirst;
+
+    /** 每次排班的结果数据（错误，正确提示都在这里） */
+    @Column(length = 2000)
+    private String planResult;
+
     @JsonIgnore
     /** 使用中间表的一对多关联 明细信息 */
     @OneToMany(mappedBy = "schedulePlan", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@@ -101,4 +108,20 @@ public class SchedulePlan extends BEntity {
     public void setTtInfoIds(String ttInfoIds) {
         this.ttInfoIds = ttInfoIds;
     }
+
+    public Boolean getIsHistoryPlanFirst() {
+        return isHistoryPlanFirst;
+    }
+
+    public void setIsHistoryPlanFirst(Boolean isHistoryPlanFirst) {
+        this.isHistoryPlanFirst = isHistoryPlanFirst;
+    }
+
+    public String getPlanResult() {
+        return planResult;
+    }
+
+    public void setPlanResult(String planResult) {
+        this.planResult = planResult;
+    }
 }
-package com.bsth.entity.schedule.temp;
-
-import com.bsth.entity.schedule.SchedulePlan;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-
-/**
- * 排班的中间结果数据，记录每次排班后规则的变化。
- */
-@Entity
-@Table(name = "bsth_c_s_sp_rule_rst")
-public class SchedulePlanRuleResult {
-    /** 主键Id */
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    /** 线路id */
-    private String xlId;
-    /** 线路名字 */
-    private String xlName;
-
-    /** 排班规则id */
-    private String ruleId;
-    /** 车辆配置id */
-    private String ccId;
-    /** 车辆自编号 */
-    private String ccZbh;
-
-    /** 路牌id列表字符串 */
-    private String gids;
-    /** 路牌名字列表字符串 */
-    private String gnames;
-    /** 翻到哪个路牌索引 */
-    private String gidindex;
-    /** 人员配置id列表字符串 */
-    private String ecids;
-    /** 人员配置搭班编码列表字符串 */
-    private String ecdbbms;
-    /** 翻到哪个人员配置索引 */
-    private String ecindex;
-
-    /** 时刻表id */
-    private String ttinfoId;
-    /** 时刻表名字 */
-    private String ttinfoName;
-
-    /** 排班日期 */
-    private Date scheduleDate;
-
-    /** 操作人员id */
-    private String sysuserId;
-    /** 操作人员姓名 */
-    private String sysuserName;
-    /** 操作时间 */
-    private Date createDate;
-
-    public SchedulePlanRuleResult() {
-
-    }
-    public SchedulePlanRuleResult(SchedulePlan schedulePlan) {
-        this.sysuserId = schedulePlan.getCreateBy().getId().toString();
-        this.sysuserName = schedulePlan.getCreateBy().getName();
-//        this.createDate = schedulePlan.getCreateDate();
-        this.createDate = new Date();
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(String ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public String getCcId() {
-        return ccId;
-    }
-
-    public void setCcId(String ccId) {
-        this.ccId = ccId;
-    }
-
-    public String getCcZbh() {
-        return ccZbh;
-    }
-
-    public void setCcZbh(String ccZbh) {
-        this.ccZbh = ccZbh;
-    }
-
-    public String getGids() {
-        return gids;
-    }
-
-    public void setGids(String gids) {
-        this.gids = gids;
-    }
-
-    public String getGnames() {
-        return gnames;
-    }
-
-    public void setGnames(String gnames) {
-        this.gnames = gnames;
-    }
-
-    public String getGidindex() {
-        return gidindex;
-    }
-
-    public void setGidindex(String gidindex) {
-        this.gidindex = gidindex;
-    }
-
-    public String getEcids() {
-        return ecids;
-    }
-
-    public void setEcids(String ecids) {
-        this.ecids = ecids;
-    }
-
-    public String getEcdbbms() {
-        return ecdbbms;
-    }
-
-    public void setEcdbbms(String ecdbbms) {
-        this.ecdbbms = ecdbbms;
-    }
-
-    public String getEcindex() {
-        return ecindex;
-    }
-
-    public void setEcindex(String ecindex) {
-        this.ecindex = ecindex;
-    }
-
-    public Date getScheduleDate() {
-        return scheduleDate;
-    }
-
-    public void setScheduleDate(Date scheduleDate) {
-        this.scheduleDate = scheduleDate;
-    }
-
-    public String getSysuserId() {
-        return sysuserId;
-    }
-
-    public void setSysuserId(String sysuserId) {
-        this.sysuserId = sysuserId;
-    }
-
-    public String getSysuserName() {
-        return sysuserName;
-    }
-
-    public void setSysuserName(String sysuserName) {
-        this.sysuserName = sysuserName;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getXlId() {
-        return xlId;
-    }
-
-    public void setXlId(String xlId) {
-        this.xlId = xlId;
-    }
-
-    public String getXlName() {
-        return xlName;
-    }
-
-    public void setXlName(String xlName) {
-        this.xlName = xlName;
-    }
-
-    public String getTtinfoId() {
-        return ttinfoId;
-    }
-
-    public void setTtinfoId(String ttinfoId) {
-        this.ttinfoId = ttinfoId;
-    }
-
-    public String getTtinfoName() {
-        return ttinfoName;
-    }
-
-    public void setTtinfoName(String ttinfoName) {
-        this.ttinfoName = ttinfoName;
-    }
-}
+package com.bsth.entity.schedule.temp;
+
+import com.bsth.entity.schedule.SchedulePlan;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * 排班的中间结果数据，记录每次排班后规则的变化。
+ */
+@Entity
+@Table(name = "bsth_c_s_sp_rule_rst")
+public class SchedulePlanRuleResult {
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 线路id */
+    private String xlId;
+    /** 线路名字 */
+    private String xlName;
+
+    /** 排班规则id */
+    private String ruleId;
+    /** 车辆配置id */
+    private String ccId;
+    /** 车辆自编号 */
+    private String ccZbh;
+
+    /** 路牌id列表字符串 */
+    private String gids;
+    /** 路牌名字列表字符串 */
+    private String gnames;
+    /** 翻到哪个路牌索引 */
+    private String gidindex;
+    /** 人员配置id列表字符串 */
+    private String ecids;
+    /** 人员配置搭班编码列表字符串 */
+    private String ecdbbms;
+    /** 翻到哪个人员配置索引 */
+    private String ecindex;
+
+    /** 时刻表id */
+    private String ttinfoId;
+    /** 时刻表名字 */
+    private String ttinfoName;
+
+    /** 排班日期 */
+    private Date scheduleDate;
+
+    /** 操作人员id */
+    private String sysuserId;
+    /** 操作人员姓名 */
+    private String sysuserName;
+    /** 操作时间 */
+    private Date createDate;
+
+    public SchedulePlanRuleResult() {
+
+    }
+    public SchedulePlanRuleResult(SchedulePlan schedulePlan) {
+        this.sysuserId = schedulePlan.getCreateBy().getId().toString();
+        this.sysuserName = schedulePlan.getCreateBy().getName();
+//        this.createDate = schedulePlan.getCreateDate();
+        this.createDate = new Date();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(String ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public String getCcId() {
+        return ccId;
+    }
+
+    public void setCcId(String ccId) {
+        this.ccId = ccId;
+    }
+
+    public String getCcZbh() {
+        return ccZbh;
+    }
+
+    public void setCcZbh(String ccZbh) {
+        this.ccZbh = ccZbh;
+    }
+
+    public String getGids() {
+        return gids;
+    }
+
+    public void setGids(String gids) {
+        this.gids = gids;
+    }
+
+    public String getGnames() {
+        return gnames;
+    }
+
+    public void setGnames(String gnames) {
+        this.gnames = gnames;
+    }
+
+    public String getGidindex() {
+        return gidindex;
+    }
+
+    public void setGidindex(String gidindex) {
+        this.gidindex = gidindex;
+    }
+
+    public String getEcids() {
+        return ecids;
+    }
+
+    public void setEcids(String ecids) {
+        this.ecids = ecids;
+    }
+
+    public String getEcdbbms() {
+        return ecdbbms;
+    }
+
+    public void setEcdbbms(String ecdbbms) {
+        this.ecdbbms = ecdbbms;
+    }
+
+    public String getEcindex() {
+        return ecindex;
+    }
+
+    public void setEcindex(String ecindex) {
+        this.ecindex = ecindex;
+    }
+
+    public Date getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(Date scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public String getSysuserId() {
+        return sysuserId;
+    }
+
+    public void setSysuserId(String sysuserId) {
+        this.sysuserId = sysuserId;
+    }
+
+    public String getSysuserName() {
+        return sysuserName;
+    }
+
+    public void setSysuserName(String sysuserName) {
+        this.sysuserName = sysuserName;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getTtinfoId() {
+        return ttinfoId;
+    }
+
+    public void setTtinfoId(String ttinfoId) {
+        this.ttinfoId = ttinfoId;
+    }
+
+    public String getTtinfoName() {
+        return ttinfoName;
+    }
+
+    public void setTtinfoName(String ttinfoName) {
+        this.ttinfoName = ttinfoName;
+    }
+}
@@ -113,5 +113,4 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 							  Double speedLimit,String descriptions,Integer version,Integer createBy,String createDate,
  
 							  Integer updateBy,String updateDate);
-	
 }
@@ -28,6 +28,14 @@ import com.bsth.entity.SectionRoute;
 @Repository
 public interface SectionRouteRepository extends BaseRepository<SectionRoute, Integer> {
  
+	// 查询最大ID
+	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_sectionroute) k" , nativeQuery=true)
+	public long sectionRouteMaxId();
+	
+	// 查询最大ID
+	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(sectionroute_code) as num FROM bsth_c_sectionroute where line_code = 601010 and directions = 1 and destroy = 0) k" , nativeQuery=true)
+	public int sectionRouteCodeMaxId();
+	
 	/**
 	 * @Description :TODO(查询路段信息)
 	 * 
@@ -162,4 +170,8 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
     @Modifying 
 	@Query(value="UPDATE bsth_c_sectionroute set is_roade_speed = ?1  where line= ?2 and directions=?3 ",nativeQuery = true)
 	void isRoadSpeedUpd(Integer isR,Integer line,Integer directions);
+	
+    @Modifying
+    @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
+	public void sectionRouteDir(Integer line);
 }
@@ -268,4 +268,12 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			"ORDER BY " +
 			"lineCode,directions,stationRouteCode")
 	List<Object[]> findAllLineWithYgc();
+	
+    @Modifying
+    @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1 ", nativeQuery=true)
+	public void stationRouteDir(Integer line);
+    
+    @Modifying
+    @Query(value="update bsth_c_stationroute set distances =?2 where id = ?1 ", nativeQuery=true)
+	public void upddis(Integer id,Double dis);
 }
@@ -22,8 +22,9 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_dlb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_dlb b where a.nbbm=b.nbbm and "
-			+ " to_days(?1)-to_days(b.rq)=1 )",nativeQuery=true)
-	List<Dlb> obtainYlbefore(String rq);
+			+ " to_days(?1)-to_days(b.rq)=1 )  and ssgsdm like %?2%  and fgsdm like %?3% and "
+			+ " xlbm like %?4% and nbbm like %?5%",nativeQuery=true)
+	List<Dlb> obtainYlbefore(String rq,String gsdm,String fgsdm,String xlbm,String nbbm);
 	/**
 	 * 当天DLB信息
 	 * @param rq
@@ -31,7 +32,77 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?)=to_days(rq)",nativeQuery=true)
-	List<Dlb> obtainDl(String rq);
+	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc",nativeQuery=true)
+	List<Dlb> obtainDl(String rq,String gsbm,String fgsdm,String xlbm,String nbbm,String px);
+	
+	@Query(value="select s from Dlb s "
+			+ " where to_days(?1)=to_days(s.rq) "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 order by nbbm,jcsx")
+	List<Dlb> listDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	
+	/**
+	 * 
+	 * @param nbbm
+	 * @param rq
+	 * @param xlbm
+	 * @return
+	 */
+	@Transactional
+	@Modifying
+	@Query(value="select nbbm,count(nbbm) from bsth_c_dlb where to_days(?1)=to_days(rq) and "
+			+ " ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm like %?4%  and nbbm  like %?5% "
+			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
+	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	@Transactional
+	@Modifying
+	@Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where to_days(?1)=to_days(rq) and "
+			+ " ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm like %?4%  and nbbm  like %?5% "
+			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
+	List<Object[]> checkNbmmDl(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	
+
+	@Query(value="select cdl,hd,sh from Dlb s "
+			+ " where to_days(?1)=to_days(s.rq)  "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 ")
+	List<Object[]> sumDlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+	
+	@Transactional
+	@Modifying
+	@Query(value="select ifnull(cdl,0),ifnull(hd,0),ifnull(sh,0) from bsth_c_dlb "
+			+ " where to_days(?1)=to_days(rq) "
+			+ " and ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm like %?4% "
+			+ " and nbbm like %?5%",nativeQuery=true)
+	List<Object[]> sumDlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_dlb SET " +
+				" czcd= ?2,"+
+				" jzcd = ?3, " +
+				" hd = ?4,"+
+				" sh = ?5," +
+				" shyy = ?6," +
+				" yhlx = ?7"+
+				" WHERE id = ?1", nativeQuery=true)
+	public void dlbUpdate(Integer id,double czcd,double jzcd,double hd, double sh,String shyy,int yhlx);
+	
  
 }
@@ -137,7 +137,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
  
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
  
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -151,8 +151,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
  
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
-	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2);
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') and gsBm like %?4% and fgsBm like %?5% order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2,String gsdm,String fgsdm);
  
 	//按照时间段统计
 		@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
-package com.bsth.repository.schedule;
-
-import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
-import com.bsth.repository.BaseRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by xu on 17/3/29.
- */
-@Repository
-public interface SchedulePlanRuleResultRepository extends BaseRepository<SchedulePlanRuleResult, Long> {
-
-    @Query("select t from SchedulePlanRuleResult t " +
-            "where not exists (select 1 from SchedulePlanRuleResult " +
-            "where createDate > t.createDate and scheduleDate < ?2 ) " +
-            "and t.xlId = ?1 and t.scheduleDate < ?2")
-    List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from);
-
-//    @Modifying
-//    @Query("delete from SchedulePlanRuleResult t " +
-//            "where t.xlId = ?1 and t.scheduleDate >= ?2 and t.scheduleDate <= ?3")
-//    void deleteByXlAndDate(String xlid, Date from, Date to);
-}
+package com.bsth.repository.schedule;
+
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by xu on 17/3/29.
+ */
+@Repository
+public interface SchedulePlanRuleResultRepository extends BaseRepository<SchedulePlanRuleResult, Long> {
+
+    @Query("select t from SchedulePlanRuleResult t " +
+            "where not exists (select 1 from SchedulePlanRuleResult " +
+            "where createDate > t.createDate and scheduleDate < ?2 ) " +
+            "and t.xlId = ?1 and t.scheduleDate < ?2")
+    List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from);
+
+//    @Modifying
+//    @Query("delete from SchedulePlanRuleResult t " +
+//            "where t.xlId = ?1 and t.scheduleDate >= ?2 and t.scheduleDate <= ?3")
+//    void deleteByXlAndDate(String xlid, Date from, Date to);
+}
@@ -51,5 +51,7 @@ public interface TTInfoDetailRepository extends BaseRepository&lt;TTInfoDetail, Lon
     @Query(value = "delete from TTInfoDetail t where t.ttinfo.id = ?1")
     void deleteByTtinfoIdWithModify(Long ttinfoid);
  
-
+    @Modifying
+    @Query(value = "delete from TTInfoDetail t where t.xl.id=?1 and t.ttinfo.id = ?2")
+    void deltidc(int xl , Long ttinfoid );
 }
@@ -13,7 +13,7 @@ import java.util.List;
 @Repository
 public interface DutyEmployeeRepository extends BaseRepository<DutyEmployee, Long>{
  
-    //@Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
-    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts < ?2")
-    List<DutyEmployee> findByLineAndTime(String lineCode, long et);
+    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
+    //@Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts < ?2")
+    List<DutyEmployee> findByLineAndTime(String lineCode, long st,  long et);
 }
@@ -41,4 +41,6 @@ public interface SectionRouteService extends BaseService&lt;SectionRoute, Integer&gt; 
 	 * @return List<Map<String, Object>> 
 	 */
 	 List<Map<String, Object>> findUpSectionRouteCode(Map<String, Object> map);
+	 
+	 Map<String, Object> quoteSection(Map<String, Object> map);
 }
@@ -79,5 +79,9 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	  */
 	 List<Map<String, Object>> findStationRouteInfo(Map<String, Object> map);
  
-	Map<String, Object> findByMultiLine(String lineIds);
+	 Map<String, Object> findByMultiLine(String lineIds);
+	 
+	 Map<String, Object> updSwitchDir(String lineIds);
+	 
+	 Map<String, Object> upddis(Map<String, Object> map);
 }
@@ -731,22 +731,33 @@ public class FormsServiceImpl implements FormsService {
  
 	@Override
 	public List<Daily> daily(Map<String, Object> map) {
+		
+		String gsbm="";
+		if(map.get("gsdmDaily")!=null){
+			gsbm=map.get("gsdmDaily").toString();
+		}
+		
+		String fgsbm="";
+		if(map.get("fgsdmDaily").toString()!=null){
+			fgsbm=map.get("fgsdmDaily").toString();
+		}
+				
 		String sql="select t.schedule_date_str,"
 				+ " t.cl_zbh,t.j_gh,t.j_name,x.yh from (select  r.schedule_date_str,r.xl_bm,r.xl_name,"
 				+ " r.cl_zbh,r.j_gh,r.j_name from bsth_c_s_sp_info_real  r WHERE "
-				+ " r.xl_bm='" + map.get("line").toString() + "'  and to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"')  "
-				+ " and r.gs_bm like '%"+map.get("gsdmDaily").toString()+"%' "
-				+ " and r.fgs_bm like '%"+map.get("fgsdmDaily").toString()+"%'  "
+				+ " r.xl_bm='" + map.get("line").toString() + "'  "
+				+ " and to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"')  "
+				+ " and r.gs_bm like '%"+gsbm+"%' "
+				+ " and r.fgs_bm like '%"+fgsbm+"%'  "
 				+ " GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name) t"
 				+ " left join (select * from bsth_c_ylb y where "
 				+ " to_days(y.rq)=to_days('"+map.get("date").toString()+"') "
 				+ " and y.xlbm= '" + map.get("line").toString() + "'"
-				+ " and  y.ssgsdm like '%"+map.get("gsdmDaily").toString()+"%' "
-				+ " and y.fgsdm like '%"+map.get("fgsdmDaily").toString()+"%'"
+				+ " and  y.ssgsdm like '%"+gsbm+"%' "
+				+ " and y.fgsdm like '%"+fgsbm+"%'"
 				+ " ) x"
 				+ " on t.cl_zbh = x.nbbm ";
  
-		System.out.println(new Date());
 		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
 			@Override
 			public Daily mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -18,4 +18,6 @@ public interface GpsService {
     Map<String,Object> findRoadSpeed(String lineCode);
  
     Map<String,Object> gpsCompletion(long schId);
+
+	Map<String,Object> history_v2(String nbbm, long st, long et);
 }
@@ -5,11 +5,14 @@ import com.bsth.data.BasicData;
 import com.bsth.data.arrival.ArrivalEntity;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.gps.entity.HistoryGps_DTO;
+import com.bsth.service.gps.entity.Road_DTO;
 import com.bsth.util.DateUtils;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
@@ -235,6 +238,9 @@ public class GpsServiceImpl implements GpsService {
                 bdLoc = TransGPS.bd_encrypt(gdLoc);
                 map.put("bd_lon", bdLoc.getLng());
                 map.put("bd_lat", bdLoc.getLat());
+                //原始坐标
+                map.put("lon", lon);
+                map.put("lat", lat);
  
                 map.put("deviceId", rs.getString("DEVICE_ID"));
                 map.put("ts", rs.getLong("TS"));
@@ -510,6 +516,49 @@ public class GpsServiceImpl implements GpsService {
         return rs;
     }
  
+    @Override
+    public Map<String, Object> history_v2(String nbbm, long st, long et) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            //获取历史gps 数据
+            List<HistoryGps_DTO> list = HistoryGps_DTO.craete(history(new String[]{nbbm}, st, et));
+            if(list!=null && list.size() > 0){
+                //获取路段信息
+                String sql = "select ID, ST_AsText(GROAD_VECTOR) as GROAD_VECTOR,ROAD_CODE,ROAD_NAME,SPEED from bsth_c_road where road_code in(select section_code from bsth_c_sectionroute where line_code=? and destroy=0)";
+                List<Road_DTO> roads = Road_DTO.craete(jdbcTemplate.queryForList(sql, list.get(0).getLineId()));
+
+                //为GPS数据关联路段信息
+                for(HistoryGps_DTO gps : list){
+                    matchRoadToGps(gps, roads);
+                }
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+    private void matchRoadToGps(HistoryGps_DTO gps, List<Road_DTO> roads){
+        double min = -1,distance;
+        Road_DTO nearRoad = null;
+        for(Road_DTO road : roads){
+            distance = GeoUtils.getDistanceFromLine(road.getLineStr(), gps.getPoint());
+
+            if (min > distance || min == -1) {
+                min = distance;
+                nearRoad = road;
+            }
+        }
+
+        gps.setRoad(nearRoad);
+        gps.setRoadMinDistance(min);
+    }
+
     private void sortGpsList(final Field f, List<GpsEntity> rs) {
         Collections.sort(rs, new Comparator<GpsEntity>() {
  
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.arrival.ArrivalEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 历史GPS DTO
+ * Created by panzhao on 2017/4/5.
+ */
+public class HistoryGps_DTO {
+
+    public static List<HistoryGps_DTO> craete(List<Map<String, Object>> mapList){
+        List<HistoryGps_DTO> list = JSONObject.parseArray(JSON.toJSONString(mapList), HistoryGps_DTO.class);
+
+        GeometryFactory geometryFactory = new GeometryFactory();
+        Point point;
+        for(HistoryGps_DTO gps : list){
+            point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+            gps.setPoint(point);
+        }
+        return list;
+    }
+
+    private double gcj_lon;
+    private double gcj_lat;
+
+    private double bd_lon;
+    private double bd_lat;
+
+    private double lon;
+    private double lat;
+
+    private String deviceId;
+    private long ts;
+    private long timestamp;
+    private String stopNo;
+    private float direction;
+
+    private String lineId;
+    private float speed;
+    private ArrivalEntity inout_stop_info;
+    private int inout_stop;
+
+    private String nbbm;
+    private int state;
+    private int upDown;
+
+    @JsonIgnore
+    private Point point;
+
+    /** 路段 */
+    private Road_DTO road;
+    /** 和路段的最短距离 */
+    private double roadMinDistance;
+
+    public double getGcj_lon() {
+        return gcj_lon;
+    }
+
+    public void setGcj_lon(double gcj_lon) {
+        this.gcj_lon = gcj_lon;
+    }
+
+    public double getGcj_lat() {
+        return gcj_lat;
+    }
+
+    public void setGcj_lat(double gcj_lat) {
+        this.gcj_lat = gcj_lat;
+    }
+
+    public double getBd_lon() {
+        return bd_lon;
+    }
+
+    public void setBd_lon(double bd_lon) {
+        this.bd_lon = bd_lon;
+    }
+
+    public double getBd_lat() {
+        return bd_lat;
+    }
+
+    public void setBd_lat(double bd_lat) {
+        this.bd_lat = bd_lat;
+    }
+
+    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 long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getStopNo() {
+        return stopNo;
+    }
+
+    public void setStopNo(String stopNo) {
+        this.stopNo = stopNo;
+    }
+
+    public float getDirection() {
+        return direction;
+    }
+
+    public void setDirection(float direction) {
+        this.direction = direction;
+    }
+
+    public String getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(String lineId) {
+        this.lineId = lineId;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public ArrivalEntity getInout_stop_info() {
+        return inout_stop_info;
+    }
+
+    public void setInout_stop_info(ArrivalEntity inout_stop_info) {
+        this.inout_stop_info = inout_stop_info;
+    }
+
+    public int getInout_stop() {
+        return inout_stop;
+    }
+
+    public void setInout_stop(int inout_stop) {
+        this.inout_stop = inout_stop;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public Road_DTO getRoad() {
+        return road;
+    }
+
+    public void setRoad(Road_DTO road) {
+        this.road = road;
+    }
+
+    public double getRoadMinDistance() {
+        return roadMinDistance;
+    }
+
+    public void setRoadMinDistance(double roadMinDistance) {
+        this.roadMinDistance = roadMinDistance;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public void setLon(double lon) {
+        this.lon = lon;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+}
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 路段信息DTO
+ * Created by panzhao on 2017/4/5.
+ */
+public class Road_DTO {
+
+    public static List<Road_DTO> craete(List<Map<String, Object>> mapList){
+        List<Road_DTO> list = JSONObject.parseArray(JSON.toJSONString(mapList), Road_DTO.class);
+        //处理路段坐标
+        String polygonStr;
+        String[] coords;
+        int i, len;
+        String[] temps;//1, temps2;
+        List<Coordinate> cds;
+
+        GeometryFactory geometryFactory = new GeometryFactory();
+        for(Road_DTO road : list){
+            polygonStr = road.getGROAD_VECTOR();
+            coords = polygonStr.substring(11, polygonStr.length() - 1).split(",");
+            len = coords.length;
+
+            cds = new ArrayList<>();
+            //每2个点连一条线
+            for(i = 0; i < len; i ++){
+                temps = coords[i].split(" ");
+                cds.add(new Coordinate(Float.parseFloat(temps[1]), Float.parseFloat(temps[0])));
+            }
+
+            Coordinate[] cdsArray = new Coordinate[cds.size()];
+            road.setLineStr(geometryFactory.createLineString(cds.toArray(cdsArray)));
+        }
+        return list;
+    }
+
+    private long ID;
+
+    @JsonIgnore
+    private String GROAD_VECTOR;
+
+    private String ROAD_CODE;
+
+    private String ROAD_NAME;
+
+    private double SPEED;
+
+    @JsonIgnore
+    private LineString lineStr;
+
+    public long getID() {
+        return ID;
+    }
+
+    public void setID(long ID) {
+        this.ID = ID;
+    }
+
+    public String getGROAD_VECTOR() {
+        return GROAD_VECTOR;
+    }
+
+    public void setGROAD_VECTOR(String GROAD_VECTOR) {
+        this.GROAD_VECTOR = GROAD_VECTOR;
+    }
+
+    public String getROAD_CODE() {
+        return ROAD_CODE;
+    }
+
+    public void setROAD_CODE(String ROAD_CODE) {
+        this.ROAD_CODE = ROAD_CODE;
+    }
+
+    public String getROAD_NAME() {
+        return ROAD_NAME;
+    }
+
+    public void setROAD_NAME(String ROAD_NAME) {
+        this.ROAD_NAME = ROAD_NAME;
+    }
+
+    public double getSPEED() {
+        return SPEED;
+    }
+
+    public void setSPEED(double SPEED) {
+        this.SPEED = SPEED;
+    }
+
+    public LineString getLineStr() {
+        return lineStr;
+    }
+
+    public void setLineStr(LineString lineStr) {
+        this.lineStr = lineStr;
+    }
+}
@@ -8,7 +8,12 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.Line;
+import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.SectionRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.service.SectionRouteService;
  
@@ -34,6 +39,12 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	@Autowired
 	SectionRouteRepository repository;
  
+	@Autowired
+	SectionRepository repository2; 
+	
+	@Autowired
+	LineRepository lineRepository;
+	
 	/**
 	 * @Description :TODO(查询路段信息)
 	 * 
@@ -43,21 +54,13 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	 */
 	@Override
 	public List<Map<String, Object>> getSectionRoute(Map<String, Object> map) {
-		
 		int lineId = map.get("line.id_eq").equals("") ? 0 : Integer.parseInt(map.get("line.id_eq").toString());
-		
 		int directions = map.get("directions_eq").equals("") ? 0 : Integer.parseInt(map.get("directions_eq").toString());
-		
 		List<Object[]> listObjArray = repository.getSectionRoute(lineId, directions);
-		
 		List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>(); 
-		
 		if(listObjArray.size()>0) {
-			
 			for(int i = 0 ; i<listObjArray.size() ; i++){
-				
 				Map<String, Object> tempM = new HashMap<String, Object>();
-				
 				tempM.put("sectionrouteId",listObjArray.get(i)[0]);
 				tempM.put("sectionrouteLine",listObjArray.get(i)[1]);
 				tempM.put("sectionrouteLineCode",listObjArray.get(i)[2]);
@@ -81,12 +84,12 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 				tempM.put("sectionTime",listObjArray.get(i)[20]);
 				tempM.put("sectiondbType",listObjArray.get(i)[21]);
 				tempM.put("sectionSpeedLimet",listObjArray.get(i)[22]);
+				tempM.put("destroy",listObjArray.get(i)[23]);
+				tempM.put("versions",listObjArray.get(i)[24]);
+				tempM.put("descriptions",listObjArray.get(i)[25]);
 				resultList.add(tempM);
-				
 			}
-			
 		}
-		
 		return resultList;
 	}
  
@@ -228,5 +231,68 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
  
 		return list;
 	}
+
+	@Override
+	public Map<String, Object> quoteSection(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			Integer line = map.get("lineId") ==null ? null : Integer.parseInt(map.get("lineId").toString());
+			Integer dir = map.get("dir")==null ? null : Integer.parseInt(map.get("dir").toString());
+			Integer toDir = map.get("toDir")==null ? null : Integer.parseInt(map.get("toDir").toString());
+			if(line!=null && dir!=null) {
+				List<Object[]> list = repository.getSectionRoute(line, dir);
+				int src = repository.sectionRouteCodeMaxId();
+				for(int i = 0 ; i<list.size() ; i++) {
+					int sectionId =  Integer.parseInt(String.valueOf(repository2.sectionMaxId())) + 1 ;
+					String sectionCode =  String.valueOf(sectionId);
+					String sectionName = list.get(i)[9] == null ? null : list.get(i)[9].toString(); 
+					String crosesRoad = list.get(i)[10] == null ? null : list.get(i)[10].toString(); 
+					String endNode = list.get(i)[11] == null ? null : list.get(i)[11].toString(); 
+					String startNode = list.get(i)[12] == null ? null : list.get(i)[12].toString(); 
+					String middleNode = list.get(i)[13] == null ? null : list.get(i)[13].toString(); 
+					String sectionType = list.get(i)[14] == null ? null : list.get(i)[14].toString();
+					String csectionVector = list.get(i)[15] == null ? null : list.get(i)[15].toString();
+					String bsectionVector = list.get(i)[16] == null ? null : list.get(i)[16].toString();
+					String gsectionVector = list.get(i)[17] == null ? null : list.get(i)[17].toString();
+					String roadCoding = list.get(i)[18] == null ? null : list.get(i)[18].toString();
+					Double sectionDistance = list.get(i)[19] == null ? null : Double.parseDouble(list.get(i)[19].toString());
+					Double sectionTime = list.get(i)[20] == null ? null : Double.parseDouble(list.get(i)[20].toString());
+					String dbType = list.get(i)[21] == null ? null : list.get(i)[21].toString();
+					Double speedLimit = list.get(i)[22] == null ? null : Double.parseDouble(list.get(i)[22].toString());
+					Integer destroy = list.get(i)[23] == null ? null : Integer.parseInt(list.get(i)[23].toString());
+					Integer versions = list.get(i)[24] == null ? null : Integer.parseInt(list.get(i)[24].toString());
+					String descriptions = list.get(i)[25] == null ? null : list.get(i)[25].toString();
+					repository2.systemSave(sectionCode, 
+							sectionName, crosesRoad, endNode, startNode, middleNode, 
+							gsectionVector, bsectionVector, 
+							sectionType, csectionVector, roadCoding, 
+							sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, sectionId);
+					int sectionRouteId = Integer.parseInt(String.valueOf(repository.sectionRouteMaxId())) + 1 ;
+					SectionRoute sr = new SectionRoute();
+					Line lineObject = lineRepository.findOne(line);
+					Section section = repository2.findOne(sectionId);
+					Integer xh = (src ==  0 ? (toDir ==1? (list.size()-i)*10 : (list.size()+i)*10) : toDir==1? (src + (list.size()-i)*10) : (src + (list.size()+i)*10)) ;
+					sr.setId(sectionRouteId);
+					sr.setSectionrouteCode(xh);
+					sr.setLineCode(lineObject.getLineCode());
+					sr.setSectionCode(sectionCode);
+					sr.setDirections(toDir);
+					sr.setVersions(versions);
+					sr.setDestroy(destroy);
+					sr.setLine(lineObject);
+					sr.setSection(section);
+					sr.setSectionCode(section.getSectionCode());
+					sr.setDescriptions(descriptions);
+					sr.setIsRoadeSpeed(1);
+					repository.save(sr);
+				}
+			}
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
  
 }
@@ -17,6 +17,7 @@ import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
  
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -1080,4 +1081,43 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 		return rs;
 	}
+
+	@Override
+	@Transactional
+	public Map<String, Object> updSwitchDir(String lineIds) {
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			if(lineIds!=null && lineIds !="") {
+				Integer lineId = Integer.parseInt(lineIds);
+				// 上行站点切换到下行.
+				repository.stationRouteDir(lineId);
+				routeRepository.sectionRouteDir(lineId);
+			}
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
+
+	@Override
+	@Transactional
+	public Map<String, Object> upddis(Map<String, Object> map) {
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			Iterator it = map.entrySet().iterator();
+			while(it.hasNext()){
+			      java.util.Map.Entry entry = (java.util.Map.Entry)it.next();
+			      Integer id = Integer.parseInt(entry.getKey().toString().split("_")[1]);      //返回对应的键
+			      Double dis = Double.parseDouble(entry.getValue().toString()) / 1000;  //返回对应的值
+			      repository.upddis(id, dis);
+			}
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
 }
 package com.bsth.service.oil;
  
  
+import java.util.List;
 import java.util.Map;
  
 import com.bsth.entity.oil.Cwjy;
@@ -9,8 +10,8 @@ import com.bsth.service.BaseService;
 import com.bsth.util.PageObject;
  
 public interface CwjyService extends BaseService<Cwjy, Integer>{
-	PageObject<Ylxxb> Pagequery(Map<String, Object> map) ;
+	List<Ylxxb> Pagequery(Map<String, Object> map) ;
 	Ylxxb bynbbm(Map<String, Object> map);
  
-	Map<String, Object> savejzl(Ylxxb t);
+	Map<String, Object> savejzl(Map<String, Object> map) throws Exception ;
 }
 package com.bsth.service.oil;
  
+import java.util.List;
 import java.util.Map;
  
 import com.bsth.entity.oil.Dlb;
@@ -11,4 +12,10 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
 	Map<String, Object> sort(Map<String, Object> map);
  
 	Map<String, Object> checkDl(Map<String, Object> map);
+	
+	List<Dlb>  listDlb(Map<String, Object> map);
+	
+	Map<String, Object> sumYlb(Map<String, Object> map);
+	
+	Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception;
 }
@@ -9,6 +9,6 @@ import com.bsth.util.PageObject;
 public interface YlxxbService extends BaseService<Ylxxb, Integer>{
 	PageObject<Ylxxb> Pagequery(Map<String, Object> map) ;
  
-	Map<String, Object> checkJsy(Map<String, Object> map);
+	Map<String, Object> checkJsy(Map<String, Object> map) throws Exception;
  
 }
@@ -6,17 +6,26 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
+import javax.transaction.Transactional;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
  
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.oil.Cwjy;
+import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.repository.oil.CwjyRepository;
 import com.bsth.repository.oil.YlxxbRepository;
@@ -35,8 +44,8 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
  
 	@Autowired
 	JdbcTemplate jdbcTemplate;
-	
-	@SuppressWarnings("unchecked")
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	/*@SuppressWarnings("unchecked")
 	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
 		int page=Integer.parseInt(map.get("page").toString());
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -129,7 +138,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				 return t;
 			 }
 		});
-		/*List<Object[]> list=repository.obtainCwjycl(rq,nbbm);
+		List<Object[]> list=repository.obtainCwjycl(rq,nbbm);
 		for (int i = 0; i < list.size(); i++) {
 			Ylxxb y=new Ylxxb();
 			y.setGsdm(list.get(i)[0]==null?"":list.get(i)[0].toString());
@@ -148,13 +157,13 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				e.printStackTrace();
 			}
 			yList.add(y);
-		}*/
+		}
 		PageHelper pageHelper = new PageHelper(listsize, map);
 		pageHelper.getMap();
 		PageObject<Ylxxb> pageObject=pageHelper.getPageObject();
 		pageObject.setDataList(yList);
 		return pageObject;
-	}
+	}*/
  
 	@Override
 	public Ylxxb bynbbm(Map<String, Object> map) {
@@ -188,28 +197,119 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		return y;
 	}
  
+	@Transactional 
 	@Override
-	public Map<String, Object> savejzl(Ylxxb t) {
+	public Map<String, Object> savejzl(Map<String, Object> maps) throws Exception {
 		// TODO Auto-generated method stub
 		Map<String, Object> map=new HashMap<String,Object>();
 		try {
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			String rq = sdf.format(t.getYyrq());
-			String nbbm=t.getNbbm();
-			List<Ylxxb> yList=ylxxbRepository.obtainYlxx2(rq,nbbm);
-			if(yList.size()>0){
-				t.setId(yList.get(0).getId());
-				ylxxbRepository.save(t);
-			}else{
-				ylxxbRepository.save(t);
+//			String rq = sdf.format(t.getYyrq());
+//			String nbbm=t.getNbbm();
+//			List<Ylxxb> yList=ylxxbRepository.obtainYlxx2(rq,nbbm);
+//			if(yList.size()>0){
+//				t.setId(yList.get(0).getId());
+//				ylxxbRepository.save(t);
+//			}else{
+//				ylxxbRepository.save(t);
+//			}
+			String gsbm=maps.get("gsbm").toString();
+			String fgsbm=maps.get("fgsbm").toString();
+			String rq=maps.get("rq").toString();
+			Date date=sdf.parse(rq);
+			String json =StringEscapeUtils.unescapeHtml4(maps.get("ylbList").toString());
+			JSONArray jsonArray=JSONArray.parseArray(json);
+			JSONObject jsonObject;
+			// 获取车辆存油信息
+			for (int i = 0; i < jsonArray.size(); i++) {
+				jsonObject=jsonArray.getJSONObject(i);
+				Integer id =jsonObject.getInteger("id");
+				String jsy=jsonObject.getString("jsy");
+				double jzl=jsonObject.getDoubleValue("jzl");
+				String stationid=jsonObject.getString("stationid");
+				String nbbm=jsonObject.getString("nbbm");
+				int nylx=jsonObject.getIntValue("nylx");
+				String jyggh=jsonObject.getString("jyggh");
+				String bz=jsonObject.getString("bz");
+				Ylxxb y;
+				if(id>0){
+					y=ylxxbRepository.findOne(id);
+					y.setJsy(jsy);
+					y.setJzl(jzl);
+					y.setStationid(stationid);
+					y.setJyggh(jyggh);
+					y.setBz(bz);
+					y.setCreatetime(new Date());
+					y.setYyrq(date);
+					ylxxbRepository.save(y);
+				}else{
+					if(jsy!="" && jzl>0){
+						y=new Ylxxb();
+						y.setGsdm(gsbm);
+						y.setJsy(jsy);
+						y.setNbbm(nbbm);
+						y.setJzl(jzl);
+						y.setStationid(stationid);
+						y.setJyggh(jyggh);
+						y.setBz(bz);
+						y.setCreatetime(new Date());
+						y.setYyrq(date);
+						y.setJylx(1);
+						y.setNylx(0);
+						ylxxbRepository.save(y);
+					}
+				}
 			}
 			map.put("status", ResponseCode.SUCCESS);
+			
 		} catch (Exception e) {
 			map.put("status", ResponseCode.ERROR);
-			e.printStackTrace();
+			logger.error("save erro.", e);
+			throw e;
 			// TODO: handle exception
 		}
 		return map;
 	}
  
+	@Override
+	public List<Ylxxb> Pagequery(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		String rq=map.get("rq").toString();
+		String nbbm=map.get("nbbh").toString();
+		String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,"
+				+ "b.jyggh as jyggh,b.jzl as jzl ,b.stationid as stationid,b.jsy as jsy,"
+				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,b.id as id ,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
+				   " left  join ("
+				   + " select * from bsth_c_ylxxb b "
+				   + "where to_days(b.yyrq)=to_days('"+rq+"') 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('"+rq+"' ) group by nbbm "+
+				   " ) c on a.nbbm=c.nbbm  "
+				   + "where  a.nbbm like '%"+nbbm+"%'";
+		
+		List<Ylxxb> yList= jdbcTemplate.query(sql,
+				 new RowMapper<Ylxxb>(){
+			 @Override
+			 public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Ylxxb t=new Ylxxb();
+				 t.setId(rs.getInt("id"));
+				 t.setGsdm(rs.getString("gsdm"));
+				 t.setFgsdm(rs.getString("fgsdm"));
+				 t.setNbbm(rs.getString("nbbm"));
+				 t.setJyggh(rs.getString("jyggh"));
+				 t.setJsy(rs.getString("jsy"));
+				 t.setJzl(rs.getDouble("jzl"));
+				 t.setStationid(rs.getString("stationid"));
+				 t.setNylx(rs.getInt("nylx"));
+				 t.setYj(rs.getDouble("yj"));
+				 t.setBz(rs.getString("bz"));
+				 t.setLdgh(rs.getString("ldgh"));
+				 return t;
+			 }
+		});
+		
+		return yList;
+	}
+
 }
@@ -14,6 +14,7 @@ import java.util.Map;
  
 import javax.transaction.Transactional;
  
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,8 +23,12 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
  
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
 import com.bsth.entity.oil.Cdl;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Dlb;
@@ -41,6 +46,7 @@ import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.DlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.Arith;
  
 @Service
 public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{
@@ -93,13 +99,13 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		// TODO Auto-generated method stub
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		//当天DLB信息
-		List<Dlb> dlList=repository.obtainDl(rq);
+		List<Dlb> dlList=repository.obtainDl(rq, gsbm, "", line, "", "nbbm");
 		//当天YLXXB信息
 		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
 		//当天加电信息表
 		List<Jdl> jdlList=jdlRepository.JdlList(rq);
 		//前一天所有车辆最后进场班次信息
-		List<Dlb> dlListBe=repository.obtainYlbefore(rq);
+		List<Dlb> dlListBe=repository.obtainYlbefore(rq, "", "", "", "");
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
 		//从排班表中计算出行驶的总里程
 		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
@@ -129,6 +135,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				}
 				try {
 					//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+					Double jzl=0.0;
 					if(map.get("seqNumber").toString().equals("1")){
 						boolean fage=true;
 						for (int i = 0; i < dlListBe.size(); i++) {
@@ -143,7 +150,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 							for (int y = 0; y < cdyList.size(); y++) {
 								Cdl cdl=cdyList.get(y);
 								if(map.get("clZbh").toString().equals(cdl.getNbbm())){
-									t.setCzcd(cdl.getClcd());
+									t.setCzcd(cdl.getClcd()==null?0:cdl.getClcd());
 									fage=false;
 									break;
 								}
@@ -152,9 +159,17 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 						if(fage){
 							t.setCzcd(0.0);
 						}
+						
+						//手动导入没有驾驶员工号
+						for (int i = 0; i < jdlList.size(); i++) {
+							Jdl jdl=jdlList.get(i);
+							if(map.get("clZbh").toString().equals(jdl.getNbbm()) ){
+								jzl+=jdl.getJdl();
+							}
+						}
 					}
  
-					Double jzl=0.0;
+					
 					//把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
 					for(int j=0;j<ylxxList.size();j++){
 						Ylxxb ylxxb= ylxxList.get(j);
@@ -163,24 +178,22 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 						}
 					}
  
-					//手动导入没有驾驶员工号
-					for (int i = 0; i < jdlList.size(); i++) {
-						Jdl jdl=jdlList.get(i);
-						if(map.get("clZbh").toString().equals(jdl.getNbbm()) ){
-							jzl+=jdl.getJdl();
-						}
-					}
 					t.setCdl(jzl);
-					t.setJzcd(t.getCzcd());
+					if(type.equals("add")){
+						t.setHd(jzl);
+						t.setJzcd(t.getCzcd());
+					}
+					
 					t.setNbbm(map.get("clZbh").toString());
 					t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
 					t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
 					t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
-					t.setHd(jzl);
 					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 					t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 					t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
+					t.setCreatetime(new Date());
 					/*if(type.equals("add")){
 						addList.add(t);
 					}else{
@@ -247,25 +260,48 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	@Override
 	public Map<String, Object> checkDl(Map<String, Object> map) {
 		Map<String, Object> newMap=new HashMap<String,Object>();
-		String xlbm=map.get("xlbm_eq").toString();
-		String gsbm="";
-		if(map.get("ssgsdm_like")!=null){
-			gsbm=map.get("ssgsdm_like").toString();
-		}
+//		String xlbm="";
+//		if(map.get("xlbm_like")!=null){
+//			xlbm=map.get("xlbm_like").toString();
+//		}
 		// TODO Auto-generated method stub
+		
+		List<Cars> carsList = carsRepository.findCars();
+		Map<String, String> carsMap = new HashMap<String, String>();
+		for (int i = 0; i < carsList.size(); i++) {
+			Cars c = carsList.get(i);
+			carsMap.put(c.getInsideCode(), c.getBrancheCompanyCode()==null?"":c.getBrancheCompanyCode());
+		}
+		
 		try{
 			//获取车辆存油信息
-//			List<Cyl> cylList=cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
+			
 			String rq=map.get("rq").toString();
-			List<Dlb> dlbList=repository.obtainDl(rq);
-			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
-			//当天加电信息表
-			List<Jdl> jdlList=jdlRepository.JdlList(rq);
+			String xlbm="";
+			if(map.get("xlbm_like")!=null){
+				xlbm= map.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map.get("ssgsdm_like")!=null){
+				gsbm=map.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map.get("fgsdm_like")!=null){
+				fgsbm=map.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map.get("nbbm_eq")!=null){
+				nbbm=map.get("nbbm_eq").toString();
+			}
+			List<Dlb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
+//			List<Cdl> cylList=cdlRepository.obtainCdl(nbbm, gsbm);
+			List<Dlb> ylbList=repository.obtainDl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
 			for (int i = 0; i < ylxxbList.size(); i++) {
 				Boolean fage=true;
 				Ylxxb y1=ylxxbList.get(i);
-				for(int y=0;y<dlbList.size();y++){
-					Dlb y2=dlbList.get(y);
+				for(int y=0;y<ylbList.size();y++){
+					Dlb y2=ylbList.get(y);
 					if(y1.getNbbm().equals(y2.getNbbm())){
 						fage=false;
 						break;
@@ -279,39 +315,276 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					t.setJsy(y1.getJsy());
 					t.setCdl(y1.getJzl());
 					t.setSsgsdm(y1.getGsdm());
-					t.setXlbm(xlbm);
-					repository.save(t);
+					String fgsdm="";
+					if(null!=carsMap.get(y1.getNbbm())){
+						fgsdm=carsMap.get(y1.getNbbm());
+					}
+					t.setFgsdm(fgsdm);
+					t.setJcsx(1);
+					Line line= BasicData.nbbm2LineMap.get(y1.getNbbm());
+					if(null !=line){
+						t.setXlbm(line.getLineCode());
+					}else{
+						t.setXlbm("");
+					}
+					boolean status=true;
+					for (int j = 0; j < ylListBe.size(); j++) {
+						Dlb b=ylListBe.get(j);
+						if(b.getNbbm().equals(y1.getNbbm())){
+							t.setCzcd(b.getJzcd());
+							status=false;
+							break;
+						}
+					}
+					/*if(status){
+						for (int j = 0; j < cylList.size(); j++) {
+							Cyl c=cylList.get(j);
+							if(c.getNbbm().equals(y1.getNbbm())){
+								t.setCzyl(c.getCyl());
+								cyl=c;
+								status=false;
+								break;
+							}
+						}
+					}*/
+					if(status){
+						t.setCzcd(0.0);
+					}
+//					double jzyl=Arith.add(t.getJzl(), t.getCzyl());
+					t.setJzcd(100.0);
+					t.setHd(0.0);
+					if(fgsdm.equals(fgsbm)){
+						repository.save(t);
+					}
 				}
 			}
-			
-			for (int i = 0; i < jdlList.size(); i++) {
-				Boolean fage=true;
-				Jdl y1=jdlList.get(i);
-				for(int y=0;y<dlbList.size();y++){
-					Dlb y2=dlbList.get(y);
-					if(y1.getNbbm().equals(y2.getNbbm())){
-						fage=false;
-						break;
+			newMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+		}
+		
+		return newMap;
+	}
+
+	@Override
+	public List<Dlb> listDlb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Dlb> listDlb=new ArrayList<Dlb>();
+		List<String> stringList=new ArrayList<String>();
+		String rq=map.get("rq").toString();
+		String gsbm=map.get("ssgsdm_like").toString();
+		String fgsbm=map.get("fgsdm_like").toString();
+		String xlbm=map.get("xlbm_like").toString().trim();
+		String nbbm=map.get("nbbm_eq").toString();
+		String sxtj=map.get("sxtj").toString();
+		
+		if(nbbm.trim()!=""){
+			stringList.add(nbbm);
+			listDlb=repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
+		}else{
+			//全部
+			if(sxtj.equals("0")){
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					stringList.add(clbm);
+				}
+				if(stringList.size()>0){
+					listDlb=repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
+				}
+			}else{
+				List<Object[]> objectLists;
+				if(sxtj.equals("3")){
+					//有加油没里程
+					objectLists=repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
+						if(jzl>0 && zlc<=0){
+							stringList.add(clbm);
+						}
+						
+					}
+					
+				}else if(sxtj.equals("4")){
+					//有里程没加油
+					objectLists=repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
+						if(zlc>0 && jzl<=0){
+							stringList.add(clbm);
+						}
+						
+					}
+				}else{
+					objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+						//一车一单
+						if(sxtj.equals("1")){
+							if(cs==1){
+								stringList.add(clbm);
+							}
+						}	
+						//一车多单
+						if(sxtj.equals("2")){
+							if(cs>1){
+								stringList.add(clbm);
+							}
+						}
 					}
 				}
  
-				if(fage){
-					Dlb t=new Dlb();
-					t.setNbbm(y1.getNbbm());
-					t.setRq(y1.getRq());
-//					t.setJsy(y1.getJsy());
-					t.setCdl(y1.getJdl());
-					t.setSsgsdm(y1.getGsBm());
-					t.setXlbm(xlbm);
-					repository.save(t);
+				if(stringList.size()>0){
+					listDlb=repository.listDlb(rq, gsbm, fgsbm, xlbm, stringList);
 				}
 			}
-			newMap.put("status", ResponseCode.SUCCESS);
+		}
+
+		return listDlb;
+	}
+
+	@Override
+	public Map<String, Object> sumYlb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<String> stringList = new ArrayList<String>();
+		String rq = map.get("rq").toString();
+		String gsbm = map.get("ssgsdm_like").toString();
+		String fgsbm = map.get("fgsdm_like").toString();
+		String xlbm = map.get("xlbm_like").toString().trim();
+		String nbbm = map.get("nbbm_eq").toString();
+		String sxtj = map.get("sxtj").toString();
+		if (nbbm.trim() != "") {
+			stringList.add(nbbm);
+		} else {
+			if (!sxtj.equals("0")) {
+				List<Object[]> objectLists;
+				if (sxtj.equals("3")) {
+					// 有加油没里程
+					objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm = objectLists.get(i)[0].toString();
+						double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+						if (jzl > 0 && zlc <= 0) {
+							stringList.add(clbm);
+						}
+
+					}
+
+				} else if (sxtj.equals("4")) {
+					// 有里程没加油
+					objectLists = repository.checkNbmmDl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm = objectLists.get(i)[0].toString();
+						double jzl = Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc = Double.parseDouble(objectLists.get(i)[2].toString());
+						if (zlc > 0 && jzl <= 0) {
+							stringList.add(clbm);
+						}
+
+					}
+				} else {
+					objectLists = repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm = objectLists.get(i)[0].toString();
+						int cs = Integer.parseInt(objectLists.get(i)[1].toString());
+						// 一车一单
+
+						if (sxtj.equals("1")) {
+							if (cs == 1) {
+								stringList.add(clbm);
+							}
+						}
+						// 一车多单
+						if (sxtj.equals("2")) {
+							if (cs > 1) {
+								stringList.add(clbm);
+							}
+						}
+					}
+				}
+			}
+		}
+			List<Object[]> sumYlbList = new ArrayList<Object[]>();
+			if (sxtj.equals("0")) {
+				sumYlbList = repository.sumDlb2(rq, gsbm, fgsbm, xlbm, nbbm);
+			} else {
+				if (stringList.size() > 0) {
+	
+					// String strings[]=new String[stringList.size()];
+					// for(int i=0;i<stringList.size();i++){
+					// strings[i]=stringList.get(i);
+					// }
+					sumYlbList = repository.sumDlb(rq, gsbm, fgsbm, xlbm, stringList);
+				} 
+//				else {
+//					sumYlbList = repository.sumDlb2(rq, gsbm, fgsbm, xlbm, nbbm);
+//				}
+			}
+			Double jzl = 0.0, yh = 0.0, sh = 0.0;
+			for (int i = 0; i < sumYlbList.size(); i++) {
+				jzl = Arith.add(jzl, Double.valueOf(sumYlbList.get(i)[0].toString()));
+				yh = Arith.add(yh, Double.valueOf(sumYlbList.get(i)[1].toString()));
+				sh = Arith.add(sh, Double.valueOf(sumYlbList.get(i)[2].toString()));
+			}
+		
+			Map<String, Object> sumMap = new HashMap<String, Object>();
+			sumMap.put("jzl", jzl);
+			sumMap.put("yh", yh);
+			sumMap.put("sh", sh);
+			return sumMap;
+	}
+	
+	
+	@Transactional  
+	@Override
+	public Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception {
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		try{
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String json =StringEscapeUtils.unescapeHtml4(map.get("dlbList").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		// 获取车辆存油信息
+//		List<Cyl> cylList = cylRepository.obtainCyl("","");
+		for (int i = 0; i < jsonArray.size(); i++) {
+//			Ylb t=new Ylb();
+			jsonObject=jsonArray.getJSONObject(i);
+			double czcd = jsonObject.getDoubleValue("czcd");
+			double cdl =jsonObject.getDoubleValue("cdl");
+			double jzcd =jsonObject.getDoubleValue("jzcd");
+			double sh  =jsonObject.getDoubleValue("sh");
+			String shyy =jsonObject.getString("shyy");
+			double hd = jsonObject.getDoubleValue("hd");
+			int yhlx =jsonObject.getIntValue("yhlx");
+			Integer id =jsonObject.getInteger("id");
+//			String nbbm =jsonObject.getString("nbbm");
+//			String rq=jsonObject.getString("rq");
+			repository.dlbUpdate(id, czcd, jzcd, hd, sh, shyy, yhlx);
+			/*for (int z = 0; z < cylList.size(); z++) {
+				Cyl cyl = cylList.get(z);
+				if (nbbm.equals(cyl.getNbbm())) {
+					cyl.setCyl(jzyl);
+					cyl.setUpdatetime(sdf.parse(rq));
+					break;
+				}
+				cylRepository.save(cyl);
+			}*/
+		}
+		newMap.put("status", ResponseCode.SUCCESS);
 		}catch(Exception e){
 			newMap.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
+			throw e;
 		}
-		
 		return newMap;
 	}
 }
@@ -135,11 +135,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								Ylb ylb=ylListBe.get(i);
 								if(map.get("clZbh").toString().equals(ylb.getNbbm())){
 									if(ylb.getJzyl()!=null){
-										if(ylb.getJzyl()>0){
-											t.setCzyl(ylb.getJzyl());
-											fage=false;
-											break;
-										}
+										t.setCzyl(ylb.getJzyl());
+										fage=false;
+										break;
 									}
  
 								}
@@ -272,7 +270,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						for (int i = 0; i < ylListBe.size(); i++) {
 							Ylb ylb = ylListBe.get(i);
 							if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
-								if(ylb.getJzyl()>0){
+								if(ylb.getJzyl()>=0){
 									t.setCzyl(ylb.getJzyl());
 									fage = false;
 									break;
@@ -284,7 +282,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							for (int y = 0; y < clyList.size(); y++) {
 								Cyl cyl = clyList.get(y);
 								if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
-									if(cyl.getCyl()>0){
+									if(cyl.getCyl()>=0){
 										t.setCzyl(cyl.getCyl());
 										fage = false;
 										break;
@@ -680,7 +678,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			if(map.get("nbbm_eq")!=null){
 				nbbm=map.get("nbbm_eq").toString();
 			}
-			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, fgsbm, xlbm, nbbm);
+			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
 			List<Cyl> cylList=cylRepository.obtainCyl(nbbm, gsbm);
 			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
@@ -703,10 +701,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setJsy(y1.getJsy());
 					t.setJzl(y1.getJzl());
 					t.setSsgsdm(y1.getGsdm());
-					t.setFgsdm(carsMap.get(y1.getNbbm()));
+					String fgsdm="";
+					if(null !=carsMap.get(y1.getNbbm())){
+						fgsdm=carsMap.get(y1.getNbbm());
+					}
+					t.setFgsdm(fgsdm);
+					t.setJcsx(1);
 					Line line= BasicData.nbbm2LineMap.get(y1.getNbbm());
-					if(null !=line)
-					t.setXlbm(line.getLineCode());
+					if(null !=line){
+						t.setXlbm(line.getLineCode());
+					}else{
+						t.setXlbm("");
+					}
 					t.setJcsx(1);
 					boolean status=true;
 					for (int j = 0; j < ylListBe.size(); j++) {
@@ -734,10 +740,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //					double jzyl=Arith.add(t.getJzl(), t.getCzyl());
 					t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
 					t.setYh(0.0);
-					repository.save(t);
-					if(null!=cyl){
-						cyl.setCyl(Arith.add(t.getJzl(), t.getCzyl()));
-						cylRepository.save(cyl);
+					if(fgsdm.equals(fgsbm)){
+						repository.save(t);
+						if(null!=cyl){
+							cyl.setCyl(Arith.add(t.getJzl(), t.getCzyl()));
+							cylRepository.save(cyl);
+						}
 					}
 				}
 			}
@@ -826,22 +834,50 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			stringList.add(nbbm);
 		}else{
 			if(!sxtj.equals("0")){
-				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
-				for (int i = 0; i < objectLists.size(); i++) {
-					String clbm=objectLists.get(i)[0].toString();
-					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
-					//一车一单
-				
-					if(sxtj.equals("1")){
-						if(cs==1){
+				List<Object[]> objectLists;
+				if(sxtj.equals("3")){
+					//有加油没里程
+					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
+						if(jzl>0 && zlc<=0){
 							stringList.add(clbm);
 						}
+						
 					}
-					//一车多单
-					if(sxtj.equals("2")){
-						if(cs>1){
+					
+				}else if(sxtj.equals("4")){
+					//有里程没加油
+					objectLists=repository.checkNbmmYl(rq, gsbm, fgsbm, xlbm, nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						double jzl=Double.parseDouble(objectLists.get(i)[1].toString());
+						double zlc=Double.parseDouble(objectLists.get(i)[2].toString());
+						if(zlc>0 && jzl<=0){
 							stringList.add(clbm);
 						}
+						
+					}
+				}else{
+					objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+						//一车一单
+					
+						if(sxtj.equals("1")){
+							if(cs==1){
+								stringList.add(clbm);
+							}
+						}
+						//一车多单
+						if(sxtj.equals("2")){
+							if(cs>1){
+								stringList.add(clbm);
+							}
+						}
 					}
 				}
 			}
@@ -857,9 +893,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //					strings[i]=stringList.get(i);
 //				}
 				sumYlbList=repository.sumYlb(rq, gsbm, fgsbm, xlbm, stringList);
-			}else{
-				sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm, nbbm);
 			}
+//			else{
+//				sumYlbList=repository.sumYlb2(rq, gsbm, fgsbm, xlbm, nbbm);
+//			}
  
 		}
  
@@ -9,6 +9,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
+import javax.transaction.Transactional;
+
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +19,8 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
  
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.excep.Offline;
 import com.bsth.entity.oil.Ylb;
@@ -44,12 +49,27 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		String rq=map.get("yyrq").toString();
 		String gsdm=map.get("gsdm_like").toString();
 		String fgsdm=map.get("fgsdm_like").toString();
-		
+	/*	
 		String sql=" select x.*,y.jsy as ldgh,y.fgsdm as fgsdm from bsth_c_ylxxb x "
 				+ " left join  bsth_c_ylb y  on  x.nbbm = y.nbbm and x.jsy !=y.jsy "
 				+ " where  DATE_FORMAT(y.rq,'%Y-%m-%d')='"+rq+"' and y.ssgsdm='"+gsdm+"' "
 				+ " and y.fgsdm='"+fgsdm+"' and DATE_FORMAT(x.yyrq,'%Y-%m-%d')='"+rq+"' "
-				+ " and x.gsdm='"+gsdm+"'";
+				+ " and x.gsdm='"+gsdm+"'";*/
+		
+		String sql= "select v.*,u.jsy as ldgh  from "
+				+ " ( select *  from   bsth_c_ylxxb x  where  "
+				+ " DATE_FORMAT(x.yyrq,'%Y-%m-%d')='"+rq+"'  and x.gsdm='"+gsdm+"'"
+				+ " and x.jsy not  in  ("
+				+ " select jsy  from bsth_c_ylb "
+				+ "  where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"' "
+				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"')"
+				+ " and x.nbbm  in (select nbbm  from bsth_c_ylb  "
+				+ " where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"' "
+				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"' )) v "
+				+ " left join (select * from  bsth_c_ylb "
+				+ " where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
+				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"' )  u "
+				+ " on  v.nbbm=u.nbbm ";
  
 		//根具条件查询指定日期Ylxxb的数据
 //		List<Ylxxb> iterator=repository.checkYlxx(rq,gsdm);
@@ -114,21 +134,33 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		pageObject.setDataList(list);
 		return pageObject;
 	}
-
+	@Transactional  
 	@Override
-	public Map<String, Object> checkJsy(Map<String, Object> map) {
+	public Map<String, Object> checkJsy(Map<String, Object> map) throws Exception{
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		// TODO Auto-generated method stub
 		try {
-		int id=Integer.parseInt(map.get("id").toString());
-		String jsy=map.get("jsy").toString();
-		Ylxxb ylxxb=repository.findOne(id);
-		ylxxb.setJsy(jsy);
-		repository.save(ylxxb);
+//		int id=Integer.parseInt(map.get("id").toString());
+//		String jsy=map.get("jsy").toString();
+//		Ylxxb ylxxb=repository.findOne(id);
+//		ylxxb.setJsy(jsy);
+//		repository.save(ylxxb);
+			String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
+			JSONArray jsonArray=JSONArray.parseArray(json);
+			JSONObject jsonObject;
+			for (int x = 0; x < jsonArray.size(); x++) {
+				jsonObject=jsonArray.getJSONObject(x);
+				Integer id =jsonObject.getInteger("id");
+				String jsy =jsonObject.getString("jsy");
+				Ylxxb ylxxb=repository.findOne(id);
+				ylxxb.setJsy(jsy);
+				repository.save(ylxxb);
+			}
 		newMap.put("status", ResponseCode.SUCCESS);
 		}catch(Exception e){
 			newMap.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
+			throw e;
 		}
 		return newMap;
 	}
@@ -13,11 +13,13 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
  
 	Map<String, Object> editStartOptTime(String time, String lineCode);
  
-	Map<String, Object> editOutTimeType(String lineCode, int type);
+	Map<String, Object> editOutTimeType(String lineCode, int type, String parkCode, String stationCode);
  
     LineConfig getByLineCode(String lineCode);
  
     Map<String,Object> enableInParkForSource(String lineCode, int enable);
  
     Map<String,Object> bufferTimeDiff(String lineCode, String field, String value);
+
+    Map<String,Object> yjtkSet(Map<String, String> map);
 }
@@ -112,7 +112,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
  
 	List<Map<String,Object>> statisticsDaily(String line, String date, String xlName, String type);
  
-	List<Map<String,Object>> statisticsDailyTj(String line, String date,String date2, String xlName, String type);
+	List<Map<String,Object>> statisticsDailyTj(String gsdm,String fgsdm,String line, String date,String date2, String xlName, String type);
  
 	//List<Object> scheduleDaily(String line,String date);
  
@@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -74,17 +75,20 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
     }
  
     @Override
-    public Map<String, Object> editOutTimeType(String lineCode, int type) {
+    public Map<String, Object> editOutTimeType(String lineCode, int type, String parkCode, String stationCode) {
         Map<String, Object> rs = new HashMap<>();
         try {
             LineConfig conf = lineConfigData.get(lineCode);
  
             conf.setOutConfig(type);
-            //conf.setInConfig(type);
+            if(type == 2){
+                conf.setTwinsPark(parkCode);
+                conf.setTwinsStation(stationCode);
+            }
             lineConfigData.set(conf);
  
             rs.put("status", ResponseCode.SUCCESS);
-            rs.put("type", type);
+            rs.put("conf", conf);
         } catch (Exception e) {
             rs.put("status", ResponseCode.ERROR);
             rs.put("msg", e.getMessage());
@@ -104,7 +108,7 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         try {
             LineConfig conf = lineConfigData.get(lineCode);
  
-            conf.setInParkForSource(enable==1);
+            conf.setInParkForSource(enable == 1);
             lineConfigData.set(conf);
  
             rs.put("status", ResponseCode.SUCCESS);
@@ -123,8 +127,10 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         Map<String, Object> rs = new HashMap<>();
         try {
             LineConfig conf = lineConfigData.get(lineCode);
+            Field f = conf.getClass().getDeclaredField(field);
+            f.setAccessible(true);
+            f.setInt(conf, Integer.parseInt(value));
  
-            conf.getClass().getField(field).set(conf, value);
             lineConfigData.set(conf);
  
             rs.put("status", ResponseCode.SUCCESS);
@@ -137,4 +143,40 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> yjtkSet(Map<String, String> map) {
+        String lineCode = map.get("lineCode").toString();
+        int enableYjtk = Integer.parseInt(map.get("enableYjtk").toString());
+
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            LineConfig conf = lineConfigData.get(lineCode);
+
+            if(enableYjtk == 1){
+                String yjtkStart = map.containsKey("yjtkStart") ? map.get("yjtkStart").toString() : "00:00";
+                String yjtkEnd = map.containsKey("yjtkEnd") ? map.get("yjtkEnd").toString() : "23:59";
+                int upStopMinute = Integer.parseInt(map.get("upStopMinute").toString());
+                int downStopMinute = Integer.parseInt(map.get("downStopMinute").toString());
+
+                conf.setEnableYjtk(true);
+                conf.setYjtkStart(yjtkStart);
+                conf.setYjtkEnd(yjtkEnd);
+                conf.setUpStopMinute(upStopMinute);
+                conf.setDownStopMinute(downStopMinute);
+            }
+            else
+                conf.setEnableYjtk(false);
+
+            lineConfigData.set(conf);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("conf", conf);
+        } catch (Exception e) {
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            logger.error("", e);
+        }
+        return rs;
+    }
 }