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

zlz
2 parents 851da92c 26bb522b
Showing 78 changed files with 3018 additions and 636 deletions
pom.xml
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/controller/logger/MileModifyController.java
src/main/java/com/bsth/controller/oil/CdlController.java
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/JdlController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/OilStationSocietyController.java
src/main/java/com/bsth/controller/realcontrol/PageForwardingController.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/ServiceDataInterface.java
src/main/java/com/bsth/controller/realcontrol/dto/LpData.java
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanController.java → src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
@@ -18,21 +18,19 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		
+
 		<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
-<!-- 		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-config</artifactId>
-		</dependency> -->
+		<!-- <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-config</artifactId> 
+			</dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -68,27 +66,32 @@
 			<artifactId>fastjson</artifactId>
 			<version>1.2.4</version>
 		</dependency>
-		
+
 		<dependency>
-	    	<groupId>org.apache.httpcomponents</groupId>
-	    	<artifactId>httpclient</artifactId>
-	    </dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
  
 		<dependency>
 			<groupId>commons-dbcp</groupId>
 			<artifactId>commons-dbcp</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 			<version>3.4</version>
 		</dependency>
 		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.2.2</version>
+		</dependency>
+		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>2.4</version>
@@ -111,38 +114,38 @@
 		</dependency>
 		<!-- ftp文件上传包 -->
 		<dependency>
-		    <groupId>commons-net</groupId>
-		    <artifactId>commons-net</artifactId>
-		    <version>3.5</version>
+			<groupId>commons-net</groupId>
+			<artifactId>commons-net</artifactId>
+			<version>3.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<version>1.3</version>
+		</dependency>
+		<!-- drools 6依赖 -->
+		<dependency>
+			<groupId>org.kie</groupId>
+			<artifactId>kie-api</artifactId>
 		</dependency>
 		<dependency>
-		    <groupId>org.apache.commons</groupId>
-		    <artifactId>commons-compress</artifactId>
-		    <version>1.3</version>
+			<groupId>org.drools</groupId>
+			<artifactId>drools-compiler</artifactId>
+		</dependency>
+
+		<!-- springboot测试 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
 		</dependency>
-        <!-- drools 6依赖 -->
-        <dependency>
-            <groupId>org.kie</groupId>
-            <artifactId>kie-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-compiler</artifactId>
-        </dependency>
  
-        <!-- springboot测试 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
+		<dependency>
 			<groupId>c3p0</groupId>
 			<artifactId>c3p0</artifactId>
 			<version>0.9.1.2</version>
 		</dependency>
-		
+
 		<!-- 图表 -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -155,82 +158,79 @@
 			<version>2.1.8</version>
 		</dependency>
  
-        <dependency>
-            <groupId>org.apache.tika</groupId>
-            <artifactId>tika-core</artifactId>
-            <version>1.7</version>
-        </dependency>
+		<dependency>
+			<groupId>org.apache.tika</groupId>
+			<artifactId>tika-core</artifactId>
+			<version>1.7</version>
+		</dependency>
+
+		<!-- pentaho kettle 依赖 -->
+		<dependency>
+			<groupId>com.pentaho.kettle</groupId>
+			<artifactId>kettle-core</artifactId>
+			<version>6.0.1.0-386</version>
+		</dependency>
+		<dependency>
+			<groupId>com.pentaho.kettle</groupId>
+			<artifactId>kettle-engine</artifactId>
+			<version>6.0.1.0-386</version>
+		</dependency>
+		<dependency>
+			<groupId>com.pentaho.kettle</groupId>
+			<artifactId>metastore</artifactId>
+			<version>6.0.1.0-386</version>
+		</dependency>
+		<dependency>
+			<groupId>com.pentaho.kettle</groupId>
+			<artifactId>vfs2</artifactId>
+			<version>2.1-20150824</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.jexcelapi</groupId>
+			<artifactId>jxl</artifactId>
+			<version>2.6.12</version>
+		</dependency>
+		<dependency>
+			<groupId>rhino</groupId>
+			<artifactId>js</artifactId>
+			<version>1.7R2</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4.7</version>
+		</dependency>
  
-        <!-- pentaho kettle 依赖 -->
-        <dependency>
-            <groupId>com.pentaho.kettle</groupId>
-            <artifactId>kettle-core</artifactId>
-            <version>6.0.1.0-386</version>
-        </dependency>
-        <dependency>
-            <groupId>com.pentaho.kettle</groupId>
-            <artifactId>kettle-engine</artifactId>
-            <version>6.0.1.0-386</version>
-        </dependency>
-        <dependency>
-            <groupId>com.pentaho.kettle</groupId>
-            <artifactId>metastore</artifactId>
-            <version>6.0.1.0-386</version>
-        </dependency>
-        <dependency>
-            <groupId>com.pentaho.kettle</groupId>
-            <artifactId>vfs2</artifactId>
-            <version>2.1-20150824</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.jexcelapi</groupId>
-            <artifactId>jxl</artifactId>
-            <version>2.6.12</version>
-        </dependency>
-        <dependency>
-            <groupId>rhino</groupId>
-            <artifactId>js</artifactId>
-            <version>1.7R2</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4.7</version>
-        </dependency>
+		<dependency>
+			<groupId>com.github.axet</groupId>
+			<artifactId>kaptcha</artifactId>
+			<version>0.0.9</version>
+		</dependency>
  
 		<dependency>
-        	<groupId>com.github.axet</groupId>
-        	<artifactId>kaptcha</artifactId>
-        	<version>0.0.9</version>
-    	</dependency>
-    	
-		<dependency>
-	      <groupId>commons-codec</groupId>
-	      <artifactId>commons-codec</artifactId>
-	      <version>1.4</version>
-	      <scope>compile</scope>
-	    </dependency>
-	    <dependency>
-	      <groupId>org.bouncycastle</groupId>
-	      <artifactId>bcprov-jdk15on</artifactId>
-	      <version>1.52</version>
-	    </dependency>   
-	   <dependency>
-		    <groupId>axis</groupId>
-		    <artifactId>axis</artifactId>
-		    <version>1.4</version>
-		</dependency>	
-		<dependency>
-		    <groupId>javax.xml</groupId>
-		    <artifactId>jaxrpc-api</artifactId>
-		    <version>1.1</version>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.4</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk15on</artifactId>
+			<version>1.52</version>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml</groupId>
+			<artifactId>jaxrpc-api</artifactId>
+			<version>1.1</version>
 		</dependency>
  
-<!--		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<optional>true</optional>
-		</dependency>-->
+		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> 
+			<optional>true</optional> </dependency> -->
 		<dependency>
 			<groupId>com.vividsolutions</groupId>
 			<artifactId>jts</artifactId>
@@ -239,18 +239,18 @@
  
 	</dependencies>
  
-    <dependencyManagement>
-        <dependencies>
-            <!-- drools 6依赖 -->
-            <dependency>
-                <groupId>org.drools</groupId>
-                <artifactId>drools-bom</artifactId>
-                <type>pom</type>
-                <version>6.2.0.Final</version>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<!-- drools 6依赖 -->
+			<dependency>
+				<groupId>org.drools</groupId>
+				<artifactId>drools-bom</artifactId>
+				<type>pom</type>
+				<version>6.3.0.Final</version>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
  
 	<build>
 		<plugins>
@@ -304,8 +304,8 @@
 			<url>http://repo.spring.io/milestone</url>
 		</pluginRepository>
 	</pluginRepositories>
-	
+
 	<properties>
-	    <start-class>com.bsth.Application</start-class>
+		<start-class>com.bsth.Application</start-class>
 	</properties>
 </project>
@@ -21,6 +21,9 @@ public class Constants {
 	public static final String LOGIN_FAILURE = "/user/loginFailure";
 	public static final String CAPTCHA = "/captcha.jpg";
  
+	//对外的营运数据接口
+	public static final String SERVICE_INTERFACE = "/companyService/**";
+
 	/**
 	 * 线调部分子页面不做拦截，便于浏览器缓存
 	 */
@@ -20,6 +20,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;  
 import org.springframework.web.bind.annotation.RequestMapping;
  
+import com.google.protobuf.UnknownFieldSet.Field;
 import com.mysql.fabric.Response;  
  
 /** 
@@ -39,9 +40,8 @@ public class DownloadController
  
 	@RequestMapping("download2")    
     public ResponseEntity<byte[]> download2(String fileName) throws IOException {
-//    	fileName = fileName+".xls";
     	String fileNames=URLDecoder.decode(fileName,"UTF-8");
-    	fileNames =fileNames + ".xls";
+    	fileNames = fileNames + ".xls";
     	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileNames; 
     	System.out.println(moudelPath);
 //       String path="D:\\export\\target\\"+jName+".xls";  
@@ -75,5 +75,29 @@ public class DownloadController
         os.write(buffer);// 输出文件
         os.flush();
         os.close();
+        file.delete();
+    }  
+    
+    @RequestMapping("downloadList")    
+    public void downloadList(HttpServletResponse response,String fileName) 
+    		throws IOException {
+//    	String fileNames=URLDecoder.decode(fileName,"UTF-8");
+    	fileName = fileName + ".zip";
+    	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName; 
+    	File file = new File(moudelPath);// path是根据日志路径和文件名拼接出来的
+//        String filename = file.getName();// 获取日志文件名称
+        InputStream fis = new BufferedInputStream(new FileInputStream(moudelPath));
+        byte[] buffer = new byte[fis.available()];
+        fis.read(buffer);
+        fis.close();
+        response.reset();
+        response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.replaceAll(" ", "").getBytes("utf-8"),"iso8859-1"));
+        response.addHeader("Content-Length", "" + file.length());
+        OutputStream os = new BufferedOutputStream(response.getOutputStream());
+        response.setContentType("application/octet-stream");
+        os.write(buffer);// 输出文件
+        os.flush();
+        os.close();
+        file.delete();
     }  
 }
+package com.bsth.controller.logger;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.logger.Logger_MileModify;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by panzhao on 2017/3/6.
+ */
+@RestController
+@RequestMapping("logger_mile_modify")
+public class MileModifyController extends BaseController<Logger_MileModify, Long>{
+}
+package com.bsth.controller.oil;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.oil.Cdl;
+import com.bsth.service.oil.CdlService;
+
+@RestController
+@RequestMapping("cdl")
+public class CdlController extends BaseController<Cdl, Integer>{
+	@Autowired
+	CdlService service;
+	@RequestMapping(value = "/save",method = RequestMethod.POST)
+	public Map<String, Object> saveCdl(Cdl t){
+//		SysUser user = SecurityUtils.getCurrentUser();
+		t.setUpdatetime(new Date());
+		/*SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		try {
+			t.setUpdatetime(sdf.parse("2016-10-13"));
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}*/
+		return service.save(t);
+	}
+}
+package com.bsth.controller.oil;
+
+import java.util.List;
+import java.util.Map;
+
+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.data.domain.Sort.Direction;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.bsth.controller.BaseController;
+import com.bsth.entity.oil.Dlb;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.service.oil.DlbService;
+import com.google.common.base.Splitter;
+
+@RestController
+@RequestMapping("dlb")
+public class DlbController extends BaseController<Dlb, Integer>{
+	@Autowired
+	DlbService service;
+	/**
+	 * 
+	 * @Title: list 
+	 * @Description: TODO(多条件分页查询) 
+	 * @param @param map 查询条件
+	 * @param @param page 页码
+	 * @param @param size 每页显示数量
+	 * @throws
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	public Page<Dlb> list(@RequestParam Map<String, Object> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "10") int size,
+			@RequestParam(defaultValue = "id") String order,
+			@RequestParam(defaultValue = "DESC") String direction){
+
+		Direction d;
+//		map.put("xlbm_like", map.get("xlbm_like").toString().trim());
+//		try {
+		String rq=map.get("rq").toString();
+		if(!(rq=="")){
+//			
+//			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+//			  Calendar   calendar   =   new   GregorianCalendar(); 
+//			  calendar.setTime(sdf.parse(rq)); 
+//			  calendar.add(calendar.DATE,1);
+//			  Date date=calendar.getTime();
+			map.put("rq_eq", rq);
+//			map.put("rq_lt", sdf.format(date));
+//			System.out.println(rq);
+//			System.out.println(sdf.format(date));
+		}
+//		} catch (ParseException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+		if(null != direction && direction.equals("ASC"))
+			d = Direction.ASC;
+		else
+			d = Direction.DESC;
+
+        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
+        // 多个字段格式：{col1},{col2},{col3},....,{coln}
+        // 每个字段的排序方向都是一致，这个以后再看要不要改
+        List<String> list = Splitter.on(",").trimResults().splitToList(order);
+        return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
+	}
+	
+	@RequestMapping(value = "/obtain",method = RequestMethod.GET)
+	public Map<String, Object> obtain(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=service.obtain(map);
+		System.out.println();
+		return list;
+	}
+	
+	/**
+	 * 保存电量
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping(value = "/sort",method = RequestMethod.GET)
+	public Map<String, Object> sort(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=service.sort(map);
+		return list;
+	}
+	
+	/**
+	 * 核对电量（有加电没里程）
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping(value = "/checkDl",method = RequestMethod.GET)
+	public Map<String, Object> checkDl(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=service.checkDl(map);
+		return list;
+	}
+}
+package com.bsth.controller.oil;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.controller.BaseController;
+import com.bsth.entity.oil.Jdl;
+import com.bsth.service.oil.JdlService;
+import com.google.common.io.Files;
+
+@RestController
+@RequestMapping("jdl")
+public class JdlController extends BaseController<Jdl, Integer> {
+
+	@Autowired
+	JdlService jdlService;
+
+	public String getDataImportClasspath(){
+		return this.getClass().getResource("/").getPath() + "/static/pages/electricity/jdl";
+	}
+	
+	@RequestMapping(value = "/uploadFile",method = RequestMethod.POST)
+	public String uploadFile(MultipartFile file, String gsbm_, String gsName,
+											String fgsbm_, String fgsName) throws Exception{
+		Map<String, Object> map = new HashMap<String, Object>();
+//		File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
+//		System.out.println(ktrfile.getAbsolutePath());
+		System.out.println(file.getSize());
+        File newFile = new File(
+        		getDataImportClasspath() + File.separator +
+                        file.getOriginalFilename());
+        Files.write(file.getBytes(), newFile);
+		String result = jdlService.importExcel(newFile, gsbm_, gsName, fgsbm_, fgsName);
+		return "{\"result\":" + "\""+result+"\"}";
+	}
+	
+	@RequestMapping(value = "/query",method = RequestMethod.GET)
+	public Map<String, Object> query(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.query(map);
+	}
+	
+}
@@ -50,8 +50,14 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	 * @return
 	 */
 	@RequestMapping(value = "/obtain",method = RequestMethod.GET)
-	public Map<String, Object> obtain(@RequestParam Map<String, Object> map){
-		Map<String, Object> list=yblService.obtain(map);
+	public Map<String, Object> obtain(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list =new HashMap<String, Object>();
+		try {
+			list = yblService.obtain(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}
 		System.out.println();
 		return list;
 	}
@@ -73,8 +79,14 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	 * @return
 	 */
 	@RequestMapping(value = "/outAndIn",method = RequestMethod.GET)
-	public Map<String, Object> outAndIn(@RequestParam Map<String, Object> map){
-		Map<String, Object> list=yblService.outAndIn(map);
+	public Map<String, Object> outAndIn(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list=yblService.outAndIn(map);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		
 		return list;
 	}
  
@@ -106,6 +118,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			@RequestParam(defaultValue = "DESC") String direction){
  
 		Direction d;
+		map.put("xlbm_like", map.get("xlbm_like").toString().trim());
 //		try {
 		String rq=map.get("rq").toString();
 		if(!(rq=="")){
@@ -2,8 +2,13 @@ package com.bsth.controller.realcontrol;
  
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
+import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
  
 import java.util.HashMap;
@@ -14,6 +19,13 @@ import java.util.Map;
 @RequestMapping("/basic")
 public class BasicDataController {
  
+	@Autowired
+	BasicData.BasicDataLoader dataLoader;
+
+	@Autowired
+	BasicData basicData;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
  
 	@RequestMapping("/cars")
 	public Iterable<String> findAllNbbm(Map<String, Object> map){
@@ -53,10 +65,6 @@ public class BasicDataController {
  
 	@RequestMapping("/all_personnel")
 	public Map<String, String> all_personnel(){
-		//Map<String, Object> rs = new HashMap<>();
-		//PersonnelFieldFilter filter=new PersonnelFieldFilter();
-		
-		//rs.put("list", JSON.parse(JSON.toJSONString(BasicData.jsyMap.values(), filter)));
 		return BasicData.allPerson;
 	}
  
@@ -72,6 +80,50 @@ public class BasicDataController {
 			}
 			return false;
 		}
-		
+	}
+
+	/**
+	 * 刷新车辆和设备号对照数据
+	 * @return
+	 */
+	@RequestMapping(value = "/refresh_nbbm2Device", method = RequestMethod.POST)
+	public Map<String, Object> refreshNbbm2DeviceId(){
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			dataLoader.loadDeviceInfo();
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+			logger.error("", e);
+		}
+		return rs;
+	}
+
+	/**
+	 * 刷新员工对照数据
+	 * @return
+	 */
+	@RequestMapping(value = "/refresh_person_data", method = RequestMethod.POST)
+	public Map<String, Object> refreshPersonData(){
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			dataLoader.loadPersonnelInfo();
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+			logger.error("", e);
+		}
+		return rs;
+	}
+
+	/**
+	 * 车辆自编号和车牌号对照
+	 * @return
+	 */
+	@RequestMapping("/nbbm2PlateNo")
+	public Map<String, String> nbbm2PlateNo(){
+		return basicData.getNbbm2PlateNo();
 	}
 }
@@ -35,8 +35,18 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 		return lineConfigService.editOutTimeType(lineCode, type);
 	}
  
+	@RequestMapping(value = "/enableInParkForSource", method = RequestMethod.POST)
+	public Map<String, Object> enableInParkForSource(@RequestParam String lineCode, @RequestParam int enable){
+		return lineConfigService.enableInParkForSource(lineCode, enable);
+	}
+
 	@RequestMapping(value = "/getByLineCode")
 	public LineConfig getByLineCode(@RequestParam String lineCode){
 		return lineConfigService.getByLineCode(lineCode);
 	}
+
+	@RequestMapping(value = "/bufferTimeDiff", method = RequestMethod.POST)
+	public Map<String, Object> bufferTimeDiff(@RequestParam String lineCode, @RequestParam String field,@RequestParam String value){
+		return lineConfigService.bufferTimeDiff(lineCode, field, value);
+	}
 }
+package com.bsth.controller.realcontrol;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.realcontrol.OilStationSociety;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by panzhao on 2017/3/16.
+ */
+@RestController
+@RequestMapping("/oilStation")
+public class OilStationSocietyController extends BaseController<OilStationSociety, String>{
+}
-package com.bsth.controller.realcontrol;
-
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * 线调登入页面转发
- * Created by panzhao on 2017/1/21.
- */
-@Controller
-@RequestMapping("real_control")
-public class PageForwardingController {
-
-    @RequestMapping("/v2")
-    public ModelAndView v2(){
-        ModelAndView mv = new ModelAndView();
-        SysUser user = SecurityUtils.getCurrentUser();
-
-        //班次管理员
-        if(user.getUserName().equals("bcgly")){
-            mv.setViewName("/real_control_v2/sch_manage/sch_imitate.html");
-        }
-        //正常线调主页
-        else
-            mv.setViewName("/real_control_v2/main.html");
-        return mv;
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 线调登入页面转发
+ * Created by panzhao on 2017/1/21.
+ */
+@Controller
+@RequestMapping("real_control")
+public class PageForwardingController {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @RequestMapping("/v2")
+    public ModelAndView v2(HttpServletResponse response){
+        ModelAndView mv = new ModelAndView();
+        SysUser user = SecurityUtils.getCurrentUser();
+
+        //班次管理员
+        if(user.getUserName().equals("bcgly")){
+            mv.setViewName("/real_control_v2/sch_manage/sch_imitate.html");
+            return mv;
+        }
+
+        try{
+            //闵行运管所，直接打开地图页面
+            if(user.getRoles().size() == 1){
+                for(Role role : user.getRoles()){
+                    if(role.getCodeName().equals("MH_YGS")){
+                        // 直接重定向
+                        response.sendRedirect("/pages/mapmonitor/alone/wrap.html");
+                        return null;
+                    }
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+
+        //正常线调主页
+        mv.setViewName("/real_control_v2/main.html");
+        return mv;
+    }
+}
@@ -49,6 +49,11 @@ public class RealMapController {
         return realMapService.findRouteByLine(lineCode);
     }
  
+    @RequestMapping(value = "/multiRouteByLine")
+    public Map<String, Object> multiRouteByLine(@RequestParam String codeStr) {
+        return realMapService.multiRouteByLine(codeStr);
+    }
+
  
     /**
      * 获取线路的路段路由 和 站点路由信息 （为前端站间距计算提供数据源）
@@ -7,6 +7,7 @@ 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.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.joda.time.format.DateTimeFormat;
@@ -143,6 +144,16 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
  
 	/**
+	 * 撤销执行
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/revokeRealArrive", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealArrive(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealArrive(id);
+	}
+
+	/**
 	 * 
 	 * @Title: spaceAdjust 
 	 * @Description: TODO(间隔调整) 
@@ -261,14 +272,20 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 			@RequestParam String date,@RequestParam String state) {
 		return scheduleRealInfoService.queryUserInfo(line, date,state);
 	}
+	
+	@RequestMapping(value = "/queryUserInfoPx")
+	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
+			@RequestParam String date,@RequestParam String state,@RequestParam String type) {
+		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
+	}
  
-	@RequestMapping(value = "/exportWaybill")
+	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
 			@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
 		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
 	}
  
-	@RequestMapping(value = "/exportWaybillQp")
+	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line) {
 		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
@@ -291,13 +308,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.findLine(line);
 	}
  
-	@RequestMapping(value="/findKMBC")
+	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
 	public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date,line);
 	}
  
-	@RequestMapping(value="/findKMBCQp")
+	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
 	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
@@ -327,13 +344,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @param lpName 路牌
 	 * @return
 	 */
-	@RequestMapping(value="/queryListWaybill")
+	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
 	}
  
-	@RequestMapping(value="/queryListWaybillQp")
+	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
 			@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
@@ -345,6 +362,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
 	}
  
+	@RequestMapping(value="/statisticsDailyTj")
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam String line, @RequestParam String date,
+			@RequestParam String date2,@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDailyTj(line, date,date2, xlName, type);
+	}
+	
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
 		return scheduleRealInfoService.MapById(id);
@@ -367,6 +390,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.realScheduleList(line,date);
 	}
  
+	@RequestMapping(value="/realScheduleListQp")
+	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleListQp(line,date);
+	}
+	
 	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
 	public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
 		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
@@ -429,4 +457,28 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<Map<String, Object>> scheduleDailyQp(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.scheduleDailyQp(line,date);
 	}
+
+	@RequestMapping(value = "scheduleDailyExport", method = RequestMethod.GET)
+	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.scheduleDailyExport(map);
+	}
+	
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
+	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
+		return scheduleRealInfoService.exportWaybillMore(map);
+	}
+
+	/**
+	 * 获取当日计划排班 ， 从计划表抓取数据
+	 * @return
+	 */
+	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
+	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
+		return scheduleRealInfoService.currentSchedulePlan(lineCode);
+	}
+
+	@RequestMapping(value = "lpChangeMulti", method = RequestMethod.POST)
+	public Map<String, Object> lpChangeMulti(@RequestParam String leftIdx, @RequestParam String rightIdx,@RequestParam int type){
+		return scheduleRealInfoService.lpChangeMulti(leftIdx, rightIdx, type);
+	}
 }
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.apache.commons.lang3.StringUtils;
+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.ArrayList;
+import java.util.List;
+
+/**
+ * 对外的营运数据接口，主要输出当日的数据
+ * Created by panzhao on 2017/3/15.
+ */
+@RestController
+@RequestMapping("/companyService")
+public class ServiceDataInterface {
+
+    private final static String SECRE_KEY = "dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki";
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @RequestMapping("/getCurrentDayPlan")
+    public List<ScheduleRealInfo> getCurrentDayPlan(
+            @RequestParam String companyId,
+            @RequestParam String workId,
+            @RequestParam String secretKey) {
+
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)
+                    && sch.getjGh().equals(workId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    @RequestMapping("/returnCCInfo")
+    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+
+            if (sch.getBcType().equals("out")
+                    && sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    @RequestMapping("/returnJCInfo")
+    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals("in")
+                    && sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+}
+package com.bsth.controller.realcontrol.dto;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+/**
+ * 路牌相关的数据（换路牌时要换的字段）
+ * Created by panzhao on 2017/3/2.
+ */
+public class LpData {
+
+    public LpData(ScheduleRealInfo sch) {
+        this.jGh = sch.getjGh();
+        this.jName = sch.getjName();
+        this.sGh = sch.getsGh();
+        this.sName = sch.getsName();
+        this.nbbm = sch.getClZbh();
+
+        this.fcsj = sch.getFcsjActualTime();
+        this.zdsj = sch.getZdsjActualTime();
+
+        this.qdName = sch.getQdzName();
+        this.zdzName = sch.getZdzName();
+    }
+
+    public void appendTo(ScheduleRealInfo sch, int type) {
+
+        if (type == 0) {
+            //只换人
+            sch.setjGh(this.jGh);
+            sch.setjName(this.jName);
+            sch.setsGh(this.sGh);
+            sch.setsName(this.sName);
+        } else if (type == 1) {
+            //只换车
+            sch.setClZbh(this.nbbm);
+            changeRealTime(sch);
+            /*//换实际时间
+            if(changeRealTime){
+                changeRealTime(sch);
+            }*/
+
+        } else if (type == 2) {
+            //换人并换车
+            sch.setjGh(this.jGh);
+            sch.setjName(this.jName);
+            sch.setsGh(this.sGh);
+            sch.setsName(this.sName);
+            sch.setClZbh(this.nbbm);
+
+            //换实际时间
+            //if(changeRealTime){
+                changeRealTime(sch);
+            //}
+        }
+    }
+
+    public void changeRealTime(ScheduleRealInfo sch){
+        if (this.fcsj != null && this.qdName.equals(sch.getQdzName()))
+            sch.setFcsjActualAll(this.fcsj);
+        if (this.zdsj != null && this.zdzName.equals(sch.getZdzName()))
+            sch.setZdsjActualAll(this.zdsj);
+    }
+
+    /**
+     * 起点站名称
+     */
+    private String qdName;
+
+    /**
+     * 终点站名称
+     */
+    private String zdzName;
+
+    /**
+     * 驾驶员
+     */
+    private String jGh;
+    private String jName;
+
+    /**
+     * 售票员
+     */
+    private String sGh;
+    private String sName;
+
+    /**
+     * 车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 实际发车时间
+     */
+    private Long fcsj;
+
+    /**
+     * 实际终点时间
+     */
+    private Long zdsj;
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getjName() {
+        return jName;
+    }
+
+    public void setjName(String jName) {
+        this.jName = jName;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public Long getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(Long fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public Long getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(Long zdsj) {
+        this.zdsj = zdsj;
+    }
+}
@@ -40,9 +40,12 @@ public class BController&lt;T, ID extends Serializable&gt; {
         SysUser sysUser = sysUserService.findByUserName(userName);
         BEntity t_b = null;
         if (t instanceof BEntity) {
+            Date cdate = new Date();
             t_b = (BEntity) t;
             t_b.setCreateBy(sysUser);
-            t_b.setCreateDate(new Date());
+            t_b.setCreateDate(cdate);
+            t_b.setUpdateBy(sysUser);
+            t_b.setUpdateDate(cdate);
         }
  
         T t_saved = bService.save(t_b == null ? t : (T) t_b);
@@ -27,22 +27,10 @@ import java.util.Map;
 public class GuideboardInfoController extends BController<GuideboardInfo, Long> {
     @Autowired
     private GuideboardInfoService guideboardInfoService;
-//    @Autowired
-//    private DataToolsProperties dataToolsProperties;
+
     @Autowired
     private GuideboardInfoRepository guideboardInfoRepository;
-//
-//    @Override
-//    protected String getDataImportKtrClasspath() {
-//        return dataToolsProperties.getGuideboardsDatainputktr();
-//    }
-//
-//    @Override
-//    public GuideboardInfo findById(@PathVariable("id") Long aLong) {
-//        return guideboardInfoRepository.findOneExtend(aLong);
-//    }
-//
-//
+
     @RequestMapping(value = "/ttlpnames", method = RequestMethod.GET)
     public List<Map<String, Object>> findLpName(Long ttid) {
         return guideboardInfoRepository.findLpName(ttid);
-package com.bsth.controller.schedule;
+package com.bsth.controller.schedule.core;
  
-import com.bsth.controller.BaseController;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.schedule.SchedulePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
+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.RestController;
  
+import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
  
 /**
@@ -16,26 +19,11 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("spc")
-public class SchedulePlanController extends BaseController<SchedulePlan, Long> {
+public class SchedulePlanController extends BController<SchedulePlan, Long> {
     @Autowired
     private SchedulePlanService schedulePlanService;
  
     /**
-     * 覆写方法，因为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 SchedulePlan t){
-
-        return baseService.save(t);
-    }
-
-    /**
      * 获取明天的一歌排班计划。
      * @return
      * @throws Exception
@@ -49,4 +37,24 @@ public class SchedulePlanController extends BaseController&lt;SchedulePlan, Long&gt; {
         }
     }
  
+    /**
+     * 创建指定线路，指定时间范围内的排班计划，使用的时刻表情况
+     * @param xlid 线路id
+     * @param from 开始时间
+     * @param to 结束时间
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/valttinfo/{xlid}/{from}/{to}", method = RequestMethod.GET)
+    public Map<String, Object> validateTTInfo(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "from") Date from,
+            @PathVariable(value = "to") Date to
+    ) throws Exception {
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", schedulePlanService.validateTTInfo(xlid, from, to));
+        return rtn;
+    }
+
 }
@@ -8,6 +8,7 @@ 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 java.util.HashMap;
@@ -87,5 +88,16 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
         }
         return rtn;
     }
-
+    
+    /**
+     * 时刻表明细批量插入
+     * 
+     * @param entities
+     * 
+     * @return
+     */
+    @RequestMapping(value = "/skbDetailMxSave" ,method = RequestMethod.POST)
+    public Map<String, Object> skbDetailMxSave(@RequestParam Map<String, Object> entities){
+    	return ttInfoDetailService.skbDetailMxSave(entities);
+    }
 }
+package com.bsth.controller.sys;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.sys.RealControAuthorityService;
+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 javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+@RestController
+@RequestMapping("realControAuthority")
+public class RealControAuthorityController extends BaseController<RealControAuthority, Integer> {
+
+    @Autowired
+    RealControAuthorityService realControAuthorityService;
+
+    @RequestMapping("findByUserId")
+    public RealControAuthority findByUserId(@RequestParam Integer userId){
+
+        return realControAuthorityService.findByUserId(userId);
+    }
+
+    @RequestMapping("findByCurrentUser")
+    public RealControAuthority findByUserId(HttpServletRequest request){
+        return realControAuthorityService.findByUserId(SecurityUtils.getCurrentUser().getId());
+    }
+}
@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
  
 import java.util.*;
@@ -89,6 +90,18 @@ public class BasicData implements CommandLineRunner {
         return name != null? name: stationCode2NameMap.get(prefix + code);
     }
  
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+    public Map<String, String> getNbbm2PlateNo(){
+        List<Map<String, Object>> list = jdbcTemplate.queryForList("select CAR_CODE,CAR_PLATE from bsth_c_cars where CAR_CODE is not null and CAR_PLATE is not null");
+
+        Map<String, String> rs = new HashMap<>();
+        for(Map<String, Object> map : list){
+            rs.put(map.get("CAR_CODE").toString(), map.get("CAR_PLATE").toString());
+        }
+        return rs;
+    }
+
     @Component
     public static class BasicDataLoader extends Thread {
  
@@ -309,9 +322,6 @@ public class BasicData implements CommandLineRunner {
                 if (StringUtils.isEmpty(jobCode))
                     continue;
  
-                /*if (jobCode.indexOf("-") != -1) {
-                    jobCode = jobCode.split("-")[1];
-                }*/
                 if (p.getPosts() != null) {
                     if (p.getPosts().equals("1"))
                         jsyTempMap.put(jobCode, p);
 package com.bsth.data.directive;
  
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.LineConfigData;
 import com.bsth.entity.directive.D60;
@@ -21,6 +9,12 @@ import com.bsth.entity.directive.DirectiveReponse;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
  
 /**
  * 
@@ -42,6 +36,9 @@ public class DayOfDirectives {
 	//等待C0_A4回复的用户
 	//public static Map<K, V>
  
+	//等待入库的指令
+	public static LinkedList<Directive> pstDirectives;
+
 	@Autowired
 	DirectiveService directiveService;
  
@@ -57,14 +54,19 @@ public class DayOfDirectives {
 	static{
 		d60Map = new HashMap<>();
 		d64Map = new HashMap<>();
+		pstDirectives = new LinkedList<>();
 	}
  
 	public void put60(D60 d60) {
 		d60Map.put(d60.getMsgId(), d60);
+		//等待持久化
+		pstDirectives.add(d60);
 	}
  
 	public void put64(D64 d64) {
 		d64Map.put(d64.getKey(), d64);
+		//等待持久化
+		pstDirectives.add(d64);
 	}
  
 	/**
@@ -98,8 +100,9 @@ public class DayOfDirectives {
 			d60.setReply47Time(System.currentTimeMillis());
 			break;
 		}
-		// 入库
-		saveD60(d60);
+		// 等待持久化
+		if(!pstDirectives.contains(d60))
+			pstDirectives.add(d60);
  
 		ScheduleRealInfo sch = d60.getSch();
 		if (null == sch)
@@ -131,19 +134,20 @@ public class DayOfDirectives {
 				logger.warn("64响应 data is null ，json： " + json);
 			else {
 				d64.setRespAck(data.getShort("requestAck"));
-				// 响应入库
-				directiveService.save64(d64);
+				// 持久化
+				if(!pstDirectives.contains(d64))
+					pstDirectives.add(d64);
 			}
 		}
 	}
  
-	private void saveD60(D60 d60) {
+/*	private void saveD60(D60 d60) {
 		// 等47再入库
 		if (d60.getReply47() == null)
 			return;
  
 		directiveService.save(d60);
-	}
+	}*/
  
 	public void clear(String device){
 		int c60 = 0, c64 = 0;
+package com.bsth.data.directive;
+
+import com.bsth.entity.directive.D60;
+import com.bsth.entity.directive.D64;
+import com.bsth.entity.directive.Directive;
+import com.bsth.repository.directive.D60Repository;
+import com.bsth.repository.directive.D64Repository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 指令持久化线程
+ * Created by panzhao on 2017/3/6.
+ */
+@Component
+public class DirectivesPstThread extends Thread {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    D60Repository d60Repository;
+
+    @Autowired
+    D64Repository d64Repository;
+
+    @Override
+    public void run() {
+        LinkedList<Directive> list = DayOfDirectives.pstDirectives;
+
+        Directive directive;
+        for (int i = 0; i < 1000; i++) {
+            try {
+                directive = list.poll();
+
+                if (directive instanceof D60) {
+                    d60Repository.save((D60) directive);
+                }
+
+                if (directive instanceof D64) {
+                    d64Repository.save((D64) directive);
+                }
+            } catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+    }
+}
-package com.bsth.data.directive;
-
-import java.util.List;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.bsth.data.match.Arrival2Schedule;
-import com.bsth.data.match.ExpectArrivalEnd;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.directive.DirectiveService;
-
-/**
- * 
- * @ClassName: FirstScheduleCheckThread 
- * @Description: TODO(首班出场检测) 
- * @author PanZhao 
- * @date 2016年8月27日 上午1:25:21 
- *
- */
-@Component
-public class FirstScheduleCheckThread extends Thread{
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	@Autowired
-	DirectiveService directiveService;
-	
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-	
-	//提前半小时下发指令
-	private final static long THREE_MINUTES = 1000 * 60 * 30L;
-	
-	@Override
-	public void run() {
-		try{
-			Set<String> cars = dayOfSchedule.allCar();
-			
-			long t = System.currentTimeMillis();
-			List<ScheduleRealInfo> schList;
-			ScheduleRealInfo first;
-			for(String car : cars){
-
-				schList = dayOfSchedule.findByNbbm(car);
-				
-				if(null == schList || schList.size() == 0)
-					continue;
-				
-				first = schList.get(0);
-				
-				if(null != first.getBcType() 
-						&& first.getBcType().equals("out")){
-					
-					//没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令
-					if(first.getJhlc() == null && first.getXlDir().equals(schList.get(1).getXlDir()))
-						first = schList.get(1);
-					
-					//为首班补发指令
-					if(first.getDirectiveState() == -1
-							&& Math.abs(first.getDfsjT() - t) < THREE_MINUTES){
-						
-						directiveService.send60Dispatch(first, dayOfSchedule.doneSum(first.getClZbh()), "定补@系统");
-						//期望完成出场班次时间
-						long endTime;
-						
-						if(first.getZdsj() != null)
-							endTime=first.getZdsjT() - 60000;
-						else
-							endTime=schList.get(1).getDfsjT() - 60000;
-						
-						ExpectArrivalEnd ead = new ExpectArrivalEnd()
-									,ead2 = new ExpectArrivalEnd();
-						ead.setNbbm(car);
-						ead.setEndStation(first.getQdzCode());
-						ead.setEndTime(endTime);
-						
-						ead2.setNbbm(car);
-						ead2.setEndStation(first.getZdzCode());
-						ead2.setEndTime(endTime);
-						
-						Arrival2Schedule.addExpect(car, ead);
-						Arrival2Schedule.addExpect(car, ead2);
-					}
-				}
-			}
-		}catch(Exception e){
-			logger.error("", e);
-		}
-	}
-}
+//package com.bsth.data.directive;
+//
+//import java.util.List;
+//import java.util.Set;
+//
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import com.bsth.data.match.Arrival2Schedule;
+//import com.bsth.data.match.ExpectArrivalEnd;
+//import com.bsth.data.schedule.DayOfSchedule;
+//import com.bsth.entity.realcontrol.ScheduleRealInfo;
+//import com.bsth.service.directive.DirectiveService;
+//
+///**
+// *
+// * @ClassName: FirstScheduleCheckThread
+// * @Description: TODO(首班出场检测)
+// * @author PanZhao
+// * @date 2016年8月27日 上午1:25:21
+// *
+// */
+//@Component
+//public class FirstScheduleCheckThread extends Thread{
+//
+//	@Autowired
+//	DayOfSchedule dayOfSchedule;
+//
+//	@Autowired
+//	DirectiveService directiveService;
+//
+//	Logger logger = LoggerFactory.getLogger(this.getClass());
+//
+//	//提前半小时下发指令
+//	private final static long THREE_MINUTES = 1000 * 60 * 30L;
+//
+//	@Override
+//	public void run() {
+//		try{
+//			Set<String> cars = dayOfSchedule.allCar();
+//
+//			long t = System.currentTimeMillis();
+//			List<ScheduleRealInfo> schList;
+//			ScheduleRealInfo first;
+//			for(String car : cars){
+//
+//				schList = dayOfSchedule.findByNbbm(car);
+//
+//				if(null == schList || schList.size() == 0)
+//					continue;
+//
+//				first = schList.get(0);
+//
+//				if(null != first.getBcType()
+//						&& first.getBcType().equals("out")){
+//
+//					//没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令
+//					if(first.getJhlc() == null && first.getXlDir().equals(schList.get(1).getXlDir()))
+//						first = schList.get(1);
+//
+//					//为首班补发指令
+//					if(first.getDirectiveState() == -1
+//							&& Math.abs(first.getDfsjT() - t) < THREE_MINUTES){
+//
+//						directiveService.send60Dispatch(first, dayOfSchedule.doneSum(first.getClZbh()), "定补@系统");
+//						//期望完成出场班次时间
+//						long endTime;
+//
+//						if(first.getZdsj() != null)
+//							endTime=first.getZdsjT() - 60000;
+//						else
+//							endTime=schList.get(1).getDfsjT() - 60000;
+//
+//						ExpectArrivalEnd ead = new ExpectArrivalEnd()
+//									,ead2 = new ExpectArrivalEnd();
+//						ead.setNbbm(car);
+//						ead.setEndStation(first.getQdzCode());
+//						ead.setEndTime(endTime);
+//
+//						ead2.setNbbm(car);
+//						ead2.setEndStation(first.getZdzCode());
+//						ead2.setEndTime(endTime);
+//
+//						Arrival2Schedule.addExpect(car, ead);
+//						Arrival2Schedule.addExpect(car, ead2);
+//					}
+//				}
+//			}
+//		}catch(Exception e){
+//			logger.error("", e);
+//		}
+//	}
+//}
@@ -88,6 +88,9 @@ public class GpsEntity {
 	/** 越界距离 */
 	private double outOfBoundDistance;
  
+	/** gps是否有效 设备端发送的状态 */
+	private int valid;
+
 	public Integer getCompanyCode() {
 		return companyCode;
 	}
@@ -280,4 +283,12 @@ public class GpsEntity {
 	public void setOutOfBoundDistance(double outOfBoundDistance) {
 		this.outOfBoundDistance = outOfBoundDistance;
 	}
+
+	public int getValid() {
+		return valid;
+	}
+
+	public void setValid(int valid) {
+		this.valid = valid;
+	}
 }
@@ -3,6 +3,7 @@ package com.bsth.data.gpsdata;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
+import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.TreeMultimap;
@@ -35,6 +36,9 @@ public class GpsRealData implements CommandLineRunner {
     GpsDataLoaderThread gpsDataLoader;
  
     @Autowired
+    OfflineMonitorThread offlineMonitorThread;
+
+    @Autowired
     DayOfSchedule dayOfSchedule;
  
     @Autowired
@@ -54,9 +58,10 @@ public class GpsRealData implements CommandLineRunner {
         //定时从网关获取GPS数据
         //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
         //定时扫描掉离线
-
+        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
     }
  
+
     public void put(GpsEntity gps) {
         String device = gps.getDeviceId();
         GpsEntity old = gpsMap.get(device);
@@ -19,10 +19,22 @@ public abstract class SignalHandle {
         return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
     }
  
-    protected boolean isDriftSignal(GpsEntity gps) {
+/*    protected boolean isDriftSignal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }*/
+
+    /**
+     * gps掉线
+     * @param gps
+     * @return
+     */
+    protected boolean isGpsOffline(GpsEntity gps){
         return gps.getLat() == 0 || gps.getLon() == 0;
     }
  
+    protected boolean isOffline(GpsEntity gps){
+        return gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline");
+    }
     /**
      * 是不是异常信号
      *
@@ -34,7 +46,7 @@ public abstract class SignalHandle {
     /**
      * 连续异常信号个数统计
      *
-     * @param prevs
+     * @param
      * @return protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
      * int count = 0;
      * <p>
@@ -58,10 +70,12 @@ public abstract class SignalHandle {
  
     protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
         int updown = Integer.parseInt(sch.getXlDir());
+        //gps 切换走向
+        gps.setUpDown(updown);
+
         List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
         StationRoute station = GeoUtils.gpsInStation(gps, srs);
         if (station != null) {
-            gps.setUpDown(updown);
             gps.setStopNo(station.getCode());
         }
     }
@@ -78,9 +92,9 @@ public abstract class SignalHandle {
             return false;
  
         GpsEntity prev = prevs.getTail();
-        //从漂移状态恢复
-        if (isDriftSignal(prev)
-                && !isDriftSignal(gps)) {
+        //从异常状态恢复
+        if (isGpsOffline(prev)
+                && !isGpsOffline(gps)) {
             return true;
         }
  
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 到离站信息
+ * Created by panzhao on 2017/2/20.
+ */
+public class ArrivalInfo {
+
+    private String lineCode;
+
+    private String deviceId;
+
+    /** 时间戳 */
+    private Long ts;
+
+    private String stop;
+
+    private Integer upDown;
+
+    private int inOut;
+
+
+}
@@ -30,6 +30,9 @@ public class AbnormalStateHandle extends SignalHandle{
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
  
+        if(isOffline(gps))
+            return false;
+
         if(overspeed(gps))
             return true;
  
@@ -46,10 +46,13 @@ public class InOutStationSignalHandle extends SignalHandle{
  
     private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
  
+    //最大的班次时间差，防止异常的GPS时间打乱数据
+    private final static int MAX_NORMAL_DIFF = 1000 * 60 * 60 * 12;
+
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //忽略漂移信号
-        if(isDriftSignal(gps))
+        //忽略掉线信号
+        if(isGpsOffline(gps))
             return false;
  
         //从异常状态恢复的第一个信号
@@ -106,8 +109,14 @@ public class InOutStationSignalHandle extends SignalHandle{
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         String qdzCode = sch.getQdzCode();
  
+        int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
+
         //首班出场最多提前1.2小时
-        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+        if(dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME)
+            return;
+
+        //正常班次最大时间差
+        if(Math.abs(diff) > MAX_NORMAL_DIFF)
             return;
  
         //起点发车
@@ -169,8 +178,18 @@ public class InOutStationSignalHandle extends SignalHandle{
  
         if(gps.getStopNo().equals(sch.getZdzCode())){
  
+            int diff = 0;
+            try{
+                diff = (int) (sch.getZdsjT() - gps.getTimestamp());
+            }catch(NullPointerException e){
+                logger.info("NullPointerException " + sch.getXlName() + " 有班次无班次历时，，，检查一下是否需要出站既出场。");
+            }
             //进场最多提前1.2小时
-            if(sch.getBcType().equals("in") && sch.getZdsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+            if(sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME)
+                return;
+
+            //正常班次最大时间差
+            if(Math.abs(diff) > MAX_NORMAL_DIFF)
                 return;
  
             //实达时间不覆盖
@@ -195,7 +214,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 //进站既进场
                 inStationAndInPark(sch, next);
                 //将gps转换为下一个班次走向的站内信号
-                transformUpdown(gps, sch);
+                transformUpdown(gps, next);
             }
         }
         else if(sch.getFcsjActual() == null){
@@ -217,6 +236,11 @@ public class InOutStationSignalHandle extends SignalHandle{
  
             sendUtils.refreshSch(next);
             dayOfSchedule.save(next);
+
+            //分班的时候，需要再跳过1个班次
+            next = dayOfSchedule.next(next);
+            if(next != null)
+                dayOfSchedule.addExecPlan(next);
         }
     }
  
@@ -21,9 +21,10 @@ public class OfflineSignalHandle extends SignalHandle{
  
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //漂移信号不管
-        if(isDriftSignal(gps)){
+        //掉线信号不管
+        if(isGpsOffline(gps)){
             gps.setSignalState("drift");
+            gps.setAbnormalStatus("gps-offline");
             return true;
         }
  
@@ -88,6 +88,7 @@ public class GpsDataLoaderThread extends Thread {
                 String nbbm;
                 GpsEntity old;
                 for (GpsEntity gps : list) {
+
                     //没有设备号
                     if (StringUtils.isBlank(gps.getDeviceId()))
                         continue;
@@ -2,7 +2,11 @@ package com.bsth.data.gpsdata.thread;
  
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
  
 import java.util.Collection;
  
@@ -10,35 +14,45 @@ import java.util.Collection;
  * GPS掉离线监控
  * Created by panzhao on 2017/1/11.
  */
+@Component
 public class OfflineMonitorThread extends Thread{
  
     @Autowired
     GpsRealData gpsRealData;
  
-    //有任务时 掉线阈值
-    private final static int LOSE_TIME = 1000 * 60 * 2;
+    //掉线阈值
+    private final static int LOSE_TIME = 1000 * 60 * 10;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    SendUtils sendUtils;
  
     //无任务时 离线阈值
-    private final static int OFFLINE_TIME = 1000 * 60 * 10;
+    //private final static int OFFLINE_TIME = 1000 * 60 * 10;
  
     @Override
     public void run() {
-        long t = System.currentTimeMillis();
-        Collection<GpsEntity> list = gpsRealData.all();
-
-        String state;
-        for(GpsEntity gps : list){
-            state = gps.getAbnormalStatus();
-
-            if(state.equals("offline"))
-                continue;
-
-
-            //if(state.equals("lose"))
-            //if(!state.equals("lose"))
-            //if(state.equals(""))
-            //if(gps.getTimestamp())
-            //if(gps.getAbnormalStatus().equals("lose"))
+        try{
+            long t = System.currentTimeMillis();
+            Collection<GpsEntity> list = gpsRealData.all();
+
+            String state;
+            for(GpsEntity gps : list){
+                state = gps.getAbnormalStatus();
+
+                if(state != null && state.equals("offline"))
+                    continue;
+
+                if (t - gps.getTimestamp() > LOSE_TIME){
+                    gps.setAbnormalStatus("offline");
+
+                    //通知页面有设备掉线
+                    sendUtils.deviceOffline(gps);
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
         }
     }
 }
@@ -5,13 +5,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.directive.FirstScheduleCheckThread;
+import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
-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.data.schedule.thread.*;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -49,6 +46,9 @@ public class DayOfSchedule implements CommandLineRunner {
  
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
+    //按线路分组的 “计划” 排班数据
+    public static Map<String, List<SchedulePlanInfo>> schedulePlanMap;
+
     // 按车辆分组的班次数据
     private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
  
@@ -101,6 +101,8 @@ public class DayOfSchedule implements CommandLineRunner {
         currSchDateMap = new HashMap<>();
         nbbm2SEStationMap = TreeMultimap.create();
         carExecutePlanMap = new HashMap<>();
+
+        schedulePlanMap = new HashMap<>();
     }
  
     @Autowired
@@ -110,9 +112,6 @@ public class DayOfSchedule implements CommandLineRunner {
     SchedulePstThread schedulePstThread;
  
     @Autowired
-    FirstScheduleCheckThread firstScheduleCheckThread;
-
-    @Autowired
     ScheduleLateThread scheduleLateThread;
  
     @Autowired
@@ -124,6 +123,12 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     GpsDataRecovery gpsDataRecovery;
  
+    @Autowired
+    DirectivesPstThread directivesPstThread;
+
+    @Autowired
+    CalcOilThread calcOilThread;
+
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
  
     @Override
@@ -135,9 +140,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //翻班线程
         Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
-//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
-        //首班出场指令补发器
-//		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
 //        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
  
@@ -148,6 +151,12 @@ public class DayOfSchedule implements CommandLineRunner {
  
         logger.info(diff / 1000 / 60 + "分钟之后提交到运管处");
         //Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+
+        //计算油、公里加注
+        Application.mainServices.scheduleWithFixedDelay(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+
+        //指令持久化线程
+        Application.mainServices.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
     }
  
     //数据恢复
@@ -328,6 +337,8 @@ public class DayOfSchedule implements CommandLineRunner {
  
             // 查询计划排班
             List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
+            //保存一份原始计划排班数据
+            schedulePlanMap.put(lineCode, planItr);
  
             // 转换为实际排班
             realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
@@ -367,13 +378,16 @@ public class DayOfSchedule implements CommandLineRunner {
                     sch.setZdsj(fmtHHmm.print(fmtHHmm.parseMillis(sch.getFcsj()) + (sch.getBcsj() * 60 * 1000)));
                     sch.setLate(false);
                 }
+
+                sch.setJhlcOrig(sch.getJhlc());
                 //计划里程为0，设置NULL
-                if (sch.getJhlc() != null && sch.getJhlc() == 0)
-                    sch.setJhlc(null);
+                //if (sch.getJhlc() != null && sch.getJhlc() == 0)
+                //    sch.setJhlc(null);
             }
         } catch (Exception e) {
             logger.error("", e);
         }
+
         return realList;
     }
  
@@ -399,13 +413,15 @@ public class DayOfSchedule implements CommandLineRunner {
         new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
     }
  
-    private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
+    public List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
         List<SchedulePlanInfo> list = new ArrayList<>();
  
         SchedulePlanInfo sp;
         while (itrab.hasNext()) {
             sp = itrab.next();
             sp.setSchedulePlan(null);
+            sp.setCreateBy(null);
+            sp.setUpdateBy(null);
             list.add(sp);
         }
         return list;
@@ -480,6 +496,9 @@ public class DayOfSchedule implements CommandLineRunner {
         if (config != null)
             outConfig = config.getOutConfig();
  
+        //限定出站既出场的停车场
+        String park = config.getTwinsPark();
+        boolean limitPark = StringUtils.isNotEmpty(park);
         boolean flag = false;
         ScheduleRealInfo next = null;
         for (ScheduleRealInfo temp : list) {
@@ -492,7 +511,8 @@ public class DayOfSchedule implements CommandLineRunner {
                 continue;
  
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out"))
+            if (outConfig == 2 && temp.getBcType().equals("out")
+                    && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
  
             if (flag) {
@@ -515,6 +535,9 @@ public class DayOfSchedule implements CommandLineRunner {
         if (config != null)
             outConfig = config.getOutConfig();
  
+        //限定出站既出场的停车场
+        String park = config.getTwinsPark();
+        boolean limitPark = StringUtils.isNotEmpty(park);
         boolean flag = false;
         ScheduleRealInfo next = null;
         for (ScheduleRealInfo temp : list) {
@@ -527,7 +550,8 @@ public class DayOfSchedule implements CommandLineRunner {
                 continue;
  
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out"))
+            if (outConfig == 2 && temp.getBcType().equals("out")
+                    && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
  
             if (flag && temp.getXlDir().equals(sch.getXlDir())) {
@@ -611,6 +635,7 @@ public class DayOfSchedule implements CommandLineRunner {
 //	}
  
     public List<ScheduleRealInfo> updateQdzTimePlan(String nbbm) {
+        Collections.sort(nbbmScheduleMap.get(nbbm), schFCSJComparator);
         return schAttrCalculator.updateQdzTimePlan(nbbmScheduleMap.get(nbbm));
     }
  
@@ -763,6 +788,8 @@ public class DayOfSchedule implements CommandLineRunner {
     public void addExecPlan(ScheduleRealInfo sch) {
         if(sch != null)
             carExecutePlanMap.put(sch.getClZbh(), sch);
+        else
+            carExecutePlanMap.remove(sch.getClZbh());
     }
  
     public void removeExecPlan(String clzbh) {
@@ -814,6 +841,14 @@ public class DayOfSchedule implements CommandLineRunner {
         return ups;
     }
  
+    public void removeNbbm2SchMapp(ScheduleRealInfo sch, String nbbm){
+        nbbmScheduleMap.remove(nbbm, sch);
+    }
+
+    public void addNbbm2SchMapp(ScheduleRealInfo sch, String nbbm){
+        nbbmScheduleMap.put(nbbm, sch);
+    }
+
     public void reCalcExecPlan(String nbbm){
         carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(nbbmScheduleMap.get(nbbm)));
     }
+package com.bsth.data.schedule.thread;
+
+import com.bsth.service.oil.YlbService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 计算油、公里加注量 线程
+ * Created by panzhao on 2017/3/7.
+ */
+@Component
+public class CalcOilThread extends Thread{
+
+    @Autowired
+    YlbService ylbService;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try{
+            logger.info("开始计算路单里程加注量....");
+            ylbService.obtainDsq();
+            logger.info("计算路单里程加注量结束！");
+        } catch(Exception e){
+            logger.error("计算路单里程加注量失败",e);
+        }
+    }
+}
 package com.bsth.data.schedule.thread;
  
 import com.bsth.service.TrafficManageService;
-import com.bsth.service.oil.YlbService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,18 +17,10 @@ public class SubmitToTrafficManage extends Thread{
  
     @Autowired
     TrafficManageService trafficManageService;
-    
-    @Autowired
-    YlbService YlbService;
  
     @Override
     public void run() {
         logger.info("开始提交数据到运管处...");
-        try{
-        	YlbService.obtainDsq();
-        } catch(Exception e){
-        	logger.error("计算路单里程加注量失败",e);
-        }
  
         try {
             //路单
@@ -52,7 +52,7 @@ public class SectionRoute {
 	// 是否撤销
 	private Integer destroy;
  
-	/** 是否有路段限速数据  <0：无；1：有>*/
+	/** 是否有路段限速数据  <0：未分段；1：分段>*/
 	private Integer isRoadeSpeed;
  
 	// 描述
+package com.bsth.entity.logger;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * 操作日志通用字段
+ * Created by panzhao on 2017/3/6.
+ */
+@MappedSuperclass
+public abstract class Logger {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 用户信息 */
+    private String userName;
+    private String name;
+
+    /** ########## 客户端信息 ########### */
+    /** ip */
+    private String clientIp;
+    /** 浏览器 */
+    private String browser;
+    /** 系统平台 */
+    private String clientSystem;
+    /** 浏览器内核 */
+    private String browserCore;
+
+    /** 操作时间 */
+    private Long ts;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getClientIp() {
+        return clientIp;
+    }
+
+    public void setClientIp(String clientIp) {
+        this.clientIp = clientIp;
+    }
+
+    public String getBrowser() {
+        return browser;
+    }
+
+    public void setBrowser(String browser) {
+        this.browser = browser;
+    }
+
+    public String getClientSystem() {
+        return clientSystem;
+    }
+
+    public void setClientSystem(String clientSystem) {
+        this.clientSystem = clientSystem;
+    }
+
+    public String getBrowserCore() {
+        return browserCore;
+    }
+
+    public void setBrowserCore(String browserCore) {
+        this.browserCore = browserCore;
+    }
+
+    public Long getTs() {
+        return ts;
+    }
+
+    public void setTs(Long ts) {
+        this.ts = ts;
+    }
+}
+package com.bsth.entity.logger;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * 操作日志 -修改公里
+ * Created by panzhao on 2017/3/6.
+ */
+@Entity
+@Table(name = "logger_mile_modify")
+public class Logger_MileModify extends Logger{
+
+    /** 之前的公里 */
+    private Double beforeMile;
+
+    /** 修改之后的公里 */
+    private Double afterMile;
+
+    /** 线路  code/name */
+    private String lineStr;
+
+    /** 路牌 */
+    private String lp;
+
+    /** 车辆自编号 */
+    private String nbbm;
+
+    /** 发车时间 */
+    private String fcsj;
+
+    /** 班次ID */
+    private Long schId;
+
+    /** 备注 */
+    private String remarks;
+
+    public Double getBeforeMile() {
+        return beforeMile;
+    }
+
+    public void setBeforeMile(Double beforeMile) {
+        this.beforeMile = beforeMile;
+    }
+
+    public Double getAfterMile() {
+        return afterMile;
+    }
+
+    public void setAfterMile(Double afterMile) {
+        this.afterMile = afterMile;
+    }
+
+    public String getLineStr() {
+        return lineStr;
+    }
+
+    public void setLineStr(String lineStr) {
+        this.lineStr = lineStr;
+    }
+
+    public String getLp() {
+        return lp;
+    }
+
+    public void setLp(String lp) {
+        this.lp = lp;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public Long getSchId() {
+        return schId;
+    }
+
+    public void setSchId(Long schId) {
+        this.schId = schId;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+}
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import com.bsth.data.BasicData;
+
+@Entity
+@Table(name = "bsth_c_cdl")
+public class Cdl {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	private String nbbm;
+	
+	//存电量
+	private Double cdl;
+	
+	private Date updatetime;
+
+	//恒定存电
+	private Double clcd;
+	//公司代码
+	private String gsdm;
+	
+	@Transient
+	private String gsname;
+	
+	@Transient
+	private String fgsname;
+	
+	//分公司代码
+	private String fgsdm;
+	
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+
+	public Double getCdl() {
+		return cdl;
+	}
+
+	public void setCdl(Double cdl) {
+		this.cdl = cdl;
+	}
+
+	public Double getClcd() {
+		return clcd;
+	}
+
+	public void setClcd(Double clcd) {
+		this.clcd = clcd;
+	}
+
+	public Date getUpdatetime() {
+		return updatetime;
+	}
+
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
+	}
+	
+
+	public String getGsdm(){
+		return gsdm;
+	}
+	
+	public void setGsdm(String gsdm){
+		this.gsdm=gsdm;
+	}
+
+	public String getFgsdm() {
+		return fgsdm;
+	}
+
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+
+	public String getGsname() {
+		return BasicData.businessCodeNameMap.get(this.gsdm);
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+	
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+	
+	
+}
+package com.bsth.entity.oil;
+
+import java.text.DecimalFormat;
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.bsth.data.BasicData;
+
+@Entity
+@Table(name = "bsth_c_dlb")
+public class Dlb {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date rq;
+	private String xlbm;
+	private String ssgsdm;
+	private String fgsdm;
+	private String nbbm;
+	private String jsy;
+	private Double czlc=0.0;
+	private Double jzlc=0.0;
+	//出站存电
+	private Double czcd=0.0;
+	//进站存电
+	private Double jzcd=0.0;
+	//充电量
+	private Double cdl;
+	private int sfkt;
+	private String jhsj;
+	//耗电
+	private Double hd=0.0;
+	private Double sh=0.0;
+	private String shyy;
+	private Double zlc=0.0;
+	private int yhlx;
+	
+	private Double ns=0.0;
+	private Double fyylc=0.0;
+	private Double jhzlc=0.0;
+	private Double jhfyylc=0.0;
+	private int jhzbc;
+	private int jhbc;
+	private int sjzbc;
+	private int sjbc;
+	private String edituser;
+	private Date edittime;
+	private Date createtime;
+	private int nylx;
+	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
+	private int jcsx;
+	
+	@Transient
+	private String bglyh;
+	
+	@Transient
+	private String xlname;
+	
+	@Transient
+	private String gsname;
+	
+	
+	
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Date getRq() {
+		return rq;
+	}
+
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+
+	public String getXlbm() {
+		return xlbm;
+	}
+
+	public void setXlbm(String xlbm) {
+		this.xlbm = xlbm;
+	}
+
+	public String getSsgsdm() {
+		return ssgsdm;
+	}
+
+	public void setSsgsdm(String ssgsdm) {
+		this.ssgsdm = ssgsdm;
+	}
+
+	public String getFgsdm() {
+		return fgsdm;
+	}
+
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public Double getCzlc() {
+		return czlc;
+	}
+
+	public void setCzlc(Double czlc) {
+		this.czlc = czlc;
+	}
+
+	public Double getJzlc() {
+		return jzlc;
+	}
+
+	public void setJzlc(Double jzlc) {
+		this.jzlc = jzlc;
+	}
+
+	public Double getCzcd() {
+		return czcd;
+	}
+
+	public void setCzcd(Double czcd) {
+		this.czcd = czcd;
+	}
+
+	public Double getJzcd() {
+		return jzcd;
+	}
+
+	public void setJzcd(Double jzcd) {
+		this.jzcd = jzcd;
+	}
+
+	public Double getCdl() {
+		return cdl;
+	}
+
+	public void setCdl(Double cdl) {
+		this.cdl = cdl;
+	}
+
+	public int getSfkt() {
+		return sfkt;
+	}
+
+	public void setSfkt(int sfkt) {
+		this.sfkt = sfkt;
+	}
+
+	public String getJhsj() {
+		return jhsj;
+	}
+
+	public void setJhsj(String jhsj) {
+		this.jhsj = jhsj;
+	}
+
+	public Double getHd() {
+		return hd;
+	}
+
+	public void setHd(Double hd) {
+		this.hd = hd;
+	}
+
+	public Double getSh() {
+		return sh;
+	}
+
+	public void setSh(Double sh) {
+		this.sh = sh;
+	}
+
+	public String getShyy() {
+		return shyy;
+	}
+
+	public void setShyy(String shyy) {
+		this.shyy = shyy;
+	}
+
+	public Double getZlc() {
+		return zlc;
+	}
+
+	public void setZlc(Double zlc) {
+		this.zlc = zlc;
+	}
+
+	public int getYhlx() {
+		return yhlx;
+	}
+
+	public void setYhlx(int yhlx) {
+		this.yhlx = yhlx;
+	}
+
+	public Double getNs() {
+		return ns;
+	}
+
+	public void setNs(Double ns) {
+		this.ns = ns;
+	}
+
+	public Double getFyylc() {
+		return fyylc;
+	}
+
+	public void setFyylc(Double fyylc) {
+		this.fyylc = fyylc;
+	}
+
+	public Double getJhzlc() {
+		return jhzlc;
+	}
+
+	public void setJhzlc(Double jhzlc) {
+		this.jhzlc = jhzlc;
+	}
+
+	public Double getJhfyylc() {
+		return jhfyylc;
+	}
+
+	public void setJhfyylc(Double jhfyylc) {
+		this.jhfyylc = jhfyylc;
+	}
+
+	public int getJhzbc() {
+		return jhzbc;
+	}
+
+	public void setJhzbc(int jhzbc) {
+		this.jhzbc = jhzbc;
+	}
+
+	public int getJhbc() {
+		return jhbc;
+	}
+
+	public void setJhbc(int jhbc) {
+		this.jhbc = jhbc;
+	}
+
+	public int getSjzbc() {
+		return sjzbc;
+	}
+
+	public void setSjzbc(int sjzbc) {
+		this.sjzbc = sjzbc;
+	}
+
+	public int getSjbc() {
+		return sjbc;
+	}
+
+	public void setSjbc(int sjbc) {
+		this.sjbc = sjbc;
+	}
+
+	public String getEdituser() {
+		return edituser;
+	}
+
+	public void setEdituser(String edituser) {
+		this.edituser = edituser;
+	}
+
+	public Date getEdittime() {
+		return edittime;
+	}
+
+	public void setEdittime(Date edittime) {
+		this.edittime = edittime;
+	}
+
+	public Date getCreatetime() {
+		return createtime;
+	}
+
+	public void setCreatetime(Date createtime) {
+		this.createtime = createtime;
+	}
+
+	public int getNylx() {
+		return nylx;
+	}
+
+	public void setNylx(int nylx) {
+		this.nylx = nylx;
+	}
+
+	public int getJcsx() {
+		return jcsx;
+	}
+
+	public void setJcsx(int jcsx) {
+		this.jcsx = jcsx;
+	}
+
+	public String getBglyh() {
+		if(this.getZlc()==0){
+			return "0.00";
+		}else{
+			DecimalFormat df = new DecimalFormat("0.00");
+			return df.format(this.getHd()/this.getZlc()*100);
+		}
+	}
+
+	public void setBglyh(String bglyh) {
+		this.bglyh = bglyh;
+	}
+
+	public String getXlname() {
+		return BasicData.lineCode2NameMap.get(this.xlbm);
+	}
+
+	public void setXlname(String xlname) {
+		this.xlname = xlname;
+	}
+
+	public String getGsname() {
+		return 	BasicData.businessCodeNameMap.get(this.ssgsdm);
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+	
+	
+}
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Entity
+@Table(name = "bsth_c_jdl")
+public class Jdl {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date rq;
+	private String gsBm;
+	private String gsName;
+	private String fgsBm;
+	private String fgsName;
+	private String nbbm;
+	private Double jdl = 0.0;
+	private String jdz;
+	private String remarks;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createrDate;
+	
+	
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Date getRq() {
+		return rq;
+	}
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+	public String getGsBm() {
+		return gsBm;
+	}
+	public void setGsBm(String gsBm) {
+		this.gsBm = gsBm;
+	}
+	public String getGsName() {
+		return gsName;
+	}
+	public void setGsName(String gsName) {
+		this.gsName = gsName;
+	}
+	public String getFgsBm() {
+		return fgsBm;
+	}
+	public void setFgsBm(String fgsBm) {
+		this.fgsBm = fgsBm;
+	}
+	public String getFgsName() {
+		return fgsName;
+	}
+	public void setFgsName(String fgsName) {
+		this.fgsName = fgsName;
+	}
+	public String getNbbm() {
+		return nbbm;
+	}
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+	public Double getJdl() {
+		return jdl;
+	}
+	public void setJdl(Double jdl) {
+		this.jdl = jdl;
+	}
+	public String getJdz() {
+		return jdz;
+	}
+	public void setJdz(String jdz) {
+		this.jdz = jdz;
+	}
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	public Date getCreaterDate() {
+		return createrDate;
+	}
+	public void setCreaterDate(Date createrDate) {
+		this.createrDate = createrDate;
+	}
+	
+}
@@ -47,6 +47,9 @@ public class LineConfig {
 	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
 	private int outConfig;
  
+	/** 出站既出场 对应的停车场 */
+	private String twinsPark;
+
 	/** 短语模板 , 号分隔多个 */
 	private String phraseTemps;
  
@@ -56,6 +59,23 @@ public class LineConfig {
 	/** 识别区间调头 */
 	private boolean readReverse;
  
+	/** 原线路回场 */
+	private boolean inParkForSource;
+
+	/**
+	 * 到离站偏移值
+	 */
+
+	//上行进站
+	private int upInDiff;
+	//上行出站
+	private int upOutDiff;
+	//下行进站
+	private int downInDiff;
+	//下行出站
+	private int downOutDiff;
+
+
 	@OneToMany(cascade = CascadeType.ALL)
 	private Set<D80ReplyTemp> d80Temps = new HashSet<>();
  
@@ -151,4 +171,52 @@ public class LineConfig {
 	public void setReadReverse(boolean readReverse) {
 		this.readReverse = readReverse;
 	}
+
+	public boolean isInParkForSource() {
+		return inParkForSource;
+	}
+
+	public void setInParkForSource(boolean inParkForSource) {
+		this.inParkForSource = inParkForSource;
+	}
+
+	public int getUpInDiff() {
+		return upInDiff;
+	}
+
+	public void setUpInDiff(int upInDiff) {
+		this.upInDiff = upInDiff;
+	}
+
+	public int getUpOutDiff() {
+		return upOutDiff;
+	}
+
+	public void setUpOutDiff(int upOutDiff) {
+		this.upOutDiff = upOutDiff;
+	}
+
+	public int getDownInDiff() {
+		return downInDiff;
+	}
+
+	public void setDownInDiff(int downInDiff) {
+		this.downInDiff = downInDiff;
+	}
+
+	public int getDownOutDiff() {
+		return downOutDiff;
+	}
+
+	public void setDownOutDiff(int downOutDiff) {
+		this.downOutDiff = downOutDiff;
+	}
+
+	public String getTwinsPark() {
+		return twinsPark;
+	}
+
+	public void setTwinsPark(String twinsPark) {
+		this.twinsPark = twinsPark;
+	}
 }
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 社会加油站
+ * Created by panzhao on 2017/3/16.
+ */
+@Entity
+@Table(name = "bsth_c_oil_station")
+public class OilStationSociety {
+
+    @Id
+    private String lineCode;
+
+    /**
+     * 加油站名称
+     */
+    private String stationName;
+
+    /**
+     * 上行进场距离
+     */
+    private Double upInMile;
+    /**
+     * 上行出场距离
+     */
+    private Double upOutMile;
+
+    /**
+     * 下行进场距离
+     */
+    private Double downInMile;
+    /**
+     * 下行出场距离
+     */
+    private Double downOutMile;
+
+
+    /**
+     * 上行进场时间 分钟
+     */
+    private int upInTime;
+    /**
+     * 上行出场时间 分钟
+     */
+    private int upOutTime;
+
+    /**
+     * 下行进场时间 分钟
+     */
+    private int downInTime;
+    /**
+     * 下行出场时间 分钟
+     */
+    private int downOutTime;
+
+
+    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 Double getUpInMile() {
+        return upInMile;
+    }
+
+    public void setUpInMile(Double upInMile) {
+        this.upInMile = upInMile;
+    }
+
+    public Double getUpOutMile() {
+        return upOutMile;
+    }
+
+    public void setUpOutMile(Double upOutMile) {
+        this.upOutMile = upOutMile;
+    }
+
+    public Double getDownInMile() {
+        return downInMile;
+    }
+
+    public void setDownInMile(Double downInMile) {
+        this.downInMile = downInMile;
+    }
+
+    public Double getDownOutMile() {
+        return downOutMile;
+    }
+
+    public void setDownOutMile(Double downOutMile) {
+        this.downOutMile = downOutMile;
+    }
+
+    public int getUpInTime() {
+        return upInTime;
+    }
+
+    public void setUpInTime(int upInTime) {
+        this.upInTime = upInTime;
+    }
+
+    public int getUpOutTime() {
+        return upOutTime;
+    }
+
+    public void setUpOutTime(int upOutTime) {
+        this.upOutTime = upOutTime;
+    }
+
+    public int getDownInTime() {
+        return downInTime;
+    }
+
+    public void setDownInTime(int downInTime) {
+        this.downInTime = downInTime;
+    }
+
+    public int getDownOutTime() {
+        return downOutTime;
+    }
+
+    public void setDownOutTime(int downOutTime) {
+        this.downOutTime = downOutTime;
+    }
+}
@@ -87,6 +87,12 @@ public class ScheduleRealInfo {
 	private Integer bcs;
 	/** 计划里程 */
 	private Double jhlc;
+
+	/** 原始计划里程 （原计调的数据） */
+	private Double jhlcOrig;
+
+	/** 实际里程  这个字段被废弃*/
+	private Double realMileage;
  
 	/** 实际里程 */
 	@Transient
@@ -344,6 +350,8 @@ public class ScheduleRealInfo {
 	}
  
 	public String getsGh() {
+		if(sGh == null)
+			return "";
 		return sGh;
 	}
  
@@ -352,6 +360,8 @@ public class ScheduleRealInfo {
 	}
  
 	public String getsName() {
+		if(sGh == null)
+			return "";
 		return sName;
 	}
  
@@ -616,6 +626,11 @@ public class ScheduleRealInfo {
 		}
 	}
  
+	@Override
+	public int hashCode() {
+		return ("schedule_" + this.id).hashCode();
+	}
+
 	public String getQdzArrDateJH() {
 		return qdzArrDatejh;
 	}
@@ -750,6 +765,7 @@ public class ScheduleRealInfo {
 	}
  
 	public void destroy(){
+		this.jhlc = 0.0;
 		this.status = -1;
 	}
  
@@ -830,4 +846,20 @@ public class ScheduleRealInfo {
 	public void setReissue(boolean reissue) {
 		this.reissue = reissue;
 	}
+
+	public Double getRealMileage() {
+		return realMileage;
+	}
+
+	public void setRealMileage(Double realMileage) {
+		this.realMileage = realMileage;
+	}
+
+	public Double getJhlcOrig() {
+		return jhlcOrig;
+	}
+
+	public void setJhlcOrig(Double jhlcOrig) {
+		this.jhlcOrig = jhlcOrig;
+	}
 }
 package com.bsth.entity.schedule;
  
+import com.bsth.entity.CarPark;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -47,9 +48,16 @@ public class CarConfigInfo extends BEntity implements Serializable {
     private Date qyrq;
     /** 终止日期 */
     private Date zzrq;
+
+
     @Column(nullable = false)
     /** 停车点（TODO：这个不知道是否要关联）*/
     private String tcd;
+
+    /** 停车场关联（出场，进场班次会关联停车场） */
+    @ManyToOne(cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+    private CarPark tcc;
+
     /** 受否切换 0或者1（TODO：不懂，貌似喝历史配车有关） */
     @Column(nullable = false)
     private int isSwitch;
@@ -58,6 +66,26 @@ public class CarConfigInfo extends BEntity implements Serializable {
     @Column(nullable = false)
     private Boolean isCancel = false;
  
+    //-------------- 车辆配置的停车场及相关信息 ------------//
+    /** 车辆配置-CheLiangPeiZhi 字典，ZW(早晚)，FS(复驶)，BSY(不使用) */
+    private String pzType;
+    /** 上行出场里程 */
+    private Double upOutLc;
+    /** 上行出场时间 */
+    private Double upOutSj;
+    /** 下行出场里程 */
+    private Double downOutLc;
+    /** 下行出场时间 */
+    private Double downOutSj;
+    /** 上行进场里程 */
+    private Double upInLc;
+    /** 上行进场时间 */
+    private Double upInSj;
+    /** 下行进场里程 */
+    private Double downInLc;
+    /** 下行进场时间 */
+    private Double downInSj;
+
     public CarConfigInfo() {}
     public CarConfigInfo(Object id, Object xlid, Object xlname, Object clid) {
         if (id != null) {
@@ -156,4 +184,84 @@ public class CarConfigInfo extends BEntity implements Serializable {
     public void setIsCancel(Boolean isCancel) {
         this.isCancel = isCancel;
     }
+
+    public String getPzType() {
+        return pzType;
+    }
+
+    public void setPzType(String pzType) {
+        this.pzType = pzType;
+    }
+
+    public Double getUpOutLc() {
+        return upOutLc;
+    }
+
+    public void setUpOutLc(Double upOutLc) {
+        this.upOutLc = upOutLc;
+    }
+
+    public Double getUpOutSj() {
+        return upOutSj;
+    }
+
+    public void setUpOutSj(Double upOutSj) {
+        this.upOutSj = upOutSj;
+    }
+
+    public Double getDownOutLc() {
+        return downOutLc;
+    }
+
+    public void setDownOutLc(Double downOutLc) {
+        this.downOutLc = downOutLc;
+    }
+
+    public Double getDownOutSj() {
+        return downOutSj;
+    }
+
+    public void setDownOutSj(Double downOutSj) {
+        this.downOutSj = downOutSj;
+    }
+
+    public Double getUpInLc() {
+        return upInLc;
+    }
+
+    public void setUpInLc(Double upInLc) {
+        this.upInLc = upInLc;
+    }
+
+    public Double getUpInSj() {
+        return upInSj;
+    }
+
+    public void setUpInSj(Double upInSj) {
+        this.upInSj = upInSj;
+    }
+
+    public Double getDownInLc() {
+        return downInLc;
+    }
+
+    public void setDownInLc(Double downInLc) {
+        this.downInLc = downInLc;
+    }
+
+    public Double getDownInSj() {
+        return downInSj;
+    }
+
+    public void setDownInSj(Double downInSj) {
+        this.downInSj = downInSj;
+    }
+
+    public CarPark getTcc() {
+        return tcc;
+    }
+
+    public void setTcc(CarPark tcc) {
+        this.tcc = tcc;
+    }
 }
@@ -2,7 +2,6 @@ package com.bsth.entity.schedule;
  
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.rule.ScheduleRule1;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnore;
  
 import javax.persistence.*;
@@ -21,7 +20,7 @@ import java.util.List;
             @NamedAttributeNode("ttInfo")
         })
 })
-public class SchedulePlan {
+public class SchedulePlan extends BEntity {
  
     /** 主键Id */
     @Id
@@ -60,19 +59,6 @@ public class SchedulePlan {
     @OneToMany(mappedBy = "schedulePlan", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<SchedulePlanInfo> schedulePlanInfoList = new ArrayList<>();
  
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -129,38 +115,6 @@ public class SchedulePlan {
         this.schedulePlanInfoList = schedulePlanInfoList;
     }
  
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public String getTtInfoNames() {
         return ttInfoNames;
     }
@@ -157,9 +157,13 @@ public class SchedulePlanInfo {
             Line xl,
             ScheduleResult_output scheduleResult_output,
             TTInfoDetail ttInfoDetail,
+            Boolean isFb,
             CarConfigInfo carConfigInfo,
             List<EmployeeConfigInfo> employeeConfigInfoList,
-            SchedulePlan schedulePlan) {
+            SchedulePlan schedulePlan,
+            boolean isFirstBc, // 是否第一个班次
+            boolean isLastBc // 是否最后一个班次
+        ) {
  
         // TODO：关联的公司名称
         // TODO：关联的公司编码
@@ -191,7 +195,7 @@ public class SchedulePlanInfo {
         // TODO：报道时间，出场时间没有
         // 关联的驾驶员
         EmployeeConfigInfo employeeConfigInfo = null;
-        if (ttInfoDetail.getIsFB()) {
+        if (isFb) {
             if (employeeConfigInfoList.size() > 1) {
                 employeeConfigInfo = employeeConfigInfoList.get(1);
             } else {
@@ -265,6 +269,47 @@ public class SchedulePlanInfo {
         // 使用的时刻表名字
         this.ttInfoName = ttInfoDetail.getTtinfo().getName();
  
+        // 使用车辆配置的停车场信息
+        String pzType = carConfigInfo.getPzType(); // 配置类型
+        if (pzType != null && !pzType.equals("BSY")) {
+            if ("ZW".equals(pzType)) { // 只看早晚进出场
+                if (isFirstBc) { // 第一个班次是出场
+                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
+                    this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
+                    this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
+
+                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
+                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
+
+                } else if (isLastBc) { // 最后一个班次是进场
+                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
+                    this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
+                    this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
+
+                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
+                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
+                }
+
+            } else if ("FS".equals(pzType)) { // 所有进出场
+                if ("out".equals(this.bcType)) { // 出场班次
+                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
+                    this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
+                    this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
+
+                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
+                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
+
+                } else if ("in".equals(this.bcType)) {
+                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
+                    this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
+                    this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
+
+                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
+                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
+                }
+            }
+        }
+
     }
  
  
@@ -71,7 +71,7 @@ public class ScheduleRule1Flat extends BEntity {
     @NotNull
     private Integer ryStart;
  
-    /** 翻班格式（TODO：这个用在车子上的，暂时不管）*/
+    /** 翻班格式（类似格式：1110011）*/
     private String fbgs;
  
     public Long getId() {
+package com.bsth.entity.sys;
+
+import javax.persistence.*;
+
+/**
+ * 线调权限配置
+ * Created by panzhao on 2017/2/14.
+ */
+@Entity
+@Table(name = "bsth_c_real_control_authority")
+public class RealControAuthority {
+
+    @Id
+    private Integer userId;
+
+    /**
+     * 可调度的线路 , 分隔多个
+     */
+    @Column(length = 4000)
+    private String lineCodeStr;
+
+    /**
+     * 调度模式 0: 监控模式  1：主调模式
+     */
+    private int pattern;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getLineCodeStr() {
+        return lineCodeStr;
+    }
+
+    public void setLineCodeStr(String lineCodeStr) {
+        this.lineCodeStr = lineCodeStr;
+    }
+
+    public int getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(int pattern) {
+        this.pattern = pattern;
+    }
+}
 package com.bsth.entity.sys;
  
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.bsth.entity.Line;
  
+import javax.persistence.*;
+
 /**
  * 
  * @ClassName: Line(用户线路分配实体类)
@@ -20,6 +15,8 @@ import com.bsth.entity.Line;
  * @Date 2016年8月26日 09:03:33
  *
  * @Version 公交调度系统BS版 0.1
+ *
+ * PS：这个类缺少主调监控模式的配置，暂不使用
  * 
  */
  
@@ -16,7 +16,7 @@ public abstract class BaseFilter implements Filter {
 	/**
 	 * 白名单
 	 */
-	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA,
+	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS };
  
 	@Override
 package com.bsth.filter;
  
-import java.io.File;
-import java.io.IOException;
+import com.bsth.util.RequestUtils;
+import org.apache.commons.lang3.StringUtils;
  
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.bsth.util.RequestUtils;
+import java.io.File;
+import java.io.IOException;
  
 /**
- * 
+ * @author PanZhao
  * @ClassName: ResourceFilter
  * @Description: TODO(HTML片段过滤器)
- * @author PanZhao
  * @date 2016年3月19日 下午10:10:11
- *
  */
 public class ResourceFilter extends BaseFilter {
-	
-	String[] params = new String[]{"no"};
  
-	@Override
-	public void doFilter(HttpServletRequest request,
-			HttpServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
-		
-		String uri = request.getRequestURI();
-		int len = uri.length();
-		if (RequestUtils.isAjaxRequest(request) || 
-				!uri.substring(len - 5, len).equals(".html")) {
-			super.doFilter(request, response, chain);
-		} else {
-			
-			String fPath = this.getClass().getResource("/").getPath()
-					+ "static/" + uri;
-			
-			File f = new File(fPath);
-			
-			
-			if (f.exists() && f.isFile() ){
-				request.getRequestDispatcher("/?initFragment=" + joinParam(request)).forward(request, response);;
-			}else
-				response.sendRedirect("/");
-		}
-	}
-	
-	/**
-	 * 拼接参数
-	 * @param request
-	 * @return
-	 */
-	public String joinParam(HttpServletRequest request){
-		
-		StringBuilder sb = new StringBuilder();
-		
-		String v
-			,url = request.getRequestURI();
-		for(String p : params){
-			v = request.getParameter(p);
-			if(!StringUtils.isEmpty(v))
-				sb.append("&" + p + "=" + v);
-		}
-		
-		if(sb.length() > 0)
-			url += "?" + sb.substring(1, sb.length());
-		return url;
-	}
+    String[] params = new String[]{"no"};
+
+    @Override
+    public void doFilter(HttpServletRequest request,
+                         HttpServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+
+        String uri = request.getRequestURI();
+        String origin = request.getParameter("origin");
+        int len = uri.length();
+        if (RequestUtils.isAjaxRequest(request)
+                || (origin != null && origin.equals("real_control_iframe"))//来自线调 iframe 的请求
+                || !uri.substring(len - 5, len).equals(".html")) {
+            super.doFilter(request, response, chain);
+        } else {
+
+            String fPath = this.getClass().getResource("/").getPath()
+                    + "static/" + uri;
+
+            File f = new File(fPath);
+
+
+            if (f.exists() && f.isFile()) {
+                request.getRequestDispatcher("/?initFragment=" + joinParam(request)).forward(request, response);
+            } else
+                response.sendRedirect("/");
+        }
+    }
+
+    /**
+     * 拼接参数
+     *
+     * @param request
+     * @return
+     */
+    public String joinParam(HttpServletRequest request) {
+
+        StringBuilder sb = new StringBuilder();
+
+        String v, url = request.getRequestURI();
+        for (String p : params) {
+            v = request.getParameter(p);
+            if (!StringUtils.isEmpty(v))
+                sb.append("&" + p + "=" + v);
+        }
+
+        if (sb.length() > 0)
+            url += "?" + sb.substring(1, sb.length());
+        return url;
+    }
 }
@@ -12,4 +12,7 @@ public interface CarsRepository extends BaseRepository&lt;Cars, Integer&gt;{
  
 	@Query(value="select s from Cars s where s.id in(select e.cl.id from CarConfigInfo e where e.xl.id = ?1) ")
 	List<Cars> findCarsByLineId(Integer lineId);
+	
+	@Query(value="select s from Cars s")
+	List<Cars> findCars();
 }
+package com.bsth.repository.logger;
+
+import com.bsth.entity.logger.Logger_MileModify;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/3/6.
+ */
+@Repository
+public interface MileModifyRepository extends BaseRepository<Logger_MileModify, Long>{
+}
+package com.bsth.repository.oil;
+
+
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.Cdl;
+import com.bsth.entity.oil.Cyl;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface CdlRepository extends BaseRepository<Cdl, Integer>{
+	@Transactional
+	@Modifying
+	@Query(value="SELECT * FROM bsth_c_cdl ",nativeQuery=true)
+	List<Cdl> obtainCdl();
+}
 package com.bsth.repository.oil;
  
  
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.bsth.entity.oil.Cyl;
 import com.bsth.repository.BaseRepository;
  
 @Repository
 public interface CylRepository extends BaseRepository<Cyl, Integer>{
-	
+	@Transactional
+	@Modifying
+	@Query(value="SELECT * FROM bsth_c_cyl where nbbm like %?1% and gsdm like %?2%",nativeQuery=true)
+	List<Cyl> obtainCyl(String nbbm,String gsdm);
 }
+package com.bsth.repository.oil;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.Dlb;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface DlbRepository extends BaseRepository<Dlb, Integer>{
+	/**
+	 * 前一天DLB信息
+	 * @param rq
+	 * @return
+	 */
+	@Transactional
+	@Modifying
+	@Query(value="SELECT a.*  FROM bsth_c_dlb a   where to_days(?1)-to_days(a.rq)=1"
+			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_dlb b where a.nbbm=b.nbbm and "
+			+ " to_days(?1)-to_days(b.rq)=1 )",nativeQuery=true)
+	List<Dlb> obtainYlbefore(String rq);
+	/**
+	 * 当天DLB信息
+	 * @param rq
+	 * @return
+	 */
+	@Transactional
+	@Modifying
+	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?)=to_days(rq)",nativeQuery=true)
+	List<Dlb> obtainDl(String rq);
+	
+}
+package com.bsth.repository.oil;
+
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.Jdl;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface JdlRepository extends BaseRepository<Jdl, Integer>{
+	
+	@Transactional
+    @Modifying
+    @Query(value="INSERT INTO bsth_c_jdl("+
+    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date)" +
+    			 " VALUES(" +
+    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'))", nativeQuery=true)
+	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate);
+	
+	@Transactional
+	@Modifying
+	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4%",nativeQuery=true)
+	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm);
+	
+	
+	@Transactional
+	@Modifying
+	@Query(value="SELECT * FROM bsth_c_jdl where rq = ?",nativeQuery=true)
+	List<Jdl> JdlList( String rq);
+	
+	@Transactional
+	@Modifying
+	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4 and jdz = ?5",nativeQuery=true)
+	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm, String jdz);
+	
+	@Transactional
+	@Modifying
+	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5 and jdz = ?6",nativeQuery=true)
+	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jdz);
+	
+}
@@ -23,8 +23,9 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_ylb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_ylb b where a.nbbm=b.nbbm and "
-			+ " to_days(?1)-to_days(b.rq)=1 )",nativeQuery=true)
-	List<Ylb> obtainYlbefore(String rq);
+			+ " to_days(?1)-to_days(b.rq)=1 ) and ssgsdm like %?2%  and fgsdm like %?3% and "
+			+ " xlbm like %?4% and nbbm like %?5% ",nativeQuery=true)
+	List<Ylb> obtainYlbefore(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
  
 	/**
 	 * 当天YLB信息
@@ -33,10 +34,16 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?)=to_days(rq)",nativeQuery=true)
-	List<Ylb> obtainYl(String rq);
+	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
+	List<Ylb> obtainYl(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
  
  
+	@Transactional
+	@Modifying
+	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3",nativeQuery=true)
+	List<Ylb> queryListYlb(String rq,String nbbm,String jgh);
 	/**
 	 * 查询当天总的加注量和总里程
 	 * @param rq
@@ -44,6 +51,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="select sum(jzl) as jzl,sum(zlc) as zlc  from bsth_c_ylb where  nbbm=?1 and rq=?2",nativeQuery=true)
-	List<Object[]> sumLcYl(String nbbm,Date rq);
+	@Query(value="select sum(jzl) as jzl,sum(zlc) as zlc ,sum(sh) as sh from bsth_c_ylb where  nbbm=?1 and rq=?2 and xlbm like %?3%",nativeQuery=true)
+	List<Object[]> sumLcYl(String nbbm,Date rq,String xlbm);
 }
@@ -19,8 +19,13 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?)=to_days(yyrq)",nativeQuery=true)
-	List<Ylxxb> obtainYlxx(String rq);
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
+	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
+	
+	@Transactional
+	@Modifying
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and ssgs=?2",nativeQuery=true)
+	List<Ylxxb> checkYlxx(String rq,String gs);
  
 	@Transactional
 	@Modifying
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.OilStationSociety;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/3/16.
+ */
+@Repository
+public interface OilStationSocietyRepository extends BaseRepository<OilStationSociety, String>{
+}
@@ -30,7 +30,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
  
 	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
-	
+
 	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh ")
 	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
  
@@ -92,7 +92,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
  
-	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsj")
+	@Query(value="select s from ScheduleRealInfo s where s.jGh like %?1% and s.clZbh like %?2% and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
  
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d')  order by bcs")
@@ -114,14 +114,25 @@ 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 like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.realExecDate,s.fcsj, (s.lpName+1)")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
  
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
+	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
+	
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
+
+	//按月统计
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date);
+	
+	//按照时间段统计
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2);
  
-	@Query(value="select 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 realExecDate,fcsj,xlBm,clZbh")
-	List<Map<String,Object>> yesterdayDataList(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 like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
+	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
  
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 	List<ScheduleRealInfo> setLD(String date);
@@ -3,6 +3,7 @@ package com.bsth.repository.schedule;
 import java.util.List;
 import java.util.Map;
  
+import com.bsth.entity.Line;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.repository.BaseRepository;
@@ -37,4 +38,8 @@ public interface GuideboardInfoRepository extends BaseRepository&lt;GuideboardInfo,
             "where td.ttinfo.id=?1 " +
             "group by td.ttinfo.id, td.lp.id, td.lp.lpName")
     List<Map<String, Object>> findLpName(Long ttid);
+    
+    @Query(value = "SELECT g FROM GuideboardInfo g  where g.xl =?1 and g.lpName = ?2 and g.lpNo = ?3 and lpType =?4 and isCancel = 0")
+    List<GuideboardInfo> validateLp(Line xl,String lpName , int lpNo,String lpType);
+   
 }
@@ -27,26 +27,29 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
     Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
  
     @Query(value = " select " +
-            "xl as xlId, " +
-            "xl_name as xlName, " +
-            "schedule_date as scheduleDate, " +
-            "lp_name as lpName, " +
-            "cl as clId, " +
-            "cl_zbh as clZbh, " +
-            "group_concat(distinct fcsj) ccsj, " +
-            "group_concat(distinct j) jsyId, " +
-            "group_concat(distinct j_gh) jsyGh, " +
-            "group_concat(distinct j_name) jsyName, " +
-            "group_concat(distinct s) spyId, " +
-            "group_concat(distinct s_gh) spyGh, " +
-            "group_concat(distinct s_name) spyName, " +
-            "max(create_date) as createDate " +
-            "from bsth_c_s_sp_info " +
-            "where bc_type = 'out' and " +
-            "xl = ?1 and " +
-            "schedule_date = ?2 " +
-            "group by xl_name, schedule_date, lp, lp_name, cl, cl_zbh " +
-            "order by xl_name, schedule_date, lp ", nativeQuery = true)
+            "info.xl as xlId, " +
+            "info.xl_name as xlName, " +
+            "info.schedule_date as scheduleDate, " +
+            "info.lp_name as lpName, " +
+            "info.cl as clId, " +
+            "info.cl_zbh as clZbh, " +
+            "group_concat(info.fcsj) ccsj, " +
+            "group_concat(info.bc_type) bctype, " +
+            "group_concat(distinct info.j) jsyId, " +
+            "group_concat(distinct info.j_gh) jsyGh, " +
+            "group_concat(distinct info.j_name) jsyName, " +
+            "group_concat(distinct info.s) spyId, " +
+            "group_concat(distinct info.s_gh) spyGh, " +
+            "group_concat(distinct info.s_name) spyName, " +
+            "group_concat(info.fcno) fcno, " +
+            "max(info.update_date) as updateDate, " +
+            "max(user.user_name) as updateUserName, " +
+            "max(info.tt_info_name) as ttInfoName " +
+            "from bsth_c_s_sp_info info left join bsth_c_sys_user user on info.update_by = user.id " +
+            "where info.xl = ?1 and " +
+            "info.schedule_date = ?2 " +
+            "group by info.xl_name, info.schedule_date, info.lp, info.lp_name, info.cl, info.cl_zbh " +
+            "order by info.xl_name, info.schedule_date, info.lp ", nativeQuery = true)
     List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
  
     @Modifying
@@ -71,14 +74,16 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "scpinfo.scheduleDate = :p3 and " +
             "scpinfo.lpName = :p4 and " +
             "scpinfo.fcsj = :p5 and " +
-            "scpinfo.bcType = :p6 ")
+            "scpinfo.bcType = :p6 and " +
+            "scpinfo.fcno = :p7 " )
     int updateGroupInfo_type_2_4(
             @Param("p1") String fcsj,
             @Param("p2") Integer xlid,
             @Param("p3") Date scheduleDate,
             @Param("p4") String lpName,
             @Param("p5") String fcsj_src,
-            @Param("p6") String bcType);
+            @Param("p6") String bcType,
+            @Param("p7") Integer fcno);
  
     @Modifying
     @Query(value = "update " +
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+@Repository
+public interface RealControAuthorityRepository extends BaseRepository<RealControAuthority, Integer>{
+
+    @Query("select t from RealControAuthority t where t.userId=?1")
+    RealControAuthority findByUserId(Integer userId);
+}
@@ -36,7 +36,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS);
     }
  
     @Override
@@ -54,14 +54,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 //指定登录页
                 .loginPage(Constants.LOGIN_PAGE)
                 .loginProcessingUrl(Constants.LOGIN).permitAll()
-                //.failureUrl(Constants.LOGIN_PAGE + "?error=true")登录失败跳转的链接
-                //.successHandler(loginSuccessHandler())登录成功后处理
                 .and().logout()
-                //.addLogoutHandler(logoutHandler())
                 //禁用CXRF
                 .and().csrf().disable()
                 //禁用匿名用户功能
-                .anonymous().disable();
+                .anonymous().disable()
+                //允许同源 iframe
+                .headers().frameOptions().sameOrigin().httpStrictTransportSecurity().disable();
  
         // 同时只保持一个回话
         http.sessionManagement().maximumSessions(1)
@@ -2,6 +2,7 @@ package com.bsth.service.forms.impl;
  
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -23,6 +24,7 @@ import com.bsth.entity.mcy_forms.Singledata;
 import com.bsth.entity.mcy_forms.Turnoutrate;
 import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.data.BasicData;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
 import com.bsth.entity.mcy_forms.Daily;
@@ -47,33 +49,33 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Waybillday> waybillday(Map<String, Object> map) {
  
-		String sql ="select x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name "
-				+ " from bsth_c_s_sp_info_real x  INNER join "
-				+ " ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,c.personnel_name from"
-				+ " bsth_c_ylb y LEFT JOIN bsth_c_personnel c  ON c.job_code=y.JSY   " 
-				+ " where 1=1  ";
-		if(map.get("date").toString()!=""){
-			sql+=" and to_days(y.RQ)=to_days('"+map.get("date").toString() + "') ";
-		}
-		if( map.get("line").toString()!=""){
-			sql+=" and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) ";
-		}
-			sql+= " z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"') ";
-		if(map.get("gsdmWaybillday").toString()!=""){
-			sql+=" and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'";
-		}
-		if(map.get("fgsdmWaybillday").toString()!=""){
-			sql+=" and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'";
-		}	
-			sql	+= " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ";
+		
+		
+		String sql=" select t.*,z.jzl,z.yh from ("
+				+ " select x.j_gh,x.cl_zbh,x.j_name,x.schedule_date,"
+				+ " x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name  from bsth_c_s_sp_info_real x "
+				+ " where  to_days( x.schedule_date)=to_days('"+map.get("date").toString() + "')  "
+				+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"' "
+				+ " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"' "
+				+ " and xl_bm like '%"+ map.get("line").toString().trim()+"%'"
+				+ " GROUP BY x.j_gh,x.cl_zbh,x.j_name,"
+				+ " x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ) t"
+				+ " LEFT join  (select  y.rq,y.xlbm,y.nbbm,y.jsy,y.jzl,y.yh from"
+				+ " bsth_c_ylb y   where 1=1   "
+				+ " and to_days(y.RQ)=to_days('"+map.get("date").toString() + "')  "
+				+ " and y.XLBM like '%"+ map.get("line").toString().trim()+"%'"
+				+ " and y.ssgsdm='"+map.get("gsdmWaybillday").toString()+"'"
+				+ " and y.fgsdm='"+map.get("gsdmWaybillday").toString()+"')  z "
+				+ " on t.cl_zbh=z.nbbm ";
+		
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
 			@Override
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Waybillday wbd = new Waybillday();
 				wbd.setCarPlate(arg0.getString("cl_zbh"));
-				wbd.setJzl(arg0.getString("JZL"));
-				wbd.setYh(arg0.getString("YH"));
-				wbd.setjName(arg0.getString("personnel_name"));
+				wbd.setJzl(arg0.getString("jzl"));
+				wbd.setYh(arg0.getString("yh"));
+				wbd.setjName(arg0.getString("j_name"));
 				wbd.setRq(arg0.getString("schedule_date"));
 				wbd.setJgh(arg0.getString("j_gh"));
 				return wbd;
@@ -193,7 +195,15 @@ public class FormsServiceImpl implements FormsService {
 	// 班次车辆人员日统计
 	@Override
 	public List<Shifday> shifday(Map<String, Object> map) {
-		String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
+		
+		String sql ="select t.* from (select r.schedule_date,r.j_name,IFNULL(r.s_name,'')as s_name,"
+				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm FROM bsth_c_s_sp_info_real r  where 1=1  "
+				+ " and to_days(r.schedule_date)=to_days('"+  map.get("date").toString() + "')  "
+				+ " and r.xl_bm like '%"+map.get("line").toString()+"%' "
+				+ " and r.gs_bm='"+map.get("gsdmShif").toString()+"' "
+				+ " and r.fgs_bm='"+map.get("fgsdmShif").toString()+"' ) t"
+				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm  ";
+		/*String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
 				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type   "
 				+ " FROM bsth_c_s_sp_info_real r " 
 				+ " where 1=1  ";
@@ -211,20 +221,18 @@ public class FormsServiceImpl implements FormsService {
 			sql+=" and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'";
 		}	
 			sql	+= " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
-				+ "  ORDER BY  r.lp_name asc";
+				+ "  ORDER BY  r.lp_name asc";*/
  
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
  
 			@Override
 			public Shifday mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shifday shifday = new Shifday();
+				shifday.setRq(arg0.getString("schedule_date"));
 				shifday.setjName(arg0.getString("j_name").toString());
 				shifday.setsName(arg0.getString("s_name") == null ? "" : arg0.getString("s_name").toString());
-				shifday.setLpName(arg0.getString("r.lp_name").toString());
 				shifday.setCarPlate(arg0.getString("cl_zbh").toString());
 				shifday.setJgh(arg0.getString("j_gh"));
-				shifday.setZbh(arg0.getString("cl_zbh"));
-				shifday.setRq(arg0.getString("schedule_date"));
 				return shifday;
 			}
  
@@ -335,33 +343,28 @@ public class FormsServiceImpl implements FormsService {
 		String rq3 = sdf1.format(d1);
  
 		rq = rq2 + "-" + rq3;
-		
-		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
-		          + "  FROM bsth_c_s_sp_info_real r "
-		          + "  left join bsth_c_ylb y"
-		          + " ON r.cl_zbh = y.nbbm   "
-				  + "  where r.schedule_date_str BETWEEN '" + map.get("startDate").toString() + "'"
-		          + "  and '"+ map.get("endDate").toString() + "'" 
-				  + "  and r.xl_bm='" + map.get("line").toString() + "'"
-				  + "  AND r.gs_bm is not null";
-				  
-			if(map.get("gsdmSing").toString()!=""){
-				sql+=" and r.gs_bm='"+map.get("gsdmSing").toString()+"'";
-			}
-			if(map.get("fgsdmSing").toString()!=""){
-				sql+=" and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'";
-			}
-				 sql += "  GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
-		
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
+		String sql = "select t.*,y.yh,y.jzl from ("
+				+ " select r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " from bsth_c_s_sp_info_real r  where r.schedule_date_str "
+				+ " BETWEEN '"+startDate+"'  and '"+endDate+"'  and r.xl_bm='"+map.get("line").toString()+"'  "
+				+ " AND r.gs_bm is not null and r.gs_bm='"+map.get("gsdmSing").toString()+"' "
+				+ " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'  "
+				+ " group by r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm) t "
+				+ " LEFT JOIN (select a.nbbm,a.jsy,SUM(a.yh) as yh,SUM(a.jzl) as jzl "
+				+ " from bsth_c_ylb a where  a.rq BETWEEN '"+startDate+"'  and '"+endDate+"'and "
+				+ " a.ssgsdm='"+map.get("gsdmSing").toString()+"' and a.fgsdm='"+map.get("fgsdmSing").toString()+"' "
+				+ "group by  a.nbbm,a.jsy) y"
+				+ " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
+		
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			@Override
 			public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Singledata sin = new Singledata();
 				sin.setrQ(rq);
-				sin.setgS(arg0.getString("gs_name"));
+				sin.setgS(arg0.getString("gs_bm"));
 				sin.setxL(arg0.getString("xl_name"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
@@ -374,8 +377,13 @@ public class FormsServiceImpl implements FormsService {
 				return sin;
 			}
 		});
+		DecimalFormat df = new DecimalFormat("0.00");
 			for(int i=0;i<list.size();i++){
+				
 				Singledata si=list.get(i);
+				si.setgS(BasicData.businessCodeNameMap.get(si.getgS()));
+				si.setJzl(df.format(Double.parseDouble(si.getJzl())));
+				si.setHyl(df.format(Double.parseDouble(si.getHyl())));
 				Map<String, Object> maps = new HashMap<>();
 				maps = commonService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
 						endDate);
@@ -712,22 +720,20 @@ public class FormsServiceImpl implements FormsService {
  
 	@Override
 	public List<Daily> daily(Map<String, Object> map) {
-
-		String sql ="select  r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
-				+ " from 	bsth_c_s_sp_info_real r  LEFT JOIN bsth_c_ylb y ON r.cl_zbh = y.nbbm "
-				+ " WHERE 1 = 1"
-		        + "  and r.xl_bm='" + map.get("line").toString() + "'"
-		        + "  and to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"')"
-		        + "  AND r.gs_bm is not null";
-		  
-	if(map.get("gsdmDaily").toString()!=""){
-		sql+=" and r.gs_bm='"+map.get("gsdmDaily").toString()+"'";
-	}
-	if(map.get("fgsdmDaily").toString()!=""){
-		sql+=" and r.fgs_bm='"+map.get("fgsdmDaily").toString()+"'";
-	}
-		 sql += "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
-
+		String sql="select t.schedule_date_str,"
+				+ " t.cl_zbh,t.j_gh,t.j_name,x.yh from (select  r.schedule_date_str,r.xl_bm,r.xl_name,"
+				+ " r.cl_zbh,r.j_gh,r.j_name from bsth_c_s_sp_info_real  r WHERE "
+				+ " r.xl_bm='" + map.get("line").toString() + "'  and to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"')  "
+				+ " and r.gs_bm like '%"+map.get("gsdmDaily").toString()+"%' "
+				+ " and r.fgs_bm like '%"+map.get("fgsdmDaily").toString()+"%'  "
+				+ " GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name) t"
+				+ " left join (select * from bsth_c_ylb y where "
+				+ " to_days(y.rq)=to_days('"+map.get("date").toString()+"') "
+				+ " and y.xlbm= '" + map.get("line").toString() + "'"
+				+ " and  y.ssgsdm like '%"+map.get("gsdmDaily").toString()+"%' "
+				+ " and y.fgsdm like '%"+map.get("fgsdmDaily").toString()+"%'"
+				+ " ) x"
+				+ " on t.cl_zbh = x.nbbm ";
 		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
 			@Override
 			public Daily mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -736,7 +742,7 @@ public class FormsServiceImpl implements FormsService {
 				daily.setZbh(arg0.getString("cl_zbh"));
 				daily.setJgh(arg0.getString("j_gh"));
 				daily.setjName(arg0.getString("j_name"));
-				daily.setYh(arg0.getString("YH"));
+				daily.setYh(arg0.getString("yh"));
 				return daily;
 			}
 		});
@@ -1345,8 +1345,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			Collections.sort(keyMap1.get(key), new Comparator<Map<String, Object>>() {
  
 				public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-					Integer a;
-					Integer b;
+					Long a;
+					Long b;
 					String lp1 = o1.get("lp").toString();
 					String lp2 = o2.get("lp").toString();
 					String str1 = "";
@@ -1358,8 +1358,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						str2 += (int)lp2.charAt(i);
 					}
  
-					a = Integer.valueOf(str1);
-					b = Integer.valueOf(str2);
+					a = Long.valueOf(str1);
+					b = Long.valueOf(str2);
  
 					// 升序
 					return a.compareTo(b);
@@ -34,8 +34,9 @@ public class PersonnelServiceImpl extends BaseServiceImpl&lt;Personnel, Integer&gt; im
 			per=perIterator.next();
 			if(per.getJobCode().indexOf(jobCode)!=-1){
 				Map<String, String> jobCodeMap= new HashMap<>();
-				jobCodeMap.put("id",per.getJobCode());
-				jobCodeMap.put("text", per.getJobCode()+"/"+per.getPersonnelName());
+				String jboCode=per.getJobCode().substring(per.getJobCode().indexOf("-")+1);
+				jobCodeMap.put("id",jboCode);
+				jobCodeMap.put("text", jboCode+"/"+per.getPersonnelName());
 				jobCodeMap.put("gs", per.getCompanyCode());
 				list.add(jobCodeMap);
 			}
@@ -11,6 +11,8 @@ import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationRouteService;
 import com.bsth.util.FTPClientUtils;
 import com.bsth.util.PackTarGZUtils;
+import com.bsth.util.Geo.GeoUtils;
+import com.bsth.util.Geo.Point;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -556,9 +558,15 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
  
-				/** 行单文件内容 @param：<objects：站点路由；lineId：线路ID>*/
-				String textStr = newTextFileToFTP(objects,lineId);
+				String textStr = "";
  
+				boolean tempTag = ishxType(objects);
+				
+				if(tempTag)
+					textStr = hxTextFileToFtp(objects,lineId);// 环线行单文件内容
+				else
+					textStr = newTextFileToFTP(objects,lineId);/** 双向行单文件内容 @param：<objects：站点路由；lineId：线路ID>*/
+					
 				/*textStr = line.getName() + "\t" + "2" + "\r" + textStr;*/
  
 				textStr = line.getName() + " " + "2" + "\r" + textStr;
@@ -574,9 +582,6 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				/** 获取txt文件 */
 				File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
  
-				/*File[] sources = new File[] {textFile};*/
-				//File[] sources = new File[] {textFile};
-				
 				File target = new File(odlGzFileName);
  
 				// 将txt文件打包
@@ -603,6 +608,24 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}  
 		return resultMap;
 	}
+	public boolean ishxType(List<Object[]> listObj) {
+		boolean tag = true;
+		String pointBStr[] = null,pointEStr[] = null;
+		int numzd = 0;
+		for(int i =0;i<listObj.size();i++) {
+			if(listObj.get(i)[3].equals("B") && Integer.valueOf(listObj.get(i)[8].toString())==0)
+				pointBStr = listObj.get(i)[2].toString().split(" ");
+			else if(listObj.get(i)[3].equals("E") && Integer.valueOf(listObj.get(i)[8].toString())==0)
+				pointEStr = listObj.get(i)[2].toString().split(" ");
+			if(Integer.valueOf(listObj.get(i)[8].toString())==1)
+				numzd++;
+		}
+		Point p1 = new Point(Double.valueOf(pointBStr[0]),Double.valueOf(pointBStr[1])); 
+		Point p2 = new Point(Double.valueOf(pointEStr[0]),Double.valueOf(pointEStr[1]));
+		if(GeoUtils.getDistance(p1, p2)>100 && numzd>2) 
+			tag = false;
+		return tag;
+	}
  
 	/**
 	 * @Description : TODO(形成行单文件内容)
@@ -717,31 +740,79 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 						}
  
 					}
-					
-					/*
-					String bdJWPointStr = objects.get(i)[2].toString();
-					
-					String bdJWPointA[] = bdJWPointStr.split(" ");
-					
-					Map<String, Object> pointsM = new HashMap<String,Object>();
-					
-					pointsM.put("lng", bdJWPointA[0]);
-					
-					pointsM.put("lat", bdJWPointA[1]);
-					
-					System.out.println(objects.get(i)[7].toString());
-					
-					sleepStr = sleepStr + GetFormPointOnPolylineSeleepLimit(pointsM,sobje);*/
 				}
  
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
-				
 			}
  
 		}
-		
 		return stationRStr;
-		
+	}
+	
+	public String hxTextFileToFtp(List<Object[]> objects,Integer lineId) {
+		String restStr = "";
+		// windows下的文本文件换行符
+		//String enterStr = "\r\n";
+		// linux/unix下的文本文件换行符
+		String enterStr = "\r";
+		int xh = 1 ;
+		for(int x =0;x<2;x++) {
+			for(int i = 0; i<objects.size();i++) {
+				if(Integer.valueOf(objects.get(i)[8].toString())==0) {
+					// 经度
+					String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+					// 纬度
+					String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+					lat = "\t" +  lat;
+					// 站点类型
+					String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
+					String stationMake = "";
+					if(stationMakeStr.equals("E")) {
+						stationMake = "\t2";
+					}else {
+						stationMake ="\t1";
+					}
+					// 站点序号 
+					// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+					String stationNo = "\t" + xh;
+					// 站点编码
+					String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+					stationCode =  "\t" +stationCode;
+					double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
+					String tempDistc = String.valueOf((int) dis);
+					// 站点距离
+					String staitondistance = "\t" + tempDistc;
+					// 站点名称
+					String stationName =  objects.get(i)[7].equals("") ? "" : objects.get(i)[7].toString();
+					stationName = "\t" +stationName;
+					// 限速
+					String sleepStr = "";
+					// 方向
+					int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
+					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
+					List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
+					if(sobje.size()==1) {
+						double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
+						sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
+					}else if(sobje.size()>1){
+						/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
+						for(int j =0;j<sobje.size();j++) {
+							String sectionName = sobje.get(j)[3].toString();
+							String sectionNameA[] = sectionName.split("至");
+							if(stationName.equals(sectionNameA[0])){
+								/*sleepStr = sobje.get(j)[2].toString();*/
+								double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+								sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
+							}
+						}
+					}
+					xh++;
+					restStr = restStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
+				}
+			}
+		}
+		System.out.println(restStr);
+		return restStr;
 	}
  
 	public String GetFormPointOnPolylineSeleepLimit(Map<String, Object> p,List<Object[]> listObjArra) {
@@ -758,7 +758,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
  
 		// 城建坐标点集合
-		String csectionVector = "";
+		String csectionVector = null;
  
 		// 路段类型
 		String sectionType = "";
+package com.bsth.service.logger;
+
+import com.bsth.entity.logger.Logger_MileModify;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by panzhao on 2017/3/6.
+ */
+public interface MileModifyService extends BaseService<Logger_MileModify, Long>{
+}
+package com.bsth.service.logger.impl;
+
+import com.bsth.entity.logger.Logger_MileModify;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.logger.MileModifyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by panzhao on 2017/3/6.
+ */
+@Service
+public class MileModifyServiceImpl extends BaseServiceImpl<Logger_MileModify, Long> implements MileModifyService {
+}
+package com.bsth.service.oil;
+
+
+import com.bsth.entity.oil.Cdl;
+import com.bsth.service.BaseService;
+
+public interface CdlService extends BaseService<Cdl, Integer>{
+}
+package com.bsth.service.oil;
+
+import java.util.Map;
+
+import com.bsth.entity.oil.Dlb;
+import com.bsth.service.BaseService;
+
+public interface DlbService extends BaseService<Dlb, Integer>{
+	Map<String, Object> obtain(Map<String, Object> map);
+	
+	Map<String, Object> sort(Map<String, Object> map);
+	
+	Map<String, Object> checkDl(Map<String, Object> map);
+}
+package com.bsth.service.oil;
+
+import java.io.File;
+import java.util.Map;
+
+import com.bsth.entity.oil.Jdl;
+import com.bsth.service.BaseService;
+
+public interface JdlService extends BaseService<Jdl, Integer> {
+	
+	public String importExcel(File file, String gsbm_, String gsName, String fgsbm, String fgsName);
+
+	public Map<String, Object> query(Map<String, Object> map);
+	
+}