Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

zq
2 parents 252e46b9 42cdfcb4
Showing 64 changed files with 2610 additions and 1288 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/BaseController2.java
src/main/java/com/bsth/controller/CarsController.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/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/dto/StationSpatialData.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/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/mcy_forms/Changetochange.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/sys/CompanyAuthority.java
@@ -32,4 +32,5 @@ public class Constants {
 	public static final String UPSTREAM_URL = "/control/upstream";
 	public static final String SESSION_USERNAME = "sessionUserName";
+	public static final String COMPANY_AUTHORITYS = "cmyAuths";
 }
@@ -5,10 +5,13 @@ import com.bsth.common.ResponseCode;
 import com.bsth.service.BaseService;
 import com.bsth.service.schedule.utils.DataImportExportService;
 import com.google.common.base.Splitter;
+import jxl.Sheet;
+import jxl.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -164,11 +167,24 @@ public class BaseController2&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();
@@ -225,4 +241,52 @@ public class BaseController2&lt;T, ID extends Serializable&gt; {
         throw new RuntimeException("必须override，并指定ktr classpath");
     }
+
+    public static class ExcelFileOutput {
+        private String fileName;
+        private List<Map<String, Object>> sheetnames = new ArrayList<>();
+
+        public String getFileName() {
+            return fileName;
+        }
+
+        public void setFileName(String fileName) {
+            this.fileName = fileName;
+        }
+
+        public List<Map<String, Object>> getSheetnames() {
+            return sheetnames;
+        }
+
+        public void setSheetnames(List<Map<String, Object>> sheetnames) {
+            this.sheetnames = sheetnames;
+        }
+    }
+
+    /**
+     * 上传Excel文件，返回文件全路径名，工作区名称列表。
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+    public ExcelFileOutput fileUpload(MultipartFile file) throws Exception {
+        // 返回对象
+        ExcelFileOutput rs = new ExcelFileOutput();
+
+        // 上传文件
+        File file1 = dataImportExportService.uploadFile(file);
+        // 获取文件的sheet
+        Workbook book = Workbook.getWorkbook(file1);
+        for (Sheet sheet : book.getSheets()) {
+            String sheetname = sheet.getName();
+            Map<String, Object> s = new HashMap<>();
+            s.put("name", sheetname);
+            rs.getSheetnames().add(s);
+        }
+
+        rs.setFileName(file1.getAbsolutePath());
+        return rs;
+    }
+
 }
 package com.bsth.controller;
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.Cars;
+import com.bsth.service.schedule.utils.DataImportExportService;
 import com.bsth.service.schedule.utils.DataToolsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import java.io.File;
+import java.util.HashMap;
 import java.util.Map;
 /**
@@ -14,24 +21,12 @@ import java.util.Map;
 @RestController
 @RequestMapping("cars")
 @EnableConfigurationProperties(DataToolsProperties.class)
-public class CarsController extends BaseController<Cars, Integer> {
+public class CarsController extends BaseController2<Cars, Integer> {
     @Autowired
     private DataToolsProperties dataToolsProperties;
-
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody Cars t){
-        return baseService.save(t);
-    }
+    @Autowired
+    private DataImportExportService dataImportExportService;
     /**
      * 验证。
@@ -44,6 +39,48 @@ public class CarsController extends BaseController&lt;Cars, Integer&gt; {
         return baseService.validateEquale(map);
     }
+    // uploadFile post
+
+    // 验证excel sheet
+    @RequestMapping(value = "/validate/sheet", method = RequestMethod.GET)
+    public Map<String, Object> validateSheet() throws Exception {
+        Map<String, Object> rtn = new HashMap<>();
+
+        // TODO：
+
+        rtn.put("status", ResponseCode.SUCCESS);
+        return rtn;
+    }
+
+    @RequestMapping(value = "/importfile", method = RequestMethod.POST)
+    public Map<String, Object> importData(
+            @RequestParam Map<String, Object> form)
+            throws Exception {
+        Map<String, Object> rtn = new HashMap<>();
+
+        // TODO：
+        String filename = (String) form.get("filename");
+
+
+        try {
+            // 获取ktr转换文件绝对路径
+            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
+            System.out.println(ktrfile.getAbsolutePath());
+            // 导入数据
+            dataImportExportService.fileDataImport(new File(filename), ktrfile);
+
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("msg", "导入成功");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getLocalizedMessage());
+        }
+
+        return rtn;
+    }
+
+
     @Override
     protected String getDataImportKtrClasspath() {
         return dataToolsProperties.getCarsDatainputktr();
@@ -13,6 +13,7 @@ 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;
@@ -274,7 +275,48 @@ public class ExportController {
 		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;
+		}
+		
+		
@@ -49,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;
 	}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.service.realcontrol.RealMapService;
+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.Map;
+
+/**
+ * 线调 地图监控相关
+ * Created by panzhao on 2016/11/23.
+ */
+@RestController
+@RequestMapping("realMap")
+public class RealMapController {
+
+    @Autowired
+    RealMapService realMapService;
+
+    /**
+     * 根据线路获取站点路由及空间数据
+     */
+    @RequestMapping(value = "/stationSpatialData")
+    public Map<String, Object> stationSpatialData(@RequestParam String idx){
+        return realMapService.stationSpatialData(idx);
+    }
+}
 package com.bsth.controller.realcontrol;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.*;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.drools.core.runtime.help.impl.XStreamJSon.JSonAbortWorkItemConverter;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.controller.BaseController;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
@@ -23,9 +7,14 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
 @RestController
 @RequestMapping("/realSchedule")
+package com.bsth.controller.realcontrol.dto;
+
+/**
+ * Created by panzhao on 2016/11/23.
+ */
+public class StationSpatialData {
+
+    private String lineCode;
+
+    private String stationName;
+
+    private String stationCode;
+
+    private String stationMark;
+
+    private int directions;
+
+    private Float distances;
+
+    private Float toTime;
+
+    private Integer versions;
+
+    private Float gLonx;
+
+    private Float gLaty;
+
+    private Float radius;
+
+    private String shapesType;
+
+    private String gPolygonGrid;
+
+    private Integer stationRouteCode;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationMark() {
+        return stationMark;
+    }
+
+    public void setStationMark(String stationMark) {
+        this.stationMark = stationMark;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+
+    public Float getDistances() {
+        return distances;
+    }
+
+    public void setDistances(Float distances) {
+        this.distances = distances;
+    }
+
+    public Float getToTime() {
+        return toTime;
+    }
+
+    public void setToTime(Float toTime) {
+        this.toTime = toTime;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public Float getgLonx() {
+        return gLonx;
+    }
+
+    public void setgLonx(Float gLonx) {
+        this.gLonx = gLonx;
+    }
+
+    public Float getgLaty() {
+        return gLaty;
+    }
+
+    public void setgLaty(Float gLaty) {
+        this.gLaty = gLaty;
+    }
+
+    public Float getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Float radius) {
+        this.radius = radius;
+    }
+
+    public String getShapesType() {
+        return shapesType;
+    }
+
+    public void setShapesType(String shapesType) {
+        this.shapesType = shapesType;
+    }
+
+    public String getgPolygonGrid() {
+        return gPolygonGrid;
+    }
+
+    public void setgPolygonGrid(String gPolygonGrid) {
+        this.gPolygonGrid = gPolygonGrid;
+    }
+
+    public Integer getStationRouteCode() {
+        return stationRouteCode;
+    }
+
+    public void setStationRouteCode(Integer stationRouteCode) {
+        this.stationRouteCode = stationRouteCode;
+    }
+}
 package com.bsth.controller.schedule;
 import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController;
+import com.bsth.controller.BaseController2;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.LineInformation;
 import com.bsth.entity.StationRoute;
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
  */
 @RestController
 @RequestMapping("tidc")
-public class TTInfoDetailController extends BaseController<TTInfoDetail, Long> {
+public class TTInfoDetailController extends BaseController2<TTInfoDetail, Long> {
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
     @Autowired
@@ -56,53 +56,13 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
     @Autowired
     private DataToolsProperties dataToolsProperties;
-
-    public static class ExcelFileOutput {
-        private String fileName;
-        private List<Map<String, Object>> sheetnames = new ArrayList<>();
-
-        public String getFileName() {
-            return fileName;
-        }
-
-        public void setFileName(String fileName) {
-            this.fileName = fileName;
-        }
-
-        public List<Map<String, Object>> getSheetnames() {
-            return sheetnames;
-        }
-
-        public void setSheetnames(List<Map<String, Object>> sheetnames) {
-            this.sheetnames = sheetnames;
-        }
-    }
-
     /**
      * 1、上传Excel文件，返回文件全路径名，工作区名称列表。
      * @param file
      * @return
      * @throws Exception
      */
-    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-    public ExcelFileOutput fileUpload(MultipartFile file) throws Exception {
-        // 返回对象
-        ExcelFileOutput rs = new ExcelFileOutput();
-
-        // 上传文件
-        File file1 = dataImportExportService.uploadFile(file);
-        // 获取文件的sheet
-        Workbook book = Workbook.getWorkbook(file1);
-        for (Sheet sheet : book.getSheets()) {
-            String sheetname = sheet.getName();
-            Map<String, Object> s = new HashMap<>();
-            s.put("name", sheetname);
-            rs.getSheetnames().add(s);
-        }
-        rs.setFileName(file1.getAbsolutePath());
-        return rs;
-    }
     /**
      * 2、验证sheet（以后放到规则引擎里去做）。
@@ -441,21 +401,6 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
         return ttInfoDetailService.getEditInfo(xlid, ttid);
     }
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody TTInfoDetail t){
-
-        return baseService.save(t);
-    }
-
     @Override
     public TTInfoDetail findById(@PathVariable("id") Long aLong) {
         return ttInfoDetailRepository.findOneExtend(aLong);
+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;
+        }
+    }
+}
@@ -308,9 +308,9 @@ public class BasicData implements CommandLineRunner {
                 if (StringUtils.isEmpty(jobCode))
                     continue;
-                if (jobCode.indexOf("-") != -1) {
+                /*if (jobCode.indexOf("-") != -1) {
                     jobCode = jobCode.split("-")[1];
-                }
+                }*/
                 if (p.getPosts() != null) {
                     if (p.getPosts().equals("1"))
                         jsyTempMap.put(jobCode, p);
@@ -41,8 +41,8 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		logger.info("ArrivalData_GPS,30,10");
-		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 10, TimeUnit.SECONDS);
+		logger.info("ArrivalData_GPS,30,06");
+		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 6, TimeUnit.SECONDS);
 	}
 	@Component
 package com.bsth.data.gpsdata;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+import com.bsth.data.forecast.ForecastRealServer;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.ConfigUtil;
+import com.google.common.collect.TreeMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -17,15 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.Application;
-import com.bsth.data.BasicData;
-import com.bsth.data.forecast.ForecastRealServer;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.util.ConfigUtil;
-import com.google.common.collect.TreeMultimap;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.*;
 /**
  *
@@ -68,7 +65,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
 package com.bsth.data.schedule;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import com.bsth.data.schedule.thread.SubmitToTrafficManage;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
@@ -34,6 +9,7 @@ import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.schedule.thread.ScheduleLateThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
+import com.bsth.data.schedule.thread.SubmitToTrafficManage;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -44,6 +20,19 @@ import com.bsth.util.DateUtils;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.TreeMultimap;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+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 java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 /**
  * 
 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);
+            }
+        }
+    }
 }
 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;
+	}
+	
 }
@@ -2,13 +2,11 @@ package com.bsth.entity.realcontrol;
 import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import javax.persistence.*;
-
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import javax.persistence.*;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -49,11 +47,6 @@ public class ScheduleRealInfo {
 	/** 车辆自编号 */
 	private String clZbh;
-
-	/** 报道时间（格式 HH:mm）
-	private String bdTime; */
-	/** 出场时间（格式 HH:mm） 
-	private String ccTime;*/
 	/** 驾驶员工号 */
 	private String jGh;
@@ -143,15 +136,6 @@ public class ScheduleRealInfo {
 	@Transient
 	private boolean late;
-	/**实际里程*/
-	private Float realMileage;
-	
-	/** 增加公里 */
-	private Float addMileage;
-	
-	/** 抽减公里 */
-	private Float remMileage;
-
 	/** 备注*/
 	private String remarks;
@@ -169,16 +153,126 @@ public class ScheduleRealInfo {
 	private Integer opDirectiveState;
 	/** 起点站计划到达时间 */
+	@Transient
 	private String qdzArrDatejh;
-	
+
 	/** 起点站实际到达时间 */
+	@Transient
 	private String qdzArrDatesj;
-	
+
 	/** 子任务 */
 	@OneToMany(fetch = FetchType.LAZY/*, cascade = CascadeType.ALL*/)
 	private Set<ChildTaskPlan> cTasks = new HashSet<>();
-	
-	/** ---------------- 
+
+	/** 关联的公司名称 */
+	private String gsName;
+	/** 关联的公司编码 */
+	private String gsBm;
+	/** 关联的分公司名称 */
+	private String fgsName;
+	/** 关联的分公司编码 */
+	private String fgsBm;
+	/** 出场顺序号 */
+	private Integer ccno;
+
+	//待发调试（是否自动调整）
+	private boolean dfAuto;
+	//是否有GPS信号
+	private boolean online;
+
+	public boolean isDfAuto() {
+		return dfAuto;
+	}
+
+	public void setDfAuto(boolean dfAuto) {
+		this.dfAuto = dfAuto;
+	}
+
+	public boolean isOnline() {
+		return online;
+	}
+
+	public void setOnline(boolean online) {
+		this.online = online;
+	}
+
+	public String getQdzArrDatejh() {
+		return qdzArrDatejh;
+	}
+
+	public void setQdzArrDatejh(String qdzArrDatejh) {
+		this.qdzArrDatejh = qdzArrDatejh;
+	}
+
+	public String getQdzArrDatesj() {
+		return qdzArrDatesj;
+	}
+
+	public void setQdzArrDatesj(String qdzArrDatesj) {
+		this.qdzArrDatesj = qdzArrDatesj;
+	}
+
+	public void setcTasks(Set<ChildTaskPlan> cTasks) {
+		this.cTasks = cTasks;
+	}
+
+	public String getGsName() {
+		return gsName;
+	}
+
+	public void setGsName(String gsName) {
+		this.gsName = gsName;
+	}
+
+	public String getGsBm() {
+		return gsBm;
+	}
+
+	public void setGsBm(String gsBm) {
+		this.gsBm = gsBm;
+	}
+
+	public String getFgsName() {
+		return fgsName;
+	}
+
+	public void setFgsName(String fgsName) {
+		this.fgsName = fgsName;
+	}
+
+	public String getFgsBm() {
+		return fgsBm;
+	}
+
+	public void setFgsBm(String fgsBm) {
+		this.fgsBm = fgsBm;
+	}
+
+	public Integer getCcno() {
+		return ccno;
+	}
+
+	public void setCcno(Integer ccno) {
+		this.ccno = ccno;
+	}
+
+	public static DateTimeFormatter getFmtHHmm() {
+		return fmtHHmm;
+	}
+
+	public static void setFmtHHmm(DateTimeFormatter fmtHHmm) {
+		ScheduleRealInfo.fmtHHmm = fmtHHmm;
+	}
+
+	public static DateTimeFormatter getFmtyyyyMMddHHmm() {
+		return fmtyyyyMMddHHmm;
+	}
+
+	public static void setFmtyyyyMMddHHmm(DateTimeFormatter fmtyyyyMMddHHmm) {
+		ScheduleRealInfo.fmtyyyyMMddHHmm = fmtyyyyMMddHHmm;
+	}
+
+	/** ----------------
 	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	private RealTimeModel sjfcModel;
 	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@@ -460,30 +554,6 @@ public class ScheduleRealInfo {
 		this.status = status;
 	}
-	public Float getRealMileage() {
-		return realMileage;
-	}
-
-	public void setRealMileage(Float realMileage) {
-		this.realMileage = realMileage;
-	}
-
-	public Float getAddMileage() {
-		return addMileage;
-	}
-
-	public void setAddMileage(Float addMileage) {
-		this.addMileage = addMileage;
-	}
-
-	public Float getRemMileage() {
-		return remMileage;
-	}
-
-	public void setRemMileage(Float remMileage) {
-		this.remMileage = remMileage;
-	}
-
 	public String getRemarks() {
 		return remarks;
 	}
+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;
+    }
+}
@@ -29,22 +29,23 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
+	//把sum(addMileage) 替换为0   数据表去掉了 add_mileage 字段
 	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,"
-			+ "sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
+			+ " 0 as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
 			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,"
 			+ " d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 "
 			+ "d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
-			+ "r.schedule_date like %?2% and r.cl_zbh like %?3% order by d.timestamp",nativeQuery=true)
+			+ " DATE_FORMAT(r.schedule_date,'%Y-%m-%d') = ?2 and r.cl_zbh like %?3% order by d.timestamp",nativeQuery=true)
 	List<Object[]> historyMessage(String line,String date,String code);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
 			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
 			+ " ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
-			+ " r.schedule_date like %?2% and r.cl_zbh like %?3% group by "
-			+ " lp_name,xl_name,cl_zbh order by d.timestamp",nativeQuery=true)
+			+ " DATE_FORMAT(r.schedule_date,'%Y-%m-%d') = ?2 and r.cl_zbh like %?3% group by "
+			+ " lp_name,xl_name,cl_zbh",nativeQuery=true)
 	List<Object[]> historyMessageCount(String line,String date,String code);
 	@Query(value = "select max(id) from ScheduleRealInfo")
@@ -100,10 +101,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 or s.xlBm is not null) 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,scheduleDate,jGh ORDER BY xlBm,clZbh")
+	@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);
+
 }
@@ -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;
+			}
 	//路单数据
@@ -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;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/23.
+ */
+public interface RealMapService {
+    Map<String, Object> stationSpatialData(String idx);
+}
+package com.bsth.service.realcontrol.impl;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.realcontrol.dto.StationSpatialData;
+import com.bsth.service.realcontrol.RealMapService;
+import com.google.common.base.Splitter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/23.
+ */
+@Service
+public class RealMapServiceImpl implements RealMapService {
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public Map<String, Object> stationSpatialData(String idx) {
+        Map<String, Object> rs = new HashMap();
+
+        try {
+            List<String> idArray = Splitter.on(",").splitToList(idx);
+            //拼接in语句
+            String inStr = "";
+            for (String code : idArray) {
+                inStr += (",'" + code+"'");
+            }
+            inStr = " (" + inStr.substring(1) + ")";
+
+            String sql = "select R.LINE_CODE,R.STATION_NAME,R.STATION_CODE,R.STATION_MARK,R.DIRECTIONS,R.DISTANCES,R.TO_TIME, R.VERSIONS,S.G_LONX,S.G_LATY,S.RADIUS,S.SHAPES_TYPE,ST_AsText(S.G_POLYGON_GRID) as G_POLYGON_GRID, R.STATION_ROUTE_CODE from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in "+inStr+" and r.destroy=0";
+
+            List<StationSpatialData> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(StationSpatialData.class));
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "查询站点空间数据出现异常！");
+        }
+
+        return rs;
+    }
+}
 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++;
@@ -1285,6 +1281,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						if(scheduleRealInfo.isSflj()){
 							ljgl += tempJhlc;
 						}
+					}else{
+						ssgl += tempJhlc;
+						ssgl_other += tempJhlc;
 					}
 				}else{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -1522,7 +1521,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();
@@ -24,6 +24,7 @@ public interface DataImportExportService {
      * @throws Exception
      */
     void fileDataImport(MultipartFile datafile, File ktrFile) throws Exception;
+    void fileDataImport(File datafile, File ktrFile) throws Exception;
     /**
      * 数据导出。
@@ -111,6 +111,31 @@ public class DataImportExportServiceImpl implements DataImportExportService, Ini
     }
     @Override
+    public void fileDataImport(File datafile, File ktrFile) throws Exception {
+//        // 1、上传数据文件
+//        File uploadFile = datafile;
+
+        // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
+        // 2.1、初始化kettle（组件初始化已经做了）
+        // 2.2、创建转换元数据，转换
+        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
+        Trans trans = new Trans(transMeta);
+        // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
+        trans.setParameterValue("filepath", datafile.getAbsolutePath()); // 指定导入数据文件的位置
+        trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
+        // TODO：可以考虑设定日志输出
+        // 2.4、执行转换
+        trans.execute(null);
+        // 2.5、等待转换结束
+        trans.waitUntilFinished();
+
+        // 3、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
+        if (trans.getErrors() > 0) {
+            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
+        }
+    }
+
+    @Override
     public File fileDataOutput(String fileName, File ktrFile) throws Exception {
         return fileDataOutput(fileName, ktrFile, null);
     }
+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;
+		}
+	}
 }
@@ -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/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= 123456
 #DATASOURCE
@@ -8,9 +8,9 @@ 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.171:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root2jsp
+spring.datasource.password= root@JSP2jsp
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
+http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.171:8080/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.40.82:8080/transport_server/message/
 \ No newline at end of file
@@ -5,13 +5,13 @@ datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-datatools.kvars_dbip=192.168.168.171
+datatools.kvars_dbip=192.168.40.100
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=root2jsp
+datatools.kvars_dbpwd=root@JSP2jsp
 #数据库库名
-datatools.kvars_dbdname=control
+datatools.kvars_dbdname=qp_control
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
@@ -11,17 +11,17 @@
     <parameters>
         <parameter>
             <name>tempfilepath</name>
-            <default_value/>
+            <default_value>&#x2f;Users&#x2f;xu&#x2f;resource&#x2f;project_code&#x2f;runtime_temp&#x2f;bsth_control_u_d_files&#x2f;temp&#x2f;test</default_value>
             <description>&#x9ed8;&#x8ba4;&#x8f93;&#x51fa;&#x7684;&#x6587;&#x4ef6;&#x8def;&#x5f84;&#x540d;</description>
         </parameter>
         <parameter>
             <name>ttid</name>
-            <default_value/>
+            <default_value>63</default_value>
             <description>&#x65f6;&#x523b;&#x8868;id</description>
         </parameter>
         <parameter>
             <name>xlid</name>
-            <default_value/>
+            <default_value>63017</default_value>
             <description>&#x7ebf;&#x8def;id</description>
         </parameter>
     </parameters>
@@ -1212,6 +1212,156 @@
         <type>String</type>
         <format/>
       </field>
+      <field>
+        <name>fcno31_id</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno31_fcsj</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno31_zdname</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno31_bctype</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno31_xldir</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno31_isfb</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno32_id</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno32_fcsj</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno32_zdname</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno32_bctype</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno32_xldir</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno32_isfb</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno33_id</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno33_fcsj</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno33_zdname</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno33_bctype</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno33_xldir</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno33_isfb</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno34_id</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno34_fcsj</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno34_zdname</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno34_bctype</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno34_xldir</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno34_isfb</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno35_id</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno35_fcsj</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno35_zdname</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno35_bctype</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno35_xldir</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
+        <name>fcno35_isfb</name>
+        <type>String</type>
+        <format/>
+      </field>
     </fields>
     <custom>
     <header_font_name>arial</header_font_name>
@@ -3776,6 +3926,426 @@
           <target_null_string/>
           <target_aggregation_type>-</target_aggregation_type>
           </field>
+        <field>
+          <field_name>id</field_name>
+          <key_value>31</key_value>
+          <target_name>fcno31_id</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fcsj</field_name>
+          <key_value>31</key_value>
+          <target_name>fcno31_fcsj</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fczdName</field_name>
+          <key_value>31</key_value>
+          <target_name>fcno31_zdname</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>bc_type</field_name>
+          <key_value>31</key_value>
+          <target_name>fcno31_bctype</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>xl_dir</field_name>
+          <key_value>31</key_value>
+          <target_name>fcno31_xldir</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>isfb</field_name>
+          <key_value>31</key_value>
+          <target_name>fcno31_isfb</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>id</field_name>
+          <key_value>32</key_value>
+          <target_name>fcno32_id</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fcsj</field_name>
+          <key_value>32</key_value>
+          <target_name>fcno32_fcsj</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fczdName</field_name>
+          <key_value>32</key_value>
+          <target_name>fcno32_zdname</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>bc_type</field_name>
+          <key_value>32</key_value>
+          <target_name>fcno32_bctype</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>xl_dir</field_name>
+          <key_value>32</key_value>
+          <target_name>fcno32_xldir</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>isfb</field_name>
+          <key_value>32</key_value>
+          <target_name>fcno32_isfb</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>id</field_name>
+          <key_value>33</key_value>
+          <target_name>fcno33_id</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fcsj</field_name>
+          <key_value>33</key_value>
+          <target_name>fcno33_fcsj</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fczdName</field_name>
+          <key_value>33</key_value>
+          <target_name>fcno33_zdname</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>bc_type</field_name>
+          <key_value>33</key_value>
+          <target_name>fcno33_bctype</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>xl_dir</field_name>
+          <key_value>33</key_value>
+          <target_name>fcno33_xldir</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>isfb</field_name>
+          <key_value>33</key_value>
+          <target_name>fcno33_isfb</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>id</field_name>
+          <key_value>34</key_value>
+          <target_name>fcno34_id</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fcsj</field_name>
+          <key_value>34</key_value>
+          <target_name>fcno34_fcsj</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fczdName</field_name>
+          <key_value>34</key_value>
+          <target_name>fcno34_zdname</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>bc_type</field_name>
+          <key_value>34</key_value>
+          <target_name>fcno34_bctype</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>xl_dir</field_name>
+          <key_value>34</key_value>
+          <target_name>fcno34_xldir</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>isfb</field_name>
+          <key_value>34</key_value>
+          <target_name>fcno34_isfb</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>id</field_name>
+          <key_value>35</key_value>
+          <target_name>fcno35_id</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fcsj</field_name>
+          <key_value>35</key_value>
+          <target_name>fcno35_fcsj</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>fczdName</field_name>
+          <key_value>35</key_value>
+          <target_name>fcno35_zdname</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>bc_type</field_name>
+          <key_value>35</key_value>
+          <target_name>fcno35_bctype</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>xl_dir</field_name>
+          <key_value>35</key_value>
+          <target_name>fcno35_xldir</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
+        <field>
+          <field_name>isfb</field_name>
+          <key_value>35</key_value>
+          <target_name>fcno35_isfb</target_name>
+          <target_type>String</target_type>
+          <target_format/>
+          <target_length>-1</target_length>
+          <target_precision>-1</target_precision>
+          <target_decimal_symbol/>
+          <target_grouping_symbol/>
+          <target_currency_symbol/>
+          <target_null_string/>
+          <target_aggregation_type>-</target_aggregation_type>
+          </field>
         </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#ms.mysql.username= root
+#ms.mysql.password= 123456
+
 ms.mysql.driver= com.mysql.jdbc.Driver
 ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 ms.mysql.username= root
 ms.mysql.password= 123456
-
-#ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
-#ms.mysql.username= root
-#ms.mysql.password= root2jsp
 \ No newline at end of file
@@ -145,7 +145,7 @@ tr.row-active td {
         <div class="page-header-inner ">
             <!-- LOGO -->
             <div class="page-logo">
-                <a href="index.html" class="logo-default logo-default-text" > 闵行公交调度系统 </a>
+                <a href="index.html" class="logo-default logo-default-text" > 青浦公交调度系统 </a>
                 <div class="menu-toggler sidebar-toggler">
                 </div>
             </div>
@@ -180,7 +180,7 @@ h3.logo-text{
 	<div class="wrapper ng-scope">
 		<div id="loginPanel" class="dialog dialog-shadow">
 			<br>
-			<h3 class="logo-text">闵行公交调度系统  </h3>
+			<h3 class="logo-text">青浦公交调度系统  </h3>
 			<hr>
 			<form style="padding: 0px 35px;">
 				<div class="form-group" style="margin-bottom: 0">
@@ -18,7 +18,7 @@
     <div class="portlet-title banner" >
         <div class="caption col_hide_1280" style="color: #FFF;">
 			<i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
-				class="caption-subject bold" style="font-size: 24px;">闵行公交线路调度系统</span>
+				class="caption-subject bold" style="font-size: 24px;">青浦公交线路调度系统</span>
 		</div>
 		<div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
 			<span class="top_username"></span> <span class="operation_mode_text animated" ></span> 
@@ -80,44 +80,18 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
+		
+		
         $('#code').select2({
             ajax: {
                 url: '/realSchedule/sreachVehic',
@@ -10,63 +10,98 @@
 	    border: 1px solid; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
-	    border-bottom-width: 2px; }
+	    border-bottom-width: 2px; 
+	        text-align: center;}
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
+	 .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th{ text-align: center; }
+.table-checkable tr > th:first-child, .table-checkable tr > td:first-child {
+    text-align: center;
+    max-width: initial;
+    min-width: 40px;
+    padding-left: 0;
+    padding-right: 0;
+}
+
 </style>
 <div class="page-head">
 	<div class="page-title">
-		<h1>鎹汉鎹㈣溅鎯呭喌缁熻琛</h1>
+		<h1>换人换车情况统计表</h1>
 	</div>
 </div>
 <div class="row">
 	<div class="col-md-12">
 		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="" method="post">
+				<div style="display: inline-block;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 120px;"></select>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="startDate" style="width: 120px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
+                    </div>
+                    <div style="display: inline-block;">
+                        <span class="item-label" style="width: 120px;">类型: </span>
+                    	<select class="form-control" id="sel">
+    						<option value="">请选择</option>
+    						<option value="1">换人</option>
+   						    <option value="2">换车</option>
+						</select>
+					</div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+				</form>
+			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container" style="margin-top: 20px;overflow:auto;min-width: 1000px">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="13">鎹汉鎹㈣溅鎯呭喌缁熻琛</th>
+								<th colspan="15">换人换车情况统计表</th>
 							</tr>
-							<!-- <tr>
-								<td colspan="12">杞﹂槦     绔     <span id="sDate"></span>鑷<span id="eDate"></span></td>
-							</tr> -->
 							<tr>
-								<td rowspan="3">鏃ユ湡</td>
-								<td rowspan="3">鍏徃</td>
-								<td rowspan="3">鍒嗗叕鍙</td>
-								<td rowspan="3">绾胯矾</td>
-								<td rowspan="3">璺墝</td>
-								<td rowspan="3">鍙戠敓鏃堕棿</td>
-								<td rowspan="3">淇敼鏃堕棿</td>
-								<td colspan="3">閰嶈溅</td>
-								<td colspan="3">浜哄憳</td>
-								<td rowspan="3">鍘熷洜</td>
-								<td rowspan="3">淇敼浜</td>
+								<td  rowspan="3" style=" padding-top: 50px;">日期</td> 
+								<td rowspan="3" style=" padding-top: 50px;">公司</td>
+								<td rowspan="3" style=" padding-top: 50px;">分公司</td>
+								<td rowspan="3" style=" padding-top: 50px;">线路</td>
+								<td rowspan="3" style=" padding-top: 50px;">路牌</td>
+								<td rowspan="3" style=" padding-top: 50px;">发生时间</td>
+								<td rowspan="3" style=" padding-top: 50px;">修改时间</td>
+								<td colspan="2">配车</td>
+								<td colspan="4">人员</td>
+								<td rowspan="3" style=" padding-top: 50px;">原因</td>
+								<td rowspan="3" style=" padding-top: 50px;">修改人</td>
 							</tr>
 							<tr>
-								<td>璁″垝</td>
-								<td>瀹為檯</td>
-								<td>璁″垝</td>
-								<td>瀹為檯</td>
+								<td>计划</td>
+								<td>实际</td>
+								<td colspan="2">计划</td>
+								<td colspan="2">实际</td>
+								
 							</tr>
 							<tr>
-								<td>璁″垝</td>
-								<td>瀹為檯</td>
-								<td>璁″垝</td>
-								<td>瀹為檯</td>
+								<td>车号</td>
+								<td>车号</td>
+								<td>工号</td>
+								<td>人员</td>
+								<td>工号</td>
+								<td>人员</td>
 							</tr>
 						</thead>
-						<tbody class="list_correctForm">
+						<tbody>
 						</tbody>
-						<tbody class="list_correctForm_statistics">
-						    
-						</tbody>
 					</table>
 				</div>
 			</div>
@@ -76,7 +111,7 @@
 <script>
 	$(function(){
-		// 鍏抽棴宸︿晶鏍
+		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -113,162 +148,81 @@
             },
             language: {
                noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">娌℃湁鎼滅储鍒扮嚎璺紒</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 杈撳叆绾胯矾鎼滅储绾胯矾</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 姝ｅ湪鎼滅储绾胯矾...</span>';
-               }
-            }
-        });
-        $('#lpName').select2({
-            ajax: {
-                url: '/realSchedule/findLpName',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{lpName: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">娌℃湁鎼滅储鍒拌矾鐗岋紒</span>';
+                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
                },
                inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 杈撳叆璺墝鎼滅储璺墝</span>';
+                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
                },
                searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 姝ｅ湪鎼滅储璺墝...</span>';
+                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
                }
             }
         });
-        $('#code').select2({
-            ajax: {
-                url: '/realSchedule/sreachVehic',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{nbbm: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</span>':'');
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">娌℃湁鎼滅储鍒拌溅杈嗭紒</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 杈撳叆鑷紪鍙锋悳绱㈣溅杈</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 姝ｅ湪鎼滅储杞﹁締...</span>';
-               }
-            }
-        });
-		
+		 var line;
+		 var startDate;
+		 var endDate;
 		$("#query").on("click",function(){
-		    var line = $("#line").val();
-		    var startDate = $("#startDate").val();
-		    var endDate = $("#endDate").val();
-		    var lpName = $("#lpName").val();
-		    var code = $("#code").val();
-		    $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code},function(result){
-		        $("#sDate").text(startDate);
-		        $("#eDate").text(endDate);
-		        var temp = {};
-		        var today_account = 0;
-		        temp["line"] = $("#line").text() ;
-		        temp["totalAdjustment"] = result.length;  
-		        
-		        $.each(result, function(i, obj) {
-		            if(moment(obj.scheduleDate).format("YYYY-MM-DD") == moment(obj.updateDate).format("YYYY-MM-DD")){
-		                today_account++;
-		            } 
-                    obj.updateDate = moment(obj.updateDate).format("YYYY-MM-DD HH:mm:ss");
-                });
-                
-                temp["todayAdjustment"] = today_account;
-                temp["beforeAdjustment"] = result.length-today_account;
-                temp["historyAdjustment"] = 0;
-		        
-		        var list_correctForm = template('list_correctForm',{list:result});
-                // 鎶婃覆鏌撳ソ鐨勬ā鐗坔tml鏂囨湰杩藉姞鍒拌〃鏍间腑
-                $('#forms .list_correctForm').html(list_correctForm);
-                
-                var list_correctForm_statistics = template('list_correctForm_statistics',temp);
-                $('#forms .list_correctForm_statistics').html(list_correctForm_statistics);
-		    });
+			line = $("#line").val();
+			sel = $("#sel").val();
+		 var	startDate1=$("#startDate").val();
+		var 	endDate1=$("#endDate").val();
+			
+			 if(startDate1!=''&&endDate1!=''){
+				 $post('/mcy_forms/changetochange',{sel:sel,line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+						startDate = $("#startDate").val();
+					    endDate = $("#endDate").val();
+					    $("#sDate").text(startDate);
+				        $("#eDate").text(endDate);
+				        var temp = {};
+				        var today_account = 0;
+				        temp["line"] = $("#line").text(); 	        
+				        $.each(result, function(i, obj) {
+				            if(moment(obj.schedule_date_str).format("YYYY-MM-DD") == moment(obj.startDate).format("YYYY-MM-DD")){
+				                today_account++;
+				            } 
+			                obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
+			            }); 
+						// 把数据填充到模版中
+						var tbodyHtml = template('changetochange',{list:result});
+						// 把渲染好的模版html文本追加到表格中
+						$('#forms tbody').html(tbodyHtml);
+					})	
+		
+			 }else{
+				 alert("请选择时间范围!");
+			 } 
+	});
+		 
+	$("#export").on("click",function(){
+		$post('/mcy_export/changetochangeExport',{startDate:startDate,endDate:endDate,type:'export'},function(result){
+			window.open("/downloadFile/download?fileName=换人换车情况日统计"+moment(startDate).format("YYYYMMDD"));
 		});
 	});
+	});
 </script>
-<script type="text/html" id="list_correctForm">
+<script type="text/html" id="changetochange">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.xlName}}</td>
-			<td>{{obj.lpName}}</td>
-			<td>{{obj.clZbh}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
-			<td>{{obj.fcsj}}</td>
-			<td>{{obj.fcsjActual}}</td>
-			<td>{{obj.zdsj}}</td>
-			<td>{{obj.zdsjActual}}</td>
-			<td>{{obj.updateBy}}</td>
-			<td>{{obj.updateDate}}</td>
-			<td>{{obj.remarks}}</td>
+			<td>{{obj.rq}}</td>
+			<td>{{obj.gs}}</td>
+			<td>{{obj.fgs}}</td>
+			<td>{{obj.xl}}</td>
+			<td>{{obj.lp}}</td>
+			<td>{{obj.fssj}}</td>
+			<td>{{obj.xgsj}}</td>
+			<td>{{obj.pcch}}</td>
+			<td>{{obj.pcry}}</td>
+			<td>{{obj.jhgh}}</td>
+			<td>{{obj.jhch}}</td>
+			<td>{{obj.sjgh}}</td>
+			<td>{{obj.sjch}}</td>
+			<td>{{obj.yy}}</td>
+			<td>{{obj.xgr}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="12"><h6 class="muted">娌℃湁鎵惧埌鐩稿叧鏁版嵁</h6></td>
+			<td colspan="15"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
-<script type="text/html" id="list_correctForm_statistics">
-    <tr>
-        <td colspan="2">绾胯矾:</td>
-        <td>{{line}}</td>
-        <td>璋冩暣鎬绘暟</td>
-        <td>{{totalAdjustment}}</td>
-        <td>浜嬪厛璋冩暣</td>
-        <td>{{beforeAdjustment}}</td>
-        <td>褰撴棩璋冩暣</td>
-        <td>{{todayAdjustment}}</td>
-        <td>鍘嗗彶璋冩暣</td>
-        <td colspan="2">{{historyAdjustment}}</td>
-    </tr>
-</script>
 \ No newline at end of file
@@ -107,44 +107,19 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
+		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
+		
+		
         $('#lpName').select2({
             ajax: {
                 url: '/realSchedule/findLpName',
@@ -92,45 +92,16 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
-		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
 		var line;
 		var date;
 		$("#query").on("click",function(){
@@ -80,44 +80,16 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-			ajax: {
-				url: '/realSchedule/findLine',
-				type: 'post',
-				dataType: 'json',
-				delay: 150,
-				data: function(params){
-					return{line: params.term};
-				},
-			    processResults: function (data) {
-			      return {
-			        results: data
-			      };
-			    },
-				cache: true
-			},
-			templateResult: function(repo){
-				if (repo.loading) return repo.text;
-				var h = '<span>'+repo.text+'</span>';
-				return h;
-			},
-			escapeMarkup: function (markup) { return markup; },
-			minimumInputLength: 1,
-			templateSelection: function(repo){
-				return repo.text;
-			},
-			language: {
-		       noResults: function(){
-		           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-		       },
-		       inputTooShort : function(e) {
-					return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-			   },
-		       searching : function() {
-					return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-			   }
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
 			}
-		});
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
 		$('#code').select2({
 			ajax: {
 				url: '/realSchedule/sreachVehic',
@@ -194,43 +194,17 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        }); 	
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
+		
 	});
 </script>
 <script type="text/html" id="list_forms">
@@ -21,12 +21,12 @@
 		<h1>线路客流量报表</h1>
 	</div>
 </div>
-
-<div class="row">
-	<div class="col-md-12">
-		<div class="portlet light porttlet-fit bordered">
-			<div class="portlet-title">
-				<form class="form-inline" action="">
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -38,10 +38,10 @@
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
-                    </div>
-				</form>
-			</div>
-			<div class="portlet-body">
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
@@ -56,63 +56,34 @@
 						</tbody>
 					</table>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
 	$(function(){
-		 var reqCodeMap = {"0xA1": '请求恢复运营', "0xA2": '申请调档', "0xA3": '出场请求', "0xA5": '进场请求', "0xA7": '加油请求', "0x50": '车辆故障', "0x70": '路阻报告', "0x60": '事故报告', "0x11": '扣证纠纷', "0x12" : '报警'};
-		// 关闭左侧栏
-		if (!$('body').hasClass('page-sidebar-closed'))
+		 var reqCodeMap = {"0xA1": '请求恢复运营', "0xA2": '申请调档', "0xA3": '出场请求', "0xA5": '进场请求', "0xA7": '加油请求', "0x50": '车辆故障', "0x70": '路阻报告', "0x60": '事故报告', "0x11": '扣证纠纷', "0x12" : '报警'};
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
-		$("#date").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
-  
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
 		$("#query").on("click",function(){
 			var line = $("#line").val();
@@ -126,10 +97,10 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
 			});	
-		}); 
-	});
-</script>
-<script type="text/html" id="list_linepasswengerflow">
+		}); 
+	});
+</script>
+<script type="text/html" id="list_linepasswengerflow">
 	{{each list as obj i}}
 		<tr>	
 			<td>{{i+1}}</td>
@@ -142,5 +113,5 @@
 		<tr>
 			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
-	{{/if}}
+	{{/if}}
 </script>
 \ No newline at end of file
@@ -102,44 +102,18 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
+		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
+		
         $('#lpName').select2({
             ajax: {
                 url: '/realSchedule/findLpName',
@@ -43,6 +43,7 @@
 			</div>
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
@@ -82,23 +83,23 @@
 								<td>援外</td>
 								<td>其他</td>
 								<td>全日</td>
-								<td>6:31~<br>8:30</td>
-								<td>16:01~<br>18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~<br>8:30</td>
-								<td>16:01~<br>18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~<br>8:30</td>
-								<td>16:01~<br>18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~<br>8:30</td>
-								<td>16:01~<br>18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~<br>8:30</td>
-								<td>16:01~<br>18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~<br>8:30</td>
-								<td>16:01~<br>18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 							</tr>
 						</thead>
@@ -260,44 +261,18 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
-		
+
+
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
 		//查询
 		$("#query").on('click',function(){
 			var line = $("#line").val();
@@ -97,44 +97,17 @@ $(function(){
 		locale : 'zh-cn'
 	});
-	$('#line').select2({
-        ajax: {
-            url: '/realSchedule/findLine',
-            type: 'post',
-            dataType: 'json',
-            delay: 150,
-            data: function(params){
-                return{line: params.term};
-            },
-            processResults: function (data) {
-              return {
-                results: data
-              };
-            },
-            cache: true
-        },
-        templateResult: function(repo){
-            if (repo.loading) return repo.text;
-            var h = '<span>'+repo.text+'</span>';
-            return h;
-        },
-        escapeMarkup: function (markup) { return markup; },
-        minimumInputLength: 1,
-        templateSelection: function(repo){
-            return repo.text;
-        },
-        language: {
-           noResults: function(){
-               return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-           },
-           inputTooShort : function(e) {
-                return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-           },
-           searching : function() {
-                return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-           }
-        }
-    });
+	
+	$.get('/basic/lineCode2Name',function(result){
+		var data=[];
+		
+		for(var code in result){
+			data.push({id: code, text: result[code]});
+		}
+		console.log(data);
+		initPinYinSelect2('#line',data,'');
+		
+	})
 		$("#query").on("click",function(){
 		   		var line = $("#line").val();
@@ -87,44 +87,17 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
+		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
         $('#lpName').select2({
             ajax: {
                 url: '/realSchedule/findLpName',
@@ -92,44 +92,18 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
+		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
+		
         $('#lpName').select2({
             ajax: {
                 url: '/realSchedule/findLpName',
@@ -43,6 +43,7 @@
 			</div>
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
@@ -70,7 +71,7 @@
 								<td rowspan="2">原因</td>
 							</tr>
 							<tr>
-								<td>路阻</td>
+								<td width="31px">路阻</td>
 								<td>吊慢</td>
 								<td>故障</td>
 								<td>纠纷</td>
@@ -82,23 +83,23 @@
 								<td>援外</td>
 								<td>其他</td>
 								<td>全日</td>
-								<td>6:31~8:30</td>
-								<td>16:01~18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~8:30</td>
-								<td>16:01~18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~8:30</td>
-								<td>16:01~18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~8:30</td>
-								<td>16:01~18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~8:30</td>
-								<td>16:01~18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 								<td>全日</td>
-								<td>6:31~8:30</td>
-								<td>16:01~18:00</td>
+								<td>早高峰</td>
+								<td>晚高峰</td>
 							</tr>
 						</thead>
 						<tbody class="statisticsDaily">
@@ -163,47 +164,21 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
+
 		$("#query").on("click",function(){
 			var line = $("#line").val();
-			var xlName = $("#line").text();
+			var xlName = $("#select2-line-container").html();
 			var date = $("#date").val();
 			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName},function(result){
 				// 把数据填充到模版中
@@ -82,44 +82,19 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
+		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
+		
+		
         $('#lpName').select2({
             ajax: {
                 url: '/realSchedule/findLpName',
@@ -21,49 +21,49 @@
 		<h1>行车路单</h1>
 	</div>
 </div>
-
-<div class="row">
-	<div class="col-md-12">
-		<div class="portlet light porttlet-fit bordered">
-			<div class="portlet-title">
-				<form class="form-inline" action="">
-					<div style="display: inline-block;">
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+					<div style="display: inline-block;">
 						<span class="item-label" style="width: 80px;">线路: </span>
-						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
-					</div>
-					<div style="display: inline-block;margin-left: 15px;">
-						<span class="item-label" style="width: 80px;">时间: </span>
-						<input class="form-control" type="text" id="date" style="width: 180px;"/>
-					</div>
-					<div class="form-group" style="display: inline-block;margin-left: 15px;">
-						<input class="btn btn-default" type="button" id="query" value="查询"/>
-						<input class="btn btn-default" type="button" id="export" value="导出"/>
-						<input class="btn btn-default" type="button" id="print" value="打印"/>
-						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
-					</div>
-				</form>
-			</div>
-			<div class="portlet-body">
-				<div class="row">
-					<div class="col-md-3">
-						<div class="" style="margin-top: 10px;overflow:auto;height: 860px">
-							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
-								<thead>
-									<tr class="hidden">
-										<th>人员</th>
-										<th>自编号</th>
-										<th>路牌</th>
-									</tr>
-								</thead>
-								<tbody>
-									
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="col-md-9"  id="printArea">
-						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
-							<table class="table table-bordered table-checkable" id="forms">
+						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 15px;">
+						<span class="item-label" style="width: 80px;">时间: </span>
+						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+					</div>
+					<div class="form-group" style="display: inline-block;margin-left: 15px;">
+						<input class="btn btn-default" type="button" id="query" value="查询"/>
+						<input class="btn btn-default" type="button" id="export" value="导出"/>
+						<input class="btn btn-default" type="button" id="print" value="打印"/>
+						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
+					</div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="row">
+					<div class="col-md-3">
+						<div class="" style="margin-top: 10px;overflow:auto;height: 860px">
+							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
+								<thead>
+									<tr class="hidden">
+										<th>人员</th>
+										<th>自编号</th>
+										<th>路牌</th>
+									</tr>
+								</thead>
+								<tbody>
+									
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="col-md-9"  id="printArea">
+						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+							<table class="table table-bordered table-checkable" id="forms">
 								<tbody class="ludan_1">
 								</tbody>
@@ -75,28 +75,39 @@
 						        </tbody>
 						        <tbody class="ludan_4">
-						        </tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script>
-	$(function(){
-		// 关闭左侧栏
-		if (!$('body').hasClass('page-sidebar-closed'))
+						        </tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
-		$("#date").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
 		});
-		$('#line').select2({
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
+		
+		/* $('#line').select2({
 			ajax: {
 				url: '/realSchedule/findLine',
 				type: 'post',
@@ -134,29 +145,30 @@
 			   }
 			}
 		});
+		 */
-		var date = '';
-		$("#query").on("click",function(){
-			var line = $("#line").val();
+		var date = '';
+		$("#query").on("click",function(){
+			var line = $("#line").val();
 			date = $("#date").val();
-			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
-				// 把数据填充到模版中
-				var tbodyHtml = template('list_info',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#info tbody').html(tbodyHtml);
-			});
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
 		});
 		var params = new Array();
-		var jName = '';
+		var jName = '';
 		$("#info tbody").on("click","tr",function(){
 			if($(this).children().size() < 2){
 				return;
-			}
-			
-			$(this).children().each(function(index){
-				params[index] = $(this).text();
+			}
+			
+			$(this).children().each(function(index){
+				params[index] = $(this).text();
 			});
 			console.log(params);
 			jName = params[0].split("\\")[0];
@@ -169,18 +181,18 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
 				//$('#forms .ludan_4').html(ludan_4);
-			});
+			});
 			$post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
-			    getTime(result);
-				var ludan_2 = template('ludan_2',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms .ludan_2').html(ludan_2);
+			    getTime(result);
+				var ludan_2 = template('ludan_2',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms .ludan_2').html(ludan_2);
 			});
 			$post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
 			    var ludan_3 = template('ludan_3',result);
 			    $('#forms .ludan_3').html(ludan_3);
 			});
-			
+			
 		});
 		$("#export").on("click",function(){
@@ -216,22 +228,22 @@
                     }
                 }
             }); 
-		}
-	});
-</script>
-<script type="text/html" id="list_info">
-	{{each list as obj i}}
-		<tr>
-			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
-			<td width="32%">{{obj[2]}}</td>
-			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
-		</tr>
-	{{/each}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
-	{{/if}}
+		}
+	});
+</script>
+<script type="text/html" id="list_info">
+	{{each list as obj i}}
+		<tr>
+			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
+			<td width="32%">{{obj[2]}}</td>
+			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 <script type="text/html" id="ludan_1">
 	  <tr>
@@ -292,31 +304,31 @@
           <td colspan="1">快</td>
           <td colspan="1">慢</td>
       </tr>
-</script>
-<script type="text/html" id="ludan_2">
-	{{each list as obj i}}
-		<tr>
-			<td>{{i+1}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
-			<td>&nbsp;</td>
-			<td>{{obj.qdzName}}</td>
-			<td>{{obj.zdzName}}</td>
-			<td>{{obj.fcsj}}</td>
-			<td>{{obj.fcsjActual}}</td>
-			<td>{{obj.zdsj}}</td>
-			<td>{{obj.zdsjActual}}</td>
-			<td>{{obj.fast}}</td>
-			<td>{{obj.slow}}</td>
+</script>
+<script type="text/html" id="ludan_2">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.sName}}</td>
+			<td>&nbsp;</td>
+			<td>{{obj.qdzName}}</td>
+			<td>{{obj.zdzName}}</td>
+			<td>{{obj.fcsj}}</td>
+			<td>{{obj.fcsjActual}}</td>
+			<td>{{obj.zdsj}}</td>
+			<td>{{obj.zdsjActual}}</td>
+			<td>{{obj.fast}}</td>
+			<td>{{obj.slow}}</td>
 			<td>{{obj.jhlc}}</td>
-			<td>{{obj.remarks}}</td>
-		</tr>
+			<td>{{obj.remarks}}</td>
+		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
 			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
-	{{/if}}
+	{{/if}}
 </script>
 <script type="text/html" id="ludan_3">
 	<tr>
@@ -79,45 +79,16 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function(params){
-                    return{line: params.term};
-                },
-                processResults: function (data) {
-                  return {
-                    results: data
-                  };
-                },
-                cache: true
-            },
-            templateResult: function(repo){
-                if (repo.loading) return repo.text;
-                var h = '<span>'+repo.text+'</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) { return markup; },
-            minimumInputLength: 1,
-            templateSelection: function(repo){
-                return repo.text;
-            },
-            language: {
-               noResults: function(){
-                   return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-               },
-               inputTooShort : function(e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-               },
-               searching : function() {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-               }
-            }
-        });
-		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
 		var line;
 		var date;
 		$("#query").on("click",function(){
@@ -294,8 +294,7 @@ $(function(){
 				}
 			});
 			$get('/ylb/obtain', params, function(){
-				console.log("----------------------");
-				jsDoQuery(null,true);
+				jsDoQuery(params,true);
 			});
 		}else{
 			layer.msg('请选择日期.');
+<style>
+    .cmpy-auth-card {
+        width: 760px;
+        background: #fff;
+        margin: auto;
+        padding: 15px;
+        box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+    }
+
+    .cmpy-auth-card .yunyin-company-panel:last-child {
+        border-bottom: none;
+        padding-bottom: 0px;
+    }
+
+    .yunyin-company-panel {
+        border-bottom: 1px solid #e9e5e5;
+        padding-bottom: 5px;
+
+        user-select:none;
+    }
+
+    .yunyin-company-panel .company {
+        font-size: 13px;
+    }
+
+    .yunyin-company-panel .sub-company {
+        display: inline-block;
+        text-align: center;
+        padding: 5px 15px;
+        border-radius: 5px !important;
+        color: #5d5c5c;
+        font-size: 13px;
+        background: linear-gradient(to bottom, #fafafa, #eeeeee);
+        cursor: pointer;
+        border: 1px solid #eeeeee;
+    }
+
+    .yunyin-company-panel .sub-company.active {
+        background: linear-gradient(to bottom, #2ab4c0, #229ea9);
+        color: #fdfdfd;
+    }
+</style>
+
+<div id="roleCompanyAuthority">
+
+    <div class="page-head">
+        <div class="page-title">
+            <h1>模块配置</h1>
+        </div>
+    </div>
+
+    <ul class="page-breadcrumb breadcrumb">
+        <li><a href="/pages/home.html" data-pjax>首页</a> <i
+                class="fa fa-circle"></i></li>
+        <li><span class="active">权限管理</span> <i class="fa fa-circle"></i></li>
+        <li><a href="list.html" data-pjax>角色管理</a> <i class="fa fa-circle"></i></li>
+        <li><span class="active">分公司数据权限</span></li>
+    </ul>
+
+    <div class="cmpy-auth-card">
+
+        <h4>角色信息</h4>
+        <table class="table">
+            <tr>
+                <td>
+                    代码：<span id="roleCode"></span>
+                </td>
+                <td>
+                    名称：<span id="roleName"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <br><br>
+    <div class="cmpy-auth-card cmpy-list">
+    </div>
+
+    <div class="cmpy-auth-card" style="text-align: right;">
+        <button type="button" class="btn btn-default">返回</button>&nbsp;
+        <button type="button" class="btn btn-primary saveBtn" ><i class="fa fa-check"></i>保存</button>
+    </div>
+
+    <script id="role-company-authority-temp" type="text/html">
+        {{each list as obj i}}
+        <div class="yunyin-company-panel">
+            <h5 class="company">{{obj.name}}</h5>
+            {{each obj.childs as fgs i}}
+            <div class="sub-company" data-company="{{obj.name}}" data-id="{{fgs.upCode}}_{{fgs.businessCode}}">{{fgs.businessName}}</div>
+            {{/each}}
+        </div>
+        {{/each}}
+    </script>
+
+</div>
+
+<script>
+$(function () {
+    var id = $.url().param('no')
+            ,roleObj;
+
+    if(!id){
+        alert('缺少主键');
+    }
+    else{
+        $.get('/role/'+id , function(obj){
+            $('#roleCompanyAuthority #roleCode').text(obj.codeName);
+            $('#roleCompanyAuthority #roleName').text(obj.roleName);
+        });
+    }
+
+
+    $.get('/business/all', function (rs) {
+        var baseCode;
+        //找到跟节点
+        $.each(rs, function () {
+           if(this.upCode == 0){
+               baseCode=this.businessCode;
+               return false;
+           }
+        });
+        if(!baseCode){
+            alert('大爷找不到跟节点，数据有问题吧！！！');
+            return;
+        }
+        //提取二级节点
+        var secondMap={};
+        $.each(rs, function () {
+            if(this.upCode==baseCode){
+                secondMap[this.businessCode] = {
+                    name: this.businessName,
+                    childs: []
+                };
+            }
+        });
+        //分公司节点
+        $.each(rs, function () {
+            if(secondMap[this.upCode])
+                secondMap[this.upCode].childs.push(this);
+        });
+
+        //排序
+        for(var sid in secondMap){
+            secondMap[sid].childs.sort(naturalSort);
+        }
+
+        var htmlStr=template('role-company-authority-temp', {list: get_vals(secondMap)});
+        $('#roleCompanyAuthority .cmpy-list').html(htmlStr);
+
+        //查询公司权限信息
+        $get('/companyAuthority/all', {roleId_eq: id}, function (rs) {
+            //console.log(rs);
+            var dataId;
+            $.each(rs, function () {
+                dataId=this.companyCode+'_'+this.subCompanyCode;
+                $('.cmpy-list div.sub-company[data-id='+dataId+']').addClass('active');
+            });
+        });
+    });
+
+    $('#roleCompanyAuthority').on('click', '.cmpy-list .sub-company', function () {
+        if($(this).hasClass('active'))
+            $(this).removeClass('active');
+        else
+            $(this).addClass('active');
+    });
+
+    var get_vals = function(json) {
+        var array = [];
+        for (var key in json) {
+            array.push(json[key]);
+        }
+
+        return array;
+    }
+
+    var naturalSort=function (a, b) {
+        return a.businessCode.localeCompare(b.businessCode);
+    }
+
+    //保存
+    $('#roleCompanyAuthority .saveBtn').on('click', function () {
+        var ats=$('.cmpy-list div.sub-company.active', '#roleCompanyAuthority')
+                ,data=[];
+        var code;
+        $.each(ats, function () {
+            code = $(this).data('id').split('_');
+            data.push({
+                companyCode: code[0],
+                subCompanyCode: code[1],
+                companyName: $(this).data('company'),
+                subCompanyName: $(this).text()
+            });
+        });
+
+        $post('/companyAuthority/save', {roleId: id, authJsonStr: JSON.stringify(data)}, function (rs) {
+            alert('保存成功！');
+        })
+    });
+});
+</script>
 \ No newline at end of file
@@ -66,9 +66,15 @@
 				<a href="settings.html?no={{role.id}}" data-pjax class=" font-blue "
 					style="display: inline-block; margin-right: 5px;"> <i
 					class="fa fa-meh-o"> </i> 模块配置
-				</a> <a href="javascript:;" class=" font-blue " 
-					style="display: inline-block;" > <i class="fa fa-key">
-				</i> 分配资源
+				</a>
+				<a href="javascript:;" class=" font-blue "
+					style="display: inline-block;color: #aaaaaa !important;" > <i class="fa fa-key">
+				</i> 系统资源权限
+				</a>
+
+				<hr>
+				<a href="companyAuthority.html?no={{role.id}}" data-pjax class="font-blue"
+				   style="display: inline-block; font-size: 12px;" >  分公司数据权限
 				</a>
 			</div>
 		</div>
@@ -169,44 +169,17 @@
 			locale : 'zh-cn'
 		});
-		$('#line').select2({
-			ajax: {
-				url: '/realSchedule/findLine',
-				type: 'post',
-				dataType: 'json',
-				delay: 150,
-				data: function(params){
-					return{line: params.term};
-				},
-			    processResults: function (data) {
-			      return {
-			        results: data
-			      };
-			    },
-				cache: true
-			},
-			templateResult: function(repo){
-				if (repo.loading) return repo.text;
-				var h = '<span>'+repo.text+'</span>';
-				return h;
-			},
-			escapeMarkup: function (markup) { return markup; },
-			minimumInputLength: 1,
-			templateSelection: function(repo){
-				return repo.text;
-			},
-			language: {
-		       noResults: function(){
-		           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-		       },
-		       inputTooShort : function(e) {
-					return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-			   },
-		       searching : function() {
-					return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-			   }
+		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
 			}
-		});
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
 		$("#query").on("click",function(){
@@ -112,44 +112,16 @@
 			$("#date").val(year + "-0" + month + "-" + day);
 		}
-		$('#line').select2({
-			ajax: {
-				url: '/realSchedule/findLine',
-				type: 'post',
-				dataType: 'json',
-				delay: 150,
-				data: function(params){
-					return{line: params.term};
-				},
-			    processResults: function (data) {
-			      return {
-			        results: data
-			      };
-			    },
-				cache: true
-			},
-			templateResult: function(repo){
-				if (repo.loading) return repo.text;
-				var h = '<span>'+repo.text+'</span>';
-				return h;
-			},
-			escapeMarkup: function (markup) { return markup; },
-			minimumInputLength: 1,
-			templateSelection: function(repo){
-				return repo.text;
-			},
-			language: {
-		       noResults: function(){
-		           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-		       },
-		       inputTooShort : function(e) {
-					return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-			   },
-		       searching : function() {
-					return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-			   }
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
 			}
-		});
+			console.log(data);
+			initPinYinSelect2('#line',data,'');
+			
+		})
 		$('#code').select2({
 			ajax: {
 				url: '/realSchedule/sreachVehic',