Merge remote-tracking branch 'origin/jiading' into jiading

游瑞烽
2 parents 26dd0e0b 54c3fcd2
Showing 15 changed files with 2185 additions and 1311 deletions
src/main/java/com/bsth/controller/calc/CalcDlbController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/service/calc/CalcDlbService.java
src/main/java/com/bsth/service/calc/impl/CalcDlbServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailForEdit.java
src/main/java/com/bsth/service/schedule/impl/plan/kBase3/validate/timetable/ErrorBcCountFunction.java
src/main/resources/META-INF/drools.packagebuilder.conf
+package com.bsth.controller.calc;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.service.calc.CalcDlbService;
+
+/**
+ * Created by 20/05/27.
+ */
+@RestController
+@RequestMapping("calc_dlb")
+public class CalcDlbController {
+	
+	@Autowired
+	CalcDlbService service;
+	
+	@RequestMapping(value="/updateDlb")
+	public Map<String, Object> generateDaliy(@RequestParam Map<String, Object> map) throws Exception{
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Date d = new Date();
+		d.setTime(d.getTime() - (1l*1000*60*60*24));	//默认前一天
+		String date = "";
+		if(map.containsKey("date") && map.get("date")!=null){
+			date=map.get("date").toString().trim();
+		}
+		
+		Map<String, Object> m = new HashMap<String, Object>();
+		m.put("date", date);
+		try {
+			sdf.format(sdf.parse(date));	//校验日期格式
+			
+//			m.put("status", service.impElectric(date));
+			service.impElectric(date);
+			m.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			m.put("status", ResponseCode.ERROR);
+			return m;
+		}
+		return m;
+	}
+	
+}
-package com.bsth.controller.realcontrol;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.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;
-import com.bsth.data.BasicData;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.bsth.util.ConfigUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@RestController
-@RequestMapping("/realSchedule")
-public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
-
-	@Autowired
-	ScheduleRealInfoService scheduleRealInfoService;
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-
-	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
-	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
-		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
-	}
-
-	@RequestMapping(value = "/lines")
-	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
-		return scheduleRealInfoService.findByLines(lines);
-	}
-
-	@RequestMapping(value = "/car")
-	public List<ScheduleRealInfo> findByCar(String nbbm){
-		return dayOfSchedule.findByNbbm(nbbm);
-	}
-
-	/**
-	 *
-	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
-	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
-	 */
-	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
-	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-										   @RequestParam String dfsj,String bcType,
-										   @RequestParam(defaultValue = "") String opType) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
-	}
-
-	/**
-	 *
-	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔 
-	 */
-	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
-	public Map<String, Object> destroy(@RequestParam String idsStr
-			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
-									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
-		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
-	}
-
-	/**
-	 *
-	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
-	 */
-	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
-	public Map<String, String> carDeviceMapp() {
-		return BasicData.deviceId2NbbmMap.inverse();
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/driver", method = RequestMethod.GET)
-	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findDriverByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
-	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findConductorByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
-	 * lineId @throws
-	 */
-	@RequestMapping(value = "/cars", method = RequestMethod.GET)
-	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode) {
-		return scheduleRealInfoService.findCarByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
-	 */
-	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
-	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
-		return scheduleRealInfoService.sreachVehic(nbbm);
-	}
-	/**
-	 *
-	 * @Title: realOutAdjust
-	 * @Description: TODO(实发调整)
-	 * @param @param id 班次ID
-	 * @param @param fcsjActual 实际发车时间 HH:mm
-	 * @param @param remarks 备注
-	 * @throws
-	 */
-	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
-	public Map<String, Object> realOutAdjust(@RequestParam Long id, @RequestParam String fcsjActual,
-											 @RequestParam String remarks) {
-		return scheduleRealInfoService.realOutAdjust(id, fcsjActual, remarks);
-	}
-
-	/**
-	 *
-	 * @Title: revokeDestroy
-	 * @Description: TODO(撤销烂班)
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value = "/revokeDestroy", method = RequestMethod.POST)
-	public Map<String, Object> revokeDestroy(@RequestParam Long id){
-		return scheduleRealInfoService.revokeDestroy(id);
-	}
-
-	/**
-	 *
-	 * @Title: revokeRealOutgo
-	 * @Description: TODO(撤销实发)
-	 * @param @param id
-	 * @throws
-	 */
-	@RequestMapping(value = "/revokeRealOutgo", method = RequestMethod.POST)
-	public Map<String, Object> revokeRealOutgo(@RequestParam Long id){
-		return scheduleRealInfoService.revokeRealOutgo(id);
-	}
-
-	/**
-	 * 撤销执行
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
-	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
-		return scheduleRealInfoService.revokeRealArrive(id);
-	}
-
-	/**
-	 *
-	 * @Title: spaceAdjust
-	 * @Description: TODO(间隔调整)
-	 * @param @param ids 要调整的班次数组ID
-	 * @param @param space 间隔
-	 * @throws
-	 */
-	@RequestMapping(value = "/spaceAdjust", method = RequestMethod.POST)
-	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
-		return scheduleRealInfoService.spaceAdjust(ids, space);
-	}
-
-	/**
-	 *
-	 * @Title: schInfoFineTune
-	 * @Description: TODO(发车信息微调)
-	 * @param @param map
-	 * @throws
-	 */
-	@RequestMapping(value = "/schInfoFineTune", method = RequestMethod.POST)
-	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
-		return scheduleRealInfoService.schInfoFineTune(map);
-	}
-
-	/**
-	 *
-	 * @Title: outgoAdjustAll
-	 * @Description: TODO(批量待发调整)
-	 * @param @param list
-	 * @throws
-	 */
-	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
-	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
-		//反转义
-		params = StringEscapeUtils.unescapeHtml4(params);
-		return scheduleRealInfoService.outgoAdjustAll(params);
-	}
-
-	/**
-	 *
-	 * @Title: findByLineAndUpDown
-	 * @Description: TODO(根据线路和走向获取班次)
-	 * @param @param line
-	 * @param @param upDown
-	 */
-	@RequestMapping(value = "/findByLineAndUpDown")
-	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
-		return dayOfSchedule.findByLineAndUpDown(line, upDown);
-	}
-
-	/**
-	 *
-	 * @Title: findRouteByLine
-	 * @Description: TODO(获取线路的站点，路段路由)
-	 * @param @param lineCode
-	 * @throws
-	 */
-	@RequestMapping(value = "/findRouteByLine")
-	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
-		return scheduleRealInfoService.findRouteByLine(lineCode);
-	}
-
-	/**
-	 *
-	 * @Title: removeChildTask
-	 * @Description: TODO(删除子任务)
-	 * @param @param taskId 子任务ID
-	 * @throws
-	 */
-	@RequestMapping(value = "/childTask/{taskId}", method = RequestMethod.DELETE)
-	public Map<String, Object> removeChildTask(@PathVariable("taskId") Long taskId){
-		return scheduleRealInfoService.removeChildTask(taskId);
-	}
-
-	/**
-	 *
-	 * @Title: findByLineCode
-	 * @Description: TODO(根据线路获取班次信息)
-	 * @param @param lineCode
-	 */
-	@RequestMapping(value = "/lineCode/{lineCode}")
-	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
-		return dayOfSchedule.findByLineCode(lineCode);
-	}
-
-	@RequestMapping(value = "/queryUserInfo")
-	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
-												@RequestParam String date,@RequestParam String state) {
-		return scheduleRealInfoService.queryUserInfo(line, date,state);
-	}
-
-	@RequestMapping(value = "/queryUserInfoPx")
-	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
-												  @RequestParam String date,@RequestParam String state,@RequestParam String type) {
-		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
-	}
-
-	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName,@RequestParam String jGh, @RequestParam String clZbh,
-												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
-		return scheduleRealInfoService.exportWaybill(jName,jGh, clZbh, lpName,date,line);
-	}
-
-	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
-			,@RequestParam String date,@RequestParam String line) {
-		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
-	}
-
-
-	@RequestMapping(value = "/dailyInfo")
-	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
-		return scheduleRealInfoService.dailyInfo(line, date, type);
-	}
-
-	@RequestMapping(value = "/historyMessage")
-	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
-										 @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.historyMessage(line, date, code, type);
-	}
-
-	@RequestMapping(value="/findLine")
-	public List<Map<String,String>> findLine(@RequestParam String line){
-		return scheduleRealInfoService.findLine(line);
-	}
-
-	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
-	public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
-	}
-
-	/**
-	 * 路单公里统计 （闵行审计专用）
-	 * @param jGh
-	 * @param clZbh
-	 * @param lpName
-	 * @param date
-	 * @param line
-	 * @return
-	 */
-	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
-	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
-	}
-
-	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
-	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
-	}
-
-	@RequestMapping(value="/findLpName")
-	public List<Map<String,String>> findLpName(@RequestParam String lpName){
-		return scheduleRealInfoService.findLpName(lpName);
-	}
-
-	@RequestMapping(value = "/account")
-	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
-											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
-		return scheduleRealInfoService.account(line, date, code, xlName, type);
-	}
-	
-	@RequestMapping(value = "/accountPx")
-	public List<Map<String,Object>> accountPx(@RequestParam String line, @RequestParam String date,
-											@RequestParam String code,@RequestParam String xlName, @RequestParam String px) {
-		return scheduleRealInfoService.accountPx(line, date, code, xlName, px);
-	}
-
-	@RequestMapping(value = "/correctForm")
-	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
-											@RequestParam String endDate,
-											 @RequestParam String lpName, @RequestParam String code, 
-											 @RequestParam String type,@RequestParam String changType) {
-		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type,changType);
-	}
-	/**
-	 * @Title queryListWaybill
-	 * @Description 查询行车路单列表
-	 * @param jName 驾驶员名字
-	 * @param clZbh 车辆自编号（内部编号）
-	 * @param lpName 路牌
-	 * @return
-	 */
-	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybill(jGh, clZbh,lpName,date,line);
-	}
-
-	/**
-	 * @Title queryListWaybill
-	 * @Description 查询行车路单列表（闵行审计专用路单）
-	 * @param jName 驾驶员名字
-	 * @param clZbh 车辆自编号（内部编号）
-	 * @param lpName 路牌
-	 * @return
-	 */
-	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
-			,@RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
-	}
-
-	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
-	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
-													 @RequestParam String date,@RequestParam String line){
-		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
-	}
-
-	@RequestMapping(value="/statisticsDaily")
-	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
-													@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
-	}
-
-	@RequestMapping(value="/statisticsDaily_mh_2")
-	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
-													@RequestParam String xlName, @RequestParam String type){
-		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
-	}
-
-	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		String type="";
-		if(map.get("type")!=null){
-			type=map.get("type").toString();
-		}
-		String nature="0";
-		if(map.get("nature")!=null){
-			nature=map.get("nature").toString();
-		}
-		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
-	}
-	
-	/*
-	 * 公里修正报表
-	 */
-	@RequestMapping(value="/mileageReportTj")
-	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
-	}
-	
-	/*
-	 * 班次修正报表
-	 */
-	@RequestMapping(value="/scheduleCorrectionReport")
-	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
-		String gsdm="";
-		if(map.get("gsdm")!=null){
-			gsdm=map.get("gsdm").toString();
-		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString();
-		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
-		String date2="";
-		if(map.get("date2")!=null){
-			date2=map.get("date2").toString();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString();
-		}
-		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
-	}
-
-	@RequestMapping(value="/MapById",method = RequestMethod.GET)
-	public Map<String, Object> MapById(@RequestParam("id") Long id){
-		return scheduleRealInfoService.MapById(id);
-	}
-	
-	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
-	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
-		return scheduleRealInfoService.MapByIdQp(id);
-	}
-
-	/**
-	 * @Title: scheduleDaily
-	 * @Description: TODO(调度日报表)
-	 * @param line 线路
-	 * @param date 时间
-	 * @return
-	 */
-	@RequestMapping(value="/scheduleDaily")
-	public Map<String,Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.scheduleDaily(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleList")
-	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleList_zrw")
-	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList_zrw(line,date);
-	}
-	
-	@RequestMapping(value="/realScheduleList_mh_2")
-	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
-	}
-
-	@RequestMapping(value="/realScheduleListQp")
-	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleListQp(line,date);
-	}
-
-	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
-	public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
-		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
-		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
-		return scheduleRealInfoService.multi_tzrc(cpcs, null);
-	}
-
-	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
-	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
-		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
-		List<DfsjChange> dfsjcs = JSONArray.parseArray(dcsJson, DfsjChange.class);
-		return scheduleRealInfoService.multi_dftz(dfsjcs);
-	}
-
-	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
-	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
-		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
-	}
-
-	@RequestMapping(value="/history", method=RequestMethod.POST)
-	public Map<String,Object> historySave(ScheduleRealInfo sch){
-		return scheduleRealInfoService.historySave(sch);
-	}
-
-
-	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
-	private final static long ONE_DAY = 1000 * 60 * 60 * 24;
-	/**
-	 * 获取可编辑的历史班次日期
-	 * @return
-	 */
-	@RequestMapping("dateArray")
-	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
-		List<String> rs = new ArrayList<>();
-
-		long t = System.currentTimeMillis();
-		if(c != 1)
-			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
-		for(int i = 0; i < 3; i ++){
-			rs.add(fmtyyyyMMdd.print(t));
-			t -= ONE_DAY;
-		}
-		return rs;
-	}
-
-	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
-	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
-		return scheduleRealInfoService.svgAttr(jsonStr);
-	}
-
-	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
-	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
-		return scheduleRealInfoService.findSvgAttr(idx);
-	}
-
-	@RequestMapping(value = "addRemarks", method = RequestMethod.POST)
-	public Map<String, Object> addRemarks(@RequestParam Long id, @RequestParam String remarks){
-		return scheduleRealInfoService.addRemarks(id, remarks);
-	}
-
-	@RequestMapping(value = "scheduleDailyQp", method = RequestMethod.GET)
-	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.scheduleDailyQp(line,date);
-	}
-
-	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
-	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
-		return scheduleRealInfoService.scheduleDailyExport(map);
-	}
-
-	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
-	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
-		return scheduleRealInfoService.exportWaybillMore(map);
-	}
-
-	/**
-	 * 获取当日计划排班 ， 从计划表抓取数据
-	 * @return
-	 */
-	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
-	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
-		return scheduleRealInfoService.currentSchedulePlan(lineCode);
-	}
-
-	@RequestMapping(value = "lpChangeMulti", method = RequestMethod.POST)
-	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);
-
-		//重新按公司编码索引数据
-		dayOfSchedule.groupByGsbm();
-		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
-		return rs;
-	}
-
-	/**
-	 * 误点调整
-	 * @param idx
-	 * @param minute
-	 * @return
-	 */
-	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
-	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
-		return scheduleRealInfoService.lateAdjust(idx, minute);
-	}
-
-	/**
-	 * 获取所有应发未到的班次
-	 * @param idx
-	 * @return
-	 */
-	@RequestMapping(value = "allLate2")
-	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
-		return scheduleRealInfoService.allLate2(idx);
-	}
-
-	/**
-	 * 添加一个临加到历史库
-	 * @param sch
-	 * @return
-	 */
-	@RequestMapping(value = "history/add", method = RequestMethod.POST)
-	public Map<String, Object> addToHistory(ScheduleRealInfo sch){
-		return scheduleRealInfoService.addToHistory(sch);
-	}
-
-	/**
-	 * 从历史库里删除临加班次
-	 * @param sch
-	 * @return
-	 */
-	@RequestMapping(value = "history/{id}", method = RequestMethod.DELETE)
-	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
-		return scheduleRealInfoService.deleteToHistory(id);
-	}
-
-    @RequestMapping(value = "isCircleQdz", method = RequestMethod.POST)
-    public Map<String, Object> isCircleQdz(@RequestParam String line,  String nbbm, String ts, String qdzCode){
-        Map<String, Object> map =new HashMap<>();
-        map.put("isExist",scheduleRealInfoService.isCircleQdz(nbbm, ts, line, qdzCode));
-	    return map;
-    }
-	
-	/**
-	 * 从历史库里删除临加班次
-	 * @param sch
-	 * @return
-	 */
-	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
-	public Map<String, Object> deleteToHistory(@RequestParam Map<String, Object> param){
-		SysUser user = SecurityUtils.getCurrentUser();
-		String uname = user.getUserName();
-		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url"));
-		url.append("?nbbm=").append(param.get("nbbm")).append("&bxy=").append(uname).append("&bxbm=").append(param.get("bxType"));
-		// 分公司保存格式 分公司编码_公司编码
-		String val = BasicData.nbbm2FgsCompanyCodeMap.get(param.get("nbbm"));
-		String[] arr = val.split("_");
-		if (!"22".equals(arr[1])) {
-			Map<String, Object> res = new HashMap<String, Object>();
-			res.put("status", ResponseCode.ERROR);
-			res.put("msg", "除金高公司外暂未开通此功能");
-			
-			return res;
-		}
-		url.append("&fgs=").append(arr[0]);
-		
-		return request(url.toString());
-	}
-	
-	@SuppressWarnings("unchecked")
-	private static Map<String, Object> request(String url) {
-		Map<String, Object> res = new HashMap<String, Object>();
-		res.put("status", ResponseCode.SUCCESS);
-		InputStream in = null;
-		HttpURLConnection con = null;
-		try {
-			con = (HttpURLConnection)new URL(url).openConnection();
-			con.setRequestMethod("POST");
-			con.setRequestProperty("keep-alive", "true");
-			con.setRequestProperty("accept", "application/json");
-			con.setRequestProperty("content-type", "application/json");
-			con.setDoInput(true);
-			con.setReadTimeout(2500);
-			con.setConnectTimeout(2500);
-			
-			con.connect();
-			if (con.getResponseCode() == 200) {
-				in = con.getInputStream();
-				ByteArrayOutputStream bout = new ByteArrayOutputStream();
-				IOUtils.copy(in, bout); bout.close();
-				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
-				if (!"报修成功".equals(response.get("msg"))) {
-					res.put("status", ResponseCode.ERROR);
-					res.putAll(response);
-				}
-			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			res.put("status", ResponseCode.ERROR);
-			res.put("msg", "调用上报接口异常");
-		} finally {
-			try {
-				if (in != null) in.close();
-				if (con != null) con.disconnect();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		
-		return res;
-	}
-}
+package com.bsth.controller.realcontrol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.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;
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.ConfigUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RestController
+@RequestMapping("/realSchedule")
+public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
+
+	@Autowired
+	ScheduleRealInfoService scheduleRealInfoService;
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+
+	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
+	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId, String jGh, String sGh, String nbbm){
+		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
+	}
+
+	@RequestMapping(value = "/lines")
+	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
+		return scheduleRealInfoService.findByLines(lines);
+	}
+
+	@RequestMapping(value = "/car")
+	public List<ScheduleRealInfo> findByCar(String nbbm){
+		return dayOfSchedule.findByNbbm(nbbm);
+	}
+
+	/**
+	 *
+	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
+	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
+	 */
+	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
+										   @RequestParam String dfsj,String bcType,
+										   @RequestParam(defaultValue = "") String opType) {
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
+	}
+
+	/**
+	 *
+	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔 
+	 */
+	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
+	public Map<String, Object> destroy(@RequestParam String idsStr
+			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
+									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
+		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
+	}
+
+	/**
+	 *
+	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
+	 */
+	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
+	public Map<String, String> carDeviceMapp() {
+		return BasicData.deviceId2NbbmMap.inverse();
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/driver", method = RequestMethod.GET)
+	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findDriverByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
+	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findConductorByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
+	 * lineId @throws
+	 */
+	@RequestMapping(value = "/cars", method = RequestMethod.GET)
+	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode) {
+		return scheduleRealInfoService.findCarByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
+	 */
+	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
+	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
+		return scheduleRealInfoService.sreachVehic(nbbm);
+	}
+	/**
+	 *
+	 * @Title: realOutAdjust
+	 * @Description: TODO(实发调整)
+	 * @param @param id 班次ID
+	 * @param @param fcsjActual 实际发车时间 HH:mm
+	 * @param @param remarks 备注
+	 * @throws
+	 */
+	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
+	public Map<String, Object> realOutAdjust(@RequestParam Long id, @RequestParam String fcsjActual,
+											 @RequestParam String remarks) {
+		return scheduleRealInfoService.realOutAdjust(id, fcsjActual, remarks);
+	}
+
+	/**
+	 *
+	 * @Title: revokeDestroy
+	 * @Description: TODO(撤销烂班)
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeDestroy", method = RequestMethod.POST)
+	public Map<String, Object> revokeDestroy(@RequestParam Long id){
+		return scheduleRealInfoService.revokeDestroy(id);
+	}
+
+	/**
+	 *
+	 * @Title: revokeRealOutgo
+	 * @Description: TODO(撤销实发)
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeRealOutgo", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealOutgo(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealOutgo(id);
+	}
+
+	/**
+	 * 撤销执行
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealArrive(id);
+	}
+
+	/**
+	 *
+	 * @Title: spaceAdjust
+	 * @Description: TODO(间隔调整)
+	 * @param @param ids 要调整的班次数组ID
+	 * @param @param space 间隔
+	 * @throws
+	 */
+	@RequestMapping(value = "/spaceAdjust", method = RequestMethod.POST)
+	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
+		return scheduleRealInfoService.spaceAdjust(ids, space);
+	}
+
+	/**
+	 *
+	 * @Title: schInfoFineTune
+	 * @Description: TODO(发车信息微调)
+	 * @param @param map
+	 * @throws
+	 */
+	@RequestMapping(value = "/schInfoFineTune", method = RequestMethod.POST)
+	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
+		return scheduleRealInfoService.schInfoFineTune(map);
+	}
+
+	/**
+	 *
+	 * @Title: outgoAdjustAll
+	 * @Description: TODO(批量待发调整)
+	 * @param @param list
+	 * @throws
+	 */
+	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
+		//反转义
+		params = StringEscapeUtils.unescapeHtml4(params);
+		return scheduleRealInfoService.outgoAdjustAll(params);
+	}
+
+	/**
+	 *
+	 * @Title: findByLineAndUpDown
+	 * @Description: TODO(根据线路和走向获取班次)
+	 * @param @param line
+	 * @param @param upDown
+	 */
+	@RequestMapping(value = "/findByLineAndUpDown")
+	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
+		return dayOfSchedule.findByLineAndUpDown(line, upDown);
+	}
+
+	/**
+	 *
+	 * @Title: findRouteByLine
+	 * @Description: TODO(获取线路的站点，路段路由)
+	 * @param @param lineCode
+	 * @throws
+	 */
+	@RequestMapping(value = "/findRouteByLine")
+	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
+		return scheduleRealInfoService.findRouteByLine(lineCode);
+	}
+
+	/**
+	 *
+	 * @Title: removeChildTask
+	 * @Description: TODO(删除子任务)
+	 * @param @param taskId 子任务ID
+	 * @throws
+	 */
+	@RequestMapping(value = "/childTask/{taskId}", method = RequestMethod.DELETE)
+	public Map<String, Object> removeChildTask(@PathVariable("taskId") Long taskId){
+		return scheduleRealInfoService.removeChildTask(taskId);
+	}
+
+	/**
+	 *
+	 * @Title: findByLineCode
+	 * @Description: TODO(根据线路获取班次信息)
+	 * @param @param lineCode
+	 */
+	@RequestMapping(value = "/lineCode/{lineCode}")
+	public List<ScheduleRealInfo> findByLineCode(@PathVariable("lineCode") String lineCode){
+		return dayOfSchedule.findByLineCode(lineCode);
+	}
+
+	@RequestMapping(value = "/queryUserInfo")
+	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
+												@RequestParam String date,@RequestParam String state) {
+		return scheduleRealInfoService.queryUserInfo(line, date,state);
+	}
+
+	@RequestMapping(value = "/queryUserInfoPx")
+	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
+												  @RequestParam String date,@RequestParam String state,@RequestParam String type) {
+		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
+	}
+
+	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName,@RequestParam String jGh, @RequestParam String clZbh,
+												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybill(jName,jGh, clZbh, lpName,date,line);
+	}
+
+	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line) {
+		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
+	}
+
+
+	@RequestMapping(value = "/dailyInfo")
+	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
+		return scheduleRealInfoService.dailyInfo(line, date, type);
+	}
+
+	@RequestMapping(value = "/historyMessage")
+	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
+										 @RequestParam String code, @RequestParam String type) {
+		return scheduleRealInfoService.historyMessage(line, date, code, type);
+	}
+
+	@RequestMapping(value="/findLine")
+	public List<Map<String,String>> findLine(@RequestParam String line){
+		return scheduleRealInfoService.findLine(line);
+	}
+
+	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
+	}
+
+	/**
+	 * 路单公里统计 （闵行审计专用）
+	 * @param jGh
+	 * @param clZbh
+	 * @param lpName
+	 * @param date
+	 * @param line
+	 * @return
+	 */
+	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
+	}
+
+	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
+	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
+	}
+
+	@RequestMapping(value="/findLpName")
+	public List<Map<String,String>> findLpName(@RequestParam String lpName){
+		return scheduleRealInfoService.findLpName(lpName);
+	}
+
+	@RequestMapping(value = "/account")
+	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
+		return scheduleRealInfoService.account(line, date, code, xlName, type);
+	}
+	
+	@RequestMapping(value = "/accountPx")
+	public List<Map<String,Object>> accountPx(@RequestParam String line, @RequestParam String date,
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String px) {
+		return scheduleRealInfoService.accountPx(line, date, code, xlName, px);
+	}
+
+	@RequestMapping(value = "/correctForm")
+	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
+											@RequestParam String endDate,
+											 @RequestParam String lpName, @RequestParam String code, 
+											 @RequestParam String type,@RequestParam String changType) {
+		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type,changType);
+	}
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表
+	 * @param jName 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill(jGh, clZbh,lpName,date,line);
+	}
+
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表（闵行审计专用路单）
+	 * @param jName 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
+	}
+
+	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
+													 @RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
+	}
+
+	@RequestMapping(value="/statisticsDaily")
+	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
+	}
+
+	@RequestMapping(value="/statisticsDaily_mh_2")
+	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
+	}
+
+	@RequestMapping(value="/statisticsDailyTj")
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
+		String nature="0";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString();
+		}
+		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type,nature);
+	}
+	
+	/*
+	 * 公里修正报表
+	 */
+	@RequestMapping(value="/mileageReportTj")
+	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
+	}
+	
+	/*
+	 * 班次修正报表
+	 */
+	@RequestMapping(value="/scheduleCorrectionReport")
+	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
+	}
+
+	@RequestMapping(value="/MapById",method = RequestMethod.GET)
+	public Map<String, Object> MapById(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapById(id);
+	}
+	
+	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
+	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapByIdQp(id);
+	}
+
+	/**
+	 * @Title: scheduleDaily
+	 * @Description: TODO(调度日报表)
+	 * @param line 线路
+	 * @param date 时间
+	 * @return
+	 */
+	@RequestMapping(value="/scheduleDaily")
+	public Map<String,Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.scheduleDaily(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleList")
+	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleList_zrw")
+	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_zrw(line,date);
+	}
+	
+	@RequestMapping(value="/realScheduleList_mh_2")
+	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
+	}
+
+	@RequestMapping(value="/realScheduleListQp")
+	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleListQp(line,date);
+	}
+
+	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
+	public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
+		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
+		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
+		return scheduleRealInfoService.multi_tzrc(cpcs, null);
+	}
+
+	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
+	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
+		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
+		List<DfsjChange> dfsjcs = JSONArray.parseArray(dcsJson, DfsjChange.class);
+		return scheduleRealInfoService.multi_dftz(dfsjcs);
+	}
+
+	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
+	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
+		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
+	}
+
+	@RequestMapping(value="/history", method=RequestMethod.POST)
+	public Map<String,Object> historySave(ScheduleRealInfo sch){
+		return scheduleRealInfoService.historySave(sch);
+	}
+
+
+	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+	private final static long ONE_DAY = 1000 * 60 * 60 * 24;
+	/**
+	 * 获取可编辑的历史班次日期
+	 * @return
+	 */
+	@RequestMapping("dateArray")
+	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
+		List<String> rs = new ArrayList<>();
+
+		long t = System.currentTimeMillis();
+		if(c != 1)
+			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
+		for(int i = 0; i < 10; i ++){
+			rs.add(fmtyyyyMMdd.print(t));
+			t -= ONE_DAY;
+		}
+		return rs;
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.POST)
+	public Map<String, Object> svgAttr(@RequestParam String jsonStr){
+		return scheduleRealInfoService.svgAttr(jsonStr);
+	}
+
+	@RequestMapping(value = "svgAttr", method = RequestMethod.GET)
+	public Map<String, Object> findSvgAttr(@RequestParam  String idx){
+		return scheduleRealInfoService.findSvgAttr(idx);
+	}
+
+	@RequestMapping(value = "addRemarks", method = RequestMethod.POST)
+	public Map<String, Object> addRemarks(@RequestParam Long id, @RequestParam String remarks){
+		return scheduleRealInfoService.addRemarks(id, remarks);
+	}
+
+	@RequestMapping(value = "scheduleDailyQp", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.scheduleDailyQp(line,date);
+	}
+
+	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.scheduleDailyExport(map);
+	}
+
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
+	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.exportWaybillMore(map);
+	}
+
+	/**
+	 * 获取当日计划排班 ， 从计划表抓取数据
+	 * @return
+	 */
+	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
+	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
+		return scheduleRealInfoService.currentSchedulePlan(lineCode);
+	}
+
+	@RequestMapping(value = "lpChangeMulti", method = RequestMethod.POST)
+	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);
+
+		//重新按公司编码索引数据
+		dayOfSchedule.groupByGsbm();
+		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
+		return rs;
+	}
+
+	/**
+	 * 误点调整
+	 * @param idx
+	 * @param minute
+	 * @return
+	 */
+	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
+	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
+		return scheduleRealInfoService.lateAdjust(idx, minute);
+	}
+
+	/**
+	 * 获取所有应发未到的班次
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping(value = "allLate2")
+	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
+		return scheduleRealInfoService.allLate2(idx);
+	}
+
+	/**
+	 * 添加一个临加到历史库
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "history/add", method = RequestMethod.POST)
+	public Map<String, Object> addToHistory(ScheduleRealInfo sch){
+		return scheduleRealInfoService.addToHistory(sch);
+	}
+
+	/**
+	 * 从历史库里删除临加班次
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "history/{id}", method = RequestMethod.DELETE)
+	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
+		return scheduleRealInfoService.deleteToHistory(id);
+	}
+
+    @RequestMapping(value = "isCircleQdz", method = RequestMethod.POST)
+    public Map<String, Object> isCircleQdz(@RequestParam String line,  String nbbm, String ts, String qdzCode){
+        Map<String, Object> map =new HashMap<>();
+        map.put("isExist",scheduleRealInfoService.isCircleQdz(nbbm, ts, line, qdzCode));
+	    return map;
+    }
+	
+	/**
+	 * 从历史库里删除临加班次
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
+	public Map<String, Object> deleteToHistory(@RequestParam Map<String, Object> param){
+		SysUser user = SecurityUtils.getCurrentUser();
+		String uname = user.getUserName();
+		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url"));
+		url.append("?nbbm=").append(param.get("nbbm")).append("&bxy=").append(uname).append("&bxbm=").append(param.get("bxType"));
+		// 分公司保存格式 分公司编码_公司编码
+		String val = BasicData.nbbm2FgsCompanyCodeMap.get(param.get("nbbm"));
+		String[] arr = val.split("_");
+		if (!"22".equals(arr[1])) {
+			Map<String, Object> res = new HashMap<String, Object>();
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "除金高公司外暂未开通此功能");
+			
+			return res;
+		}
+		url.append("&fgs=").append(arr[0]);
+		
+		return request(url.toString());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private static Map<String, Object> request(String url) {
+		Map<String, Object> res = new HashMap<String, Object>();
+		res.put("status", ResponseCode.SUCCESS);
+		InputStream in = null;
+		HttpURLConnection con = null;
+		try {
+			con = (HttpURLConnection)new URL(url).openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "application/json");
+			con.setRequestProperty("content-type", "application/json");
+			con.setDoInput(true);
+			con.setReadTimeout(2500);
+			con.setConnectTimeout(2500);
+			
+			con.connect();
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout); bout.close();
+				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				if (!"报修成功".equals(response.get("msg"))) {
+					res.put("status", ResponseCode.ERROR);
+					res.putAll(response);
+				}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "调用上报接口异常");
+		} finally {
+			try {
+				if (in != null) in.close();
+				if (con != null) con.disconnect();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return res;
+	}
+}
-package com.bsth.data.gpsdata_v2;
-
-import com.alibaba.fastjson.JSON;
-import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.handlers.*;
-import com.google.common.collect.ArrayListMultimap;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * 实时信号数据处理
- * Created by panzhao on 2017/11/15.
- */
-@Component
-public class DataHandleProcess {
-
-    @Autowired
-    GpsStateProcess gpsStateProcess;
-    @Autowired
-    StationInsideProcess stationInsideProcess;
-    @Autowired
-    AbnormalStateProcess abnormalStateProcess;
-    @Autowired
-    InStationProcess inStationProcess;
-    @Autowired
-    OutStationProcess outStationProcess;
-    @Autowired
-    ReverseRouteProcess reverseRouteProcess;
-    @Autowired
-    GpsRealData gpsRealData;
-
-
-    static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
-
-    final static int POOL_SIZE = 9;
-
-    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
-    public static CountDownLatch count;
-
-    static long lastTime;
-
-    public static boolean isBlock() {
-        return System.currentTimeMillis() - lastTime > 1000 * 30;
-    }
-
-    public void handle(List<GpsEntity> list) {
-        try {
-            if (list.size() == 0)
-                return;
-            lastTime = System.currentTimeMillis();
-            //按设备号分组数据（一个设备的多条数据，必须在一个线程里跑）
-            ArrayListMultimap multimap = ArrayListMultimap.create();
-            for (GpsEntity gps : list) {
-                multimap.put(gps.getDeviceId(), gps);
-            }
-            List<String> deviceList = new ArrayList<>(multimap.keySet());
-
-            //数据均分给线程
-            ArrayListMultimap dataListMap = ArrayListMultimap.create();
-            int size = deviceList.size(), threadIndex = 0, threadSize = size / POOL_SIZE;
-            if(threadSize==0)
-                threadSize = size;
-            for (int i = 0; i < size; i++) {
-                if (i % threadSize == 0)
-                    threadIndex++;
-                dataListMap.putAll(threadIndex, multimap.get(deviceList.get(i)));
-            }
-            Set<Integer> ks = dataListMap.keySet();
-            logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
-            count = new CountDownLatch(ks.size());
-
-            logger.info(JSON.toJSONString(ks));
-            for (Integer index : ks) {
-                threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
-            }
-
-
-            //等待子线程结束
-            count.await();
-
-            //加入实时gps对照
-            for (GpsEntity gps : list)
-                gpsRealData.put(gps);
-
-            logger.info("time , " + (System.currentTimeMillis() - lastTime));
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-
-    static GpsComp comp = new GpsComp();
-
-    public class SignalHandleThread implements Runnable {
-
-        List<GpsEntity> list;
-        CountDownLatch count;
-
-        SignalHandleThread(List<GpsEntity> gpsList, CountDownLatch count) {
-            this.list = gpsList;
-            this.count = count;
-        }
-
-        @Override
-        public void run() {
-            try {
-                Collections.sort(list, comp);
-                GpsEntity gps;
-                for(int i = 0,len = list.size(); i< len ;i ++){
-                    gps = list.get(i);
-
-                    try {
-                        if (StringUtils.isEmpty(gps.getNbbm()))
-                            continue;
-                        if (Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
-                            continue;
-
-                        gpsStateProcess.process(gps);//状态处理
-                        stationInsideProcess.process(gps);//场站内外判定
-                        reverseRouteProcess.process(gps);//反向路由处理
-                        abnormalStateProcess.process(gps);//超速越界
-
-                        inStationProcess.process(gps);//进站
-                        outStationProcess.process(gps);//出站
-
-
-                        GpsCacheData.putGps(gps);//历史gps缓存
-                    } catch (Throwable e) {
-                        logger.error("", e);
-                    }
-                }
-            } finally {
-                if (count != null)
-                    count.countDown();
-            }
-        }
-    }
-
-    public static class GpsComp implements Comparator<GpsEntity> {
-
-        @Override
-        public int compare(GpsEntity g1, GpsEntity g2) {
-            return g1.getTimestamp().compareTo(g2.getTimestamp());
-        }
-    }
+package com.bsth.data.gpsdata_v2;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.*;
+import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 实时信号数据处理
+ * Created by panzhao on 2017/11/15.
+ */
+@Component
+public class DataHandleProcess {
+
+    @Autowired
+    GpsStateProcess gpsStateProcess;
+    @Autowired
+    StationInsideProcess stationInsideProcess;
+    @Autowired
+    AbnormalStateProcess abnormalStateProcess;
+    @Autowired
+    InStationProcess inStationProcess;
+    @Autowired
+    OutStationProcess outStationProcess;
+    @Autowired
+    ReverseRouteProcess reverseRouteProcess;
+    @Autowired
+    GpsRealData gpsRealData;
+
+
+    static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
+
+    final static int POOL_SIZE = 9;
+
+    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
+    public static CountDownLatch count;
+
+    static long lastTime;
+
+    public static boolean isBlock() {
+        return System.currentTimeMillis() - lastTime > 1000 * 30;
+    }
+
+    public void handle(List<GpsEntity> list) {
+        try {
+            if (list.size() == 0)
+                return;
+            lastTime = System.currentTimeMillis();
+            //按设备号分组数据（一个设备的多条数据，必须在一个线程里跑）
+            ArrayListMultimap multimap = ArrayListMultimap.create();
+            for (GpsEntity gps : list) {
+                multimap.put(gps.getDeviceId(), gps);
+            }
+            List<String> deviceList = new ArrayList<>(multimap.keySet());
+
+            //数据均分给线程
+            ArrayListMultimap dataListMap = ArrayListMultimap.create();
+            int size = deviceList.size(), threadIndex = 0, threadSize = size / POOL_SIZE;
+            if(threadSize==0)
+                threadSize = size;
+            for (int i = 0; i < size; i++) {
+                if (i % threadSize == 0)
+                    threadIndex++;
+                dataListMap.putAll(threadIndex, multimap.get(deviceList.get(i)));
+            }
+            Set<Integer> ks = dataListMap.keySet();
+            logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
+            count = new CountDownLatch(ks.size());
+
+            logger.info(JSON.toJSONString(ks));
+            for (Integer index : ks) {
+                threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
+            }
+
+
+            //等待子线程结束
+            count.await();
+
+            //加入实时gps对照
+            for (GpsEntity gps : list)
+                gpsRealData.put(gps);
+
+            logger.info("time , " + (System.currentTimeMillis() - lastTime));
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    static GpsComp comp = new GpsComp();
+
+    public class SignalHandleThread implements Runnable {
+
+        List<GpsEntity> list;
+        CountDownLatch count;
+
+        SignalHandleThread(List<GpsEntity> gpsList, CountDownLatch count) {
+            this.list = gpsList;
+            this.count = count;
+        }
+
+        @Override
+        public void run() {
+            try {
+                Collections.sort(list, comp);
+                GpsEntity gps;
+                for(int i = 0,len = list.size(); i< len ;i ++){
+                    gps = list.get(i);
+
+                    try {
+                        if (StringUtils.isEmpty(gps.getNbbm()))
+                            continue;
+                        if (Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
+                            continue;
+
+                        gpsStateProcess.process(gps);//状态处理
+                        stationInsideProcess.process(gps);//场站内外判定
+                        reverseRouteProcess.process(gps);//反向路由处理
+                        abnormalStateProcess.process(gps);//超速越界
+
+                        inStationProcess.process(gps);//进站
+                        outStationProcess.process(gps);//出站
+
+
+                        GpsCacheData.putGps(gps);//历史gps缓存
+                    } catch (Throwable e) {
+                        logger.error("", e);
+                    }
+                }
+            } finally {
+                if (count != null)
+                    count.countDown();
+            }
+        }
+    }
+
+    public static class GpsComp implements Comparator<GpsEntity> {
+
+        @Override
+        public int compare(GpsEntity g1, GpsEntity g2) {
+            return g1.getTimestamp().compareTo(g2.getTimestamp());
+        }
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata_v2.cache;
-
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.entity.StationRoute;
-import com.bsth.data.gpsdata_v2.entity.trail.GpsExecTrail;
-import com.bsth.data.gpsdata_v2.utils.CircleQueue;
-import com.google.common.collect.ArrayListMultimap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * gps 数据缓存
- * Created by panzhao on 2017/11/15.
- */
-public class GpsCacheData {
-
-    /**
-     * 每辆车缓存最后200条gps
-     */
-    private static final int CACHE_SIZE = 200;
-    private static ConcurrentMap<String, CircleQueue<GpsEntity>> gpsCacheMap = new ConcurrentHashMap<>();
-
-    /**
-     * 车辆执行班次的详细 进出站数据
-     */
-    private static ArrayListMultimap<String, GpsExecTrail> trailListMultimap = ArrayListMultimap.create();
-
-    static Logger logger = LoggerFactory.getLogger(GpsCacheData.class);
-
-    public static CircleQueue<GpsEntity> getGps(String device) {
-        return gpsCacheMap.get(device);
-    }
-
-    /**
-     * 清除车辆的轨迹数据
-     * @param nbbm
-     */
-    public static void remove(String nbbm){
-        //logger.info("清除车辆到离站轨迹, " + nbbm);
-        trailListMultimap.removeAll(nbbm);
-    }
-
-    public static GpsExecTrail gpsExecTrail(String nbbm){
-        List<GpsExecTrail> list = trailListMultimap.get(nbbm);
-
-        GpsExecTrail trail;
-        if(null == list || list.size() == 0
-                || list.get(list.size() - 1).isEnd()){
-            trail = new GpsExecTrail();
-
-            trailListMultimap.put(nbbm, trail);
-        }
-        else{
-            trail = list.get(list.size() - 1);
-        }
-
-        return trail;
-    }
-
-    public static void out(GpsEntity gps){
-        GpsExecTrail trail = gpsExecTrail(gps.getNbbm());
-        trail.getSrs().add(gps);
-
-    }
-
-    public static void in(GpsEntity gps, boolean end){
-        GpsExecTrail trail = gpsExecTrail(gps.getNbbm());
-        trail.getSrs().add(gps);
-        trail.setEnd(end);
-    }
-
-    public static GpsEntity getPrev(GpsEntity gps){
-        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getDeviceId());
-        if(queue != null)
-            return queue.getTail();
-        return null;
-    }
-
-    public static void putGps(GpsEntity gps) {
-        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getDeviceId());
-        if (queue == null) {
-            queue = new CircleQueue<>(CACHE_SIZE);
-            gpsCacheMap.put(gps.getDeviceId(), queue);
-        }
-        queue.add(gps);
-    }
-
-    public static void clear(String deviceId) {
-        try {
-            CircleQueue<GpsEntity> queue = gpsCacheMap.get(deviceId);
-            if (queue != null)
-                queue.clear();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-
-    public static StationRoute prevStation(GpsEntity gps) {
-        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
-        if(null == trails || trails.size() == 0)
-            return null;
-
-        GpsEntity prev;
-        for(int i = trails.size() - 1; i > 0; i--){
-            prev = trails.get(i).getSrs().peekLast();
-
-            if(prev != null){
-                return GeoCacheData.getRouteCode(prev);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 最后一段轨迹
-     * @param gps
-     * @return
-     */
-    public static int lastInTrailsSize(GpsEntity gps) {
-        //int size = 0;
-        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
-        if(null == trails || trails.size() == 0)
-            return 0;
-
-        GpsExecTrail gs = trails.get(trails.size() - 1);
-        if(gs.isEnd())
-            return 0;
-
-        Set<String> set = new HashSet<>();
-        for(GpsEntity g : gs.getSrs()){
-            if(g.getInstation() == 1)
-                set.add(g.getStation().getName());
-        }
-        return set.size();
-    }
-
-    public static List<StationRoute> prevMultiStation(GpsEntity gps) {
-        List<StationRoute> rs = new ArrayList<>();
-        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
-        if(null == trails || trails.size() == 0)
-            return null;
-
-        for(int i = trails.size() - 1; i > 0; i--){
-            rs.addAll(searchLinked(trails.get(i).getSrs(), gps.getUpDown()));
-            if(rs.size() > 3)
-                break;
-        }
-        return rs;
-    }
-
-    private static List<StationRoute> searchLinked(LinkedList<GpsEntity> list, int upDown){
-        List<StationRoute> rs = new ArrayList<>();
-
-        GpsEntity gps;
-        int prevCode=0;
-        for(int i = list.size() - 1; i > 0; i --){
-            gps = list.get(i);
-            if(gps.getInstation()!=1)
-                continue;
-
-            if(gps.getUpDown() != upDown)
-                break;
-
-            if(gps.getStation().getRouteSort() != prevCode)
-                rs.add(gps.getStation());
-
-            prevCode = gps.getStation().getRouteSort();
-
-            if(rs.size() >= 3)
-                break;
-        }
-        return rs;
-    }
-}
+package com.bsth.data.gpsdata_v2.cache;
+
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
+import com.bsth.data.gpsdata_v2.entity.trail.GpsExecTrail;
+import com.bsth.data.gpsdata_v2.utils.CircleQueue;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * gps 数据缓存
+ * Created by panzhao on 2017/11/15.
+ */
+public class GpsCacheData {
+
+    /**
+     * 每辆车缓存最后200条gps
+     */
+    private static final int CACHE_SIZE = 200;
+    private static ConcurrentMap<String, CircleQueue<GpsEntity>> gpsCacheMap = new ConcurrentHashMap<>();
+
+    /**
+     * 车辆执行班次的详细 进出站数据
+     */
+    //private static ArrayListMultimap<String, GpsExecTrail> trailListMultimap = ArrayListMultimap.create();
+    private static Map<String, List<GpsExecTrail>> trailListMultimap = new ConcurrentHashMap<>();
+
+    static Logger logger = LoggerFactory.getLogger(GpsCacheData.class);
+
+    public static CircleQueue<GpsEntity> getGps(String device) {
+        return gpsCacheMap.get(device);
+    }
+
+    /**
+     * 清除车辆的轨迹数据
+     * @param nbbm
+     */
+    public static void remove(String nbbm){
+        //logger.info("清除车辆到离站轨迹, " + nbbm);
+        trailListMultimap.remove(nbbm);
+    }
+
+    public static GpsExecTrail gpsExecTrail(String nbbm){
+        List<GpsExecTrail> list = trailListMultimap.get(nbbm);
+
+        GpsExecTrail trail;
+        if (null == list || list.size() == 0 || list.get(list.size() - 1).isEnd()) {
+            if (null == list) {
+                list = new CopyOnWriteArrayList<>();
+                trailListMultimap.put(nbbm, list);
+            }
+            trail = new GpsExecTrail();
+            list.add(trail);
+        } else{
+            trail = list.get(list.size() - 1);
+        }
+
+        return trail;
+    }
+
+    public static void out(GpsEntity gps){
+        GpsExecTrail trail = gpsExecTrail(gps.getNbbm());
+        trail.getSrs().add(gps);
+
+    }
+
+    public static void in(GpsEntity gps, boolean end){
+        GpsExecTrail trail = gpsExecTrail(gps.getNbbm());
+        trail.getSrs().add(gps);
+        trail.setEnd(end);
+    }
+
+    public static GpsEntity getPrev(GpsEntity gps){
+        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getDeviceId());
+        if(queue != null)
+            return queue.getTail();
+        return null;
+    }
+
+    public static void putGps(GpsEntity gps) {
+        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getDeviceId());
+        if (queue == null) {
+            queue = new CircleQueue<>(CACHE_SIZE);
+            gpsCacheMap.put(gps.getDeviceId(), queue);
+        }
+        queue.add(gps);
+    }
+
+    public static void clear(String deviceId) {
+        try {
+            CircleQueue<GpsEntity> queue = gpsCacheMap.get(deviceId);
+            if (queue != null)
+                queue.clear();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    public static StationRoute prevStation(GpsEntity gps) {
+        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
+        if(null == trails || trails.size() == 0)
+            return null;
+
+        GpsEntity prev;
+        for(int i = trails.size() - 1; i > 0; i--){
+            prev = trails.get(i).getSrs().peekLast();
+
+            if(prev != null){
+                return GeoCacheData.getRouteCode(prev);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 最后一段轨迹
+     * @param gps
+     * @return
+     */
+    public static int lastInTrailsSize(GpsEntity gps) {
+        //int size = 0;
+        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
+        if(null == trails || trails.size() == 0)
+            return 0;
+
+        GpsExecTrail gs = trails.get(trails.size() - 1);
+        if(gs.isEnd())
+            return 0;
+
+        Set<String> set = new HashSet<>();
+        for(GpsEntity g : gs.getSrs()){
+            if(g.getInstation() == 1)
+                set.add(g.getStation().getName());
+        }
+        return set.size();
+    }
+
+    public static List<StationRoute> prevMultiStation(GpsEntity gps) {
+        List<StationRoute> rs = new ArrayList<>();
+        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
+        if(null == trails || trails.size() == 0)
+            return null;
+
+        for(int i = trails.size() - 1; i > 0; i--){
+            rs.addAll(searchLinked(trails.get(i).getSrs(), gps.getUpDown()));
+            if(rs.size() > 3)
+                break;
+        }
+        return rs;
+    }
+
+    private static List<StationRoute> searchLinked(LinkedList<GpsEntity> list, int upDown){
+        List<StationRoute> rs = new ArrayList<>();
+
+        GpsEntity gps;
+        int prevCode=0;
+        for(int i = list.size() - 1; i > 0; i --){
+            gps = list.get(i);
+            if(gps.getInstation()!=1)
+                continue;
+
+            if(gps.getUpDown() != upDown)
+                break;
+
+            if(gps.getStation().getRouteSort() != prevCode)
+                rs.add(gps.getStation());
+
+            prevCode = gps.getStation().getRouteSort();
+
+            if(rs.size() >= 3)
+                break;
+        }
+        return rs;
+    }
+}
@@ -39,11 +39,13 @@ public class Dlb {
 	private String jhsj;
 	//耗电
 	private Double hd=0.0;
+	//损耗
 	private Double sh=0.0;
 	private String shyy;
 	private Double zlc=0.0;
 	private int yhlx;
-	
+
+	//当前存入百公里油耗
 	private Double ns=0.0;
 	private Double fyylc=0.0;
 	private Double jhzlc=0.0;
@@ -26,13 +26,22 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	List<Dlb> obtainYlbefore(String rq,String gsdm,String fgsdm,String xlbm,String nbbm);
 	/**
 	 * 当天DLB信息
-	 * @param rq
+	 * @param rq, xlbm(like)
 	 * @return
 	 */
 	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 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);
+	/**
+	 * 当天DLB信息
+	 * @param rq, xlbm(=)
+	 * @return
+	 */
+	@Query(value="SELECT * FROM bsth_c_dlb  where rq=?1 and ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm = ?4 and nbbm like %?5% order by ?6 asc",nativeQuery=true)
+	List<Dlb> obtainDlEq(String rq,String gsbm,String fgsdm,String xlbm,String nbbm,String px);
 	@Query(value="select s from Dlb s "
 			+ " where to_days(s.rq)=to_days(?1) "
+package com.bsth.service.calc;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by 20/05/27.
+ */
+public interface CalcDlbService {
+	
+	public void impElectric(String date) throws Exception;
+	
+}
+package com.bsth.service.calc.impl;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.calc.CalcDlbService;
+import com.bsth.util.Arith;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+/**
+ * Created by 20/05/27.
+ */
+@Service
+public class CalcDlbServiceImpl implements CalcDlbService {
+	
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
+	@Autowired
+    ScheduleRealInfoRepository scheRepository;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	final DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+    
+	
+	/**
+	 * @throws Exception
+	 */
+	public void impElectric(String date) throws Exception{
+		try {
+    		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    		Calendar calendar2 = Calendar.getInstance();
+		    calendar2.setTime(new Date());
+		    int hours= calendar2.get(Calendar.HOUR_OF_DAY);
+		    
+//			if(hoursC>=8 && hours<9){//每天8点到9点间执行
+			if(true){	//无更新时点限制
+	    		//查询所有车辆
+	    		String sql = "select inside_code,branche_company_code, ny_type from bsth_c_cars";
+				
+				List<Map<String, String>> listMap= jdbcTemplate.query(sql, new RowMapper<Map<String,String>>(){
+					@Override
+					public Map<String, String> mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, String> m=new HashMap<String, String>();
+						m.put("insideCode", rs.getString("inside_code"));
+						m.put("brancheCompanyCode", rs.getString("branche_company_code"));
+						m.put("nyType", rs.getString("ny_type"));
+						return m;
+					}
+				});
+				Map<String, String> map=new HashMap<String, String>();
+				Map<String, String> nyTypeMap=new HashMap<String, String>();
+				for (int i = 0; i < listMap.size(); i++) {
+					Map<String, String> m=listMap.get(i);
+					map.put(m.get("insideCode"), m.get("brancheCompanyCode"));
+					nyTypeMap.put(m.get("insideCode"), m.get("nyType"));
+				}
+//				Date dNow = new Date();
+//		        Calendar calendar = Calendar.getInstance();
+//		        calendar.setTime(dNow);
+//		        calendar.add(Calendar.DAY_OF_MONTH, -1);
+//		        Date dBefore = calendar.getTime();
+//		        String date = sdf.format(dBefore);
+				String json = this.getHttpInterface("https://web.enneagon.com/exchange/pub/rest/vehicle/getJiaDingBusDailyData?scheduleDate="+date);
+				List<Map<String, Object>> list=(List<Map<String, Object>>) JSONObject.parse(json);
+				if(list.size()>0){
+						savePush(list, date, map);
+				}
+				
+				//第一步获取从排班表获取日期，人，车，线，路牌，里程
+				List<ScheduleRealInfo> findByDate = scheRepository.findByDate(date);
+				Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
+				for(ScheduleRealInfo s : findByDate){
+					String key = s.getGsBm() + "/" + s.getFgsBm() + "/" + s.getXlBm() + "/" + s.getLpName() + "/" + s.getClZbh() + "/" + s.getjGh();
+					if(!(keyMap.containsKey(key))){
+						keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+					}
+					keyMap.get(key).add(s);
+				}
+
+				List<Map<String, Object>> list1 = new ArrayList<Map<String, Object>>();
+				List<Map<String, Object>> list2 = (List<Map<String, Object>>) JSONObject.parse(json);
+				Set<String> set = new HashSet<String>();
+				Map<String, List<Map<String, Object>>> keyMap1 = new HashMap<String, List<Map<String, Object>>>();
+				Map<String, List<Map<String, Object>>> keyMap2 = new HashMap<String, List<Map<String, Object>>>();
+				
+				for(String key : keyMap.keySet()){
+					Map<String, Object> m = new HashMap<String, Object>();
+					List<ScheduleRealInfo> list3 = keyMap.get(key);
+					double sjzgl = 0;
+					String gsName = "", fgsName = "", xlName = "", jName = "", red = "", fcsj = "";
+					for (ScheduleRealInfo scheduleRealInfo : list3) {
+						
+						//取最小的发车时间
+						String fcsjA = "", redA = "";
+						if(scheduleRealInfo.getFcsjActual() != null && scheduleRealInfo.getFcsjActual().trim().length() > 0){
+							fcsjA = scheduleRealInfo.getFcsjActual();
+						} else if(scheduleRealInfo.getFcsj() != null && scheduleRealInfo.getFcsj().trim().length() > 0){
+							fcsjA = scheduleRealInfo.getFcsj();
+						}
+						if(scheduleRealInfo.getRealExecDate() != null && scheduleRealInfo.getRealExecDate().trim().length() > 0){
+							redA = scheduleRealInfo.getRealExecDate();
+						} else {
+							redA = date;
+						}
+						if(fcsjA.trim().length() > 0){
+							if(fcsj.length() == 0 || dtf.parseMillis(redA+fcsjA) < dtf.parseMillis(red+fcsj)){
+								fcsj = fcsjA;
+								red = redA;
+							}
+						}
+						
+						if(scheduleRealInfo.getGsName() != null && scheduleRealInfo.getGsName().trim().length() > 0){
+							gsName = scheduleRealInfo.getGsName();
+						}
+						if(scheduleRealInfo.getFgsName() != null && scheduleRealInfo.getFgsName().trim().length() > 0){
+							fgsName = scheduleRealInfo.getFgsName();
+						}
+						if(scheduleRealInfo.getXlName() != null && scheduleRealInfo.getXlName().trim().length() > 0){
+							xlName = scheduleRealInfo.getXlName();
+						}
+						if(scheduleRealInfo.getjName() != null && scheduleRealInfo.getjName().trim().length() > 0){
+							jName = scheduleRealInfo.getjName();
+						}
+						
+						//开始算里程
+						if (!isInOut(scheduleRealInfo)) {
+							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+							if(!scheduleRealInfo.isSflj()){
+								if(childTaskPlans.isEmpty()){
+									if(!scheduleRealInfo.isDestroy()){
+										//非子任务 实际里程
+										double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+										double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+										if(jhlc-jhlcOrig>0){
+											sjzgl=Arith.add(sjzgl,jhlcOrig);
+										}else{
+											sjzgl=Arith.add(sjzgl,jhlc);
+										}
+									}
+									//临加里程
+									double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+									double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+									double zjlc=Arith.sub(jhlc, jhlcOrig);
+									if(zjlc>0){
+										sjzgl=Arith.add(zjlc, sjzgl);
+									}
+								} else {
+									Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+									while (it.hasNext()) {
+										ChildTaskPlan childTaskPlan = it.next();
+										if(childTaskPlan.getMileageType().equals("service")
+												&&"正常".equals(childTaskPlan.getType1())
+												&& childTaskPlan.getCcId()==null){
+											//子任务 实际里程
+											if (!childTaskPlan.isDestroy()) {
+												Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+												sjzgl=Arith.add(sjzgl,jhgl);
+											} 
+										} else if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
+											//空驶公里
+											if (!childTaskPlan.isDestroy()) {
+												Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+												sjzgl=Arith.add(sjzgl,jhgl);
+											} 
+										} else if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())
+												&& childTaskPlan.getCcId()==null){
+											//临加里程
+											if (!childTaskPlan.isDestroy()) {
+												Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+												sjzgl=Arith.add(sjzgl,jhgl);
+											}
+										}
+									}
+								}
+							} else {
+								//临加里程
+								if(childTaskPlans.isEmpty()){
+									sjzgl=Arith.add(sjzgl,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+								}else{
+									Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+									while (it.hasNext()) {
+										ChildTaskPlan childTaskPlan = it.next();
+										if(childTaskPlan.getMileageType().equals("service") && childTaskPlan.getCcId()==null){
+											if (!childTaskPlan.isDestroy()) {
+												Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+												sjzgl=Arith.add(sjzgl,jhgl);
+											} 
+										}
+									}
+								}
+							}
+						} else {
+							//进出场里程
+							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+							if(childTaskPlans.isEmpty()){
+								if(!scheduleRealInfo.isDestroy()){
+									sjzgl=Arith.add(sjzgl, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
+								}
+							}else{
+								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+								while (it.hasNext()) {
+									ChildTaskPlan childTaskPlan = it.next();
+									if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
+										if (!childTaskPlan.isDestroy()) {
+											Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+											sjzgl=Arith.add(sjzgl,jhgl);
+										}
+									}
+								}
+							}
+						}
+					}
+					String[] split = key.split("/");
+					m.put("red", red);
+					m.put("fcsj", fcsj);
+					m.put("gsName", gsName);
+					m.put("fgsName", fgsName);
+					m.put("date", date);
+					m.put("gsBm", split[0]);
+					m.put("fgsBm", split[1]);
+					m.put("xlBm", split[2]);
+					m.put("xlName", xlName);
+					m.put("lpName", split[3]);
+					m.put("clZbh", split[4]);
+					m.put("jGh", split[5]);
+					m.put("jName", jName);
+					m.put("sjzgl", sjzgl);
+					list1.add(m);
+				}
+				
+				//第二步根据日期，车辆匹配
+				for(Map<String, Object> m : list1){//里程
+					String key = m.get("date").toString() + "/" + m.get("clZbh").toString();
+					if(!(keyMap1.containsKey(key))){
+						keyMap1.put(key, new ArrayList<Map<String, Object>>());
+					}
+					keyMap1.get(key).add(m);
+					set.add(key);
+				}
+				for(Map<String, Object> m : list2){//加电量
+					String key = m.get("scheduleDate").toString() + "/" + m.get("insideCode").toString();
+					if(!(keyMap2.containsKey(key))){
+						keyMap2.put(key, new ArrayList<Map<String, Object>>());
+					}
+					keyMap2.get(key).add(m);
+					set.add(key);
+				}
+				
+				//第三步 一车多单进行拆分
+				final List<Map<String, Object>> list5 = new ArrayList<Map<String, Object>>();
+				
+				for(String key : set){
+//					Map<String, Object> resMap = new HashMap<String, Object>();
+					List<Map<String, Object>> list3 = keyMap1.get(key);
+					List<Map<String, Object>> list4 = keyMap2.get(key);
+					
+					double jdl = 0d;
+					if(list4 != null){
+						for(Map<String, Object> m : list4){
+							jdl = Arith.add(jdl, m.get("sum").toString());
+						}
+					}
+					
+					String clZbh = key.split("/")[1];
+					if(jdl < 0.01d){
+						if(nyTypeMap.get(clZbh) != null
+								&& "1".equals(nyTypeMap.get(clZbh).toString())	//1：全电；2：油电混合
+								&& "2".equals(nyTypeMap.get(clZbh).toString())){
+							//加电量为0情况下，只取电车
+						} else {
+							continue;
+						}
+					}
+					
+					if(list3 != null && list3.size() > 0){
+						
+						if(list3.size() > 1){	//多条时，排序
+							Collections.sort(list3, new Comparator<Map<String, Object>>() {
+								@Override
+								public int compare(Map<String, Object> c1, Map<String, Object> c2) {
+									String k1 = c1.get("red").toString() + c1.get("fcsj").toString();
+									String k2 = c2.get("red").toString() + c2.get("fcsj").toString();
+									
+									if(c1.get("fcsj").toString().length() == 0){
+										return -1;
+									}
+									if(c2.get("fcsj").toString().length() == 0){
+										return 1;
+									}
+									
+									long l1 = dtf.parseMillis(k1);
+									long l2 = dtf.parseMillis(k2);
+									
+									long diff = l1 - l2;
+									if (diff > 0l) {
+										return 1;
+									} else if (diff < 0l) {
+										return -1;
+									}
+									return 0; //相等为0
+								}
+							});
+						}
+						
+						double zgl = 0;
+						for(Map<String, Object> m : list3){
+							zgl = Arith.add(zgl, m.get("sjzgl").toString());
+						}
+						double jdl_ = Arith.add(0, jdl);//为保精度计算最后总数不变，一车多单情况最后一条直接用减剩下的值
+						for(int i = 0; i < list3.size(); i++){
+							Map<String, Object> m = list3.get(i);
+							m.put("jcsx", i + 1);	//顺序
+							
+							if(i == (list3.size() - 1)){	//最后一条
+								m.put("jdl", jdl_);
+							} else {
+								if(m.get("sjzgl") != null && !("0".equals(m.get("sjzgl").toString()))){
+									double mul = Arith.mul(jdl, Arith.div(m.get("sjzgl").toString(), zgl, 2));
+									double div = Arith.div(mul, 1, 2);	//除1，利用工具类以去除小数点
+									jdl_ = Arith.sub(jdl_, div);
+									m.put("jdl", div);
+								} else {
+									m.put("jdl", "0");
+								}
+							}
+							
+							if(m.get("sjzgl") != null && new BigDecimal(m.get("sjzgl").toString()).doubleValue() > 0d
+									&& new BigDecimal(m.get("jdl").toString()).doubleValue() > 0d){
+								double mul = Arith.mul(Arith.div(m.get("jdl").toString(), m.get("sjzgl").toString(), 4), 100);
+								m.put("hdl",mul);
+							} else {
+								m.put("hdl", 0);
+							}
+							list5.add(m);
+						}
+					} else if(list4 != null && list4.size() > 0){
+						Map<String, Object> map2 = list4.get(0);
+						Map<String, Object> m = new HashMap<String, Object>();
+						m.put("fcsj", "");
+						m.put("jcsx", "1");
+						m.put("gsName", "");
+						m.put("fgsName", "");
+						m.put("date", date);
+						m.put("gsBm", "24");
+						m.put("fgsBm", map.get(map2.get("insideCode").toString())==null?"":map.get(map2.get("insideCode").toString()).toString());
+						m.put("xlBm", "");
+						m.put("xlName", "");
+						m.put("lpName", "");
+						m.put("clZbh", map2.get("insideCode").toString());
+						m.put("jGh", "");
+						m.put("jName", "");
+						m.put("sjzgl", 0);	//总里程
+						m.put("jdl", jdl);	//加电量（耗电量）
+						m.put("hdl", 0);	//百公里耗电
+						list5.add(m);
+					}
+				}
+				
+				//第四部保存入库
+				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				String createDate = sdf2.format(new Date());
+				for(Map<String, Object> m : list5){
+					m.put("created", "aotu");	//代表定时器自动生成
+					m.put("createDate", createDate);
+				}
+//				String deleteSql = "delete from bsth_c_hdl where date='" + date + "' and created = 'aotu'";
+				String deleteSql = "delete from bsth_c_dlb where rq = '" + date + "'";
+	         	jdbcTemplate.batchUpdate(deleteSql);	//先删除这一天的数据
+//				String insertSql = "insert into bsth_c_hdl(gs_bm, fgs_bm, gs_name, fgs_name, date, nbbm, j_gh, j_name,"
+//						+ " xl_bm, xl_name, lp_name, jdl, sjzgl, hdl, created, create_date) "
+//						+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+				String insertSql = "insert into bsth_c_dlb(ssgsdm, fgsdm, rq, czcd, jzcd, nbbm, jsy, jname,"
+				+ " xlbm, linename, lp, cdl, hd, zlc, ns, createtime, jhsj, jcsx, nylx, yhlx, jhbc, jhzbc,"
+				+ " fyylc, jhfyylc, jhzlc, jzlc, sfkt, sh, sjbc, sjzbc) "
+				+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+				jdbcTemplate.batchUpdate(insertSql, new BatchPreparedStatementSetter() {
+					
+	                @Override
+	                public void setValues(PreparedStatement ps, int i) throws SQLException {
+	                	Map<String, Object> m = list5.get(i);
+	                    ps.setString(1, "24");
+	                    ps.setString(2, m.get("fgsBm").toString());
+	                    ps.setString(3, m.get("date").toString());
+	                    ps.setString(4, "100");
+	                    ps.setString(5, "100");
+	                    ps.setString(6, m.get("clZbh").toString());
+	                    ps.setString(7, m.get("jGh").toString());
+	                    ps.setString(8, m.get("jName").toString());
+	                    ps.setString(9, m.get("xlBm").toString());
+	                    ps.setString(10, m.get("xlName").toString());
+	                    ps.setString(11, m.get("lpName").toString());
+	                    ps.setString(12, m.get("jdl").toString());
+	                    ps.setString(13, m.get("jdl").toString());
+	                    ps.setString(14, m.get("sjzgl").toString());
+	                    ps.setString(15, m.get("hdl").toString());
+	                    ps.setString(16, m.get("createDate").toString());
+	                    ps.setString(17, m.get("fcsj").toString());
+	                    ps.setString(18, m.get("jcsx").toString());
+	                    ps.setString(19, "0");
+	                    ps.setString(20, "0");
+	                    ps.setString(21, "0");
+	                    ps.setString(22, "0");
+	                    ps.setString(23, "0");
+	                    ps.setString(24, "0");
+	                    ps.setString(25, "0");
+	                    ps.setString(26, "0");
+	                    ps.setString(27, "0");
+	                    ps.setString(28, "0");
+	                    ps.setString(29, "0");
+	                    ps.setString(30, "0");
+	                }
+
+	                @Override
+	                public int getBatchSize() {
+	                    return list5.size();
+	                }
+	            });
+		    }
+		}catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}finally{
+			logger.info("setDDRB:");
+		}
+    }
+	
+	private void savePush(final List<Map<String, Object>> list,final String rq,final Map<String, String> map) {
+        String sql = "insert into bsth_c_jdl(rq, gs_bm, fgs_bm,jdl, "
+        		+ " nbbm,adding_time,remarks) " +
+                "  VALUES(?,?,?,?,?,?,?)";
+        
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+        try {
+        	String sql2="delete from bsth_c_jdl where rq='"+rq+"' and remarks='JKSJ'";
+         	jdbcTemplate.batchUpdate(sql2);
+            jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+			
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                	Map<String, Object> t = list.get(i);
+                    ps.setString(1, t.get("scheduleDate").toString());
+                    ps.setString(2, "24");
+                    ps.setString(3, map.get(t.get("insideCode").toString())==null?"":map.get(t.get("insideCode").toString()).toString());
+                    ps.setString(4, t.get("sum").toString());
+                    ps.setString(5, t.get("insideCode").toString());
+                    ps.setString(6, t.get("addingTime").toString());
+                    ps.setString(7, "JKSJ");	//代表来源接口数据
+
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return list.size();
+                }
+            });
+
+            tran.commit(status);
+        } catch (Exception e) {
+            tran.rollback(status);
+            logger.error("", e);
+        }
+    }
+	
+	public static boolean isInOut(ScheduleRealInfo s){
+		boolean fage=false;
+		if(s.getBcType().equals("in")){
+			fage=true;
+		}
+		if(s.getBcType().equals("out")){
+			fage=true;
+		}
+		if(s.getBcType().equals("ldks")){
+			fage=true;
+		}
+			
+		return fage;
+	}
+	
+	public static String getHttpInterface(String path){
+        BufferedReader in = null;
+        StringBuffer result = null;
+        try {
+            URL url = new URL(path);
+            //打开和url之间的连接
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            connection.setRequestProperty("Charset", "utf-8");
+            connection.connect();
+ 
+            result = new StringBuffer();
+            //读取URL的响应
+            in = new BufferedReader(new InputStreamReader(
+                    connection.getInputStream(),"utf-8"));
+            String line;
+            while ((line = in.readLine()) != null) {
+            	
+                result.append(line);
+            }
+            return result.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }finally {
+            try {
+                if (in != null) {
+                    in.close();
+                }
+            } catch (Exception e2) {
+                e2.printStackTrace();
+            }
+        }
+        return null;
+    }
+	
+}
@@ -2682,6 +2682,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        double jzl = 0.0;
 		        double zlc = 0.0;
 		        String rylx="";
+		        double ccyl_ = 0.0;
+		        double jcyl_ = 0.0;
+		        double yh_ = 0.0;
+		        double jzl_ = 0.0;
 //		        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
 //		        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
 		        List<Ylb> listYlb = ylbMap.get(jsy + nbbm);
@@ -2690,57 +2694,105 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //		        List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
 		        List<Cars> listCars = carMap.get(s.getClZbh());
 				if (listCars != null && listCars.size() > 0) {
-					if(listCars.get(0).getSfdc()!=null){
-						if (listCars.get(0).getSfdc()) {
-							type = 1;
-							if(listDlb != null)
-							for (int i = 0; i < listDlb.size(); i++) {
-								Dlb d = listDlb.get(i);
-								if (d.getLp() == null) {
-									ccyl = Arith.add(ccyl, d.getCzcd());
-									jcyl = Arith.add(jcyl, d.getJzcd());
-									yh = Arith.add(yh, d.getHd());
-									jzl = Arith.add(jzl, d.getCdl());
-									zlc = Arith.add(zlc, d.getZlc());
-								} else {
-									if (d.getLp().equals(s.getLpName())) {
-										ccyl = Arith.add(ccyl, d.getCzcd());
-										jcyl = Arith.add(jcyl, d.getJzcd());
-										yh = Arith.add(yh, d.getHd());
-										jzl = Arith.add(jzl, d.getCdl());
-										zlc = Arith.add(zlc, d.getZlc());
-									}
-								}
-			
-							}
-						} else {
-							type = 0;
-							if(listYlb != null)
-							for (int i = 0; i < listYlb.size(); i++) {
-								Ylb y = listYlb.get(i);
-								if (y.getLp() == null) {
-									ccyl = Arith.add(ccyl, y.getCzyl());
-									jcyl = Arith.add(jcyl, y.getJzyl());
-									yh = Arith.add(yh, y.getYh());
-									jzl = Arith.add(jzl, y.getJzl());
-									zlc = Arith.add(zlc, y.getZlc());
-									if(dMap.get(y.getRylx())!=null)
-										rylx=dMap.get(y.getRylx()).toString();
-								} else {
-									if (y.getLp().equals(s.getLpName())) {
-										ccyl = Arith.add(ccyl, y.getCzyl());
-										jcyl = Arith.add(jcyl, y.getJzyl());
-										yh = Arith.add(yh, y.getYh());
-										jzl = Arith.add(jzl, y.getJzl());
-										zlc = Arith.add(zlc, y.getZlc());
-										if(dMap.get(y.getRylx())!=null)
-											rylx=dMap.get(y.getRylx()).toString();
-										
-									}
-								}
-							}
-						}
-					}
+					if (listCars.get(0).getNyType() != null) {
+		                if ("1".equals(listCars.get(0).getNyType().toString())) {	//全电
+//		                    List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+		                    type = 1;
+		                    if(listDlb != null){
+			                    for (int i = 0; i < listDlb.size(); i++) {
+			                        Dlb d = listDlb.get(i);
+			                        if (d.getLp() == null) {
+			                            ccyl = Arith.add(ccyl, d.getCzcd());
+			                            jcyl = Arith.add(jcyl, d.getJzcd());
+			                            yh = Arith.add(yh, d.getHd());
+			                            jzl = Arith.add(jzl, d.getCdl());
+			                            zlc = Arith.add(zlc, d.getZlc());
+			                        } else {
+			                            if (d.getLp().equals(s.getLpName())) {
+			                                ccyl = Arith.add(ccyl, d.getCzcd());
+			                                jcyl = Arith.add(jcyl, d.getJzcd());
+			                                yh = Arith.add(yh, d.getHd());
+			                                jzl = Arith.add(jzl, d.getCdl());
+			                                zlc = Arith.add(zlc, d.getZlc());
+			                            }
+			                        }
+			                    }
+		                    }
+		                } else if("2".equals(listCars.get(0).getNyType().toString())){	//油点混合
+//		                    List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+//		                    List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+		                	type = 2;
+		                	if(listYlb != null){
+			                	for (int i = 0; i < listYlb.size(); i++) {
+			                        Ylb y = listYlb.get(i);
+			                        if (y.getLp() == null) {
+			                            ccyl = Arith.add(ccyl, y.getCzyl());
+			                            jcyl = Arith.add(jcyl, y.getJzyl());
+			                            yh = Arith.add(yh, y.getYh());
+			                            jzl = Arith.add(jzl, y.getJzl());
+			                            zlc = Arith.add(zlc, y.getZlc());
+			                            if(dMap.get(y.getRylx())!=null)
+			                            	rylx =dMap.get(y.getRylx()).toString();
+			                        } else {
+			                            if (y.getLp().equals(s.getLpName())) {
+			                                ccyl = Arith.add(ccyl, y.getCzyl());
+			                                jcyl = Arith.add(jcyl, y.getJzyl());
+			                                yh = Arith.add(yh, y.getYh());
+			                                jzl = Arith.add(jzl, y.getJzl());
+			                                zlc = Arith.add(zlc, y.getZlc());
+			                                if(dMap.get(y.getRylx())!=null)
+			                                	rylx =dMap.get(y.getRylx()).toString();
+			                            }
+			                        }
+			                    }
+		                	}
+		                	if(listDlb != null){
+			                    for (int i = 0; i < listDlb.size(); i++) {
+			                        Dlb d = listDlb.get(i);
+			                        if (d.getLp() == null) {
+			                            ccyl_ = Arith.add(ccyl_, d.getCzcd());
+			                            jcyl_ = Arith.add(jcyl_, d.getJzcd());
+			                            yh_ = Arith.add(yh_, d.getHd());
+			                            jzl_ = Arith.add(jzl, d.getCdl());
+			                        } else {
+			                            if (d.getLp().equals(s.getLpName())) {
+			                                ccyl_ = Arith.add(ccyl_, d.getCzcd());
+			                                jcyl_ = Arith.add(jcyl_, d.getJzcd());
+			                                yh_ = Arith.add(yh_, d.getHd());
+			                                jzl_ = Arith.add(jzl_, d.getCdl());
+			                            }
+			                        }
+			                    }
+		                	}
+		                } else {
+//		                    List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+		                    type = 0;
+		                    if(listYlb != null){
+			                    for (int i = 0; i < listYlb.size(); i++) {
+			                        Ylb y = listYlb.get(i);
+			                        if (y.getLp() == null) {
+			                            ccyl = Arith.add(ccyl, y.getCzyl());
+			                            jcyl = Arith.add(jcyl, y.getJzyl());
+			                            yh = Arith.add(yh, y.getYh());
+			                            jzl = Arith.add(jzl, y.getJzl());
+			                            zlc = Arith.add(zlc, y.getZlc());
+			                            if(dMap.get(y.getRylx())!=null)
+			                            	rylx =dMap.get(y.getRylx()).toString();
+			                        } else {
+			                            if (y.getLp().equals(s.getLpName())) {
+			                                ccyl = Arith.add(ccyl, y.getCzyl());
+			                                jcyl = Arith.add(jcyl, y.getJzyl());
+			                                yh = Arith.add(yh, y.getYh());
+			                                jzl = Arith.add(jzl, y.getJzl());
+			                                zlc = Arith.add(zlc, y.getZlc());
+			                                if(dMap.get(y.getRylx())!=null)
+			                                	rylx =dMap.get(y.getRylx()).toString();
+			                            }
+			                        }
+			                    }
+		                    }
+		                }
+		            }
 				}
 				double jylc=ylbMapJylc.get(line+"-"+jGh+"-"+nbbm+"-"+lpName)==null?0.0:ylbMapJylc.get(line+"-"+jGh+"-"+nbbm+"-"+lpName);
 				Map.put("jylc", jylc);
@@ -2749,6 +2801,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Map.put("yh", yh);
 		        Map.put("ccyl", ccyl);
 		        Map.put("jcyl", jcyl);
+		        Map.put("jzl_", jzl_);
+		        Map.put("yh_", yh_);
+		        Map.put("ccyl_", ccyl_);
+		        Map.put("jcyl_", jcyl_);
 		        Map.put("type", type);
 		        Map.put("zlc", zlc);
 		        Map.put("xlName", s.getXlName());
@@ -2964,8 +3020,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
                 String xls="";
                 if(Map.get("type").toString().equals("0")){
                 	xls="waybill_minhang.xls";
-                }else{
+                } else if(Map.get("type").toString().equals("1")){
                 	xls="waybill_minhang_dl.xls";
+                } else {
+                	xls="waybill_minhang_yd.xls";
                 }
                 Map.put("sheetName", jName + "-" + clZbh + "-" + lpName);
                 ee.excelReplace(list1, new Object[]{Map}, path1 + "mould/"+xls,
@@ -14,13 +14,13 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
-import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.Dictionary;
+import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.jdtest.JdtestService;
@@ -40,6 +40,8 @@ public class JdtestServiceImpl implements JdtestService {
 	@Autowired
 	YlbRepository ylbRepository;
 	@Autowired
+	DlbRepository dlbRepository;
+	@Autowired
 	DictionaryService dictionaryService;
 	@Override
 	public List<Ylxxb> cwjyList(Map<String, Object> map) {
@@ -159,13 +161,26 @@ public class JdtestServiceImpl implements JdtestService {
 		}else{
 			listYlb=ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
 		}
-		Map<String, Ylb> mapYlb=new HashMap<>();
+		Map<String, Ylb> mapYlb=new HashMap<String, Ylb>();
 		for (int j = 0; j < listYlb.size(); j++) {
 			Ylb y=listYlb.get(j);
 			if(mapYlb.get(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp())==null){
 				mapYlb.put(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp(), y);
 			}
 		}
+		List<Dlb> listDlb=new ArrayList<Dlb>();
+		if(xlbm.equals("")){
+			listDlb=dlbRepository.obtainDl(map.get("date").toString(), gsbm, fgsbm, xlbm, "", "xlbm");
+		}else{
+			listDlb=dlbRepository.obtainDlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
+		}
+		Map<String, Dlb> mapDlb=new HashMap<String, Dlb>();
+		for (int i = 0; i < listDlb.size(); i++) {
+			Dlb d = listDlb.get(i);
+			if(mapDlb.get(d.getXlbm()+d.getJsy()+d.getNbbm()+d.getLp()) == null){
+				mapDlb.put(d.getXlbm()+d.getJsy()+d.getNbbm()+d.getLp(), d);
+			}
+		}
 		List<ScheduleRealInfo> sList;
 		List<ScheduleRealInfo> jList;
@@ -180,6 +195,7 @@ public class JdtestServiceImpl implements JdtestService {
 		double czyl_z=0.0;
 		double jzl_z=0.0;
 		double yh_z=0.0;
+		double dh_z=0.0;
 		int jhbc_z=0;
 		double jhlc_z=0.0;
 		int sjbc_z=0;
@@ -193,6 +209,7 @@ public class JdtestServiceImpl implements JdtestService {
 		double czyl_line=0.0;
 		double jzl_line=0.0;
 		double yh_line=0.0;
+		double dh_line=0.0;
 		int jhbc_line=0;
 		double jhlc_line=0.0;
 		int sjbc_line=0;
@@ -209,6 +226,7 @@ public class JdtestServiceImpl implements JdtestService {
 			double czyl=0.0;
 			double jzl=0.0;
 			double yh=0.0;
+			double dh=0.0;	//电耗
 			String rylx="";
 			if(mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
 				Ylb t=mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
@@ -225,6 +243,10 @@ public class JdtestServiceImpl implements JdtestService {
 					}
 				}
 			}
+			if(mapDlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
+				Dlb d=mapDlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
+				dh = d.getHd();
+			}
 			m.put("jylc",jylc);
 			jylc_z=Arith.add(jylc, jylc_z);
 			m.put("jzyl",jzyl);
@@ -236,7 +258,8 @@ public class JdtestServiceImpl implements JdtestService {
 			m.put("yh", yh);
 			yh_z=Arith.add(yh, yh_z);
 			m.put("rylx", rylx);
-			m.put("dh", "");
+			m.put("dh", dh);
+			dh_z=Arith.add(dh, dh_z);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
 				if(m.get("xlBm").toString().equals(s.getXlBm()) &&
@@ -263,6 +286,7 @@ public class JdtestServiceImpl implements JdtestService {
 			double jhlc=culateMileageService.culateJhgl(jList);
 			jhlc_z=Arith.add(jhlc, jhlc_z);
 			int sjbc=culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "");
+			sjbc_z=sjbc+sjbc_z;
 			double ljgl=culateMileageService.culateLjgl(sList);
 			double sjgl=culateMileageService.culateSjgl(sList);
 			double sjzlc=Arith.add(ljgl, sjgl);
@@ -284,127 +308,154 @@ public class JdtestServiceImpl implements JdtestService {
 			m.put("zlc2", zlc2);
 			listAll.add(m);
 			//线路小计
-			if (i < list.size() - 1) {
-				 if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {
-					  jylc_line=Arith.add(jylc_line, jylc);
-					  jzyl_line=Arith.add(jzyl_line, jzyl);
-					  czyl_line=Arith.add(czyl_line, czyl);
-					  jzl_line=Arith.add(jzl_line, jzl);
-					  yh_line=Arith.add(yh_line, yh);
-					  jhbc_line=jhbc_line+jhbc;
-					  jhlc_line=Arith.add(jhlc_line,jhlc);
-					  sjbc_line=sjbc_line+sjbc;
-					  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
-					  kszlc_line=Arith.add(kszlc_line,kszlc);
-					  zlc_line=Arith.add(zlc_line, zlc);
-					  zlc_line2=Arith.add(zlc_line2, zlc2);
-	             } else {
-					  jylc_line=Arith.add(jylc_line, jylc);
-	            	  jzyl_line=Arith.add(jzyl_line, jzyl);
-					  czyl_line=Arith.add(czyl_line, czyl);
-					  jzl_line=Arith.add(jzl_line, jzl);
-					  yh_line=Arith.add(yh_line, yh);
-					  jhbc_line=jhbc_line+jhbc;
-					  jhlc_line=Arith.add(jhlc_line,jhlc);
-					  sjbc_line=sjbc_line+sjbc;
-					  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
-					  kszlc_line=Arith.add(kszlc_line,kszlc);
-					  zlc_line=Arith.add(zlc_line, zlc);
-					  zlc_line2=Arith.add(zlc_line2, zlc2);
-					  
-					  Map<String, Object> mmm=new HashMap<>();
-					  mmm.put("xlName", "小计");
-					  mmm.put("lp", "");
-					  mmm.put("jGh", "");
-					  mmm.put("clZbh", "");
-					  mmm.put("jName", "");
-					  mmm.put("jhbc", jhbc_line);
-					  mmm.put("jhlc", jhlc_line);
-					  mmm.put("sjbc", sjbc_line);
-					  mmm.put("sjzlc", sjzlc_line);
-					  mmm.put("kszlc",kszlc_line);
-					  mmm.put("jylc", jylc_line);
-					  mmm.put("zlc", zlc_line);
-					  mmm.put("zlc2", zlc_line2);
-					  mmm.put("jzyl",jzyl_line);
-					  mmm.put("czyl",czyl_line);
-					  mmm.put("jzl", jzl_line);
-					  mmm.put("yh", yh_line);
-					  mmm.put("rylx", "");
-					  mmm.put("dh","");
-					  listAll.add(mmm);
-					  jylc_line=0.0;
-					  jzyl_line=0.0;
-					  czyl_line=0.0;
-					  jzl_line=0.0;
-					  yh_line=0.0;
-					  jhbc_line=0;
-					  jhlc_line=0.0;
-					  sjbc_line=0;
-					  sjzlc_line=0.0;
-					  kszlc_line=0.0;
-					  zlc_line=0.0;
-					  zlc_line2=0.0;
-	             }
-			} else {
-                if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {
-					  jylc_line=Arith.add(jylc_line, jylc);
-					  jzyl_line=Arith.add(jzyl_line, jzyl);
-					  czyl_line=Arith.add(czyl_line, czyl);
-					  jzl_line=Arith.add(jzl_line, jzl);
-					  yh_line=Arith.add(yh_line, yh);
-					  jhbc_line=jhbc_line+jhbc;
-					  jhlc_line=Arith.add(jhlc_line,jhlc);
-					  sjbc_line=sjbc_line+sjbc;
-					  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
-					  kszlc_line=Arith.add(kszlc_line,kszlc);
-					  zlc_line=Arith.add(zlc_line, zlc);
-					  zlc_line2=Arith.add(zlc_line2, zlc2);
-					  Map<String, Object> mmm=new HashMap<>();
-					  mmm.put("xlName", "小计");
-					  mmm.put("lp", "");
-					  mmm.put("jGh", "");
-					  mmm.put("clZbh", "");
-					  mmm.put("jName", "");
-					  mmm.put("jhbc", jhbc_line);
-					  mmm.put("jhlc", jhlc_line);
-					  mmm.put("sjbc", sjbc_line);
-					  mmm.put("sjzlc", sjzlc_line);
-					  mmm.put("kszlc",kszlc_line);
-					  mmm.put("jylc", jylc_line);
-					  mmm.put("zlc", zlc_line);
-					  mmm.put("zlc2", zlc_line2);
-					  mmm.put("jzyl",jzyl_line);
-					  mmm.put("czyl",czyl_line);
-					  mmm.put("jzl", jzl_line);
-					  mmm.put("yh", yh_line);
-					  mmm.put("rylx", "");
-					  mmm.put("dh","");
-					  listAll.add(mmm);
-                } else {
-					 
-					 Map<String, Object> mmm=new HashMap<>();
-					  mmm.put("xlName", "小计");
-					  mmm.put("lp", "");
-					  mmm.put("jGh", "");
-					  mmm.put("clZbh", "");
-					  mmm.put("jName", "");
-					  mmm.put("jhbc", jhbc);
-					  mmm.put("jhlc", jhlc);
-					  mmm.put("sjbc", sjbc);
-					  mmm.put("sjzlc", sjzlc);
-					  mmm.put("kszlc",kszlc);
-					  mmm.put("jylc", jylc_line);
-					  mmm.put("zlc", zlc);
-					  mmm.put("zlc2", zlc2);
-					  mmm.put("jzyl",jzyl);
-					  mmm.put("czyl",czyl);
-					  mmm.put("jzl", jzl);
-					  mmm.put("yh", yh);
-					  mmm.put("rylx", "");
-					  mmm.put("dh","");
-					  listAll.add(mmm);
-                }
+			if(list.size()==1){
+				 Map<String, Object> mmm=new HashMap<>();
+				  mmm.put("xlName", "小计");
+				  mmm.put("lp", "");
+				  mmm.put("jGh", "");
+				  mmm.put("clZbh", "");
+				  mmm.put("jName", "");
+				  mmm.put("jhbc", jhbc);
+				  mmm.put("jhlc", jhlc);
+				  mmm.put("sjbc", sjbc);
+				  mmm.put("sjzlc", sjzlc);
+				  mmm.put("kszlc",kszlc);
+				  mmm.put("jylc", jylc_line);
+				  mmm.put("zlc", zlc);
+				  mmm.put("zlc2", zlc2);
+				  mmm.put("jzyl",jzyl);
+				  mmm.put("czyl",czyl);
+				  mmm.put("jzl", jzl);
+				  mmm.put("yh", yh);
+				  mmm.put("rylx", "");
+				  mmm.put("dh", dh);
+				  listAll.add(mmm);
+				}else{
+					if (i < list.size() - 1) {
+					   if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {
+						  jylc_line=Arith.add(jylc_line, jylc);
+						  jzyl_line=Arith.add(jzyl_line, jzyl);
+						  czyl_line=Arith.add(czyl_line, czyl);
+						  jzl_line=Arith.add(jzl_line, jzl);
+						  yh_line=Arith.add(yh_line, yh);
+						  dh_line=Arith.add(dh_line, dh);
+						  jhbc_line=jhbc_line+jhbc;
+						  jhlc_line=Arith.add(jhlc_line,jhlc);
+						  sjbc_line=sjbc_line+sjbc;
+						  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
+						  kszlc_line=Arith.add(kszlc_line,kszlc);
+						  zlc_line=Arith.add(zlc_line, zlc);
+						  zlc_line2=Arith.add(zlc_line2, zlc2);
+		               } else {
+						  jylc_line=Arith.add(jylc_line, jylc);
+		            	  jzyl_line=Arith.add(jzyl_line, jzyl);
+						  czyl_line=Arith.add(czyl_line, czyl);
+						  jzl_line=Arith.add(jzl_line, jzl);
+						  yh_line=Arith.add(yh_line, yh);
+						  dh_line=Arith.add(dh_line, dh);
+						  jhbc_line=jhbc_line+jhbc;
+						  jhlc_line=Arith.add(jhlc_line,jhlc);
+						  sjbc_line=sjbc_line+sjbc;
+						  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
+						  kszlc_line=Arith.add(kszlc_line,kszlc);
+						  zlc_line=Arith.add(zlc_line, zlc);
+						  zlc_line2=Arith.add(zlc_line2, zlc2);
+						  
+						  Map<String, Object> mmm=new HashMap<>();
+						  mmm.put("xlName", "小计");
+						  mmm.put("lp", "");
+						  mmm.put("jGh", "");
+						  mmm.put("clZbh", "");
+						  mmm.put("jName", "");
+						  mmm.put("jhbc", jhbc_line);
+						  mmm.put("jhlc", jhlc_line);
+						  mmm.put("sjbc", sjbc_line);
+						  mmm.put("sjzlc", sjzlc_line);
+						  mmm.put("kszlc",kszlc_line);
+						  mmm.put("jylc", jylc_line);
+						  mmm.put("zlc", zlc_line);
+						  mmm.put("zlc2", zlc_line2);
+						  mmm.put("jzyl",jzyl_line);
+						  mmm.put("czyl",czyl_line);
+						  mmm.put("jzl", jzl_line);
+						  mmm.put("yh", yh_line);
+						  mmm.put("rylx", "");
+						  mmm.put("dh", dh_line);
+						  listAll.add(mmm);
+						  jylc_line=0.0;
+						  jzyl_line=0.0;
+						  czyl_line=0.0;
+						  jzl_line=0.0;
+						  yh_line=0.0;
+						  dh_line=0.0;
+						  jhbc_line=0;
+						  jhlc_line=0.0;
+						  sjbc_line=0;
+						  sjzlc_line=0.0;
+						  kszlc_line=0.0;
+						  zlc_line=0.0;
+						  zlc_line2=0.0;
+		             }
+				} else {
+	                if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {
+						  jylc_line=Arith.add(jylc_line, jylc);
+						  jzyl_line=Arith.add(jzyl_line, jzyl);
+						  czyl_line=Arith.add(czyl_line, czyl);
+						  jzl_line=Arith.add(jzl_line, jzl);
+						  yh_line=Arith.add(yh_line, yh);
+						  dh_line=Arith.add(dh_line, dh);
+						  jhbc_line=jhbc_line+jhbc;
+						  jhlc_line=Arith.add(jhlc_line,jhlc);
+						  sjbc_line=sjbc_line+sjbc;
+						  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
+						  kszlc_line=Arith.add(kszlc_line,kszlc);
+						  zlc_line=Arith.add(zlc_line, zlc);
+						  zlc_line2=Arith.add(zlc_line2, zlc2);
+						  Map<String, Object> mmm=new HashMap<>();
+						  mmm.put("xlName", "小计");
+						  mmm.put("lp", "");
+						  mmm.put("jGh", "");
+						  mmm.put("clZbh", "");
+						  mmm.put("jName", "");
+						  mmm.put("jhbc", jhbc_line);
+						  mmm.put("jhlc", jhlc_line);
+						  mmm.put("sjbc", sjbc_line);
+						  mmm.put("sjzlc", sjzlc_line);
+						  mmm.put("kszlc",kszlc_line);
+						  mmm.put("jylc", jylc_line);
+						  mmm.put("zlc", zlc_line);
+						  mmm.put("zlc2", zlc_line2);
+						  mmm.put("jzyl",jzyl_line);
+						  mmm.put("czyl",czyl_line);
+						  mmm.put("jzl", jzl_line);
+						  mmm.put("yh", yh_line);
+						  mmm.put("rylx", "");
+						  mmm.put("dh", dh_line);
+						  listAll.add(mmm);
+	                } else {
+						 Map<String, Object> mmm=new HashMap<>();
+						  mmm.put("xlName", "小计");
+						  mmm.put("lp", "");
+						  mmm.put("jGh", "");
+						  mmm.put("clZbh", "");
+						  mmm.put("jName", "");
+						  mmm.put("jhbc", jhbc);
+						  mmm.put("jhlc", jhlc);
+						  mmm.put("sjbc", sjbc);
+						  mmm.put("sjzlc", sjzlc);
+						  mmm.put("kszlc",kszlc);
+						  mmm.put("jylc", jylc_line);
+						  mmm.put("zlc", zlc);
+						  mmm.put("zlc2", zlc2);
+						  mmm.put("jzyl",jzyl);
+						  mmm.put("czyl",czyl);
+						  mmm.put("jzl", jzl);
+						  mmm.put("yh", yh);
+						  mmm.put("rylx", "");
+						  mmm.put("dh", dh);
+						  listAll.add(mmm);
+	                }
+				}
 			}
 		}
 		Map<String, Object> mmp=new HashMap<>();
@@ -426,7 +477,7 @@ public class JdtestServiceImpl implements JdtestService {
 		mmp.put("jzl", jzl_z);
 		mmp.put("yh", yh_z);
 		mmp.put("rylx", "");
-		mmp.put("dh","");
+		mmp.put("dh", dh_z);
 		listAll.add(mmp);
 		return listAll;
 	}
@@ -1162,8 +1162,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String xls = "";
         if (map.get("type").toString().equals("0")) {
             xls = "waybill_minhang.xls";
+        } else if (map.get("type").toString().equals("1")){
+        	xls = "waybill_minhang_dl.xls";
         } else {
-            xls = "waybill_minhang_dl.xls";
+        	xls = "waybill_minhang_yd.xls";
         }
@@ -4610,10 +4612,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Double jzl = 0.0;
         Double zlc = 0.0;
         String rylx="";
+        Double ccyl_ = 0.0;
+        Double jcyl_ = 0.0;
+        Double yh_ = 0.0;
+        Double jzl_ = 0.0;
         List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
         if (listCars.size() > 0) {
-            if (listCars.get(0).getSfdc() != null) {
-                if (listCars.get(0).getSfdc()) {
+            if (listCars.get(0).getNyType() != null) {
+                if ("1".equals(listCars.get(0).getNyType().toString())) {	//全电
                     List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
                     type = 1;
                     for (int i = 0; i < listDlb.size(); i++) {
@@ -4633,7 +4639,48 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                                 zlc = Arith.add(zlc, d.getZlc());
                             }
                         }
-
+                    }
+                } else if("2".equals(listCars.get(0).getNyType().toString())){	//油点混合
+                    List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+                    List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+                	type = 2;
+                	for (int i = 0; i < listYlb.size(); i++) {
+                        Ylb y = listYlb.get(i);
+                        if (y.getLp() == null) {
+                            ccyl = Arith.add(ccyl, y.getCzyl());
+                            jcyl = Arith.add(jcyl, y.getJzyl());
+                            yh = Arith.add(yh, y.getYh());
+                            jzl = Arith.add(jzl, y.getJzl());
+                            zlc = Arith.add(zlc, y.getZlc());
+                            if(dMap.get(y.getRylx())!=null)
+                            	rylx =dMap.get(y.getRylx()).toString();
+                        } else {
+                            if (y.getLp().equals(s.getLpName())) {
+                                ccyl = Arith.add(ccyl, y.getCzyl());
+                                jcyl = Arith.add(jcyl, y.getJzyl());
+                                yh = Arith.add(yh, y.getYh());
+                                jzl = Arith.add(jzl, y.getJzl());
+                                zlc = Arith.add(zlc, y.getZlc());
+                                if(dMap.get(y.getRylx())!=null)
+                                	rylx =dMap.get(y.getRylx()).toString();
+                            }
+                        }
+                    }
+                    for (int i = 0; i < listDlb.size(); i++) {
+                        Dlb d = listDlb.get(i);
+                        if (d.getLp() == null) {
+                            ccyl_ = Arith.add(ccyl_, d.getCzcd());
+                            jcyl_ = Arith.add(jcyl_, d.getJzcd());
+                            yh_ = Arith.add(yh_, d.getHd());
+                            jzl_ = Arith.add(jzl, d.getCdl());
+                        } else {
+                            if (d.getLp().equals(s.getLpName())) {
+                                ccyl_ = Arith.add(ccyl_, d.getCzcd());
+                                jcyl_ = Arith.add(jcyl_, d.getJzcd());
+                                yh_ = Arith.add(yh_, d.getHd());
+                                jzl_ = Arith.add(jzl_, d.getCdl());
+                            }
+                        }
                     }
                 } else {
                     List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
@@ -4661,6 +4708,49 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         }
                     }
                 }
+            } else {
+            	//油点混合
+                List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+                List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+            	type = 2;
+            	for (int i = 0; i < listYlb.size(); i++) {
+                    Ylb y = listYlb.get(i);
+                    if (y.getLp() == null) {
+                        ccyl = Arith.add(ccyl, y.getCzyl());
+                        jcyl = Arith.add(jcyl, y.getJzyl());
+                        yh = Arith.add(yh, y.getYh());
+                        jzl = Arith.add(jzl, y.getJzl());
+                        zlc = Arith.add(zlc, y.getZlc());
+                        if(dMap.get(y.getRylx())!=null)
+                        	rylx =dMap.get(y.getRylx()).toString();
+                    } else {
+                        if (y.getLp().equals(s.getLpName())) {
+                            ccyl = Arith.add(ccyl, y.getCzyl());
+                            jcyl = Arith.add(jcyl, y.getJzyl());
+                            yh = Arith.add(yh, y.getYh());
+                            jzl = Arith.add(jzl, y.getJzl());
+                            zlc = Arith.add(zlc, y.getZlc());
+                            if(dMap.get(y.getRylx())!=null)
+                            	rylx =dMap.get(y.getRylx()).toString();
+                        }
+                    }
+                }
+                for (int i = 0; i < listDlb.size(); i++) {
+                    Dlb d = listDlb.get(i);
+                    if (d.getLp() == null) {
+                        ccyl_ = Arith.add(ccyl_, d.getCzcd());
+                        jcyl_ = Arith.add(jcyl_, d.getJzcd());
+                        yh_ = Arith.add(yh_, d.getHd());
+                        jzl_ = Arith.add(jzl, d.getCdl());
+                    } else {
+                        if (d.getLp().equals(s.getLpName())) {
+                            ccyl_ = Arith.add(ccyl_, d.getCzcd());
+                            jcyl_ = Arith.add(jcyl_, d.getJzcd());
+                            yh_ = Arith.add(yh_, d.getHd());
+                            jzl_ = Arith.add(jzl_, d.getCdl());
+                        }
+                    }
+                }
             }
         }
@@ -4669,6 +4759,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("yh", yh);
         map.put("ccyl", ccyl);
         map.put("jcyl", jcyl);
+        map.put("jzl_", jzl_);
+        map.put("yh_", yh_);
+        map.put("ccyl_", ccyl_);
+        map.put("jcyl_", jcyl_);
         map.put("type", type);
         map.put("zlc", zlc);
         map.put("xlName", s.getXlName());
@@ -348,7 +348,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                 for (int r = 1; r < sheet.getRows(); r++) {
                     List<FcInfo> fcInfos = new ArrayList<>();
                     // 每行第一列都是路牌
-                    fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null, null)); // 用fcsj放置路牌显示
+                    fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null, null, null)); // 用fcsj放置路牌显示
                     int bc_ks = 0; // 空驶班次
                     int bc_yy = 0; // 营运班次
@@ -373,7 +373,9 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                             String ists = content == null ? "" : content[9]; // 是否停驶
-                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode, ists);
+                            String bcsj = content == null ? "" : content[10]; // 班次时间
+
+                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode, ists, bcsj);
                             if (StringUtils.isNotEmpty(fzdname))
                                 headarrays[c] = fzdname;
@@ -407,10 +409,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                     }
                     // 添加一列 空驶班次/空驶里程，fcsj放置数据
-                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null, null));
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null, null, null));
                     // 添加一列 营运班次/营运里程，fcsj放置数据
-                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null, null));
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null, null, null));
                     editInfo.getContents().add(fcInfos);
                 }
@@ -31,6 +31,8 @@ public interface TTInfoDetailForEdit {
         private String zdzCode;
         /** 是否停驶 */
         private Boolean ists;
+        /** 班次时间 */
+        private String bcsj;
         public FcInfo() {
         }
@@ -43,7 +45,8 @@ public interface TTInfoDetailForEdit {
                 String isfb,
                 String qdzCode,
                 String zdzCode,
-                String ists) {
+                String ists,
+                String bcsj) {
             this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
             this.bc_type = bc_type;
             this.fcsj = fcsj;
@@ -69,6 +72,10 @@ public interface TTInfoDetailForEdit {
             else
                 this.ists = false;
+            if (StringUtils.isNotEmpty(bcsj) && !"null".equals(bcsj)) {
+                this.bcsj = bcsj;
+            }
+
         }
         public Long getTtdid() {
@@ -134,6 +141,14 @@ public interface TTInfoDetailForEdit {
         public void setIsts(Boolean ists) {
             this.ists = ists;
         }
+
+        public String getBcsj() {
+            return bcsj;
+        }
+
+        public void setBcsj(String bcsj) {
+            this.bcsj = bcsj;
+        }
     }
     /**
@@ -59,10 +59,16 @@ public class ErrorBcCountFunction implements AccumulateFunction {
             return;
         }
+        // 判定条件（数据库中的对应字段没有非空约束），与界面saTimeTable.js的validInfo方法对应
+        // 1、起点站编码，名字为空
+        // 2、终点站编码，名字为空
+        // 3、班次时间
+        // TODO：其他再议
         if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
             StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
             StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
-            StringUtils.isEmpty(ttInfoDetail.getZdzName()) ) {
+            StringUtils.isEmpty(ttInfoDetail.getZdzName()) ||
+            (ttInfoDetail.getBcsj() == null) ) {
             errorCountData.errorcount ++;
         }
+# 貌似用import accumulate报错，使用配置文件方式
+
+drools.accumulate.function.gidscount = com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidsCountFunction
+drools.accumulate.function.gidfbtime = com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbTimeFunction
+drools.accumulate.function.gidfbfcno = com.bsth.service.schedule.impl.plan.kBase1.core.shiftloop.GidFbFcnoFunction
+
+drools.accumulate.function.lpinforesult = com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.LpInfoResultsFunction
+drools.accumulate.function.minruleqyrq = com.bsth.service.schedule.impl.plan.kBase1.core.ttinfo.MinRuleQyrqFunction
+
+drools.accumulate.function.vrb = com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidRepeatBcFunction
+drools.accumulate.function.vwrb = com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWholeRerunBcFunction
+drools.accumulate.function.vwlp = com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWantLpFunction