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

娄高锋
2 parents 91cf2ec5 7821e6c0
Showing 52 changed files with 2320 additions and 664 deletions
pom.xml
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/controller/sys/CompanyAuthorityController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/controller/sys/dto/CompanyData.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/entity/Station.java
src/main/java/com/bsth/entity/mcy_forms/Changetochange.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/sys/CompanyAuthority.java
src/main/java/com/bsth/filter/BaseFilter.java
@@ -220,11 +220,11 @@
 		    <version>1.1</version>
 		</dependency>
-		<dependency>
+<!--		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
 			<optional>true</optional>
-		</dependency>
+		</dependency>-->
 	</dependencies>
     <dependencyManagement>
@@ -24,11 +24,13 @@ public class Constants {
 	/**
 	 * 线调部分子页面不做拦截，便于浏览器缓存
 	 */
-	public static final String  XD_CHILD_PAGES = "/real_control_v2/**";
-	public static final String XD_TEMPS = "/pages/control/line/temps/**";
+	public static final String XD_CHILD_PAGES = "/real_control_v2/**";
+	public static final String XD_REAL_GPS = "/gps/real/line";
+	//public static final String XD_TEMPS = "/pages/control/line/temps/**";
 	//车载网关上行接口
 	public static final String UPSTREAM_URL = "/control/upstream";
 	public static final String SESSION_USERNAME = "sessionUserName";
+	public static final String COMPANY_AUTHORITYS = "cmyAuths";
 }
@@ -9,6 +9,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -167,11 +168,24 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
      */
     @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
     public void dataExport(HttpServletResponse response) throws Exception {
+        dataExport(response, null);
+    }
+
+    @RequestMapping(value = "/dataExportExt", method = RequestMethod.GET)
+    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
         // 1、使用ktr转换获取输出文件
         File ktrfile = new File(this.getClass().getResource(getDataExportKtrClasspath()).toURI());
-        File outputfile = dataImportExportService.fileDataOutput(
-                getDataExportFilename(),
-                ktrfile);
+        File outputfile = null;
+        if (!CollectionUtils.isEmpty(param)) {
+            outputfile = dataImportExportService.fileDataOutput(
+                    getDataExportFilename(),
+                    ktrfile,
+                    param);
+        } else {
+            outputfile = dataImportExportService.fileDataOutput(
+                    getDataExportFilename(),
+                    ktrfile);
+        }
         System.out.println(outputfile.getName());
         String filePath = outputfile.getAbsolutePath();
+package com.bsth.controller.forms;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.mcy_forms.Changetochange;
+import com.bsth.entity.mcy_forms.Linepasswengerflow;
+import com.bsth.entity.mcy_forms.Operationservice;
+import com.bsth.entity.mcy_forms.Shifday;
+import com.bsth.entity.mcy_forms.Shiftuehiclemanth;
+import com.bsth.entity.mcy_forms.Singledata;
+import com.bsth.entity.mcy_forms.Vehicleloading;
+import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.service.forms.ExportService;
+import com.bsth.service.forms.FormsService;
+import com.bsth.util.ReportUtils;
+
+@RestController
+@RequestMapping("mcy_export")
+public class ExportController {
+	
+	@Autowired
+	FormsService formsService;
+
+	@Autowired
+	ExportService exportService;
+	
+	//行车路单日报表
+	@RequestMapping(value = "/waybilldayExport",method = RequestMethod.POST)
+	public List<Waybillday> waybilldayExport(@RequestParam Map<String, Object> map){
+		List<Waybillday> waybillday = formsService.waybillday(map);
+		exportService.waybillday(map.get("date").toString(), waybillday);
+		return waybillday;
+	}
+	
+	
+	//线路客流量报表
+	@RequestMapping(value = "/linepasswengerflowExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> linepasswengerflowExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Linepasswengerflow> linepasswengerflow = formsService.linepasswengerflow(map);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+			for(Linepasswengerflow l : linepasswengerflow){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("i", i);
+			m.put("stationName", l.getStationName());
+			m.put("1", " ");
+			m.put("2", " ");
+			resList.add(m);
+			i++;
+			}
+			
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\linepassengerflow.xls",
+				path+"export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		return resList;
+	}
+
+	
+	
+	//班次车辆人员日统计
+	@RequestMapping(value = "/shifdayExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> shifdayExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Shifday> shifday = formsService.shifday(map);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+			for(Shifday l : shifday){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("jName",l.getjName());
+			m.put("sName", l.getsName());
+			m.put("lpName", l.getLpName());
+			m.put("carPlate", l.getCarPlate());
+			m.put("jhlc", l.getJhlc());
+			//m.put("sjjhlc", l.getSjjhlc());
+			m.put("yygl", l.getYygl());
+			m.put("emptMileage", l.getEmptMileage());
+			m.put("remMileage", l.getRemMileage());
+			m.put("addMileage", l.getAddMileage());
+			m.put("totalm", l.getTotalm());
+			m.put("jhbc", l.getJhbc());
+			//m.put("sjjhbc", l.getSjjhbc());
+			m.put("cjbc", l.getCjbc());
+			m.put("ljbc", l.getLjbc());
+			m.put("sjbc", l.getSjbc());
+			resList.add(m);
+			}
+					
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\shifday.xls",
+				path+"export\\班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		return resList;
+	}
+	
+	//班次车辆人员月统计
+	@RequestMapping(value = "/shiftuehiclemanthExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> shiftuehiclemanthExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Shiftuehiclemanth> shiftuehiclemanth = formsService.shiftuehiclemanth(map);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+		for(Shiftuehiclemanth l : shiftuehiclemanth){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("i", i);
+			m.put("jName",l.getjName() );
+			m.put("jhlc", l.getJhlc());
+			m.put("emptMileage",l.getEmptMileage() );
+			m.put("remMileage", l.getRemMileage());
+			m.put("addMileage", l.getAddMileage());
+			m.put("totalm", l.getTotalm());
+			m.put("cjbc", l.getCjbc());
+			m.put("ljbc", l.getLjbc());
+			m.put("sjbc", l.getSjbc());
+			resList.add(m);
+			i++;
+			}
+					
+			try {
+			listI.add(resList.iterator());
+			
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\shiftuehiclemanth.xls",
+					path+"export\\班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+			
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		
+		return resList;
+	}
+	
+
+	//路单数据报表
+	@RequestMapping(value = "/singledataExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> singledataExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Singledata> singledata = formsService.singledata(map);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+		for(Singledata l : singledata){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("i", i);
+			m.put("rQ",l.getrQ());
+			m.put("gS", l.getgS());
+			m.put("xL",l.getxL() );
+			m.put("clzbh", l.getClzbh());
+			m.put("jsy", l.getJsy());
+			m.put("jName", l.getjName());
+			m.put("sgh", l.getSgh());
+			m.put("sName", l.getsName());
+			m.put("jhlc", l.getJhlc());
+			m.put("emptMileage", l.getEmptMileage());
+			m.put("hyl", l.getHyl());
+			m.put("jzl", l.getJzl());
+			m.put("unyyyl",l.getUnyyyl());
+			m.put("jhjl", l.getJhjl());
+			resList.add(m);
+			i++;
+			}
+					
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\singledata.xls",
+				path+"export\\路单报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+		
+		return resList;
+	}
+	
+	//车辆加注
+	@RequestMapping(value = "/vehicleloadingExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> vehicleloadingExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("line").toString(), map.get("date").toString());
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+		for(Vehicleloading l : vehicleloading){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("i", i);
+			m.put("rQ", l.getrQ());
+			m.put("gS", l.getgS());
+			m.put("xL", l.getxL());
+			m.put("clzbh", l.getClzbh());
+			m.put("hyl", l.getHyl());
+			m.put("jzl", l.getJzl());
+			m.put("ls", l.getLs());
+			m.put("jhlc", l.getJhlc());
+			m.put("unyyyl", l.getUnyyyl());
+			m.put("jhbc", l.getJhbc());
+			m.put("sjbc", l.getSjbc());
+			resList.add(m);
+			i++;
+			}
+					
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\vehicleloading.xls",
+				path+"export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+		return resList;
+	}
+	
+	//运营服务阶段报表
+	@RequestMapping(value = "/operationserviceExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> operationserviceExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		List<Operationservice> operationservice = formsService.operationservice(map);
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		int i=1;
+		for(Operationservice l : operationservice){
+		Map<String, Object> m = new HashMap<String, Object>();
+		m.put("i", i);
+		m.put("xlName", l.getXlName());
+		m.put("jzl", l.getJzl());
+		m.put("xhl", l.getXhl());
+		m.put("xsgl", l.getXsgl());
+		m.put("emptMileage", l.getEmptMileage());
+		m.put("sjbc", l.getSjbc());
+		resList.add(m);
+		i++;
+		}
+		
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\operationservice.xls",
+				path+"export\\运营服务阶段报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+		return resList;
+	}
+	
+
+	//换人换车情况日统计
+		@RequestMapping(value = "/changetochangeExport",method = RequestMethod.POST)
+		public List<Map<String, Object>> changetochangeExport(@RequestParam Map<String, Object> map){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			ReportUtils ee = new ReportUtils();
+			List<Changetochange> changetochange = formsService.changetochange(map);
+			List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+			for(Changetochange l : changetochange){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("rq",l.getRq());
+			m.put("gs",l.getGs());
+			m.put("fgs",l.getFgs());
+			m.put("xl",l.getXl());
+			m.put("lp",l.getLp());
+			m.put("fssj",l.getFssj());
+			m.put("xgsj",l.getXgsj());
+			m.put("pcch",l.getPcch());
+			m.put("pcry",l.getPcry());
+			m.put("jhch",l.getJhch());
+			m.put("jhgh",l.getJhgh());
+			m.put("sjch",l.getSjch());
+			m.put("sjgh",l.getSjgh());
+			m.put("yy",l.getYy());
+			m.put("xgr",l.getXgr());
+			resList.add(m);
+			}
+			
+			try {
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { map }, path+"mould\\changetochange.xls",
+					path+"export\\换人换车情况日统计" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+				} catch (Exception e) {
+					e.printStackTrace();
+				}	
+			return resList;
+		}
+		
+		
+	
+	
+	
+}
@@ -4,6 +4,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -23,6 +24,7 @@ import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.oil.YlbService;
+import com.bsth.util.ReportUtils;
 import com.google.common.base.Splitter;
 @RestController
@@ -47,8 +49,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	 */
 	@RequestMapping(value = "/obtain",method = RequestMethod.GET)
 	public Map<String, Object> obtain(@RequestParam Map<String, Object> map){
-		String rq=map.get("rq").toString();
-		Map<String, Object> list=yblService.obtain(rq);
+		Map<String, Object> list=yblService.obtain(map);
 		System.out.println();
 		return list;
 	}
@@ -131,4 +132,58 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return yblService.oilListMonth(line, date);
 	}
+	
+	@RequestMapping(value = "/listExport",method = RequestMethod.POST)
+	public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		ReportUtils ee = new ReportUtils();
+		String rq=map.get("rq").toString();
+		if(!(rq=="")){
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			try {
+				map.put("rq_eq", sdfMonth.parse(rq));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		List<Ylb> ylb= (List<Ylb>)yblService.list(map);
+//		(new CustomerSpecs<Ylb>(map)).iterator();
+		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
+		for (Ylb y : ylb) {
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("rq", y.getRq());
+			m.put("gsname",y.getGsname() );
+			m.put("xlname", y.getXlname());
+			m.put("nbbm", y.getNbbm());
+			m.put("jsy", y.getJsy());
+			m.put("jzl", y.getJzl());
+			m.put("czlc", y.getCzlc());
+			m.put("jzlc", y.getJzlc());
+			m.put("czyl", y.getCzyl());
+			m.put("jzyl", y.getJzyl());
+			m.put("yh", y.getYh());
+			m.put("rylx", y.getRylx());
+			m.put("ns", y.getNs());
+			m.put("shyy", y.getShyy());
+			m.put("sh", y.getSh());
+			m.put("zlc", y.getZlc());
+			m.put("yhlx", y.getYhlx());
+			m.put("bglyh", y.getBglyh());
+			resList.add(m);
+		}
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\list.xls",
+				path+"export\\进出场存油量" + sdfSimple.format(sdfMonth.parse(map.get("rq").toString())) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+			
+		return resList;
+		
+	}
 }
@@ -14,6 +14,7 @@ import com.bsth.service.StationRouteService;
 import com.bsth.service.schedule.GuideboardInfoService;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.utils.DataImportExportService;
+import com.bsth.service.schedule.utils.DataToolsProperties;
 import jxl.Cell;
 import jxl.Sheet;
 import jxl.Workbook;
@@ -26,6 +27,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -51,6 +53,8 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
     private StationRouteService stationRouteService;
     @Autowired
     private GuideboardInfoService guideboardInfoService;
+    @Autowired
+    private DataToolsProperties dataToolsProperties;
     public static class ExcelFileOutput {
@@ -126,11 +130,15 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
                 Cell[] cells = sheet.getRow(0); // 获取第一行数据列
                 for (int i = 0; i < cells.length; i++) {
                     String cell_con = cells[i].getContents();
+
                     if (StringUtils.isEmpty(cell_con)) {
                         rtn.put("status", ResponseCode.ERROR);
                         rtn.put("msg", String.format("第1行，第%d列数据不能为空", i + 1));
                         return rtn;
                     } else {
+                        // 正则表达式去除数字
+                        cell_con = cell_con.replaceAll("[\\d+]", "");
+
                         if (i == 0) { // 第一列必须是路牌2个字
                             if (!"路牌".equals(cell_con.trim())) {
                                 rtn.put("status", ResponseCode.ERROR);
@@ -457,4 +465,25 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
     public List<TTInfoDetail> findBcdetails(Integer xlId, Long ttinfoId, Long lpId) {
         return ttInfoDetailRepository.findBcdetails(xlId, ttinfoId, lpId);
     }
+
+    @Override
+    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
+        // 获取injectktr
+        File ktrFile2 = new File(this.getClass().getResource(
+                dataToolsProperties.getTtinfodetailOutput()).toURI());
+        param.put("injectktrfile", ktrFile2.getAbsolutePath());
+        param.put("ttinfoid", param.get("ttinfoid"));
+
+        super.dataExport(response, param);
+    }
+
+    @Override
+    protected String getDataExportKtrClasspath() {
+        return dataToolsProperties.getTtinfodetailMetaoutput();
+    }
+
+    @Override
+    protected String getDataExportFilename() {
+        return "时刻表";
+    }
 }
+package com.bsth.controller.sys;
+
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.service.sys.CompanyAuthorityService;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@RestController
+@RequestMapping("companyAuthority")
+public class CompanyAuthorityController extends BaseController<CompanyAuthority, Integer>{
+
+    @Autowired
+    CompanyAuthorityService companyAuthorityService;
+
+    @RequestMapping(value = "save")
+    public Map<String, Object> save(@RequestParam  Integer roleId, @RequestParam String authJsonStr){
+        authJsonStr = StringEscapeUtils.unescapeHtml4(authJsonStr);
+        System.out.println(authJsonStr);
+        List<CompanyAuthority> list = JSONArray.parseArray(authJsonStr, CompanyAuthority.class);
+        return companyAuthorityService.save(roleId, list);
+    }
+}
 package com.bsth.controller.sys;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.BaseController;
+import com.bsth.controller.sys.dto.CompanyData;
+import com.bsth.controller.sys.util.RSAUtils;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.sys.CompanyAuthorityService;
+import com.bsth.service.sys.SysUserService;
+import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,13 +23,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.bsth.common.Constants;
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController;
-import com.bsth.controller.sys.util.RSAUtils;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.sys.SysUserService;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.*;
 @RestController
 @RequestMapping("user")
@@ -34,6 +35,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 	@Autowired
 	SysUserService sysUserService;
+
+	@Autowired
+	CompanyAuthorityService companyAuthorityService;
 	@RequestMapping(value = "/login/jCryptionKey")
 	public Map<String, Object> jCryptionKey(HttpServletRequest request){
@@ -97,7 +101,11 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 			SecurityUtils.login(user, request);
 			//session里写入用户名，webSocket连接时标识身份用
 			session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
-			
+
+			//获取公司权限数据
+			List<CompanyAuthority> cmyAuths=companyAuthorityService.findByUser(user);
+			session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
+
 			captchaMap.remove(userName);
 			rs.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
@@ -106,6 +114,43 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 		}
 		return rs;
 	}
+
+	/**
+	 * 返回当前用户的公司权限数据，用于构建页面级联下拉框
+	 * @return
+	 */
+	@RequestMapping("companyData")
+	public List<CompanyData> companyData(HttpServletRequest request){
+		List<CompanyData> rs = new ArrayList<>();
+		CompanyData companyData;
+
+		ArrayListMultimap<String, CompanyAuthority> map = ArrayListMultimap.create();
+		List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
+
+		for(CompanyAuthority cAuth : cmyAuths){
+			map.put(cAuth.getCompanyCode()+"_"+cAuth.getCompanyName(), cAuth);
+		}
+
+		Set<String> keys = map.keySet();
+		String[] temps;
+		for(String k : keys){
+			temps = k.split("_");
+
+			companyData = new CompanyData();
+			companyData.setCompanyCode(temps[0]);
+			companyData.setCompanyName(temps[1]);
+			companyData.setChildren(new ArrayList<CompanyData.ChildrenCompany>());
+
+			cmyAuths = map.get(k);
+			for(CompanyAuthority c : cmyAuths){
+				companyData.getChildren().add(new CompanyData.ChildrenCompany(c.getSubCompanyCode(), c.getSubCompanyName()));
+			}
+
+			rs.add(companyData);
+		}
+
+		return rs;
+	}
 	@RequestMapping(value = "/login/captchaStatus")
 	public int captchaStatus(String userName){
@@ -162,7 +207,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 	 * @Description: TODO(修改密码)
 	 * @param oldPWD
 	 *            原始密码
-	 * @param newwPWD
+	 * @param newPWD
 	 *            新密码
 	 * @param cnewPWD
 	 *            确认新密码
+package com.bsth.controller.sys.dto;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+public class CompanyData {
+
+    private String companyCode;
+
+    private String companyName;
+
+    private List<ChildrenCompany> children;
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public List<ChildrenCompany> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<ChildrenCompany> children) {
+        this.children = children;
+    }
+
+    public static class ChildrenCompany {
+        private String code;
+
+        private String name;
+
+        public ChildrenCompany(String code, String name){
+            this.code = code;
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+    }
+}
 package com.bsth.data;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
+import com.bsth.Application;
+import com.bsth.entity.*;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.repository.*;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import com.bsth.Application;
-import com.bsth.entity.CarPark;
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-import com.bsth.entity.Personnel;
-import com.bsth.entity.Station;
-import com.bsth.entity.StationRoute;
-import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.repository.CarParkRepository;
-import com.bsth.repository.CarsRepository;
-import com.bsth.repository.LineRepository;
-import com.bsth.repository.PersonnelRepository;
-import com.bsth.repository.StationRepository;
-import com.bsth.repository.StationRouteRepository;
-import com.bsth.repository.schedule.CarConfigInfoRepository;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.TreeMultimap;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 /**
- * 
+ * @author PanZhao
  * @ClassName: BasicData
  * @Description: TODO(基础的映射数据)
- * @author PanZhao
  * @date 2016年8月10日 下午3:27:45
- *
  */
 @Component
-public class BasicData implements CommandLineRunner{
-	
-	//设备号和车辆自编号 （K: 设备编码 ，V：车辆自编号）
-	public static BiMap<String, String> deviceId2NbbmMap;
-
-	//车辆自编号和公司代码对照 （K: 车辆自编号 ，V：公司代码）
-	public static Map<String, String> nbbm2CompanyCodeMap;
-
-	//站点编码和名称对照，包括停车场 （K: 站点编码 ，V：站点名称）
-	public static Map<String, String> stationCode2NameMap;
-	
-	//车辆和线路对照
-	public static Map<String, Line> nbbm2LineMap;
-
-	//线路和用户对照 用于webSocket定向推送消息（用户进入线调时写入数据）
-	public static TreeMultimap<String, String> lineCode2SocketUserMap = TreeMultimap.create();
-
-	//线路ID和code 对照
-	public static BiMap<Integer, String> lineId2CodeMap;
-	
-	//线路编码和名称对照
-	public static Map<String, String> lineCode2NameMap;
-	
-	//线路编码_站点编码 == 0|1  上下行
-	public static Map<String, Integer> lineStationUpDownMap;
-	
-	//停车场
-	public static List<String> parkCodeList;
-	
-	//线路ID和shangHaiLinecode 对照
-	public static Map<Integer, String> lineId2ShangHaiCodeMap;
-	
-	//线路Code和shangHaiLinecode 对照
-	public static Map<String, String> lineCode2ShangHaiCodeMap;
-	
-	//驾驶员工号 和 personnel 对象映射
-	public static Map<String, Personnel> jsyMap;
-	//售票员工号 和 personnel 对象映射
-	public static Map<String, Personnel> spyMap;
-	//全量员工 工号和姓名对照
-	public static Map<String, String> allPerson;
-	
-	
-	static Logger logger = LoggerFactory.getLogger(BasicData.class);
-	
-	@Autowired
-	BasicDataLoader dataLoader;
-	
-	@Override
-	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 1, TimeUnit.HOURS);
-	}
-	
-	
-	@Component
-	public static class BasicDataLoader extends Thread{
-		
-		@Autowired
-		CarsRepository carsRepository;
-		
-		@Autowired
-		StationRepository stationRepository;
-		
-		@Autowired
-		CarParkRepository carParkRepository;
-		
-		@Autowired
-		CarConfigInfoRepository carConfigInfoRepository;
-		
-		@Autowired
-		LineRepository lineRepository;
-		
-		@Autowired
-		StationRouteRepository stationRouteRepository;
-		
-		@Autowired
-		PersonnelRepository personnelRepository;
-		
-		
-		@Override
-		public void run() {
-			loadAllData();
-		}
-
-		/**
-		 * @Title: loadAllData 
-		 * @Description: TODO(加载所有数据) 
-		 */
-		public int loadAllData(){
-			try{
-				//设备信息
-				loadDeviceInfo();
-				//站点信息
-				loadStationInfo();
-				//线路信息
-				loadLineInfo();
-				//车辆和线路映射信息
-				loadNbbm2LineInfo();
-				//站点路由信息
-				loadStationRouteInfo();	
-				//人员信息
-				loadPersonnelInfo();
-				logger.info("加载基础数据成功！，" );
-			}catch(Exception e){
-				logger.error("加载基础数据时出现异常，" , e);
-			}
-			return 0;
-		}
-		
-		
-		private void loadStationRouteInfo() {
-			Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
-			Map<String, Integer> map = new HashMap<>();
-			StationRoute route;
-			
-			while(iterator.hasNext()){
-				route = iterator.next();
-				map.put(route.getLineCode() + "_" + route.getStationCode(), route.getDirections());
-			}
-			lineStationUpDownMap = map;
-		}
-
-		/**
-		 * @Title: loadDeviceInfo 
-		 * @Description: TODO(加载设备相关信息) 
-		 */
-		public void loadDeviceInfo(){
-			BiMap<String, String> deviceId2Nbbm = HashBiMap.create();
-			//车辆和公司代码对照
-			Map<String, String> nbbm2CompanyCode = new HashMap<>();
-			Iterator<Cars> carIterator = carsRepository.findAll().iterator();
-			Cars car;
-			while(carIterator.hasNext()){
-				car = carIterator.next();
-				deviceId2Nbbm.put(car.getEquipmentCode(), car.getInsideCode());
-				nbbm2CompanyCode.put(car.getInsideCode(), car.getBusinessCode());
-			}
-			
-			deviceId2NbbmMap = deviceId2Nbbm;
-			nbbm2CompanyCodeMap = nbbm2CompanyCode;
-		}
-		
-		/**
-		 * @Title: loadStationInfo 
-		 * @Description: TODO(加载站点信息) 
-		 */
-		public void loadStationInfo(){
-			Map<String, String> stationCode2Name = new HashMap<>();
-			Iterator<Station> iterator = stationRepository.findAll().iterator();
-			//站点
-			Station station;
-			while(iterator.hasNext()){
-				station = iterator.next();
-				stationCode2Name.put(station.getStationCod(), station.getStationName());
-			}
-			//停车场
-			Iterator<CarPark> iterator2 = carParkRepository.findAll().iterator();
-			
-			List<String> parkCodes = new ArrayList<>(); 
-			
-			CarPark carPark;
-			while(iterator2.hasNext()){
-				carPark = iterator2.next();
-				stationCode2Name.put(carPark.getParkCode(), carPark.getParkName());
-				
-				parkCodes.add(carPark.getParkCode());
-			}
-			parkCodeList = parkCodes;
-			stationCode2NameMap = stationCode2Name;
-		}
-		
-		/**
-		 * @Title: loadNbbm2LineInfo 
-		 * @Description: TODO(车辆和线路对照) 
-		 */
-		public void loadNbbm2LineInfo(){
-			Iterator<CarConfigInfo> allIterator = carConfigInfoRepository.findAll().iterator();
-			Map<String, Line> ccMap = new HashMap<>();
-			
-			CarConfigInfo cci;
-			while(allIterator.hasNext()){
-				cci = allIterator.next();
-				ccMap.put(cci.getCl().getInsideCode(), cci.getXl());
-			}
-			nbbm2LineMap = ccMap;
-		}
-		
-		/**
-		 * @Title: loadLineInfo 
-		 * @Description: TODO(加载线路相关信息) 
-		 */
-		public void loadLineInfo(){
-			Iterator<Line> iterator = lineRepository.findAll().iterator();
-			
-			Line line;
-			BiMap<Integer, String> biMap = HashBiMap.create();
-			Map<String, String> code2name = new HashMap<>();
-			Map<Integer, String> id2SHcode = new HashMap<Integer, String>();
-			Map<String, String> code2SHcode = new HashMap<String, String>();
-			
-			while(iterator.hasNext()){
-				line = iterator.next();
-				biMap.put(line.getId(), line.getLineCode());
-				code2name.put(line.getLineCode(), line.getName());
-				id2SHcode.put(line.getId(),line.getShanghaiLinecode());
-				code2SHcode.put(line.getLineCode(), line.getShanghaiLinecode());
-			}
-			
-			lineId2CodeMap = biMap;
-			lineCode2NameMap = code2name;
-			lineId2ShangHaiCodeMap = id2SHcode;
-			lineCode2ShangHaiCodeMap = code2SHcode;
-		}
-		
-		/**
-		 * 
-		 * @Title: loadPersonnelInfo 
-		 * @Description: TODO(加载人员信息) 
-		 */
-		public void loadPersonnelInfo() {
-			Iterator<Personnel> iterator = personnelRepository.findAll().iterator();
-			
-			Map<String, Personnel> jsyTempMap=new HashMap<>()
-					, spyTempMap=new HashMap<>();
-			Map<String, String> allPersonMap=new HashMap<>();
-			
-			Personnel p;
-			
-			while(iterator.hasNext()){
-				p = iterator.next();
-				
-				if(p.getPosts() != null){
-					if(p.getPosts().equals("1"))
-						jsyTempMap.put(p.getJobCode(), p);
-					else if(p.getPosts().equals("2"))
-						spyTempMap.put(p.getJobCode(), p);
-				}
-				
-				allPersonMap.put(p.getJobCode(), p.getPersonnelName());
-			}
-			
-			jsyMap=jsyTempMap;
-			spyMap=spyTempMap;
-			allPerson=allPersonMap;
-		}
-	}
+public class BasicData implements CommandLineRunner {
+
+    //设备号和车辆自编号 （K: 设备编码 ，V：车辆自编号）
+    public static BiMap<String, String> deviceId2NbbmMap;
+
+    //车辆自编号和公司代码对照 （K: 车辆自编号 ，V：公司代码）
+    public static Map<String, String> nbbm2CompanyCodeMap;
+
+    //站点编码和名称对照，包括停车场 （K: 站点编码 ，V：站点名称）
+    public static Map<String, String> stationCode2NameMap;
+
+    //线路起终点对照（线路编码_上下行_起终点）  1024_0_B (1024上行起点)
+    public static Map<String, String> lineSEPointMap;
+
+    //车辆和线路对照
+    public static Map<String, Line> nbbm2LineMap;
+
+    //线路和用户对照 用于webSocket定向推送消息（用户进入线调时写入数据）
+    //public static TreeMultimap<String, String> lineCode2SocketUserMap = TreeMultimap.create();
+
+    //线路ID和code 对照
+    public static BiMap<Integer, String> lineId2CodeMap;
+
+    //线路编码和名称对照
+    public static Map<String, String> lineCode2NameMap;
+
+    //线路编码_站点编码 == 0|1  上下行
+    public static Map<String, Integer> lineStationUpDownMap;
+
+    //停车场
+    public static List<String> parkCodeList;
+
+    //线路ID和shangHaiLinecode 对照
+    public static Map<Integer, String> lineId2ShangHaiCodeMap;
+
+    //线路Code和shangHaiLinecode 对照
+    public static Map<String, String> lineCode2ShangHaiCodeMap;
+
+    //驾驶员工号 和 personnel 对象映射
+    public static Map<String, Personnel> jsyMap;
+    //售票员工号 和 personnel 对象映射
+    public static Map<String, Personnel> spyMap;
+    //全量员工 工号和姓名对照
+    public static Map<String, String> allPerson;
+
+    //站点名和运管处编号 对照
+    public static Map<String, Map<String, Map>> stationName2YgcNumber;
+
+
+    static Logger logger = LoggerFactory.getLogger(BasicData.class);
+
+    @Autowired
+    BasicDataLoader dataLoader;
+
+    @Override
+    public void run(String... arg0) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 1, TimeUnit.HOURS);
+    }
+
+
+    @Component
+    public static class BasicDataLoader extends Thread {
+
+        @Autowired
+        CarsRepository carsRepository;
+
+        @Autowired
+        StationRepository stationRepository;
+
+        @Autowired
+        CarParkRepository carParkRepository;
+
+        @Autowired
+        CarConfigInfoRepository carConfigInfoRepository;
+
+        @Autowired
+        LineRepository lineRepository;
+
+        @Autowired
+        StationRouteRepository stationRouteRepository;
+
+        @Autowired
+        PersonnelRepository personnelRepository;
+
+
+        @Override
+        public void run() {
+            loadAllData();
+        }
+
+        /**
+         * @Title: loadAllData
+         * @Description: TODO(加载所有数据)
+         */
+        public int loadAllData() {
+            try {
+                //设备信息
+                loadDeviceInfo();
+                //站点信息
+                loadStationInfo();
+                //线路信息
+                loadLineInfo();
+                //车辆和线路映射信息
+                loadNbbm2LineInfo();
+                //站点路由信息
+                loadStationRouteInfo();
+                //人员信息
+                loadPersonnelInfo();
+                logger.info("加载基础数据成功！，");
+            } catch (Exception e) {
+                logger.error("加载基础数据时出现异常，", e);
+            }
+            return 0;
+        }
+
+
+        private void loadStationRouteInfo() {
+            Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
+
+            Map<String, String> sePointMap = new HashMap<>();
+            //lineSEPointMap
+            Map<String, Integer> map = new HashMap<>();
+
+            StationRoute route;
+            while (iterator.hasNext()) {
+                route = iterator.next();
+                map.put(route.getLineCode() + "_" + route.getStationCode(), route.getDirections());
+
+                if (route.getStationMark() != null &&
+                        (route.getStationMark().equals("B") || route.getStationMark().equals("E"))) {
+                    sePointMap.put(route.getLineCode() + "_"
+                            + route.getDirections()
+                            + "_" + route.getStationMark(), route.getStationCode());
+                }
+            }
+            lineStationUpDownMap = map;
+            lineSEPointMap = sePointMap;
+        }
+
+        /**
+         * @Title: loadDeviceInfo
+         * @Description: TODO(加载设备相关信息)
+         */
+        public void loadDeviceInfo() {
+            BiMap<String, String> deviceId2Nbbm = HashBiMap.create();
+            //车辆和公司代码对照
+            Map<String, String> nbbm2CompanyCode = new HashMap<>();
+            Iterator<Cars> carIterator = carsRepository.findAll().iterator();
+            Cars car;
+            while (carIterator.hasNext()) {
+                car = carIterator.next();
+                deviceId2Nbbm.put(car.getEquipmentCode(), car.getInsideCode());
+                nbbm2CompanyCode.put(car.getInsideCode(), car.getBusinessCode());
+            }
+
+            deviceId2NbbmMap = deviceId2Nbbm;
+            nbbm2CompanyCodeMap = nbbm2CompanyCode;
+        }
+
+        /**
+         * @Title: loadStationInfo
+         * @Description: TODO(加载站点信息)
+         */
+        public void loadStationInfo() {
+            Map<String, String> stationCode2Name = new HashMap<>();
+            Iterator<Station> iterator = stationRepository.findAll().iterator();
+            //站点
+            Station station;
+            while (iterator.hasNext()) {
+                station = iterator.next();
+                stationCode2Name.put(station.getStationCod(), station.getStationName());
+            }
+            //停车场
+            Iterator<CarPark> iterator2 = carParkRepository.findAll().iterator();
+
+            List<String> parkCodes = new ArrayList<>();
+
+            CarPark carPark;
+            while (iterator2.hasNext()) {
+                carPark = iterator2.next();
+                stationCode2Name.put(carPark.getParkCode(), carPark.getParkName());
+
+                parkCodes.add(carPark.getParkCode());
+            }
+            parkCodeList = parkCodes;
+            stationCode2NameMap = stationCode2Name;
+        }
+
+        /**
+         * @Title: loadNbbm2LineInfo
+         * @Description: TODO(车辆和线路对照)
+         */
+        public void loadNbbm2LineInfo() {
+            Iterator<CarConfigInfo> allIterator = carConfigInfoRepository.findAll().iterator();
+            Map<String, Line> ccMap = new HashMap<>();
+
+            CarConfigInfo cci;
+            while (allIterator.hasNext()) {
+                cci = allIterator.next();
+                ccMap.put(cci.getCl().getInsideCode(), cci.getXl());
+            }
+            nbbm2LineMap = ccMap;
+        }
+
+        /**
+         * @Title: loadLineInfo
+         * @Description: TODO(加载线路相关信息)
+         */
+        public void loadLineInfo(){
+            List<StationRoute> stationsList = null;// 站点路由集
+            StationRoute stationRoute = null;
+            int size = 0;
+            Map<String, Integer> station2Number ;
+            Map<String, Map> dirs2Statioin ;
+            int[] dirs = {0,1};// 运行方向  上下行
+            int num = 1;
+            Iterator<Line> iterator = lineRepository.findAll().iterator();
+
+            Line line;
+            BiMap<Integer, String> biMap = HashBiMap.create();
+            Map<String, String> code2name = new HashMap<>();
+            Map<Integer, String> id2SHcode = new HashMap<Integer, String>();
+            Map<String, String> code2SHcode = new HashMap<String, String>();
+            Map<String, Map<String, Map>> tempStationName2YgcNumber = new HashMap<String, Map<String, Map>>();
+
+            while(iterator.hasNext()){
+                line = iterator.next();
+                biMap.put(line.getId(), line.getLineCode());
+                code2name.put(line.getLineCode(), line.getName());
+                id2SHcode.put(line.getId(),line.getShanghaiLinecode());
+                code2SHcode.put(line.getLineCode(), line.getShanghaiLinecode());
+
+                /**
+                 * 加载运管处的站点及序号
+                 * 上行从1开始，下行顺序续编
+
+                num = 1;
+                dirs2Statioin = new HashMap<String, Map>();
+                for (int i = 0; i < dirs.length; i++) {
+                    // 分别取得上下行的站点
+                    stationsList = stationRouteRepository.findByLine(line.getLineCode(), dirs[i]);
+                    size = stationsList == null ? 0 :stationsList.size();
+                    if(size > 0 ){
+                        station2Number = new HashMap<String, Integer>();
+                        for (int j = 0; j < size; j++) {
+                            stationRoute = stationsList.get(j);
+                            // map保存为（站点名称 -->序号）
+                            station2Number.put(stationRoute.getStationName(), num++);
+                        }
+                        // 保存两个数据，（0 --> station2Number）（1 --> station2Number） 0上行 1 下行
+                        dirs2Statioin.put(dirs[i]+"", station2Number);
+                    }
+                }
+                // 保存(站点编码 --> dirs2Statioin)
+                tempStationName2YgcNumber.put(line.getLineCode(), dirs2Statioin);
+                 */
+            }
+
+            lineId2CodeMap = biMap;
+            lineCode2NameMap = code2name;
+            lineId2ShangHaiCodeMap = id2SHcode;
+            lineCode2ShangHaiCodeMap = code2SHcode;
+            stationName2YgcNumber = tempStationName2YgcNumber;
+        }
+
+        /**
+         * @Title: loadPersonnelInfo
+         * @Description: TODO(加载人员信息)
+         */
+        public void loadPersonnelInfo() {
+            Iterator<Personnel> iterator = personnelRepository.findAll().iterator();
+
+            Map<String, Personnel> jsyTempMap = new HashMap<>(), spyTempMap = new HashMap<>();
+            Map<String, String> allPersonMap = new HashMap<>();
+
+            Personnel p;
+            String jobCode;
+            while (iterator.hasNext()) {
+                p = iterator.next();
+
+                jobCode = p.getJobCode();
+                if (StringUtils.isEmpty(jobCode))
+                    continue;
+
+                /*if (jobCode.indexOf("-") != -1) {
+                    jobCode = jobCode.split("-")[1];
+                }*/
+                if (p.getPosts() != null) {
+                    if (p.getPosts().equals("1"))
+                        jsyTempMap.put(jobCode, p);
+                    else if (p.getPosts().equals("2"))
+                        spyTempMap.put(jobCode, p);
+                }
+
+                allPersonMap.put(jobCode, p.getPersonnelName());
+            }
+
+            jsyMap = jsyTempMap;
+            spyMap = spyTempMap;
+            allPerson = allPersonMap;
+        }
+    }
 }
 package com.bsth.data.arrival;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.TimeUnit;
-
+import com.bsth.data.match.Arrival2Schedule;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import com.bsth.Application;
-import com.bsth.data.match.Arrival2Schedule;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
+import java.util.*;
 /**
  * 
@@ -32,7 +23,7 @@ import com.google.common.collect.ListMultimap;
 @Component
 public class ArrivalData_GPS implements CommandLineRunner{
-	// 起终点站进出数据  K：车辆编码 
+	// 起终点站进出数据  K：车辆编码
 	private static ListMultimap<String, ArrivalEntity> startAndEndMaps;
 	private static Map<String, Integer> carIndexMap;
@@ -50,8 +41,8 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		logger.info("ArrivalData_GPS,100,10 @11-10");
-		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 100, 10, TimeUnit.SECONDS);
+		logger.info("ArrivalData_GPS,30,10");
+		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 10, TimeUnit.SECONDS);
 	}
 	@Component
@@ -69,6 +60,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 		@Override
 		public void run() {
 			try{
+				logger.info("开始加载到离站数据, " + System.currentTimeMillis());
 				List<ArrivalEntity> arrSets = dataLoader.load();
 				if(null == arrSets || arrSets.size() == 0)
 					return;
@@ -71,6 +71,9 @@ public class GpsEntity {
 	private int version;
+	/** 是否起终点站 */
+	private boolean sEPoint;
+
 	public Integer getCompanyCode() {
 		return companyCode;
 	}
@@ -238,4 +241,12 @@ public class GpsEntity {
 	public void setVersion(int version) {
 		this.version = version;
 	}
+
+	public boolean issEPoint() {
+		return sEPoint;
+	}
+
+	public void setsEPoint(boolean sEPoint) {
+		this.sEPoint = sEPoint;
+	}
 }
@@ -28,7 +28,7 @@ import com.bsth.util.ConfigUtil;
 import com.google.common.collect.TreeMultimap;
 /**
- * 
+ *
  * @ClassName: GpsRealData
  * @Description: TODO(实时GPS数据集合)
  * @author PanZhao
@@ -37,25 +37,25 @@ import com.google.common.collect.TreeMultimap;
  */
 @Component
 public class GpsRealData implements CommandLineRunner{
-	
+
 	static Logger logger = LoggerFactory.getLogger(GpsRealData.class);
-	
+
 	private static Map<String, GpsEntity> gpsMap;
-	
+
 	//按线路分组设备号
 	private static TreeMultimap<String, String> lineCode2Devices;
 	// 网关数据接口地址
 	private static String url;
-	
+
 	@Autowired
 	GpsDataLoader gpsDataLoader;
-	
+
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	
+
 	@Autowired
-	ForecastRealServer forecastRealServer;	
+	ForecastRealServer forecastRealServer;
 	/**
 	 * 构造函数
 	 */
@@ -64,49 +64,52 @@ public class GpsRealData implements CommandLineRunner{
 		lineCode2Devices = TreeMultimap.create();
 		url = ConfigUtil.get("http.gps.real.url");
 	}
-	
+
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
 		String device = gps.getDeviceId();
 		GpsEntity old = gpsMap.get(device);
-		
-		//定时定距数据附带站点编码改变
-		if(null == old || !old.getStopNo().equals(gps.getStopNo())){
-			gps.setArrTime(gps.getTimestamp());
-			//预测到达终点时间
-			forecastRealServer.forecast(gps.getNbbm(), gps);
-		}
-		else{
-			gps.setArrTime(old.getArrTime());
-			//不预测， 重新计算终点时间
-			gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
+
+		if(!StringUtils.isEmpty(gps.getStopNo())){
+			//定时定距数据附带站点编码改变
+			if(null == old || !gps.getStopNo().equals(old.getStopNo())){
+				gps.setArrTime(gps.getTimestamp());
+				//预测到达终点时间
+				forecastRealServer.forecast(gps.getNbbm(), gps);
+			}
+			else{
+				gps.setArrTime(old.getArrTime());
+				//不预测， 重新计算终点时间
+				gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
+			}
 		}
-		
+
 		gpsMap.put(device, gps);
-		lineCode2Devices.put(gps.getLineId(), device);
+		if(StringUtils.isNotBlank(gps.getLineId()))
+			lineCode2Devices.put(gps.getLineId(), device);
 		return gps;
 	}
 	/**
-	 * 
+	 *
 	 * @Title: get @Description: TODO(设备号获取GPS)
 	 */
 	public GpsEntity get(String deviceId) {
 		return gpsMap.get(deviceId);
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
 	 */
 	public List<GpsEntity> getByLine(String lineCode) {
 		NavigableSet<String> set = lineCode2Devices.get(lineCode);
-		
+
 		List<GpsEntity> rs = new ArrayList<>();
 		GpsEntity gps;
 		ScheduleRealInfo sch;
@@ -115,19 +118,19 @@ public class GpsRealData implements CommandLineRunner{
 			//过滤异常GPS数据
 			if(gps.isAbnormal())
 				continue;
-			
+
 			sch = dayOfSchedule.execPlamMap().get(gps.getNbbm());
 			if(null != sch)
 				gps.setSchId(sch.getId());
 			rs.add(gps);
 		}
-		
+
 		return rs;
 	}
-	
+
 	public List<GpsEntity> get(List<String> pArray){
 		List<GpsEntity> list = new ArrayList<>();
-		
+
 		for(String code : pArray)
 			list.addAll(getByLine(code));
 		return list;
@@ -136,11 +139,11 @@ public class GpsRealData implements CommandLineRunner{
 	public Set<String> allDevices(){
 		return gpsMap.keySet();
 	}
-	
+
 	public GpsEntity findByDeviceId(String deviceId) {
 		return gpsMap.get(deviceId);
 	}
-	
+
 	public Collection<GpsEntity> all(){
 		return gpsMap.values();
 	}
@@ -150,9 +153,9 @@ public class GpsRealData implements CommandLineRunner{
 	}
 	@Component
 	public static class GpsDataLoader extends Thread{
-		
+
 		Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
-		
+
 		@Autowired
 		GpsRealData gpsRealData;
@@ -164,7 +167,7 @@ public class GpsRealData implements CommandLineRunner{
 				logger.error("", e);
 			}
 		}
-		
+
 		public void load() throws Exception {
 			List<GpsEntity> list = new ArrayList<>();
 			CloseableHttpClient httpClient = null;
@@ -172,7 +175,7 @@ public class GpsRealData implements CommandLineRunner{
 			try {
 				httpClient = HttpClients.createDefault();
 				HttpGet get = new HttpGet(url);
-				
+
 				response = httpClient.execute(get);
 				HttpEntity entity = response.getEntity();
@@ -181,32 +184,45 @@ public class GpsRealData implements CommandLineRunner{
 					BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
 					StringBuffer stringBuffer = new StringBuffer();
 					String str = "";
-					while ((str = br.readLine()) != null) 
+					while ((str = br.readLine()) != null)
 						stringBuffer.append(str);
 					JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
-					if (jsonObj != null) 
+					if (jsonObj != null)
 						list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
-					
+
 					String nbbm;
-					//附加车辆内部编码
-					Integer updown;
 					for(GpsEntity gps : list){
+						//没有设备号
+						if(StringUtils.isBlank(gps.getDeviceId()))
+							continue;
+
 						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
 						if(StringUtils.isBlank(nbbm))
 							gps.setAbnormal(true);//标记为异常数据
 						else
 							gps.setNbbm(nbbm);
-						
+
 						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
+						gpsRealData.add(gps);
+
+						//纠正走向
+						correctUpdown(gps);
+						/*if(issEPoint(gps))
+							continue;
+
+						//如果走向未知，尝试根据站点纠正走向
 						if(gps.getUpDown() == -1){
-							//如果走向未知，尝试根据站点纠正走向
-							updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
+							updown=stationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
 							if(updown != null)
 								gps.setUpDown(updown);
 						}
-						gpsRealData.add(gps);
+						//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
+						updown=stationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
+						if(updown != null && !gps.getUpDown().equals(updown)){
+							gps.setUpDown(updown);
+						}*/
 					}
 				} else
 					logger.error("result is null");
@@ -220,5 +236,55 @@ public class GpsRealData implements CommandLineRunner{
 					response.close();
 			}
 		}
+
+		/**
+		 * 是否是起终点
+		 * @param gps
+		 * @return
+		 */
+		public boolean isSEPoint(GpsEntity gps){
+			String key = gps.getLineId()+"_"+gps.getUpDown()+"_"
+					,stationCode;
+
+			if(BasicData.lineSEPointMap.containsKey(key+"B")){
+				stationCode = BasicData.lineSEPointMap.get(key+"B");
+				if(gps.getStopNo().equals(stationCode)){
+					gps.setsEPoint(true);
+					return true;
+				}
+			}
+
+			if(BasicData.lineSEPointMap.containsKey(key+"E")){
+				stationCode = BasicData.lineSEPointMap.get(key+"E");
+				if(gps.getStopNo().equals(stationCode)){
+					gps.setsEPoint(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * 纠正上下行
+		 * @param gps
+		 */
+		public void correctUpdown(GpsEntity gps){
+			Integer updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
+			if(updown != null && !updown.equals(gps.getUpDown()))
+				gps.setUpDown(updown);
+			/*//如果走向未知，尝试根据站点纠正走向
+			if(gps.getUpDown() == -1){
+
+			}*/
+
+			if(isSEPoint(gps))
+				return;
+
+			/*//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
+			updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
+			if(updown != null && !gps.getUpDown().equals(updown)){
+				gps.setUpDown(updown);
+			}*/
+		}
 	}
 }
@@ -130,11 +130,11 @@ public class DayOfSchedule implements CommandLineRunner {
 		//翻班线程
 		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
 		//入库
-		//Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
-		//Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
 		//班次误点扫描
-		//Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
 		//每天凌晨2点20提交数据到运管处
 		long diff = (DateUtils.getTimestamp() + 1000*60*140) - System.currentTimeMillis();
 package com.bsth.data.schedule.thread;
-import java.util.LinkedList;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.JpaObjectRetrievalFailureException;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.EntityNotFoundException;
+import java.util.LinkedList;
 /**
- * 
- * @ClassName: SchedulePstThread 
- * @Description: TODO(班次异步持久化) 
- * @author PanZhao 
- * @date 2016年8月24日 上午1:47:05 
- *
+ * @author PanZhao
+ * @ClassName: SchedulePstThread
+ * @Description: TODO(班次异步持久化)
+ * @date 2016年8月24日 上午1:47:05
  */
 @Component
-public class SchedulePstThread extends Thread{
-
-	@Autowired
-	ScheduleRealInfoRepository scheduleRepository;
-	
-	@Override
-	public void run() {
-		LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
-
-		ScheduleRealInfo schedule;
-		for (int i = 0; i < 1000; i++) {
-			schedule = list.poll();
-			if (null == schedule)
-				break;
-
-			scheduleRepository.save(schedule);
-		}
-	}
+public class SchedulePstThread extends Thread {
+
+    @Autowired
+    ScheduleRealInfoRepository scheduleRepository;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
+
+        ScheduleRealInfo schedule;
+        for (int i = 0; i < 1000; i++) {
+            schedule = list.poll();
+            if (null == schedule)
+                break;
+
+            try {
+                scheduleRepository.save(schedule);
+            }
+            catch (JpaObjectRetrievalFailureException e1){
+                logger.error("JpaObjectRetrievalFailureException error.... 可忽略");
+            }
+            catch(EntityNotFoundException e2){
+                logger.error("EntityNotFoundException error.... 可忽略");
+            }
+            catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+    }
 }
@@ -97,7 +97,16 @@ public class Station {
 	// 版本号
 	private Integer versions;
-		
+	
+	/** 是否有电子站牌 这里是老调度系统的原始字段，暂时保留该字段。 */
+	private Integer isHaveLed;
+	
+	/** 是否有候车亭  这里是老调度系统的原始字段，暂时保留该字段。*/
+	private Integer isHaveShelter;
+	
+	/** 是否港湾式公交站  这里是老调度系统的原始字段，暂时保留该字段。*/
+	private Integer isHarbourStation;
+	
 	// 描述
 	private String descriptions;
@@ -115,6 +124,30 @@ public class Station {
 	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
+	public Integer getIsHaveLed() {
+		return isHaveLed;
+	}
+
+	public void setIsHaveLed(Integer isHaveLed) {
+		this.isHaveLed = isHaveLed;
+	}
+
+	public Integer getIsHaveShelter() {
+		return isHaveShelter;
+	}
+
+	public void setIsHaveShelter(Integer isHaveShelter) {
+		this.isHaveShelter = isHaveShelter;
+	}
+
+	public Integer getIsHarbourStation() {
+		return isHarbourStation;
+	}
+
+	public void setIsHarbourStation(Integer isHarbourStation) {
+		this.isHarbourStation = isHarbourStation;
+	}
+
 	public String getAddr() {
 		return addr;
 	}
 package com.bsth.entity.mcy_forms;
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "bsth_c_chtoch")
 public class Changetochange {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	private String rq;//日期
+	
+	private String gs;//公司
+	
+	private String fgs;//分公司
+	
+	private String xl;//线路
+	
+	private String lp;//路牌
+	
+	private String fssj;//发生时间
+	
+	private String xgsj;//修改时间
+	
+	private String pcch;//配车车号
+	
+	private String pcry;//配车人员
+	
+	private String jhch;//计划车号
+	
+	private String jhgh;//计划工号
+	
+	private String sjch;//实际车号
+	
+	private String sjgh;//实际工号
+	
+	private String yy;//原因
+	
+	private String xgr;//修改人
+
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public String getGs() {
+		return gs;
+	}
+
+	public void setGs(String gs) {
+		this.gs = gs;
+	}
+
+	public String getFgs() {
+		return fgs;
+	}
+
+	public void setFgs(String fgs) {
+		this.fgs = fgs;
+	}
+
+	public String getXl() {
+		return xl;
+	}
+
+	public void setXl(String xl) {
+		this.xl = xl;
+	}
+
+	public String getLp() {
+		return lp;
+	}
+
+	public void setLp(String lp) {
+		this.lp = lp;
+	}
+
+	public String getFssj() {
+		return fssj;
+	}
+
+	public void setFssj(String fssj) {
+		this.fssj = fssj;
+	}
+
+	public String getXgsj() {
+		return xgsj;
+	}
+
+	public void setXgsj(String xgsj) {
+		this.xgsj = xgsj;
+	}
+
+	public String getPcch() {
+		return pcch;
+	}
+
+	public void setPcch(String pcch) {
+		this.pcch = pcch;
+	}
+
+	public String getPcry() {
+		return pcry;
+	}
+
+	public void setPcry(String pcry) {
+		this.pcry = pcry;
+	}
+
+
+	public String getJhch() {
+		return jhch;
+	}
+
+	public void setJhch(String jhch) {
+		this.jhch = jhch;
+	}
+
+	public String getJhgh() {
+		return jhgh;
+	}
+
+	public void setJhgh(String jhgh) {
+		this.jhgh = jhgh;
+	}
+
+	public String getSjch() {
+		return sjch;
+	}
+
+	public void setSjch(String sjch) {
+		this.sjch = sjch;
+	}
+
+	public String getSjgh() {
+		return sjgh;
+	}
+
+	public void setSjgh(String sjgh) {
+		this.sjgh = sjgh;
+	}
+
+	public String getYy() {
+		return yy;
+	}
+
+	public void setYy(String yy) {
+		this.yy = yy;
+	}
+
+	public String getXgr() {
+		return xgr;
+	}
+
+	public void setXgr(String xgr) {
+		this.xgr = xgr;
+	}
+	
 }
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import org.apache.commons.lang3.StringUtils;
 import javax.persistence.*;
 import java.util.Date;
@@ -199,12 +200,29 @@ public class SchedulePlanInfo {
         }
         this.j = employeeConfigInfo.getJsy().getId();
-        this.jGh = employeeConfigInfo.getJsy().getJobCode();
+//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
+        if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+            String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+            if (jsy_temp.length > 1) {
+                this.jGh = jsy_temp[1];
+            } else {
+                this.jGh = jsy_temp[0];
+            }
+        }
         this.jName = employeeConfigInfo.getJsy().getPersonnelName();
         // 关联的售票员
         if (employeeConfigInfo.getSpy() != null) {
             this.s = employeeConfigInfo.getSpy().getId();
-            this.sGh = employeeConfigInfo.getSpy().getJobCode();
+//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
+            if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+                String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+                if (spy_temp.length > 1) {
+                    this.sGh = spy_temp[1];
+                } else {
+                    this.sGh = spy_temp[0];
+                }
+            }
+
             this.sName = employeeConfigInfo.getSpy().getPersonnelName();
         }
+package com.bsth.entity.sys;
+
+import javax.persistence.*;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@Entity
+@Table(name = "bsth_c_sys_company_auth")
+public class CompanyAuthority {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /** 公司代码 */
+    private String companyCode;
+
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司代码 */
+    private String subCompanyCode;
+
+    /** 分公司代码 */
+    private String subCompanyName;
+
+    private Integer roleId;
+
+    public String getSubCompanyName() {
+        return subCompanyName;
+    }
+
+    public void setSubCompanyName(String subCompanyName) {
+        this.subCompanyName = subCompanyName;
+    }
+
+    public String getSubCompanyCode() {
+        return subCompanyCode;
+    }
+
+    public void setSubCompanyCode(String subCompanyCode) {
+        this.subCompanyCode = subCompanyCode;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+}
@@ -24,7 +24,7 @@ public abstract class BaseFilter implements Filter {
 	 * 白名单
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_TEMPS };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS };
 	@Override
 	public void destroy() {
@@ -3,8 +3,8 @@ package com.bsth.oplog.http;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import com.bsth.common.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
 import org.springframework.web.method.HandlerMethod;
@@ -25,7 +25,7 @@ public class HttpOpLogInterceptor implements HandlerInterceptor {
 	private final PathMatcher pathMatcher = new AntPathMatcher();
 	// GET 白名单
-	private String[] httpGetWhiteList = { "/user/login/**", "/user/currentUser","/dictionary/**", "/module/findByCurrentUser", "/gps/**", "/error/**" };
+	private String[] httpGetWhiteList = { "/user/login/**", "/user/currentUser","/dictionary/**", "/module/findByCurrentUser", "/gps/**", "/error/**", Constants.XD_CHILD_PAGES};
 	// POST 白名单
 	private String[] httpPostWhiteList = {
@@ -33,9 +33,9 @@ public interface CarParkRepository extends BaseRepository&lt;CarPark, Integer&gt;{
     			 "?6 ,  str_to_date(?7,'%Y-%m-%d %H:%i:%s') , ?8 , ?9 , ?10," +
-    			 "str_to_date(?11,'%Y-%m-%d %H:%i:%s'), ?12 ,?13,GeomFromText(?14), ?15, " +
+    			 "str_to_date(?11,'%Y-%m-%d %H:%i:%s'), ?12 ,?13,ST_GeomFromText(?14), ?15, " +
-    			 "?16, GeomFromText(?17), ?18,?19)", nativeQuery=true)
+    			 "?16, ST_GeomFromText(?17), ?18,?19)", nativeQuery=true)
 	public void carParkSave(Double area,String company,String parkCode,String parkName,
 							String brancheCompany,Integer createBy,String createDate,String descriptions,Integer destroy,
@@ -91,8 +91,8 @@ public interface CarParkRepository extends BaseRepository&lt;CarPark, Integer&gt;{
     		"versions = ?12  , " +
     		"b_center_point = ?13  , " +
     		"g_center_point = ?14 , " +
-    		"b_park_point = GeomFromText(?15)  , " +
-    		"g_park_point = GeomFromText(?16)  , " +
+    		"b_park_point = ST_GeomFromText(?15)  , " +
+    		"g_park_point = ST_GeomFromText(?16)  , " +
     		"db_type = ?17  , " +
     		"radius = ?18  , " +
     		"shapes_type = ?19  " +
@@ -83,33 +83,32 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 	@Transactional
     @Modifying
 	@Query(value="UPDATE bsth_c_section SET " +
-				"gsection_vector = ST_GeomFromText(?2) , " +
-				"bsection_vector = ST_GeomFromText(?3)," +
-				"section_code = ?4," +
-				"section_name = ?5," +
-				"croses_road = ?6," +
-				"end_node = ?7," +
-				"start_node = ?8," +
-				"middle_node = ?9," +
-				"section_type = ?10," +
-				"csection_vector = ?11," +
-				"road_coding = ?12," +
-				"section_distance = ?13," +
-				"section_time = ?14," +
-				"db_type = ?15," +
-				"speed_limit = ?16," +
-				"descriptions = ?17," +
-				"versions = ?18," +
-				"create_by = ?19," +
-				"create_date =  str_to_date(?20,'%Y-%m-%d %H:%i:%s')," +
-				"update_by = ?21," +
-				"update_date =  str_to_date(?22,'%Y-%m-%d %H:%i:%s')" +
+				" gsection_vector = ST_GeomFromText(?2) , " +
+				" bsection_vector = ST_GeomFromText(?3)," +
+				" section_code = ?4," +
+				" section_name = ?5," +
+				" croses_road = ?6," +
+				" end_node = ?7," +
+				" start_node = ?8," +
+				" middle_node = ?9," +
+				" section_type = ?10," +
+				" road_coding = ?11," +
+				" section_distance = ?12," +
+				" section_time = ?13," +
+				" db_type = ?14," +
+				" speed_limit = ?15," +
+				" descriptions = ?16," +
+				" versions = ?17," +
+				" create_by = ?18," +
+				" create_date =  str_to_date(?19,'%Y-%m-%d %H:%i:%s')," +
+				" update_by = ?20," +
+				" update_date =  str_to_date(?21,'%Y-%m-%d %H:%i:%s')" +
 				" WHERE id = ?1", nativeQuery=true)
 	public void sectionUpdate(Integer sectionId,String gsectionVector,String bsectionVector,String sectionCode,String sectionName,
 							  String crosesRoad,String endNode,String startNode,String middleNode,String sectionType,
-							  String csectionVector,String roadCoding,Double sectionDistance,Double sectionTime,String dbType,
+							  String roadCoding,Double sectionDistance,Double sectionTime,String dbType,
 							  Double speedLimit,String descriptions,Integer version,Integer createBy,String createDate,
@@ -69,7 +69,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 								"r.versions AS versions," +
 								"r.descriptions AS descriptions" +
 								"  FROM bsth_c_sectionroute r where r.line = ?1 and r.directions = ?2 and r.destroy=0 ) a " +
-								"	LEFT JOIN bsth_c_section b  ON a.sectionrouteSection = b.id", nativeQuery=true)
+								"	LEFT JOIN bsth_c_section b  ON a.sectionrouteSection = b.id order by a.sectionrouteCode asc", nativeQuery=true)
 	List<Object[]> getSectionRoute(int lineId, int directions);
@@ -110,9 +110,12 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	 * 
 	 * @return List<Object[]>
 	 */
-	@Query(value = "SELECT s.b_jwpoints,s.station_name FROM (" +
+	/*@Query(value = "SELECT s.b_jwpoints,s.station_name FROM (" +
 						"SELECT b.station FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
-				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)
+				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)*/
+	@Query(value = "SELECT s.b_jwpoints,s.station_name,r.station_route_code FROM (" +
+			"SELECT b.station,b.station_route_code FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
+	   "LEFT JOIN bsth_c_station s on r.station = s.id order by r.station_route_code asc", nativeQuery=true)
 	List<Object[]> getSelectStationRouteCenterPoints(Integer lineId,Integer direction);
 	/**
@@ -23,7 +23,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_ylb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_ylb b where a.nbbm=b.nbbm and "
-			+ " to_days(?1)-to_days(b.rq)=1 ) group by nbbm",nativeQuery=true)
+			+ " to_days(?1)-to_days(b.rq)=1 )",nativeQuery=true)
 	List<Ylb> obtainYlbefore(String rq);
 	/**
@@ -100,10 +100,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	void deleteByLineCodeAndDate(String xlBm, String schDate);
 	//去掉了 xlBm is not null 
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where (s.xlBm = ?1 or s.xlBm is not null) and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh ORDER BY xlBm,clZbh,realExecDate,fcsjActual")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
 	List<Map<String,Object>> yesterdayDataList(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@Repository
+public interface CompanyAuthorityRepository extends BaseRepository<CompanyAuthority, Integer>{
+
+    @Modifying
+    @Query(value="DELETE FROM CompanyAuthority WHERE roleId = ?1")
+    void deleteByRoleId(Integer roleId);
+
+    @Query(value = "select ca from CompanyAuthority ca where ca.roleId in ?1")
+    List<CompanyAuthority> findByRoles(List<Integer> idx);
+}
 package com.bsth.repository.sys;
-import java.util.List;
-import java.util.Set;
-
+import com.bsth.entity.sys.Module;
+import com.bsth.repository.BaseRepository;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
-import com.bsth.entity.sys.Module;
-import com.bsth.repository.BaseRepository;
+import java.util.List;
+import java.util.Set;
 @Repository
-public interface ModuleRepository extends BaseRepository<Module, Integer>{
-	
-	@Query("select m from Module m where m.groupType in ?1")
-	List<Module> findByGroupType(String[] groupType);
-	
-	List<Module> findByPId(Integer pId);
-	
-	@Query("select m from Module m where m.id in ?1")
-	Set<Module> findByIds(List<Integer> ids);
-	
-	@Override
-	List<Module> findAll(Specification<Module> spec);
+public interface ModuleRepository extends BaseRepository<Module, Integer> {
+
+    @Query("select m from Module m where m.groupType in ?1")
+    List<Module> findByGroupType(String[] groupType);
+
+    List<Module> findByPId(Integer pId);
+
+    @Query("select m from Module m where m.id in ?1")
+    Set<Module> findByIds(List<Integer> ids);
+
+    @Override
+    List<Module> findAll(Specification<Module> spec);
+
 }
@@ -36,7 +36,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 	public void configure(WebSecurity web) throws Exception {
 		// 白名单
 		web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-				Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_TEMPS);
+				Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES);
 	}
 	@Override
 package com.bsth.service;
-import com.bsth.entity.Line;
-
 /**
- * 
+ *
  * @Interface: LineService(线路service业务层实现接口)
- * 
+ *
  * @extends : BaseService
- * 
+ *
  * @Description: TODO(线路service业务层实现接口)
- * 
+ *
  * @Author bsth@lq
- * 
+ *
  * @Date 2016年4月28日 上午9:21:17
  *
  * @Version 公交调度系统BS版 0.1
- * 
+ *
  */
 public interface TrafficManageService {
-	
+
 	/**
 	 * 上传线路信息
-	 * 
+	 *
 	 * @return 调用接口返回信息
 	 */
 	String setXL();
-	
+
 	/**
 	 * 上传车辆信息
-	 * 
+	 *
 	 * @return 调用接口返回信息
 	 */
 	String setCL();
-	
+
 	/**
 	 * 上传司机信息
 	 * @return 调用接口返回信息
 	 */
 	String setSJ();
-	
+
 	/**
 	 * 上传超速数据
-	 * 
+	 *
 	 * @return 调用接口返回信息
 	 */
 	String setCS();
-	
+
 	/**
 	 * 上传线路班次时刻表数据
-	 * 
+	 *
 	 * @return 调用接口返回信息
 	 */
 	String setSKB(String ids);
-	
+
 	/**
 	 * 线路人员车辆配置信息
 	 * @return 调用接口返回信息
 	 */
 	String setXLPC();
-	
+
 	/**
 	 * 线路计划班次表
 	 * @return 调用接口返回信息
 	 */
 	String setJHBC();
-	
+
 	String setLD();
-	
+
 	String setLCYH();
-	
-	String setDDRB();	
+
+	String setDDRB();
+
+	/**
+	 * 下载全量的公交基础数据
+	 * @return
+	 */
+	String getDownLoadAllDataFile();
+
+	/**
+	 * 下载增量的公交基础数据
+	 * @return
+	 */
+	String getDownLoadIncreaseDataFile();
+
+	/**
+	 * 指定线路查询方式公交基础数据下载
+	 * @return
+	 */
+	String getDownLoadWarrantsBusLineStation();
 }
+package com.bsth.service.forms;
+
+import java.util.List;
+
+import com.bsth.entity.mcy_forms.Linepasswengerflow;
+import com.bsth.entity.mcy_forms.Operationservice;
+import com.bsth.entity.mcy_forms.Shifday;
+import com.bsth.entity.mcy_forms.Shiftuehiclemanth;
+import com.bsth.entity.mcy_forms.Singledata;
+import com.bsth.entity.mcy_forms.Vehicleloading;
+import com.bsth.entity.mcy_forms.Waybillday;
+
+public interface ExportService {
+
+	public void waybillday(String date, List<Waybillday> resList);
+
+	public void linepasswengerflow(String date,List<Linepasswengerflow> resList);
+
+	public void shifday(String date, List<Shifday> resList);
+	
+	public void shiftuehiclemanth(String startDate, String endDate, String lpName,
+			List<Shiftuehiclemanth> resList);
+	
+	public void singledata(String startDate, String endDate, String lpName, List<Singledata> resList);
+	
+    public void vehicleloading(String date, List<Vehicleloading> resList);
+
+	public void operationservice(String startDate, String endDate, String lpName,
+			List<Operationservice> resList);
+	
+	
+	
+}
+package com.bsth.service.forms.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.mcy_forms.Linepasswengerflow;
+import com.bsth.entity.mcy_forms.Operationservice;
+import com.bsth.entity.mcy_forms.Shifday;
+import com.bsth.entity.mcy_forms.Shiftuehiclemanth;
+import com.bsth.entity.mcy_forms.Singledata;
+import com.bsth.entity.mcy_forms.Vehicleloading;
+import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.service.forms.ExportService;
+import com.bsth.util.ReportUtils;
+
+@Service 
+public class ExportServiceImpl implements ExportService{
+
+	
+	//行车路单日报表
+	@Override
+	public void waybillday(String date, List<Waybillday> list) {
+		
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> map = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			
+			for(Waybillday w : list){
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("carPlate", w.getCarPlate());
+				m.put("jzl1", w.getJzl1());
+				m.put("jzl", w.getJzl());
+				m.put("yh", w.getYh());
+				m.put("jName", w.getjName());
+				m.put("zlc", w.getZlc());
+				resList.add(m);
+			}
+			
+			try {
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { map }, path+"mould\\waybillday.xls",
+						path+"export\\行车路单日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+	}
+	
+	//线路客流量报表
+	@Override
+	public void linepasswengerflow(String date, List<Linepasswengerflow> list) {
+				
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> map = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			for(Linepasswengerflow l : list){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("stationName", l.getStationName());
+			resList.add(m);
+			}
+			
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\linepasswengerflow.xls",
+				path+"export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+				
+			}
+
+	
+	//班次车辆人员日统计
+	@Override
+	public void shifday(String date,List<Shifday> list) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> map = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+					
+			for(Shifday l : list){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("jName",l.getjName());
+			m.put("sName", l.getsName());
+			m.put("lpName", l.getLpName());
+			m.put("carPlate", l.getCarPlate());
+			m.put("jhlc", l.getJhlc());
+			m.put("sjjhlc", l.getSjjhlc());
+			m.put("yygl", l.getYygl());
+			m.put("emptMileage", l.getEmptMileage());
+			m.put("remMileage", l.getRemMileage());
+			m.put("addMileage", l.getAddMileage());
+			m.put("totalm", l.getTotalm());
+			m.put("jhbc", l.getJhbc());
+			m.put("sjjhbc", l.getSjjhbc());
+			m.put("cjbc", l.getCjbc());
+			m.put("ljbc", l.getLjbc());
+			m.put("sjbc", l.getSjbc());
+			resList.add(m);
+			}
+					
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\shifday.xls",
+				path+"export\\班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+				
+	}
+
+	//班次车辆人员月统计
+	@Override
+	public void shiftuehiclemanth(String startDate,String endDate,String lpName, List<Shiftuehiclemanth> list) {
+		
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> map = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+					
+			for(Shiftuehiclemanth l : list){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("jName",l.getjName() );
+			m.put("jhlc", l.getJhlc());
+			m.put("emptMileage",l.getEmptMileage() );
+			m.put("remMileage", l.getRemMileage());
+			m.put("addMileage", l.getAddMileage());
+			m.put("totalm", l.getTotalm());
+			m.put("cjbc", l.getCjbc());
+			m.put("ljbc", l.getLjbc());
+			m.put("sjbc", l.getSjbc());
+			resList.add(m);
+			}
+					
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\shiftuehiclemanth.xls",
+				path+"export\\班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		
+	}
+
+	//路单报表
+	@Override
+	public void singledata(String startDate,String endDate,String lpName, List<Singledata> list) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> map = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+					
+			for(Singledata l : list){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("rQ",l.getrQ());
+			m.put("gS", l.getgS());
+			m.put("xL",l.getxL() );
+			m.put("clzbh", l.getClzbh());
+			m.put("jsy", l.getJsy());
+			m.put("jName", l.getjName());
+			m.put("sgh", l.getSgh());
+			m.put("sName", l.getsName());
+			m.put("jhlc", l.getJhlc());
+			m.put("emptMileage", l.getEmptMileage());
+			m.put("hyl", l.getHyl());
+			m.put("jzl", l.getJzl());
+			m.put("unyyyl",l.getUnyyyl());
+			m.put("jhjl", l.getJhjl());
+			resList.add(m);
+			}
+					
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\singledata.xls",
+				path+"export\\路单日报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+		
+		
+	}
+
+	
+	//车辆加注
+	@Override
+	public void vehicleloading(String date, List<Vehicleloading> list) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> map = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+					
+			for(Vehicleloading l : list){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("rQ", l.getrQ());
+			m.put("gS", l.getgS());
+			m.put("xL", l.getxL());
+			m.put("clzbh", l.getClzbh());
+			m.put("hyl", l.getHyl());
+			m.put("jzl", l.getJzl());
+			m.put("ls", l.getLs());
+			m.put("jhlc", l.getJhlc());
+			m.put("unyyyl", l.getUnyyyl());
+			m.put("jhbc", l.getJhbc());
+			m.put("sjbc", l.getSjbc());
+			resList.add(m);
+			}
+					
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\vehicleloading.xls",
+				path+"export\\车辆加注" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+	}
+
+	//运营服务阶段报表
+	@Override
+	public void operationservice(String startDate,String endDate,String lpName,List<Operationservice> list) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> map = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+			for(Operationservice l : list){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("xlName", l.getXlName());
+			m.put("jzl", l.getJzl());
+			m.put("xhl", l.getXhl());
+			m.put("xsgl", l.getXsgl());
+			m.put("emptMileage", l.getEmptMileage());
+			m.put("sjbc", l.getSjbc());
+			resList.add(m);
+			}
+					
+			try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+			ee.excelReplace(listI, new Object[] { map }, path+"mould\\operationservice.xls",
+				path+"export\\运营服务阶段报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}	
+	}
+
+	
+}
@@ -3,8 +3,10 @@ package com.bsth.service.forms.impl;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -226,11 +228,66 @@ public class FormsServiceImpl implements FormsService{
 	}
 	//换人换车情况日统计
-	@Override
-	public List<Changetochange> changetochange(Map<String, Object> map) {
-		
-		return null;
-	}
+		String rq;
+			@Override
+			public List<Changetochange> changetochange(Map<String, Object> map) {
+				 
+				 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd") ; 
+				 SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日") ; 
+				 Date d = null ; 
+				 Date d1 = null ;  
+				 try {
+					d = sdf.parse(map.get("startDate").toString());
+					d1 = sdf.parse(map.get("endDate").toString());
+				} catch (ParseException e) {
+				 
+					e.printStackTrace();
+				} 
+				String rq2=sdf1.format(d);
+				String rq3=sdf1.format(d1);
+				
+				 rq=rq2+"-"+ rq3;
+				 
+				String sql=" select c.*,l.line_code   from bsth_c_chtoch c LEFT JOIN bsth_c_line l on c.xl=l.name WHERE 1=1  ";  
+					if(!map.get("startDate").toString().equals(" ")&&!map.get("endDate").toString().equals(" ")){
+						sql+= "and DATE_FORMAT( c.rq,'%Y-%m-%d') BETWEEN  '"+map.get("startDate").toString()+"'  and '"+map.get("endDate").toString()+"'";
+					}	  
+				if(!map.get("line").equals("")){
+					sql+="and  line_code='"+map.get("line")+"'";	 
+				}	   		
+				if(map.get("sel").equals("2")){
+					sql+=" and c.pcch!=c.pcry";
+				}else if(map.get("sel").equals("1")){
+					sql+=" and c.jhgh!=c.sjgh";
+				}
+				
+			 
+				List<Changetochange> list = jdbcTemplate.query(sql, new RowMapper<Changetochange>() {
+					
+					@Override
+					public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
+						Changetochange  chan= new Changetochange();
+						
+				        chan.setRq(rq);
+						chan.setGs(arg0.getString("gs").toString());
+						chan.setFgs(arg0.getString("fgs").toString());
+						chan.setXl(arg0.getString("xl").toString());
+						chan.setLp(arg0.getString("lp").toString());
+						chan.setFssj(arg0.getString("fssj").toString());
+						chan.setXgsj(arg0.getString("xgsj").toString());
+						chan.setPcch(arg0.getString("pcch").toString());
+						chan.setPcry(arg0.getString("pcry").toString());
+						chan.setJhch(arg0.getString("jhch").toString());
+						chan.setJhgh(arg0.getString("jhgh").toString());
+						chan.setSjch(arg0.getString("sjch").toString());
+						chan.setSjgh(arg0.getString("sjgh").toString());
+						chan.setYy(arg0.getString("yy").toString());
+						chan.setXgr(arg0.getString("xgr").toString());
+						return chan;
+					}
+				});
+				return list;
+			}
 	//路单数据
@@ -339,4 +396,5 @@ public class FormsServiceImpl implements FormsService{
 	}
+
 }
@@ -75,9 +75,19 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 			}
-			bParkPoint = "POLYGON(("  + bParkPoint +"))";
+			if(bParkPoint.equals(""))
+				bParkPoint = null;
+			else
+				bParkPoint = "POLYGON(("  + bParkPoint +"))";
+				
+			if(gParkPoint.equals(""))
+				gParkPoint = null;
+			else
+				gParkPoint = "POLYGON(("  + gParkPoint +"))";
-			gParkPoint = "POLYGON(("  + gParkPoint +"))";
+			/*bParkPoint = "POLYGON(("  + bParkPoint +"))";
+			
+			gParkPoint = "POLYGON(("  + gParkPoint +"))";*/
 			// 地理位置中心点(百度坐标)
 			String bCenterPoint = map.get("bCenterPoint").equals("") ? "" : map.get("bCenterPoint").toString();
@@ -93,7 +103,7 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 			}
-			String gCenterPoint = "";
+			String gCenterPoint = null;
 			if(bJwpointsArray.length>0) {
@@ -147,6 +157,9 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 			// 修改人
 			Integer updateBy = map.get("updateBy").equals("") ? null : Integer.parseInt(map.get("updateBy").toString());
+			
+			
+			
 			carParkRepository.carParkSave(area, company, parkCode, parkName, 
 										  brancheCompany, createBy, createDate, descriptions, destroy, 
@@ -296,7 +309,7 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 				}
-				String gCenterPoint = "";
+				String gCenterPoint =null;
 				if(bJwpointsArray.length>0) {
@@ -337,10 +350,18 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 					}
 				}
+				if(bParkPoint.equals(""))
+					bParkPoint = null;
+				else
+					bParkPoint = "POLYGON(("  + bParkPoint +"))";
+					
+				if(gParkPoint.equals(""))
+					gParkPoint = null;
+				else
+					gParkPoint = "POLYGON(("  + gParkPoint +"))";
+				/*bParkPoint = "POLYGON(("  + bParkPoint +"))";
-				bParkPoint = "POLYGON(("  + bParkPoint +"))";
-				
-				gParkPoint = "POLYGON(("  + gParkPoint +"))";
+				gParkPoint = "POLYGON(("  + gParkPoint +"))";*/
 				// 编码
 				String parkCode = map.get("parkCode").equals("") ? "" : map.get("parkCode").toString();
@@ -213,10 +213,11 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			String sectionType="";
-			String csectionVector="";
+			// String csectionVector="";
 			// 更新
-			repository.sectionUpdate(sectionId, gsectionVector, bsectionVectorS, sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, createBy, createDate, updateBy, updateDate);
+			/*repository.sectionUpdate(sectionId, gsectionVector, bsectionVectorS, sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, createBy, createDate, updateBy, updateDate);*/
+			repository.sectionUpdate(sectionId, gsectionVector, bsectionVectorS, sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, sectionType, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, createBy, createDate, updateBy, updateDate);
 			SectionRoute route = new SectionRoute();
@@ -393,7 +394,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			String sectionType="";
-			String csectionVector="";
+			String csectionVector=null;
 			Integer id = Integer.valueOf(sectionCode);
@@ -977,9 +977,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			}
-			bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+		/*	bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
-			gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
+			gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";*/
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
@@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
 import com.bsth.data.BasicData;
@@ -119,6 +120,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private ScheduleRealInfoRepository scheduleRealInfoRepository;
+	@Autowired
+	NamedParameterJdbcTemplate jdbcTemplate;
+
+
 	// 运管处接口
 	private InternalPortType portType = new Internal().getInternalHttpSoap11Endpoint();
 	private WebServiceSoap ssop ;
@@ -163,9 +168,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			sBuffer.append("<XLs>");
 			while(lineIterator.hasNext()){
 				line = lineIterator.next();
-				if(line.getLinePlayType() == null){
-					continue;
-				}
 				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
 					continue;
 				}
@@ -189,7 +191,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sBuffer.append("<QZLC>").append(upMileage).append("</QZLC>");
 					sBuffer.append("<ZQLC>").append(downMileage).append("</ZQLC>");
 				}
-				sBuffer.append("<XLGH>").append(line.getLinePlayType()).append("</XLGH>");
+				sBuffer.append("<XLGH>").append(line.getLinePlayType() == null ?"0":line.getLinePlayType())
+						.append("</XLGH>");
 				// 循环添加站点信息
 				sBuffer.append("<StationList>");
 				// 先查上行
@@ -334,21 +337,28 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					int seqNumber = 0;
 					for(ScheduleRealInfo scheduleRealInfo:list){
-						if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getLpName().equals(scheduleRealInfo.getLpName())
+						if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getLpName()
+								.equals(scheduleRealInfo.getLpName())
 								&& schRealInfo.getClZbh().equals(scheduleRealInfo.getClZbh())){
+							if(scheduleRealInfo.getFcsjActual() == null ||scheduleRealInfo.getBcType().equals("in")
+									|| scheduleRealInfo.getBcType().equals("out")){
+								continue;
+							}
 							scheduleRealInfo.getQdzCode();
 							sf.append("<LD>");
 							sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
 							sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
 							sf.append("<FCZDMC>"+scheduleRealInfo.getQdzName()+"</FCZDMC>");
-							sf.append("<FCZDXH>" + ++seqNumber + "</FCZDXH>");
+							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(
+									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getQdzName()) + "</FCZDXH>");
 							sf.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");
 							sf.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");
 							sf.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");
 							sf.append("<SJFCSJ>"+scheduleRealInfo.getFcsjActual()+"</SJFCSJ>");
 							sf.append("<FCZDLX>"+""+"</FCZDLX>");
 							sf.append("<DDZDMC>"+scheduleRealInfo.getZdzName()+"</DDZDMC>");
-							sf.append("<DDZDXH>"+ seqNumber +"</DDZDXH>");
+							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(
+									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getZdzName()) +"</DDZDXH>");
 							sf.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");
 							sf.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");
 							sf.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");
@@ -404,7 +414,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
 					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
 					for(ScheduleRealInfo scheduleRealInfo:list){
-						if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getClZbh().equals(scheduleRealInfo.getClZbh())){
+						if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getClZbh()
+								.equals(scheduleRealInfo.getClZbh())){
 							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 							//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
 							if(childTaskPlans.isEmpty()){
@@ -412,7 +423,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 									totalKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
 									if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
 											|| scheduleRealInfo.getBcType().equals("venting")){
-										emptyKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();;
+										emptyKilometers += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
 									}
 								}
 							}else{
@@ -588,14 +599,19 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					if(xlbm.equals(schedulePlanInfo.getXlBm())
 							&& zbh.equals(schedulePlanInfo.getClZbh())
 							&& lp == schedulePlanInfo.getLp()){
+						if(schedulePlanInfo.getBcType().equals("in") || schedulePlanInfo.getBcType().equals("out")){
+							continue;
+						}
 						sBuffer.append("<BC>");
 						sBuffer.append("<SJGH>").append(schedulePlanInfo.getjGh()).append("</SJGH>");
 						sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>");
 						sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>");
-						sBuffer.append("<ZDXH>").append(++startSerialNum).append("</ZDXH>");
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
+								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzName())).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
-						sBuffer.append("<ZDXH>").append(++endSerialNum).append("</ZDXH>");
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
+								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzName())).append("</ZDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
 								.append("</JHDDSJ>");
 						sBuffer.append("</BC>");
@@ -643,6 +659,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			Iterator<TTInfoDetail> ttInfoDetailIterator;
 			HashMap<String,Object> param = new HashMap<String, Object>();
 			String ttinfoJhlc = null;//计划总里程
+			String lineCode ;
 			sBuffer.append("<SKBs>");
 			for (int i = 0; i < idArray.length; i++) {
 				ttInfo = ttInfoRepository.findOne(Long.valueOf(idArray[i]));
@@ -652,7 +669,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				ttInfoDetailIterator = ttInfoDetailRepository.findAll(new CustomerSpecs<TTInfoDetail>(param),
 						new Sort(Direction.ASC, "xlDir")).iterator();
 				sBuffer.append("<SKB>");
-				sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(ttInfo.getXl())).append("</XLBM>");
+				sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(ttInfo.getXl().getId()))
+						.append("</XLBM>");
 				ttinfoJhlc = new String();
 				sBuffer.append("<JHZLC>").append(ttinfoJhlc).append("</JHZLC>");
 				sBuffer.append("<JHYYLC>").append(ttinfoJhlc).append("</JHYYLC>");
@@ -662,23 +680,35 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				sBuffer.append("<TBYY>").append("").append("</TBYY>");
 				sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
 				int num = 1;
+				// 加上<BCList>
+				if(ttInfoDetailIterator.hasNext()){
+					sBuffer.append("<BCList>");
+				}
 				while (ttInfoDetailIterator.hasNext()) {
 					ttInfoDetail = ttInfoDetailIterator.next();
+					if(ttInfoDetail.getBcType().equals("in") || ttInfoDetail.getBcType().equals("out")){
+						continue;
+					}
 					ttinfoJhlc = ttInfoDetail.getJhlc()+"";// 设置计划总里程
-					sBuffer.append("<BCList>");
+					lineCode = ttInfoDetail.getXl().getLineCode();
 					sBuffer.append("<BC>");
 					sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 					sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
-					sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz()).append("</FCZDMC>");
-					sBuffer.append("<ZDXH>").append(num).append("</ZDXH>");
+					sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");
+					sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
+							lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationName())).append("</ZDXH>");
 					sBuffer.append("<JHFCSJ>").append(ttInfoDetail.getFcsj()).append("</JHFCSJ>");
-					sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz()).append("</DDZDMC>");
-					sBuffer.append("<ZDXH>").append(num).append("</ZDXH>");
+					sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");
+					sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
+							lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationName())).append("</ZDXH>");
 					sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 					sBuffer.append("</BC>");
-					sBuffer.append("</BCList>");
+
 					num++;
 				}
+				if(sBuffer.indexOf("<BCList>") != -1){
+					sBuffer.append("</BCList>");
+				}
 				sBuffer.append("</SKB>");
 			}
 			sBuffer.append("</SKBs>");
@@ -1008,7 +1038,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				zdlx = "2";
 			}
 			sBuffer.append("<Station>");
-			sBuffer.append("<ZDXH>").append(startId).append("</ZDXH>");
+			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationName())).append("</ZDXH>");
 			sBuffer.append("<SXX>").append(srRoute.getDirections()).append("</SXX>");
 			sBuffer.append("<ZDMC>").append(srRoute.getStationName()).append("</ZDMC>");
 			sBuffer.append("<ZDBM>").append(srRoute.getStationCode()).append("</ZDBM>");
@@ -1023,4 +1053,18 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		return startId;
 	}
+	/**
+	 *
+	 * @param lineCode 线路编码
+	 * @param direction 线路方向
+	 * @param stationName 让点名称
+	 * @return 运管处站点序号
+	 */
+	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationName){
+		Integer number = 0;
+		Map<String, Map> dirs2Statioin = BasicData.stationName2YgcNumber.get(lineCode);
+		Map<String, Integer> station2Number = dirs2Statioin.get(direction);
+		number = station2Number.get(stationName);
+		return number;
+	}
 }
@@ -7,7 +7,7 @@ import com.bsth.entity.oil.Ylb;
 import com.bsth.service.BaseService;
 public interface YlbService extends BaseService<Ylb, Integer>{
-	Map<String, Object> obtain(String rq);
+	Map<String, Object> obtain(Map<String, Object> map);
 	String obtainDsq();
 	Map<String, Object> sort(Map<String, Object> map);
@@ -85,7 +85,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		//前一天所有车辆最后进场班次信息
 		List<Ylb> ylListBe=repository.obtainYlbefore(rq);
 		//从排班表中计算出行驶的总里程
-		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("1024",rq);
+		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("",rq);
 		for(int x=0;x<listpb.size();x++){
@@ -151,7 +151,13 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	 */
 	@Transactional  
 	@Override
-	public Map<String, Object> obtain(String rq) {
+	public Map<String, Object> obtain(Map<String, Object> map2) {
+		String rq=map2.get("rq").toString();
+		String line="";
+		if(map2.get("xlbm_eq")!=null){
+			line=map2.get("xlbm_eq").toString();
+		}
+		
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 		//保留两位小数
 		DecimalFormat df = new DecimalFormat("#.00");
@@ -164,7 +170,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		//前一天所有车辆最后进场班次信息
 		List<Ylb> ylListBe=repository.obtainYlbefore(rq);
 		//从排班表中计算出行驶的总里程
-		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("1024",rq);
+		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq);
 		for(int x=0;x<listpb.size();x++){
-package com.bsth.service.realcontrol.dto;
-
-/**
- * 班次执行率DTO
- * Created by panzhao on 2016/11/14.
- */
-public class ScheduleExecRate {
-
-    private long id;
-    private String dfsj;
-    private String fcsjActual;
-    private String zdsj;
-    private String zdsjActual;
-    private int status;
-    private String lineCode;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getDfsj() {
-        return dfsj;
-    }
-
-    public void setDfsj(String dfsj) {
-        this.dfsj = dfsj;
-    }
-
-    public String getFcsjActual() {
-        return fcsjActual;
-    }
-
-    public void setFcsjActual(String fcsjActual) {
-        this.fcsjActual = fcsjActual;
-    }
-
-    public String getZdsj() {
-        return zdsj;
-    }
-
-    public void setZdsj(String zdsj) {
-        this.zdsj = zdsj;
-    }
-
-    public String getZdsjActual() {
-        return zdsjActual;
-    }
-
-    public void setZdsjActual(String zdsjActual) {
-        this.zdsjActual = zdsjActual;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-}
+package com.bsth.service.realcontrol.dto;
+
+/**
+ * 班次执行率DTO
+ * Created by panzhao on 2016/11/14.
+ */
+public class ScheduleExecRate {
+
+    private long id;
+    private String dfsj;
+    private String fcsjActual;
+    private String zdsj;
+    private String zdsjActual;
+    private int status;
+    private String lineCode;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public String getFcsjActual() {
+        return fcsjActual;
+    }
+
+    public void setFcsjActual(String fcsjActual) {
+        this.fcsjActual = fcsjActual;
+    }
+
+    public String getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(String zdsj) {
+        this.zdsj = zdsj;
+    }
+
+    public String getZdsjActual() {
+        return zdsjActual;
+    }
+
+    public void setZdsjActual(String zdsjActual) {
+        this.zdsjActual = zdsjActual;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+}
 package com.bsth.service.realcontrol.impl;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-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.bsth.entity.realcontrol.LineConfig;
-import org.apache.commons.lang3.StringUtils;
-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.stereotype.Service;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
@@ -39,6 +16,7 @@ import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
@@ -54,17 +32,25 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.SectionRouteService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.bsth.util.DateUtils;
-import com.bsth.util.ReportRelatedUtils;
-import com.bsth.util.ReportUtils;
-import com.bsth.util.TimeUtils;
-import com.bsth.util.TransGPS;
+import com.bsth.util.*;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
+import org.apache.commons.lang3.StringUtils;
+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.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Service
 public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Long>
@@ -289,6 +275,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				rs.put("msg", "驾驶员工号不能为空！");
 				return rs;
 			}
+			//截取工号
+			if(t.getsGh().indexOf("-") != -1){
+				t.setsGh(t.getsGh().split("-")[1]);
+			}
 			t.setScheduleDateStr(schDate);
 			t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
@@ -454,12 +444,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public void adjustDriver(ScheduleRealInfo schedule, String driver, String driverName) {
+		if(driver.indexOf("-") != -1)
+			driver = driver.split("-")[1];
 		schedule.setjGh(driver);
 		schedule.setjName(driverName);
 	}
 	@Override
 	public void adjustConductor(ScheduleRealInfo schedule, String conductor, String conductorName) {
+		if(conductor.indexOf("-") != -1)
+			conductor = conductor.split("-")[1];
 		schedule.setsGh(conductor);
 		schedule.setsName(conductorName);
 	}
@@ -1135,8 +1129,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					addMileage += tempJhlc;
 					ljbc++;
 				}else{
+					if(scheduleRealInfo.getBcType().equals("normal")){
+						jhbc++;
+					}
 					jhlc += tempJhlc;
-					jhbc++;
 					if(scheduleRealInfo.getStatus() == -1){
 						remMileage += tempJhlc;
 						cjbc++;
@@ -1522,7 +1518,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					if(scheduleRealInfo.getXlBm().equals(yesterdayDataList.get(i).get("xlBm")) && scheduleRealInfo.getClZbh().equals(yesterdayDataList.get(i).get("clZbh"))
 							&& scheduleRealInfo.getjGh().equals(yesterdayDataList.get(i).get("jGh"))){
 						//根据线路代码获取公司
-						Line li = lineRepository.findByLineCode(line);
+						Line li = lineRepository.findByLineCode(scheduleRealInfo.getXlBm());
 						yesterdayDataList.get(i).put("company", li.getCompany());
 						//计算总公里
 						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
@@ -3,6 +3,7 @@ package com.bsth.service.schedule.utils;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
+import java.util.Map;
 /**
  * 数据导入导出服务。
@@ -32,4 +33,7 @@ public interface DataImportExportService {
      * @throws Exception
      */
     File fileDataOutput(String fileName, File ktrFile) throws Exception;
+
+
+    File fileDataOutput(String fileName, File ktrFile, Map<String, Object> param) throws Exception;
 }
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
@@ -111,6 +112,11 @@ public class DataImportExportServiceImpl implements DataImportExportService, Ini
     @Override
     public File fileDataOutput(String fileName, File ktrFile) throws Exception {
+        return fileDataOutput(fileName, ktrFile, null);
+    }
+
+    @Override
+    public File fileDataOutput(String fileName, File ktrFile, Map<String, Object> param) throws Exception {
         // 初始化转换，元数据，转换对象
         TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
         Trans trans = new Trans(transMeta);
@@ -120,6 +126,14 @@ public class DataImportExportServiceImpl implements DataImportExportService, Ini
                 fileName +
                 new DateTime().toString("yyyyMMddHHmmss") + ".xls";
         trans.setParameterValue("filepath", filepath);
+
+        // 添加其他参数
+        if (!CollectionUtils.isEmpty(param)) {
+            for (String key : param.keySet()) {
+                trans.setParameterValue(key, String.valueOf(param.get(key)));
+            }
+        }
+
         // 执行转换
         trans.execute(null);
         // 等待转换结束
@@ -83,6 +83,10 @@ public class DataToolsProperties {
     /** 人员信息导出ktr转换 */
     @NotNull
     private String employeesDataoutputktr;
+    /** 时刻表导出元数据ktr转换 */
+    private String ttinfodetailMetaoutput;
+    /** 时刻表导出数据ktr转换 */
+    private String ttinfodetailOutput;
     // TODO：
@@ -253,4 +257,20 @@ public class DataToolsProperties {
     public void setKvarsDbdname(String kvarsDbdname) {
         this.kvarsDbdname = kvarsDbdname;
     }
+
+    public String getTtinfodetailMetaoutput() {
+        return ttinfodetailMetaoutput;
+    }
+
+    public void setTtinfodetailMetaoutput(String ttinfodetailMetaoutput) {
+        this.ttinfodetailMetaoutput = ttinfodetailMetaoutput;
+    }
+
+    public String getTtinfodetailOutput() {
+        return ttinfodetailOutput;
+    }
+
+    public void setTtinfodetailOutput(String ttinfodetailOutput) {
+        this.ttinfodetailOutput = ttinfodetailOutput;
+    }
 }
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+public interface CompanyAuthorityService extends BaseService<CompanyAuthority, Integer> {
+    Map<String,Object> save(Integer roleId, List<CompanyAuthority> list);
+
+    List<CompanyAuthority> findByUser(SysUser user);
+}
+package com.bsth.service.sys.impl;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.sys.CompanyAuthorityRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.CompanyAuthorityService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@Service
+public class CompanyAuthorityServiceImpl extends BaseServiceImpl<CompanyAuthority, Integer> implements CompanyAuthorityService {
+
+    @Autowired
+    CompanyAuthorityRepository companyAuthorityRepository;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Transactional
+    @Override
+    public Map<String, Object> save(Integer roleId, List<CompanyAuthority> list) {
+        Map<String, Object> rs = new HashMap();
+
+        try {
+            for(CompanyAuthority cauth : list){
+                cauth.setRoleId(roleId);
+            }
+
+            //删除原数据
+            companyAuthorityRepository.deleteByRoleId(roleId);
+
+            //重新写入数据
+            companyAuthorityRepository.save(list);
+
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+
+        return rs;
+    }
+
+    @Override
+    public List<CompanyAuthority> findByUser(SysUser user) {
+        Set<Role> roles = user.getRoles();
+        if(roles == null || roles.size() == 0)
+            return null;
+
+        List<Integer> idx = new ArrayList<>();
+        for(Role r : roles)
+            idx.add(r.getId());
+
+        List<CompanyAuthority> cAuths = companyAuthorityRepository.findByRoles(idx);
+        return cAuths;
+    }
+}
 package com.bsth.service.sys.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Service;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.sys.Module;
 import com.bsth.entity.sys.Role;
@@ -20,12 +8,23 @@ import com.bsth.repository.sys.ModuleRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.ModuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
 @Service
 public class ModuleServiceImpl extends BaseServiceImpl<Module, Integer> implements ModuleService{
 	@Autowired
 	ModuleRepository moduleRepository;
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	@Override
 	public List<Module> findByGroupType(String group) {
@@ -62,26 +61,38 @@ public class ModuleServiceImpl extends BaseServiceImpl&lt;Module, Integer&gt; implemen
 		SysUser user = SecurityUtils.getCurrentUser();
 		Set<Role> roles = user.getRoles();
-		List<Module> all = (List<Module>) moduleRepository.findAll(new Sort(Direction.ASC, "id"))
-					,results = new ArrayList<>();
-		
+		String inCond = "";
+		for(Role r : roles)
+			inCond += ("," + r.getId());
+
+		inCond = "(" + inCond.substring(1) + ")";
+
+		String sql = "select ID,CREATE_DATE,`ENABLE`,GROUP_TYPE,ICON,MAPP_SYMBOL,NAME,P_ID,PATH,UPDATE_DATE,CONTAINER from bsth_c_sys_module m where id in (select modules from bsth_c_sys_role_modules where roles in "+inCond+")  or group_type != 3";
+		List<Module> all = jdbcTemplate.query(sql, new ModuleRowMapper())
+				,rs = new ArrayList<>();
+
 		Map<Integer, Module> map = new HashMap<>();
 		for(Module m : all){
 			map.put(m.getId(), m);
-			for(Role r : roles){
-				if(m.getRoles().contains(r))
-					results.add(m);
-			}
+			if(m.getGroupType().equals("3"))
+				rs.add(m);
 		}
 		//上层目录和组节点
 		Set<Module> pSet = new HashSet<>();
-		for(Module m : results){
+		for(Module m : rs){
 			searchParentNode(m, map, pSet);
 		}
-		results.addAll(pSet);
-		
-		return results;
+		rs.addAll(pSet);
+
+		//排序
+		Collections.sort(rs, new Comparator<Module>() {
+			@Override
+			public int compare(Module o1, Module o2) {
+				return o1.getId() - o2.getId();
+			}
+		});
+		return rs;
 	}
 	/**
@@ -105,4 +116,24 @@ public class ModuleServiceImpl extends BaseServiceImpl&lt;Module, Integer&gt; implemen
 				searchParentNode(pModule, idMap, pSet);
 		}
 	}
+
+	public class ModuleRowMapper implements RowMapper<Module>{
+
+		@Override
+		public Module mapRow(ResultSet rs, int rowNum) throws SQLException {
+			Module module = new Module();
+			module.setId(rs.getInt("ID"));
+			module.setCreateDate(rs.getDate("CREATE_DATE"));
+			module.setEnable(rs.getBoolean("ENABLE"));
+			module.setGroupType(rs.getString("GROUP_TYPE"));
+			module.setIcon(rs.getString("ICON"));
+			module.setMappSymbol(rs.getString("MAPP_SYMBOL"));
+			module.setName(rs.getString("NAME"));
+			module.setpId(rs.getInt("P_ID"));
+			module.setPath(rs.getString("PATH"));
+			module.setUpdateDate(rs.getDate("UPDATE_DATE"));
+			module.setContainer(rs.getString("CONTAINER"));
+			return module;
+		}
+	}
 }
@@ -25,9 +25,11 @@ public class SHCJ2BDJW {
 		ResultSet rs = null;
-		String sqlSelect = "SELECT b.SHAPESTRING as SHAPE , b.id as ID FROM jjwgps_t_gjldb b where  SHAPESTRING is not null order by b.ldbh asc  ";
+		/*String sqlSelect = "SELECT b.SHAPESTRING as SHAPE , b.id as ID FROM jjwgps_t_gjldb b where  SHAPESTRING is not null order by b.ldbh asc  ";*/
+		/*String sqlSelect = "select s.id,s.descriptions from bsth_c_station s order by s.id asc  ";*/
+		String sqlSelect = "SELECT s.id,s.descriptions FROM bsth_c_section s order by s.id asc ";
-		String sqlUpdate = "UPDATE jjwgps_t_gjldb SET bdjw = GeomFromText(?),SHAPE = GeomFromText(?) where id = ?";
+		String sqlUpdate = "UPDATE bsth_c_section SET csection_vector = ST_GeomFromText(?) , bsection_vector=ST_GeomFromText(?) , gsection_vector=ST_GeomFromText(?) where id = ?";
 		List<Map<String, Object>> list = new ArrayList<>();
@@ -42,9 +44,9 @@ public class SHCJ2BDJW {
 				Map<String, Object> map = new HashMap<String, Object>();
-				map.put("shape", rs.getString("SHAPE"));
+				map.put("descriptions", rs.getString("descriptions"));
-				map.put("id", rs.getInt("ID"));
+				map.put("id", rs.getInt("id"));
 				list.add(map);
 			}
@@ -52,15 +54,29 @@ public class SHCJ2BDJW {
 			for(int i =0;i<list.size();i++) {
 				Map<String, Object> temp = list.get(i);
-				
-				String lineString = temp.get("shape").toString();
-				/*String lineString = "LINESTRING  (13532.5305161702 -3677.63275264995, 13433.22401617 -3881.74765264988)";*/
-				
+				// POINT (8229.30921617 -933.16425265)
+				String lineString = temp.get("descriptions").toString();
+				int id = Integer.parseInt(temp.get("id").toString());
 				String arrayP[] = lineString.substring(lineString.indexOf("(")+1, lineString.length()-1).split(", ");
-				
-				int id = Integer.parseInt(temp.get("id").toString());
-				String geometry = "";
+				/*String arrayP[] = lineString.substring(lineString.indexOf("(")+1, lineString.length()-1).split(" ");
+				String b_jwpoints = "";
+				Float g_lonx=0.0f,g_laty=0.0f,x=0.0f,y=0.0f;*/
+				
+				/*Double lng = Double.parseDouble(arrayP[0]);
+				Double lat = Double.parseDouble(arrayP[1]);
+				x = Float.parseFloat(arrayP[0]);
+				y = Float.parseFloat(arrayP[1]);
+				// WGS84
+				Map map_2 = JWDUtil.ConvertSHToJW(lng,lat);
+				g_lonx = Float.parseFloat(map_2.get("x").toString());
+				g_laty = Float.parseFloat(map_2.get("y").toString());
+				Location location = TransGPS.LocationMake(Float.parseFloat(map_2.get("x").toString()), Float.parseFloat(map_2.get("y").toString()));
+				location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
+				b_jwpoints = (location.getLng()+0.000727) + " " + (location.getLat() - 0.0000624);*/
+				//b_jwpoints = (location.getLng()) + " " + (location.getLat());
+				
+				String csection_vector="",bsection_vector="",gsection_vector="";
 				for(int k =0;k<arrayP.length;k++) {
@@ -76,28 +92,42 @@ public class SHCJ2BDJW {
 					location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
-					if(k==arrayP.length-1)
-						geometry = geometry + (location.getLng()+0.000727) + " " + (location.getLat() - 0.0000624);
-					else 
-						geometry = geometry + (location.getLng()+0.000727) + " " + (location.getLat() - 0.0000624) + ",";
+					if(k==arrayP.length-1) {
+						bsection_vector = bsection_vector + (location.getLng()+0.000727) + " " + (location.getLat() - 0.0000624);
+						csection_vector = csection_vector + arrayXY[0]  + " " + arrayXY[1];
+						gsection_vector = gsection_vector + map_2.get("x").toString() + " " + map_2.get("y").toString();
+					}else {
+						bsection_vector = bsection_vector + (location.getLng()+0.000727) + " " + (location.getLat() - 0.0000624) + ",";
+						csection_vector = csection_vector + arrayXY[0]  + " " + arrayXY[1] +",";
+						gsection_vector = gsection_vector + map_2.get("x").toString() + " " + map_2.get("y").toString()+",";
+					}
 				}
 				ps = null;
-				
-				geometry = "LINESTRING(" + geometry +")";
+				bsection_vector = "LINESTRING(" + bsection_vector +")";
+				csection_vector = "LINESTRING(" + csection_vector +")";
+				gsection_vector = "LINESTRING(" + gsection_vector +")";
 				ps = conn.prepareStatement(sqlUpdate);
-				ps.setString(1, geometry);
-				
-				ps.setString(2, lineString);
-				
-				ps.setInt(3, id);
-				
+				// String sqlUpdate = "UPDATE bsth_c_section SET csection_vector = ? , bsection_vector=? , gsection_vector=? where id = ?";
+				ps.setString(1, csection_vector);
+				ps.setString(2, bsection_vector);
+				ps.setString(3, gsection_vector);
+				ps.setInt(4, id);
+				
+				//int stauts = ps.executeUpdate();
+				// String sqlUpdate = "UPDATE bsth_c_station SET b_jwpoints = ?1 , g_lonx=?2 , g_laty=?3 , x = ?4 , y = ?5 where id = ?6";
+				/*ps.setString(1, b_jwpoints);
+				ps.setFloat(2, g_lonx);
+				ps.setFloat(3, g_laty);
+				ps.setFloat(4, x);
+				ps.setFloat(5, y);
+				ps.setFloat(6, id);*/
 				int stauts = ps.executeUpdate();
-				
+				System.out.println(stauts);
 			}
 		} catch (SQLException e) {
@@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.168.201:3306/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= 123456
 #DATASOURCE
@@ -48,13 +48,19 @@ datatools.employeesconfig_datainputktr=/datatools/ktrs/employeesConfigDataInput.
 # 4、数据导出配置信息
 # 导出数据文件目录配置（根据不同的环境需要修正）
-datatools.fileoutput_dir=/Users/xu/resource/project/bsth_control_u_d_files
+datatools.fileoutput_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
 ##---------------------------- 导出数据ktr -----------------------------##
 # 车辆信息导出ktr转换
 datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr
 # 人员信息导出ktr转换
 datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr
+# 时刻表导出元数据ktr转换
+datatools.ttinfodetail_metaoutput=/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
+# 时刻表导出数据ktr转换
+datatools.ttinfodetail_output=/datatools/ktrs/ttinfodetailDataOutput.ktr
+
+
 # TODO：
@@ -56,5 +56,9 @@ datatools.fileoutput_dir=/opt/bsth_control_u_d_files
 datatools.cars_dataoutputktr=/datatools/ktrs/carsDataOutput.ktr
 # 人员信息导出ktr转换
 datatools.employees_dataoutputktr=/datatools/ktrs/employeesDataOutput.ktr
+# 时刻表导出元数据ktr转换
+datatools.ttinfodetail_metaoutput=/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
+# 时刻表导出数据ktr转换
+datatools.ttinfodetail_output=/datatools/ktrs/ttinfodetailDataOutput.ktr
 # TODO：
 \ No newline at end of file