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

王通
2 parents 5feb311a d81d276b
Showing 25 changed files with 287 additions and 116 deletions
src/main/java/com/bsth/entity/LsStationRoute.java
src/main/java/com/bsth/entity/StationRoute.java
src/main/java/com/bsth/entity/StationRouteCache.java
src/main/java/com/bsth/repository/StationRouteCacheRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/line/addstation.html
src/main/resources/static/pages/base/line/editstation.html
src/main/resources/static/pages/base/line/js/map-function.js
src/main/resources/static/pages/base/line/js/map.js
src/main/resources/static/pages/base/station/edit.html
src/main/resources/static/pages/base/station/js/station-positions-function.js
src/main/resources/static/pages/base/station/list.html
src/main/resources/static/pages/base/station/list_edit.html
src/main/resources/static/pages/base/stationroute/add.html
src/main/resources/static/pages/base/stationroute/edit.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
@@ -41,7 +41,9 @@ public class LsStationRoute {
 	// 线路编码
 	private String lineCode;
-	
+
+	// 行业编码
+	private String industryCode;
 	/**
 	 * 站点类型
 	 * 
@@ -145,6 +147,14 @@ public class LsStationRoute {
 		this.lineCode = lineCode;
 	}
+	public String getIndustryCode() {
+		return industryCode;
+	}
+
+	public void setIndustryCode(String industryCode) {
+		this.industryCode = industryCode;
+	}
+
 	public String getStationMark() {
 		return stationMark;
 	}
@@ -43,6 +43,9 @@ public class StationRoute {
 	// 线路编码
 	private String lineCode;
+
+	// 行业编码
+	private String industryCode;
 	/**
 	 * 站点类型
@@ -147,6 +150,14 @@ public class StationRoute {
 		this.lineCode = lineCode;
 	}
+	public String getIndustryCode() {
+		return industryCode;
+	}
+
+	public void setIndustryCode(String industryCode) {
+		this.industryCode = industryCode;
+	}
+
 	public String getStationMark() {
 		return stationMark;
 	}
@@ -44,7 +44,9 @@ public class StationRouteCache {
 	// 线路编码
 	private String lineCode;
-	
+
+	// 行业编码
+	private String industryCode;
 	/**
 	 * 站点类型
 	 * 
@@ -148,6 +150,14 @@ public class StationRouteCache {
 		this.lineCode = lineCode;
 	}
+	public String getIndustryCode() {
+		return industryCode;
+	}
+
+	public void setIndustryCode(String industryCode) {
+		this.industryCode = industryCode;
+	}
+
 	public String getStationMark() {
 		return stationMark;
 	}
@@ -57,11 +57,11 @@ public interface StationRouteCacheRepository extends BaseRepository&lt;StationRoute
      */
     @Modifying
     @Query(value="delete from bsth_c_stationroute_cache where line_code = ?1 and directions = ?2 ", nativeQuery=true)
-    public void stationRouteCacheDel(String lineCode,Integer dir);
+    void stationRouteCacheDel(String lineCode,Integer dir);
     @Modifying
     @Query(value="delete from bsth_c_stationroute_cache where line = ?1 and directions = ?2 ", nativeQuery=true)
-    public void stationRouteCacheDel(Integer lineId,Integer dir);
+    void stationRouteCacheDel(Integer lineId,Integer dir);
     @Query(value = "SELECT  a.`stationRoute.id`," +
@@ -95,7 +95,9 @@ public interface StationRouteCacheRepository extends BaseRepository&lt;StationRoute
 			"ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
 			"b.destroy AS 'station.destroy'," +
 			"b.versions AS 'station.versions'," +
-			"b.descriptions AS 'station.descriptions' FROM (" +
+			"b.descriptions AS 'station.descriptions'," +
+			"a.`industryCode` " +
+			" FROM (" +
 				"SELECT r.id AS 'stationRoute.id'," +
 				" r.line AS 'stationRoute.line'," +
 				"r.station AS 'stationRoute.station'," +
@@ -110,7 +112,7 @@ public interface StationRouteCacheRepository extends BaseRepository&lt;StationRoute
 				"r.first_time AS 'stationRoute.firstTime'," +
 				"r.end_time AS 'stationRoute.endTime'," +
 				"r.descriptions AS 'stationRoute.descriptions'," +
-				"r.versions AS 'stationRoute.versions' FROM bsth_c_stationroute_cache r  WHERE  r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
+				"r.versions AS 'stationRoute.versions',r.industry_code AS industryCode FROM bsth_c_stationroute_cache r  WHERE  r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
 			"LEFT JOIN bsth_c_station b " +
 			"ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
     List<Object[]> findCachePoint(int lineId, int dir);
@@ -66,7 +66,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 							"ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
 							"b.destroy AS 'station.destroy'," +
 							"b.versions AS 'station.versions'," +
-							"b.descriptions AS 'station.descriptions' FROM (" +
+							"b.descriptions AS 'station.descriptions', " +
+							"a.`stationRoute.industryCode` " +
+							" FROM (" +
 								"SELECT r.id AS 'stationRoute.id'," +
 								" r.line AS 'stationRoute.line'," +
 								"r.station AS 'stationRoute.station'," +
@@ -81,7 +83,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 								"r.first_time AS 'stationRoute.firstTime'," +
 								"r.end_time AS 'stationRoute.endTime'," +
 								"r.descriptions AS 'stationRoute.descriptions'," +
-								"r.versions AS 'stationRoute.versions' FROM bsth_c_stationroute r  WHERE  r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
+								"r.versions AS 'stationRoute.versions', " +
+								"r.industry_code AS 'stationRoute.industryCode' " +
+							" FROM bsth_c_stationroute r  WHERE  r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
 							"LEFT JOIN bsth_c_station b " +
 							"ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
 	List<Object[]> findPoints(int line,int directions);
@@ -149,29 +153,33 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			" b.create_date AS stationCreateDate," +
 			" b.update_by AS stationUpdateBy," +
 			" b.update_date AS stationUpdateDate," +
-			" a.stationRouteId,b.station_name as zdmc "+
-			" FROM ( SELECT s.id AS stationRouteId," +
-			" s.line AS stationRouteLine," +
-			" s.station as stationRouteStation," +
-			" s.station_name AS stationRouteName," +
-			" s.station_route_code as stationRouteCode," +
-			" s.line_code AS stationRouteLIneCode," +
-			" s.station_mark AS stationRouteStationMark," +
-			" s.out_station_nmber AS stationOutStationNmber," +
-			" s.directions AS stationRoutedirections," +
-			" s.distances AS stationRouteDistances," +
-			" s.to_time AS stationRouteToTime," +
-			" s.first_time AS staitonRouteFirstTime," +
-			" s.end_time AS stationRouteEndTime," +
-			" s.descriptions AS stationRouteDescriptions," +
-			" s.destroy AS stationRouteDestroy," +
-			" s.versions AS stationRouteVersions," +
-			" s.create_by AS stationRouteCreateBy," +
-			" s.create_date AS stationRouteCreateDate," +
-			" s.update_by AS stationRouteUpdateBy," +
-			" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.station_route_code =(" +
-			"select  MIN(station_route_code) as stationRouteCode   from bsth_c_stationroute r  WHERE  " +
-			"r.line=?1 and r.directions =?2 and station_route_code > ?3 and r.destroy = 0  ) and s.line=?1 and s.directions = ?2 AND s.destroy = 0) a " +
+			" a.stationRouteId, " +
+			" b.station_name as zdmc, " +
+			" a.industryCode"+
+			" FROM " +
+			"( SELECT s.id AS stationRouteId," +
+				" s.line AS stationRouteLine," +
+				" s.station as stationRouteStation," +
+				" s.station_name AS stationRouteName," +
+				" s.station_route_code as stationRouteCode," +
+				" s.industry_code as industryCode," +
+				" s.line_code AS stationRouteLIneCode," +
+				" s.station_mark AS stationRouteStationMark," +
+				" s.out_station_nmber AS stationOutStationNmber," +
+				" s.directions AS stationRoutedirections," +
+				" s.distances AS stationRouteDistances," +
+				" s.to_time AS stationRouteToTime," +
+				" s.first_time AS staitonRouteFirstTime," +
+				" s.end_time AS stationRouteEndTime," +
+				" s.descriptions AS stationRouteDescriptions," +
+				" s.destroy AS stationRouteDestroy," +
+				" s.versions AS stationRouteVersions," +
+				" s.create_by AS stationRouteCreateBy," +
+				" s.create_date AS stationRouteCreateDate," +
+				" s.update_by AS stationRouteUpdateBy," +
+				" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.station_route_code =(" +
+				"select  MIN(station_route_code) as stationRouteCode   from bsth_c_stationroute r  WHERE  " +
+				"r.line=?1 and r.directions =?2 and station_route_code > ?3 and r.destroy = 0  ) and s.line=?1 and s.directions = ?2 AND s.destroy = 0) a " +
 			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
 	List<Object[]> findDownStationRoute(Integer id,Integer direction,Integer stationRouteCode);
@@ -278,27 +286,30 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			" b.create_date AS stationCreateDate," +
 			" b.update_by AS stationUpdateBy," +
 			" b.update_date AS stationUpdateDate," +
-			" a.stationRouteId,b.station_name as zdmc "+
-			" FROM ( SELECT s.id AS stationRouteId," +
-			" s.line AS stationRouteLine," +
-			" s.station as stationRouteStation," +
-			" s.station_name AS stationRouteName," +
-			" s.station_route_code as stationRouteCode," +
-			" s.line_code AS stationRouteLIneCode," +
-			" s.station_mark AS stationRouteStationMark," +
-			" s.out_station_nmber AS stationOutStationNmber," +
-			" s.directions AS stationRoutedirections," +
-			" s.distances AS stationRouteDistances," +
-			" s.to_time AS stationRouteToTime," +
-			" s.first_time AS staitonRouteFirstTime," +
-			" s.end_time AS stationRouteEndTime," +
-			" s.descriptions AS stationRouteDescriptions," +
-			" s.destroy AS stationRouteDestroy," +
-			" s.versions AS stationRouteVersions," +
-			" s.create_by AS stationRouteCreateBy," +
-			" s.create_date AS stationRouteCreateDate," +
-			" s.update_by AS stationRouteUpdateBy," +
-			" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.id = ?1 ) a " +
+			" a.stationRouteId,b.station_name as zdmc, " +
+			" a.industryCode "+
+			" FROM " +
+			"( SELECT s.id AS stationRouteId," +
+				" s.line AS stationRouteLine," +
+				" s.station as stationRouteStation," +
+				" s.station_name AS stationRouteName," +
+				" s.station_route_code as stationRouteCode," +
+				" s.industry_code as industryCode," +
+				" s.line_code AS stationRouteLIneCode," +
+				" s.station_mark AS stationRouteStationMark," +
+				" s.out_station_nmber AS stationOutStationNmber," +
+				" s.directions AS stationRoutedirections," +
+				" s.distances AS stationRouteDistances," +
+				" s.to_time AS stationRouteToTime," +
+				" s.first_time AS staitonRouteFirstTime," +
+				" s.end_time AS stationRouteEndTime," +
+				" s.descriptions AS stationRouteDescriptions," +
+				" s.destroy AS stationRouteDestroy," +
+				" s.versions AS stationRouteVersions," +
+				" s.create_by AS stationRouteCreateBy," +
+				" s.create_date AS stationRouteCreateDate," +
+				" s.update_by AS stationRouteUpdateBy," +
+				" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.id = ?1 ) a " +
 			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
 	List<Object[]> findStationRouteInfo(Integer id);
@@ -348,27 +359,30 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			" b.create_date AS stationCreateDate," +
 			" b.update_by AS stationUpdateBy," +
 			" b.update_date AS stationUpdateDate," +
-			" a.stationRouteId,b.station_name as zdmc "+
+			" a.stationRouteId," +
+			"b.station_name as zdmc, "+
+			"a.industryCode "+
 			" FROM ( SELECT s.id AS stationRouteId," +
-			" s.line AS stationRouteLine," +
-			" s.station as stationRouteStation," +
-			" s.station_name AS stationRouteName," +
-			" s.station_route_code as stationRouteCode," +
-			" s.line_code AS stationRouteLIneCode," +
-			" s.station_mark AS stationRouteStationMark," +
-			" s.out_station_nmber AS stationOutStationNmber," +
-			" s.directions AS stationRoutedirections," +
-			" s.distances AS stationRouteDistances," +
-			" s.to_time AS stationRouteToTime," +
-			" s.first_time AS staitonRouteFirstTime," +
-			" s.end_time AS stationRouteEndTime," +
-			" s.descriptions AS stationRouteDescriptions," +
-			" s.destroy AS stationRouteDestroy," +
-			" s.versions AS stationRouteVersions," +
-			" s.create_by AS stationRouteCreateBy," +
-			" s.create_date AS stationRouteCreateDate," +
-			" s.update_by AS stationRouteUpdateBy," +
-			" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.destroy = 0) a " +
+				" s.line AS stationRouteLine," +
+				" s.station as stationRouteStation," +
+				" s.station_name AS stationRouteName," +
+				" s.station_route_code as stationRouteCode," +
+				" s.industry_code as industryCode," +
+				" s.line_code AS stationRouteLIneCode," +
+				" s.station_mark AS stationRouteStationMark," +
+				" s.out_station_nmber AS stationOutStationNmber," +
+				" s.directions AS stationRoutedirections," +
+				" s.distances AS stationRouteDistances," +
+				" s.to_time AS stationRouteToTime," +
+				" s.first_time AS staitonRouteFirstTime," +
+				" s.end_time AS stationRouteEndTime," +
+				" s.descriptions AS stationRouteDescriptions," +
+				" s.destroy AS stationRouteDestroy," +
+				" s.versions AS stationRouteVersions," +
+				" s.create_by AS stationRouteCreateBy," +
+				" s.create_date AS stationRouteCreateDate," +
+				" s.update_by AS stationRouteUpdateBy," +
+				" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.destroy = 0) a " +
 			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true)
 	List<Object[]> getStationRouteList(Integer lineId, Integer dir);
@@ -702,16 +702,15 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	public List<Map<String, Object>> sumInterval(Map<String, Object> map) {
 		// TODO Auto-generated method stub
     	final DecimalFormat df = new DecimalFormat("0.00");
-		List<Map<String, Object>> list=new ArrayList<>();
 		String gs=map.get("gs").toString().trim();
 		String fgs=map.get("fgs").toString().trim();
 		String sDate=map.get("date").toString();
 		String eDate=map.get("endDate").toString();
-//		String nature=map.get("nature").toString();
+		String nature=map.get("nature").toString();
         List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
-        String sql="select gsbm,fgsbm,level,djg_all,bcs"
+        String sql="select gsbm,fgsbm,xl_bm,xl_name,level,djg_all,bcs"
     			+ " from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"'"
     			+ " and level is not null and level <> '' ";
 		if(gs.length() > 0){
@@ -722,29 +721,52 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 			}
 		}
 		sql += " order by gsbm,fgsbm,level";
-    			
-		List<Map<String, Object>> countList=jdbcTemplate.query(sql, 
+    	
+		List<Map<String, Object>> countList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list=jdbcTemplate.query(sql, 
 				 new RowMapper<Map<String,Object>>(){
 			 @Override 
 			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException { 
 				 Map<String, Object> m=new HashMap<String,Object>();
 				 m.put("gs", BasicData.businessCodeNameMap.get(rs.getString("gsbm")));
 				 m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsbm")+"_"+rs.getString("gsbm")));
+				 m.put("xlBm", rs.getString("xl_bm"));
+				 m.put("xlName", rs.getString("xl_name"));
 				 m.put("level", rs.getString("level"));
 				 m.put("djgAll", rs.getInt("djg_all"));
 				 m.put("bcs", rs.getInt("bcs"));
 				 return m;
 			 }
 		});
+		
+		//根据线路类型确定是否营运
+		Map<String, Boolean> lineMap=lineService.lineNature();
+	    for (int i = 0; i < list.size(); i++) {
+			Map<String, Object> m=list.get(i);
+			if (nature.equals("0")) {
+				countList.add(m);
+			}else if(nature.equals("1")){
+				if(lineMap.get(m.get("xlBm").toString())){
+					countList.add(m);
+				}
+			}else{
+				if(!lineMap.get(m.get("xlBm").toString())){
+					countList.add(m);
+				}
+			}
+		}
         List<String> keyList = new ArrayList<String>();
         Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
         Map<String, Object> sumMap1 = new HashMap<String, Object>();
         Map<String, Object> sumMap2 = new HashMap<String, Object>();
         sumMap1.put("fgs", "合计");	//分公司合计
+        sumMap1.put("level", "");
         sumMap1.put("djgNum", "0");
         sumMap1.put("bcs", "0");
         sumMap2.put("gs", "合计");	//公司合计
+        sumMap2.put("fgs", "");
+        sumMap2.put("level", "");
         sumMap2.put("djgNum", "0");
         sumMap2.put("bcs", "0");
         for(Map<String, Object> m : countList){
@@ -763,6 +785,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
         			sumMap1 = new HashMap<String, Object>();
             		sumMap1.put("gs", gsName);
         			sumMap1.put("fgs", "合计");
+        	        sumMap1.put("level", "");
         	        sumMap1.put("djgNum", "0");
         	        sumMap1.put("bcs", "0");
         		}
@@ -833,10 +856,10 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				String xlsName="";
 				m.put("sDate", sDate);
 				m.put("eDate", eDate);
-				xls="calcIntervalCount.xls";
-				xlsName="大间隔情况表.xls";
+				xls="calcIntervalSum.xls";
+				xlsName="大间隔发生次数汇总.xls";
-				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + ""+xls,
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + xls,
 						path + "export/"+dateTime+"-"+lineName+"-"+xlsName);
 			} catch (Exception e) {
 				// TODO: handle exception
@@ -275,6 +275,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				tempM.put("stationVersions", stationList.get(i)[30]);
 				// 站点说明
 				tempM.put("stationDescriptions", stationList.get(i)[31]);
+				// 行业标准
+				tempM.put("industryCode", stationList.get(i)[32]);
 				tempM.put("zdmc", stationList.get(i)[3]);
 				tempM.put("text", stationList.get(i)[3]);
 				tempM.put("icon", "fa fa-bus");
@@ -603,6 +605,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
             tempM.put("stationRouteId", objects.get(i)[39]);
             tempM.put("zdmc", objects.get(i)[40]);
+            // 行业编码
+            tempM.put("industryCode", objects.get(i)[41]);
             resultList.add(tempM);
         }
@@ -1406,6 +1410,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 站点说明
 				tempM.put("stationDescriptions", stationList.get(i)[31]);
+				// 行业编码
+				tempM.put("industryCode", stationList.get(i)[32]);
 				staitonRouteList.add(tempM);
 			}
@@ -759,6 +759,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Integer stationId = null;
 			// 站点名称
 			String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
+			// 行业编码
+			String industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
 			// 方向
 			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
 			// 原坐标点
@@ -860,6 +862,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 线路
 			arg0.setLine(resultLine);
 			arg0.setLineCode(resultLine.getLineCode());
+			arg0.setIndustryCode(industryCode);
 			// 站点
 			arg0.setStation(station);
 			// 站点路由名称
@@ -900,8 +903,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	public Map<String, Object> stationCacheSave(Map<String, Object> map) {
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
-			// 站点编码
-			String stationCod = "";
+			// 站点编码 , 行业编码
+			String stationCod = "",industryCode = "";
 			// 站点ID
 			Integer stationId = null;
 			// 站点名称
@@ -986,6 +989,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			}
 			Station station = repository.findOne(stationId);
 			StationRouteCache arg0 = new StationRouteCache();
+			// 行业编码
+			industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
 			// 距离
 			Double distances =  map.get("distances").equals("") ? 0.0d : Double.parseDouble(map.get("distances").toString());
 			// 时间
@@ -1012,6 +1017,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			arg0.setLineCode(resultLine.getLineCode());
 			// 站点
 			arg0.setStation(station);
+			// 行业编码
+			arg0.setIndustryCode(industryCode);
 			// 站点路由名称
 			arg0.setStationName(stationName);
 			// 站点路由编码
@@ -1064,6 +1071,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 站点Id
 			Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString());
 			String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
+			String industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
 			String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
 			// 站点名称
 			String stationRouteName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
@@ -1158,6 +1166,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			stationRoute.setStationRouteCode(stationRouteCode);
 			stationRoute.setStation(station);
 			stationRoute.setStationCode(station.getStationCod());
+			stationRoute.setIndustryCode(industryCode);
 			stationRoute.setLine(line);
 			stationRoute.setLineCode(line.getLineCode());
 			stationRoute.setStationMark(stationMark);
@@ -1799,6 +1808,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString());
 			String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
 			String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
+			// 行业编码
+			String industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
 			// 站点路由名称
 			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
 			// 所在道路编码
@@ -1890,6 +1901,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			stationRoute.setStationName(stationName);
 			stationRoute.setId(stationRouteId);
 			stationRoute.setStationRouteCode(stationRouteCode);
+			stationRoute.setIndustryCode(industryCode);
 			stationRoute.setStation(station);
 			stationRoute.setStationCode(station.getStationCod());
 			stationRoute.setLine(line);
@@ -52,6 +52,17 @@
 							</div>
 						</div>
 					</div>
+					<!-- 行业编码 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+							</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
+							</div>
+						</div>
+					</div>
 					<!-- 站点方向 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -54,6 +54,17 @@
 							</div>
 						</div>
 					</div>
+					<!-- 行业编码 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+							</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
+							</div>
+						</div>
+					</div>
 					<!-- 站点方向 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -363,5 +374,5 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,fun,s
 		}
 		return tel; 
 	}, '方向必须一致!');
-});
+});
 </script>
 \ No newline at end of file
@@ -61,6 +61,8 @@ var PublicFunctions = function () {
 				$('#stationNameInput').val(editStationParmas.stationRouteStationName);
 				// 获取站点编码元素设值
 				$('#stationCodInput').val(editStationParmas.stationStationCod);
+				// 行业编码
+				$('#industryCodeInput').val(editStationParmas.industryCode);
 				// 获取站点类型元素设值
 				// $('#stationMarkSelect').val(editStationParmas.stationRouteStationMark);
 				// 获取站点方向元素设值
@@ -559,16 +559,16 @@ var WorldsBMapLine = function () {
 			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
 								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode  == null ? "":objStation.industryCode) + '</span>' +
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
 								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
 								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
-								objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
+								objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions  == null ? "":objStation.stationRouteDescriptions)+ '</span>' ;
 					// 创建信息窗口
 					var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
@@ -668,6 +668,7 @@ var WorldsBMapLine = function () {
 			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
 								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode  == null ? "":objStation.industryCode)+ '</span>' +
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
@@ -677,7 +678,7 @@ var WorldsBMapLine = function () {
 								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
 								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
 								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
-								objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
+								objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions  == null ? "":objStation.stationRouteDescriptions) + '</span>' ;
 			  		// 创建信息窗口
 			  		var infoWindow_target = new BMap.InfoWindow(htm, opts);
@@ -67,6 +67,17 @@
 							</div>
 						</div>
 					</div>
+					<!-- 行业编码 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+							</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
+							</div>
+						</div>
+					</div>
 					<!-- 站点方向 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -28,16 +28,17 @@ var PositionsPublicFunctions = function () {
 						var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
 									'<span style="color:#DDD;font-size: 15px;">站点名称：' + r[0].zdmc + '</span>' + 
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + r[0].stationCode + '</span>' +
+                            		'<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (r[0].industryCode == null ? "":r[0].industryCode) + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + r[0].stationRouteCode + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + r[0].stationJwpoints + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + r[0].stationRouteToTime + '&nbsp;分钟</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + r[0].stationRouteDistances + '&nbsp;公里</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + r[0].stationRadius + '</span>' +
-									'<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + r[0].stationRouteVersions + '</span>' +
+									'<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp;&nbsp;：' + r[0].stationRouteVersions + '</span>' +
 									'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
 									'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
-									r[0].stationRouteDescriptions +'" >说明/描述：' + r[0].stationRouteDescriptions + '</span>' ;
+									r[0].stationRouteDescriptions +'" >说明/描述：' + (r[0].stationRouteDescriptions == null ? "":r[0].stationRouteDescriptions) + '</span>' ;
 						// 信息窗口参数属性
 				  		var opts = {
 									// 信息窗口宽度
@@ -118,6 +119,8 @@ var PositionsPublicFunctions = function () {
 				$('#stationRouteLineInput').val(stationObj.stationRouteLine);
 				// 线路编码
 				$('#lineCodeInput').val(stationObj.stationRouteLIneCode);
+				// 线路编码
+				$('#industryCodeInput').val(stationObj.industryCode);
 				// WGS坐标点图形集合
 				$('#bPolygonGridInput').val(stationObj.stationBPolyonGrid);
 				// 获取站点名称元素设值
@@ -201,6 +204,8 @@ var PositionsPublicFunctions = function () {
 				$('#versionsInput').val(stationObj.stationRouteVersions);
 				// 描述/说明
 				$('#descriptionsTextarea').val(stationObj.stationRouteDescriptions);
+				// 行业编码
+				$('#industryCodeInput').val(stationObj.industryCode);
 			},
 			// 获取站点路由.
 			getzdlyInfo : function(params,callback) {
@@ -34,14 +34,15 @@
 								<th width="3%">序号</th>
 								<th width="5%">线路编号</th>
 								<th width="8%">线路名称</th>
-								<th width="5%">线路方向</th>
+								<th width="4%">线路方向</th>
 								<th width="8%">站点路由名称</th>
 								<th width="4%">站点编码</th>
+								<th width="4%">行业编码</th>
 								<th width="4%">站点序号</th>
 								<th width="4%">站点类型</th>
 								<th width="6%">站点距离(km)</th>
 								<th width="6%">站点时长(min)</th>
-								<th width="4%">版本号</th>
+								<th width="3%">版本号</th>
 								<th width="4%">是否撤销</th>
 								<th width="8%">操作</th>
 							</tr>
@@ -68,6 +69,9 @@
 									 <input type="text" class="form-control form-filter input-sm" name="stationCode_eq">
 								</td>
 								<td>
+									 <input type="text" class="form-control form-filter input-sm" name="industryCode_eq">
+								</td>
+								<td>
 									<input type="text" class="form-control form-filter input-sm"  name="stationRouteCode_eq">
 								</td>
 								<td>
@@ -141,6 +145,9 @@
 				{{obj.stationCode}}
 			</td>
 			<td>
+				{{obj.industryCode}}
+			</td>
+			<td>
 				{{obj.stationRouteCode}}
 			</td>
 			<td>	
@@ -249,7 +249,16 @@
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
-                 	<!-- 描述/说明 -->
+					 <!-- 行业编码 -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
+						</div>
+	                </div>
+					 <!-- 描述/说明 -->
 					<div class="col-md-6">
 						<label class="control-label col-md-5"><span class="required"></span>描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
 						 </label>
@@ -52,6 +52,17 @@
 							</div>
 						</div>
 					</div>
+					<!-- 行业编码 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+							</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
+							</div>
+						</div>
+					</div>
 					<!-- 站点方向 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -30,7 +30,7 @@
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
-          						<span class="required"> * </span> 站点名称:
+          						<span class="required"> * </span> 站点名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
 								<input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点名称" readonly="readonly">
@@ -48,6 +48,18 @@
 							</div>
 						</div>
 					</div>
+
+					<!-- 行业编码 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+							</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
+							</div>
+						</div>
+					</div>
 					<!-- 站点序号 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -251,7 +263,7 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 					// 弹出添加成功提示消息
 					layer.msg('修改成功...');
 					/** 通知更新缓存区 */
-					$.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs){console.log(rs)})
+					// $.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs){console.log(rs)})
 				}else {
 					// 弹出添加失败提示消息
 					layer.msg('修改失败...');
@@ -359,6 +359,8 @@ var PublicFunctions = function () {
 			$('#stationRouteLineInput').val(editStationParmas.stationRouteLine);
 			// 线路编码
 			$('#lineCodeInput').val(editStationParmas.stationRouteLIneCode);
+            // 行业标准
+			$('#industryCodeInput').val(editStationParmas.industryCode);
 			// 百度坐标点图形集合
 			$('#bPolygonGridInput').val(editStationParmas.stationBPolygonGrid);
 			// 获取站点名称元素设值
@@ -225,7 +225,7 @@ window.WorldsBMap = function () {
                     // 信息窗口宽度
                     width: (width < 240 ? 240 : width),
                     // 信息窗口高度
-                    height: shapes=="r" ?330:300,
+                    // height: shapes=="r" ?380:350,
                     // 信息窗位置偏移值。
                     offset: new BMap.Size(10,-20),
                     //设置不允许信窗发送短息
@@ -246,6 +246,7 @@ window.WorldsBMap = function () {
                 }
                 var htm = '<span style="color: #ff8355;font-size: 20px; overflow: hidden; white-space: nowrap; text-overflow:ellipsis;display: -webkit-box; -webkit-box-orient: vertical;">' + objStation.stationRouteName + '</span>' +
                     '<span class="help-block" >站点编码：' + objStation.stationCode + '</span>' +
+                    '<span class="help-block" >行业编号：' + (objStation.industryCode == null ? "":objStation.industryCode)+ '</span>' +
                     '<span class="help-block" >站点序号：' + objStation.stationRouteCode + '</span>' +
                     '<span class="help-block" >站点类型：' + markTypeStr + '</span>' +
                     '<span class="help-block" >经度：&nbsp&nbsp' + BJwpoints[0] + '</span>' +
@@ -434,7 +434,7 @@
 // 							+dateTime+"-"+lineName+"-发车到站准点率");
 // 				}else{
 					window.open("/downloadFile/download?fileName="
-							+dateTime+"-"+lineName+"-大间情况表");
+							+dateTime+"-"+lineName+"-大间隔情况表");
 // 				}
 				layer.close(i);
@@ -18,7 +18,7 @@
 <div class="page-head">
 	<div class="page-title">
-		<h1>大间隔统计表</h1>
+		<h1>大间隔发生次数汇总</h1>
 	</div>
 </div>
@@ -27,7 +27,7 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-				<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
+				<div style="display: inline-block; margin-left: 42px;" id="gsdmDiv">
 							<span class="item-label" style="width: 80px;">公司: </span>
 							<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 						</div> 
@@ -35,16 +35,16 @@
 							<span class="item-label" style="width: 80px;">分公司: </span>
 							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 						</div>
-<!--                     	<div style="display: inline-block;margin-left: 18px;"> -->
-<!-- 							<span class="item-label" style="width: 80px;">线路性质: </span> -->
-<!-- 							 <select -->
-<!-- 								class="form-control" name="nature" id="nature" -->
-<!-- 								style="width: 180px;"> -->
-<!-- 								<option value="0">全部线路</option> -->
-<!-- 								<option value="1" selected="selected">营运线路</option> -->
-<!-- 								<option value="2">非营运线路</option> -->
-<!-- 							</select> -->
-<!-- 						</div> -->
+                    	<div style="display: inline-block;margin-left: 18px;">
+							<span class="item-label" style="width: 80px;">线路性质: </span>
+							 <select
+								class="form-control" name="nature" id="nature"
+								style="width: 180px;">
+								<option value="0" selected="selected">全部线路</option>
+								<option value="1">营运线路</option>
+								<option value="2">非营运线路</option>
+							</select>
+						</div>
 					<div style="margin-top: 10px">
                     </div>
 					<div style="display: inline-block;">
@@ -56,10 +56,10 @@
                         <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
                     </div>
-                    <div class="form-group">
+                    <div class="form-group" style="margin-left: 8px;">
                     	<input type="hidden" id="id"/>
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
 			</div>
@@ -72,8 +72,8 @@
 								<td>公司</td>
 								<td>分公司</td>
 								<td>线路等级</td>
-								<td>发生次数</td>
-								<td>班次数</td>
+								<td>大间隔发生次数</td>
+								<td>全日班次数</td>
 								<td>万班次发生率</td>
 							</tr>
 						</thead>
@@ -166,9 +166,9 @@
 			var endDate = $("#endDate").val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
-// 			var nature=$("#nature").val();
+			var nature=$("#nature").val();
 			var i = layer.load(2);
-		    $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,type:'query'},function(result){
+		    $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:'query'},function(result){
 			var intervalList_sum = template('intervalList_sum',{list:result});
 			$('#forms_djg_sum tbody').html(intervalList_sum);
@@ -185,13 +185,13 @@
 			var endDate = $("#endDate").val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
-// 			var nature=$('#nature').val();
+			var nature=$('#nature').val();
 			var lineName = $('#fgsdm option:selected').text();
 			if(lineName=="全部分公司")
 				lineName = $('#gsdm option:selected').text();
 			var i = layer.load(2);
-			$get('/calcInterval/countList',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:"export",lineName:lineName},function(result){
+			$get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:"export",lineName:lineName},function(result){
 				var dateTime = "";
 				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");
@@ -200,7 +200,7 @@
 							moment(endDate).format("YYYYMMDD");
 				}
 				window.open("/downloadFile/download?fileName="
-						+dateTime+"-"+lineName+"-大间统计表");
+						+dateTime+"-"+lineName+"-大间隔发生次数汇总");
 				layer.close(i);
 			});