潘钊 / bsth_control · Commits

Commit 0d980fc84324c508e6f44f7bc1b3f9b7998601b1

Authored by 王通
2 parents 5feb311a d81d276b
build: skipped

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

Inline Side-by-side
Showing 25 changed files with 287 additions and 116 deletions
src/main/java/com/bsth/entity/LsStationRoute.java
  View file @0d980fc
... ... @@ -41,7 +41,9 @@ public class LsStationRoute {
41 41  
42 42 // 线路编码
43 43 private String lineCode;
44   -
  44 +
  45 + // 行业编码
  46 + private String industryCode;
45 47 /**
46 48 * 站点类型
47 49 *
... ... @@ -145,6 +147,14 @@ public class LsStationRoute {
145 147 this.lineCode = lineCode;
146 148 }
147 149  
  150 + public String getIndustryCode() {
  151 + return industryCode;
  152 + }
  153 +
  154 + public void setIndustryCode(String industryCode) {
  155 + this.industryCode = industryCode;
  156 + }
  157 +
148 158 public String getStationMark() {
149 159 return stationMark;
150 160 }
... ...
src/main/java/com/bsth/entity/StationRoute.java
  View file @0d980fc
... ... @@ -43,6 +43,9 @@ public class StationRoute {
43 43  
44 44 // 线路编码
45 45 private String lineCode;
  46 +
  47 + // 行业编码
  48 + private String industryCode;
46 49  
47 50 /**
48 51 * 站点类型
... ... @@ -147,6 +150,14 @@ public class StationRoute {
147 150 this.lineCode = lineCode;
148 151 }
149 152  
  153 + public String getIndustryCode() {
  154 + return industryCode;
  155 + }
  156 +
  157 + public void setIndustryCode(String industryCode) {
  158 + this.industryCode = industryCode;
  159 + }
  160 +
150 161 public String getStationMark() {
151 162 return stationMark;
152 163 }
... ...
src/main/java/com/bsth/entity/StationRouteCache.java
  View file @0d980fc
... ... @@ -44,7 +44,9 @@ public class StationRouteCache {
44 44  
45 45 // 线路编码
46 46 private String lineCode;
47   -
  47 +
  48 + // 行业编码
  49 + private String industryCode;
48 50 /**
49 51 * 站点类型
50 52 *
... ... @@ -148,6 +150,14 @@ public class StationRouteCache {
148 150 this.lineCode = lineCode;
149 151 }
150 152  
  153 + public String getIndustryCode() {
  154 + return industryCode;
  155 + }
  156 +
  157 + public void setIndustryCode(String industryCode) {
  158 + this.industryCode = industryCode;
  159 + }
  160 +
151 161 public String getStationMark() {
152 162 return stationMark;
153 163 }
... ...
src/main/java/com/bsth/repository/StationRouteCacheRepository.java
  View file @0d980fc
... ... @@ -57,11 +57,11 @@ public interface StationRouteCacheRepository extends BaseRepository<StationRoute
57 57 */
58 58 @Modifying
59 59 @Query(value="delete from bsth_c_stationroute_cache where line_code = ?1 and directions = ?2 ", nativeQuery=true)
60   - public void stationRouteCacheDel(String lineCode,Integer dir);
  60 + void stationRouteCacheDel(String lineCode,Integer dir);
61 61  
62 62 @Modifying
63 63 @Query(value="delete from bsth_c_stationroute_cache where line = ?1 and directions = ?2 ", nativeQuery=true)
64   - public void stationRouteCacheDel(Integer lineId,Integer dir);
  64 + void stationRouteCacheDel(Integer lineId,Integer dir);
65 65  
66 66  
67 67 @Query(value = "SELECT a.`stationRoute.id`," +
... ... @@ -95,7 +95,9 @@ public interface StationRouteCacheRepository extends BaseRepository<StationRoute
95 95 "ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
96 96 "b.destroy AS 'station.destroy'," +
97 97 "b.versions AS 'station.versions'," +
98   - "b.descriptions AS 'station.descriptions' FROM (" +
  98 + "b.descriptions AS 'station.descriptions'," +
  99 + "a.`industryCode` " +
  100 + " FROM (" +
99 101 "SELECT r.id AS 'stationRoute.id'," +
100 102 " r.line AS 'stationRoute.line'," +
101 103 "r.station AS 'stationRoute.station'," +
... ... @@ -110,7 +112,7 @@ public interface StationRouteCacheRepository extends BaseRepository<StationRoute
110 112 "r.first_time AS 'stationRoute.firstTime'," +
111 113 "r.end_time AS 'stationRoute.endTime'," +
112 114 "r.descriptions AS 'stationRoute.descriptions'," +
113   - "r.versions AS 'stationRoute.versions' FROM bsth_c_stationroute_cache r WHERE r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
  115 + "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 " +
114 116 "LEFT JOIN bsth_c_station b " +
115 117 "ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
116 118 List<Object[]> findCachePoint(int lineId, int dir);
... ...
src/main/java/com/bsth/repository/StationRouteRepository.java
  View file @0d980fc
... ... @@ -66,7 +66,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
66 66 "ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
67 67 "b.destroy AS 'station.destroy'," +
68 68 "b.versions AS 'station.versions'," +
69   - "b.descriptions AS 'station.descriptions' FROM (" +
  69 + "b.descriptions AS 'station.descriptions', " +
  70 + "a.`stationRoute.industryCode` " +
  71 + " FROM (" +
70 72 "SELECT r.id AS 'stationRoute.id'," +
71 73 " r.line AS 'stationRoute.line'," +
72 74 "r.station AS 'stationRoute.station'," +
... ... @@ -81,7 +83,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
81 83 "r.first_time AS 'stationRoute.firstTime'," +
82 84 "r.end_time AS 'stationRoute.endTime'," +
83 85 "r.descriptions AS 'stationRoute.descriptions'," +
84   - "r.versions AS 'stationRoute.versions' FROM bsth_c_stationroute r WHERE r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
  86 + "r.versions AS 'stationRoute.versions', " +
  87 + "r.industry_code AS 'stationRoute.industryCode' " +
  88 + " FROM bsth_c_stationroute r WHERE r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
85 89 "LEFT JOIN bsth_c_station b " +
86 90 "ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
87 91 List<Object[]> findPoints(int line,int directions);
... ... @@ -149,29 +153,33 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
149 153 " b.create_date AS stationCreateDate," +
150 154 " b.update_by AS stationUpdateBy," +
151 155 " b.update_date AS stationUpdateDate," +
152   - " a.stationRouteId,b.station_name as zdmc "+
153   - " FROM ( SELECT s.id AS stationRouteId," +
154   - " s.line AS stationRouteLine," +
155   - " s.station as stationRouteStation," +
156   - " s.station_name AS stationRouteName," +
157   - " s.station_route_code as stationRouteCode," +
158   - " s.line_code AS stationRouteLIneCode," +
159   - " s.station_mark AS stationRouteStationMark," +
160   - " s.out_station_nmber AS stationOutStationNmber," +
161   - " s.directions AS stationRoutedirections," +
162   - " s.distances AS stationRouteDistances," +
163   - " s.to_time AS stationRouteToTime," +
164   - " s.first_time AS staitonRouteFirstTime," +
165   - " s.end_time AS stationRouteEndTime," +
166   - " s.descriptions AS stationRouteDescriptions," +
167   - " s.destroy AS stationRouteDestroy," +
168   - " s.versions AS stationRouteVersions," +
169   - " s.create_by AS stationRouteCreateBy," +
170   - " s.create_date AS stationRouteCreateDate," +
171   - " s.update_by AS stationRouteUpdateBy," +
172   - " s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.station_route_code =(" +
173   - "select MIN(station_route_code) as stationRouteCode from bsth_c_stationroute r WHERE " +
174   - "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 " +
  156 + " a.stationRouteId, " +
  157 + " b.station_name as zdmc, " +
  158 + " a.industryCode"+
  159 + " FROM " +
  160 + "( SELECT s.id AS stationRouteId," +
  161 + " s.line AS stationRouteLine," +
  162 + " s.station as stationRouteStation," +
  163 + " s.station_name AS stationRouteName," +
  164 + " s.station_route_code as stationRouteCode," +
  165 + " s.industry_code as industryCode," +
  166 + " s.line_code AS stationRouteLIneCode," +
  167 + " s.station_mark AS stationRouteStationMark," +
  168 + " s.out_station_nmber AS stationOutStationNmber," +
  169 + " s.directions AS stationRoutedirections," +
  170 + " s.distances AS stationRouteDistances," +
  171 + " s.to_time AS stationRouteToTime," +
  172 + " s.first_time AS staitonRouteFirstTime," +
  173 + " s.end_time AS stationRouteEndTime," +
  174 + " s.descriptions AS stationRouteDescriptions," +
  175 + " s.destroy AS stationRouteDestroy," +
  176 + " s.versions AS stationRouteVersions," +
  177 + " s.create_by AS stationRouteCreateBy," +
  178 + " s.create_date AS stationRouteCreateDate," +
  179 + " s.update_by AS stationRouteUpdateBy," +
  180 + " s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.station_route_code =(" +
  181 + "select MIN(station_route_code) as stationRouteCode from bsth_c_stationroute r WHERE " +
  182 + "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 " +
175 183 " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
176 184 List<Object[]> findDownStationRoute(Integer id,Integer direction,Integer stationRouteCode);
177 185  
... ... @@ -278,27 +286,30 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
278 286 " b.create_date AS stationCreateDate," +
279 287 " b.update_by AS stationUpdateBy," +
280 288 " b.update_date AS stationUpdateDate," +
281   - " a.stationRouteId,b.station_name as zdmc "+
282   - " FROM ( SELECT s.id AS stationRouteId," +
283   - " s.line AS stationRouteLine," +
284   - " s.station as stationRouteStation," +
285   - " s.station_name AS stationRouteName," +
286   - " s.station_route_code as stationRouteCode," +
287   - " s.line_code AS stationRouteLIneCode," +
288   - " s.station_mark AS stationRouteStationMark," +
289   - " s.out_station_nmber AS stationOutStationNmber," +
290   - " s.directions AS stationRoutedirections," +
291   - " s.distances AS stationRouteDistances," +
292   - " s.to_time AS stationRouteToTime," +
293   - " s.first_time AS staitonRouteFirstTime," +
294   - " s.end_time AS stationRouteEndTime," +
295   - " s.descriptions AS stationRouteDescriptions," +
296   - " s.destroy AS stationRouteDestroy," +
297   - " s.versions AS stationRouteVersions," +
298   - " s.create_by AS stationRouteCreateBy," +
299   - " s.create_date AS stationRouteCreateDate," +
300   - " s.update_by AS stationRouteUpdateBy," +
301   - " s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.id = ?1 ) a " +
  289 + " a.stationRouteId,b.station_name as zdmc, " +
  290 + " a.industryCode "+
  291 + " FROM " +
  292 + "( SELECT s.id AS stationRouteId," +
  293 + " s.line AS stationRouteLine," +
  294 + " s.station as stationRouteStation," +
  295 + " s.station_name AS stationRouteName," +
  296 + " s.station_route_code as stationRouteCode," +
  297 + " s.industry_code as industryCode," +
  298 + " s.line_code AS stationRouteLIneCode," +
  299 + " s.station_mark AS stationRouteStationMark," +
  300 + " s.out_station_nmber AS stationOutStationNmber," +
  301 + " s.directions AS stationRoutedirections," +
  302 + " s.distances AS stationRouteDistances," +
  303 + " s.to_time AS stationRouteToTime," +
  304 + " s.first_time AS staitonRouteFirstTime," +
  305 + " s.end_time AS stationRouteEndTime," +
  306 + " s.descriptions AS stationRouteDescriptions," +
  307 + " s.destroy AS stationRouteDestroy," +
  308 + " s.versions AS stationRouteVersions," +
  309 + " s.create_by AS stationRouteCreateBy," +
  310 + " s.create_date AS stationRouteCreateDate," +
  311 + " s.update_by AS stationRouteUpdateBy," +
  312 + " s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.id = ?1 ) a " +
302 313 " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
303 314 List<Object[]> findStationRouteInfo(Integer id);
304 315  
... ... @@ -348,27 +359,30 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
348 359 " b.create_date AS stationCreateDate," +
349 360 " b.update_by AS stationUpdateBy," +
350 361 " b.update_date AS stationUpdateDate," +
351   - " a.stationRouteId,b.station_name as zdmc "+
  362 + " a.stationRouteId," +
  363 + "b.station_name as zdmc, "+
  364 + "a.industryCode "+
352 365 " FROM ( SELECT s.id AS stationRouteId," +
353   - " s.line AS stationRouteLine," +
354   - " s.station as stationRouteStation," +
355   - " s.station_name AS stationRouteName," +
356   - " s.station_route_code as stationRouteCode," +
357   - " s.line_code AS stationRouteLIneCode," +
358   - " s.station_mark AS stationRouteStationMark," +
359   - " s.out_station_nmber AS stationOutStationNmber," +
360   - " s.directions AS stationRoutedirections," +
361   - " s.distances AS stationRouteDistances," +
362   - " s.to_time AS stationRouteToTime," +
363   - " s.first_time AS staitonRouteFirstTime," +
364   - " s.end_time AS stationRouteEndTime," +
365   - " s.descriptions AS stationRouteDescriptions," +
366   - " s.destroy AS stationRouteDestroy," +
367   - " s.versions AS stationRouteVersions," +
368   - " s.create_by AS stationRouteCreateBy," +
369   - " s.create_date AS stationRouteCreateDate," +
370   - " s.update_by AS stationRouteUpdateBy," +
371   - " s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.destroy = 0) a " +
  366 + " s.line AS stationRouteLine," +
  367 + " s.station as stationRouteStation," +
  368 + " s.station_name AS stationRouteName," +
  369 + " s.station_route_code as stationRouteCode," +
  370 + " s.industry_code as industryCode," +
  371 + " s.line_code AS stationRouteLIneCode," +
  372 + " s.station_mark AS stationRouteStationMark," +
  373 + " s.out_station_nmber AS stationOutStationNmber," +
  374 + " s.directions AS stationRoutedirections," +
  375 + " s.distances AS stationRouteDistances," +
  376 + " s.to_time AS stationRouteToTime," +
  377 + " s.first_time AS staitonRouteFirstTime," +
  378 + " s.end_time AS stationRouteEndTime," +
  379 + " s.descriptions AS stationRouteDescriptions," +
  380 + " s.destroy AS stationRouteDestroy," +
  381 + " s.versions AS stationRouteVersions," +
  382 + " s.create_by AS stationRouteCreateBy," +
  383 + " s.create_date AS stationRouteCreateDate," +
  384 + " s.update_by AS stationRouteUpdateBy," +
  385 + " s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.destroy = 0) a " +
372 386 " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true)
373 387 List<Object[]> getStationRouteList(Integer lineId, Integer dir);
374 388  
... ...
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
  View file @0d980fc
... ... @@ -702,16 +702,15 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
702 702 public List<Map<String, Object>> sumInterval(Map<String, Object> map) {
703 703 // TODO Auto-generated method stub
704 704 final DecimalFormat df = new DecimalFormat("0.00");
705   - List<Map<String, Object>> list=new ArrayList<>();
706 705 String gs=map.get("gs").toString().trim();
707 706 String fgs=map.get("fgs").toString().trim();
708 707 String sDate=map.get("date").toString();
709 708 String eDate=map.get("endDate").toString();
710   -// String nature=map.get("nature").toString();
  709 + String nature=map.get("nature").toString();
711 710  
712 711 List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
713 712  
714   - String sql="select gsbm,fgsbm,level,djg_all,bcs"
  713 + String sql="select gsbm,fgsbm,xl_bm,xl_name,level,djg_all,bcs"
715 714 + " from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"'"
716 715 + " and level is not null and level <> '' ";
717 716 if(gs.length() > 0){
... ... @@ -722,29 +721,52 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
722 721 }
723 722 }
724 723 sql += " order by gsbm,fgsbm,level";
725   -
726   - List<Map<String, Object>> countList=jdbcTemplate.query(sql,
  724 +
  725 + List<Map<String, Object>> countList = new ArrayList<Map<String, Object>>();
  726 + List<Map<String, Object>> list=jdbcTemplate.query(sql,
727 727 new RowMapper<Map<String,Object>>(){
728 728 @Override
729 729 public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
730 730 Map<String, Object> m=new HashMap<String,Object>();
731 731 m.put("gs", BasicData.businessCodeNameMap.get(rs.getString("gsbm")));
732 732 m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsbm")+"_"+rs.getString("gsbm")));
  733 + m.put("xlBm", rs.getString("xl_bm"));
  734 + m.put("xlName", rs.getString("xl_name"));
733 735 m.put("level", rs.getString("level"));
734 736 m.put("djgAll", rs.getInt("djg_all"));
735 737 m.put("bcs", rs.getInt("bcs"));
736 738 return m;
737 739 }
738 740 });
  741 +
  742 + //根据线路类型确定是否营运
  743 + Map<String, Boolean> lineMap=lineService.lineNature();
  744 + for (int i = 0; i < list.size(); i++) {
  745 + Map<String, Object> m=list.get(i);
  746 + if (nature.equals("0")) {
  747 + countList.add(m);
  748 + }else if(nature.equals("1")){
  749 + if(lineMap.get(m.get("xlBm").toString())){
  750 + countList.add(m);
  751 + }
  752 + }else{
  753 + if(!lineMap.get(m.get("xlBm").toString())){
  754 + countList.add(m);
  755 + }
  756 + }
  757 + }
739 758  
740 759 List<String> keyList = new ArrayList<String>();
741 760 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
742 761 Map<String, Object> sumMap1 = new HashMap<String, Object>();
743 762 Map<String, Object> sumMap2 = new HashMap<String, Object>();
744 763 sumMap1.put("fgs", "合计"); //分公司合计
  764 + sumMap1.put("level", "");
745 765 sumMap1.put("djgNum", "0");
746 766 sumMap1.put("bcs", "0");
747 767 sumMap2.put("gs", "合计"); //公司合计
  768 + sumMap2.put("fgs", "");
  769 + sumMap2.put("level", "");
748 770 sumMap2.put("djgNum", "0");
749 771 sumMap2.put("bcs", "0");
750 772 for(Map<String, Object> m : countList){
... ... @@ -763,6 +785,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
763 785 sumMap1 = new HashMap<String, Object>();
764 786 sumMap1.put("gs", gsName);
765 787 sumMap1.put("fgs", "合计");
  788 + sumMap1.put("level", "");
766 789 sumMap1.put("djgNum", "0");
767 790 sumMap1.put("bcs", "0");
768 791 }
... ... @@ -833,10 +856,10 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
833 856 String xlsName="";
834 857 m.put("sDate", sDate);
835 858 m.put("eDate", eDate);
836   - xls="calcIntervalCount.xls";
837   - xlsName="大间隔情况表.xls";
  859 + xls="calcIntervalSum.xls";
  860 + xlsName="大间隔发生次数汇总.xls";
838 861  
839   - ee.excelReplace(listI, new Object[]{m}, path + "mould/" + ""+xls,
  862 + ee.excelReplace(listI, new Object[]{m}, path + "mould/" + xls,
840 863 path + "export/"+dateTime+"-"+lineName+"-"+xlsName);
841 864 } catch (Exception e) {
842 865 // TODO: handle exception
... ...
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @0d980fc
... ... @@ -275,6 +275,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
275 275 tempM.put("stationVersions", stationList.get(i)[30]);
276 276 // 站点说明
277 277 tempM.put("stationDescriptions", stationList.get(i)[31]);
  278 + // 行业标准
  279 + tempM.put("industryCode", stationList.get(i)[32]);
278 280 tempM.put("zdmc", stationList.get(i)[3]);
279 281 tempM.put("text", stationList.get(i)[3]);
280 282 tempM.put("icon", "fa fa-bus");
... ... @@ -603,6 +605,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
603 605  
604 606 tempM.put("stationRouteId", objects.get(i)[39]);
605 607 tempM.put("zdmc", objects.get(i)[40]);
  608 + // 行业编码
  609 + tempM.put("industryCode", objects.get(i)[41]);
606 610  
607 611 resultList.add(tempM);
608 612 }
... ... @@ -1406,6 +1410,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
1406 1410  
1407 1411 // 站点说明
1408 1412 tempM.put("stationDescriptions", stationList.get(i)[31]);
  1413 + // 行业编码
  1414 + tempM.put("industryCode", stationList.get(i)[32]);
1409 1415  
1410 1416 staitonRouteList.add(tempM);
1411 1417 }
... ...
src/main/java/com/bsth/service/impl/StationServiceImpl.java
  View file @0d980fc
... ... @@ -759,6 +759,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
759 759 Integer stationId = null;
760 760 // 站点名称
761 761 String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
  762 + // 行业编码
  763 + String industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
762 764 // 方向
763 765 Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
764 766 // 原坐标点
... ... @@ -860,6 +862,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
860 862 // 线路
861 863 arg0.setLine(resultLine);
862 864 arg0.setLineCode(resultLine.getLineCode());
  865 + arg0.setIndustryCode(industryCode);
863 866 // 站点
864 867 arg0.setStation(station);
865 868 // 站点路由名称
... ... @@ -900,8 +903,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
900 903 public Map<String, Object> stationCacheSave(Map<String, Object> map) {
901 904 Map<String, Object> resultMap = new HashMap<String, Object>();
902 905 try {
903   - // 站点编码
904   - String stationCod = "";
  906 + // 站点编码 , 行业编码
  907 + String stationCod = "",industryCode = "";
905 908 // 站点ID
906 909 Integer stationId = null;
907 910 // 站点名称
... ... @@ -986,6 +989,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
986 989 }
987 990 Station station = repository.findOne(stationId);
988 991 StationRouteCache arg0 = new StationRouteCache();
  992 + // 行业编码
  993 + industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
989 994 // 距离
990 995 Double distances = map.get("distances").equals("") ? 0.0d : Double.parseDouble(map.get("distances").toString());
991 996 // 时间
... ... @@ -1012,6 +1017,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1012 1017 arg0.setLineCode(resultLine.getLineCode());
1013 1018 // 站点
1014 1019 arg0.setStation(station);
  1020 + // 行业编码
  1021 + arg0.setIndustryCode(industryCode);
1015 1022 // 站点路由名称
1016 1023 arg0.setStationName(stationName);
1017 1024 // 站点路由编码
... ... @@ -1064,6 +1071,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1064 1071 // 站点Id
1065 1072 Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString());
1066 1073 String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
  1074 + String industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
1067 1075 String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
1068 1076 // 站点名称
1069 1077 String stationRouteName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
... ... @@ -1158,6 +1166,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1158 1166 stationRoute.setStationRouteCode(stationRouteCode);
1159 1167 stationRoute.setStation(station);
1160 1168 stationRoute.setStationCode(station.getStationCod());
  1169 + stationRoute.setIndustryCode(industryCode);
1161 1170 stationRoute.setLine(line);
1162 1171 stationRoute.setLineCode(line.getLineCode());
1163 1172 stationRoute.setStationMark(stationMark);
... ... @@ -1799,6 +1808,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1799 1808 Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString());
1800 1809 String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
1801 1810 String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
  1811 + // 行业编码
  1812 + String industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
1802 1813 // 站点路由名称
1803 1814 String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
1804 1815 // 所在道路编码
... ... @@ -1890,6 +1901,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1890 1901 stationRoute.setStationName(stationName);
1891 1902 stationRoute.setId(stationRouteId);
1892 1903 stationRoute.setStationRouteCode(stationRouteCode);
  1904 + stationRoute.setIndustryCode(industryCode);
1893 1905 stationRoute.setStation(station);
1894 1906 stationRoute.setStationCode(station.getStationCod());
1895 1907 stationRoute.setLine(line);
... ...
src/main/resources/static/pages/base/line/addstation.html
  View file @0d980fc
... ... @@ -52,6 +52,17 @@
52 52 </div>
53 53 </div>
54 54 </div>
  55 + <!-- 行业编码 -->
  56 + <div class="form-body">
  57 + <div class="form-group">
  58 + <label class="control-label col-md-3">
  59 + 行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
  60 + </label>
  61 + <div class="col-md-6">
  62 + <input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
  63 + </div>
  64 + </div>
  65 + </div>
55 66 <!-- 站点方向 -->
56 67 <div class="form-body">
57 68 <div class="form-group">
... ...
src/main/resources/static/pages/base/line/editstation.html
  View file @0d980fc
... ... @@ -54,6 +54,17 @@
54 54 </div>
55 55 </div>
56 56 </div>
  57 + <!-- 行业编码 -->
  58 + <div class="form-body">
  59 + <div class="form-group">
  60 + <label class="control-label col-md-3">
  61 + 行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
  62 + </label>
  63 + <div class="col-md-6">
  64 + <input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
  65 + </div>
  66 + </div>
  67 + </div>
57 68 <!-- 站点方向 -->
58 69 <div class="form-body">
59 70 <div class="form-group">
... ... @@ -363,5 +374,5 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,fun,s
363 374 }
364 375 return tel;
365 376 }, '方向必须一致!');
366   -});
  377 +});
367 378 </script>
368 379 \ No newline at end of file
... ...
src/main/resources/static/pages/base/line/js/map-function.js
  View file @0d980fc
... ... @@ -61,6 +61,8 @@ var PublicFunctions = function () {
61 61 $('#stationNameInput').val(editStationParmas.stationRouteStationName);
62 62 // 获取站点编码元素设值
63 63 $('#stationCodInput').val(editStationParmas.stationStationCod);
  64 + // 行业编码
  65 + $('#industryCodeInput').val(editStationParmas.industryCode);
64 66 // 获取站点类型元素设值
65 67 // $('#stationMarkSelect').val(editStationParmas.stationRouteStationMark);
66 68 // 获取站点方向元素设值
... ...
src/main/resources/static/pages/base/line/js/map.js
  View file @0d980fc
... ... @@ -559,16 +559,16 @@ var WorldsBMapLine = function () {
559 559 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
560 560 '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
561 561 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
  562 + '<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode == null ? "":objStation.industryCode) + '</span>' +
562 563 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
563 564 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
564 565 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
565 566 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
566 567 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
567   - '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
568 568 '<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
569 569 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
570 570 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
571   - objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
  571 + objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions == null ? "":objStation.stationRouteDescriptions)+ '</span>' ;
572 572  
573 573 // 创建信息窗口
574 574 var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
... ... @@ -668,6 +668,7 @@ var WorldsBMapLine = function () {
668 668 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
669 669 '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
670 670 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
  671 + '<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode == null ? "":objStation.industryCode)+ '</span>' +
671 672 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
672 673 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
673 674 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
... ... @@ -677,7 +678,7 @@ var WorldsBMapLine = function () {
677 678 '<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
678 679 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
679 680 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
680   - objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
  681 + objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions == null ? "":objStation.stationRouteDescriptions) + '</span>' ;
681 682  
682 683 // 创建信息窗口
683 684 var infoWindow_target = new BMap.InfoWindow(htm, opts);
... ...
src/main/resources/static/pages/base/station/edit.html
  View file @0d980fc
... ... @@ -67,6 +67,17 @@
67 67 </div>
68 68 </div>
69 69 </div>
  70 + <!-- 行业编码 -->
  71 + <div class="form-body">
  72 + <div class="form-group">
  73 + <label class="control-label col-md-3">
  74 + 行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
  75 + </label>
  76 + <div class="col-md-6">
  77 + <input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
  78 + </div>
  79 + </div>
  80 + </div>
70 81 <!-- 站点方向 -->
71 82 <div class="form-body">
72 83 <div class="form-group">
... ...
src/main/resources/static/pages/base/station/js/station-positions-function.js
  View file @0d980fc
... ... @@ -28,16 +28,17 @@ var PositionsPublicFunctions = function () {
28 28 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
29 29 '<span style="color:#DDD;font-size: 15px;">站点名称：' + r[0].zdmc + '</span>' +
30 30 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + r[0].stationCode + '</span>' +
  31 + '<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (r[0].industryCode == null ? "":r[0].industryCode) + '</span>' +
31 32 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + r[0].stationRouteCode + '</span>' +
32 33 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
33 34 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + r[0].stationJwpoints + '</span>' +
34 35 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + r[0].stationRouteToTime + '&nbsp;分钟</span>' +
35 36 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + r[0].stationRouteDistances + '&nbsp;公里</span>' +
36 37 '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + r[0].stationRadius + '</span>' +
37   - '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + r[0].stationRouteVersions + '</span>' +
  38 + '<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp;&nbsp;：' + r[0].stationRouteVersions + '</span>' +
38 39 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
39 40 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
40   - r[0].stationRouteDescriptions +'" >说明/描述：' + r[0].stationRouteDescriptions + '</span>' ;
  41 + r[0].stationRouteDescriptions +'" >说明/描述：' + (r[0].stationRouteDescriptions == null ? "":r[0].stationRouteDescriptions) + '</span>' ;
41 42 // 信息窗口参数属性
42 43 var opts = {
43 44 // 信息窗口宽度
... ... @@ -118,6 +119,8 @@ var PositionsPublicFunctions = function () {
118 119 $('#stationRouteLineInput').val(stationObj.stationRouteLine);
119 120 // 线路编码
120 121 $('#lineCodeInput').val(stationObj.stationRouteLIneCode);
  122 + // 线路编码
  123 + $('#industryCodeInput').val(stationObj.industryCode);
121 124 // WGS坐标点图形集合
122 125 $('#bPolygonGridInput').val(stationObj.stationBPolyonGrid);
123 126 // 获取站点名称元素设值
... ... @@ -201,6 +204,8 @@ var PositionsPublicFunctions = function () {
201 204 $('#versionsInput').val(stationObj.stationRouteVersions);
202 205 // 描述/说明
203 206 $('#descriptionsTextarea').val(stationObj.stationRouteDescriptions);
  207 + // 行业编码
  208 + $('#industryCodeInput').val(stationObj.industryCode);
204 209 },
205 210 // 获取站点路由.
206 211 getzdlyInfo : function(params,callback) {
... ...
src/main/resources/static/pages/base/station/list.html
  View file @0d980fc
... ... @@ -34,14 +34,15 @@
34 34 <th width="3%">序号</th>
35 35 <th width="5%">线路编号</th>
36 36 <th width="8%">线路名称</th>
37   - <th width="5%">线路方向</th>
  37 + <th width="4%">线路方向</th>
38 38 <th width="8%">站点路由名称</th>
39 39 <th width="4%">站点编码</th>
  40 + <th width="4%">行业编码</th>
40 41 <th width="4%">站点序号</th>
41 42 <th width="4%">站点类型</th>
42 43 <th width="6%">站点距离(km)</th>
43 44 <th width="6%">站点时长(min)</th>
44   - <th width="4%">版本号</th>
  45 + <th width="3%">版本号</th>
45 46 <th width="4%">是否撤销</th>
46 47 <th width="8%">操作</th>
47 48 </tr>
... ... @@ -68,6 +69,9 @@
68 69 <input type="text" class="form-control form-filter input-sm" name="stationCode_eq">
69 70 </td>
70 71 <td>
  72 + <input type="text" class="form-control form-filter input-sm" name="industryCode_eq">
  73 + </td>
  74 + <td>
71 75 <input type="text" class="form-control form-filter input-sm" name="stationRouteCode_eq">
72 76 </td>
73 77 <td>
... ... @@ -141,6 +145,9 @@
141 145 {{obj.stationCode}}
142 146 </td>
143 147 <td>
  148 + {{obj.industryCode}}
  149 + </td>
  150 + <td>
144 151 {{obj.stationRouteCode}}
145 152 </td>
146 153 <td>
... ...
src/main/resources/static/pages/base/station/list_edit.html
  View file @0d980fc
... ... @@ -249,7 +249,16 @@
249 249  
250 250 <!-- 表单分组组件 form-group START -->
251 251 <div class="form-group">
252   - <!-- 描述/说明 -->
  252 + <!-- 行业编码 -->
  253 + <div class="col-md-6">
  254 + <label class="control-label col-md-5">
  255 + 行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
  256 + </label>
  257 + <div class="col-md-4">
  258 + <input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
  259 + </div>
  260 + </div>
  261 + <!-- 描述/说明 -->
253 262 <div class="col-md-6">
254 263 <label class="control-label col-md-5"><span class="required"></span>描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
255 264 </label>
... ...
src/main/resources/static/pages/base/stationroute/add.html
  View file @0d980fc
... ... @@ -52,6 +52,17 @@
52 52 </div>
53 53 </div>
54 54 </div>
  55 + <!-- 行业编码 -->
  56 + <div class="form-body">
  57 + <div class="form-group">
  58 + <label class="control-label col-md-3">
  59 + 行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
  60 + </label>
  61 + <div class="col-md-6">
  62 + <input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
  63 + </div>
  64 + </div>
  65 + </div>
55 66 <!-- 站点方向 -->
56 67 <div class="form-body">
57 68 <div class="form-group">
... ...
src/main/resources/static/pages/base/stationroute/edit.html
  View file @0d980fc
... ... @@ -30,7 +30,7 @@
30 30 <div class="form-body">
31 31 <div class="form-group">
32 32 <label class="control-label col-md-3">
33   - <span class="required"> * </span> 站点名称:
  33 + <span class="required"> * </span> 站点名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
34 34 </label>
35 35 <div class="col-md-6">
36 36 <input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点名称" readonly="readonly">
... ... @@ -48,6 +48,18 @@
48 48 </div>
49 49 </div>
50 50 </div>
  51 +
  52 + <!-- 行业编码 -->
  53 + <div class="form-body">
  54 + <div class="form-group">
  55 + <label class="control-label col-md-3">
  56 + 行业编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
  57 + </label>
  58 + <div class="col-md-6">
  59 + <input type="text" class="form-control" name="industryCode" id="industryCodeInput" placeholder="行业编码">
  60 + </div>
  61 + </div>
  62 + </div>
51 63 <!-- 站点序号 -->
52 64 <div class="form-body">
53 65 <div class="form-group">
... ... @@ -251,7 +263,7 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
251 263 // 弹出添加成功提示消息
252 264 layer.msg('修改成功...');
253 265 /** 通知更新缓存区 */
254   - $.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs){console.log(rs)})
  266 + // $.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs){console.log(rs)})
255 267 }else {
256 268 // 弹出添加失败提示消息
257 269 layer.msg('修改失败...');
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
  View file @0d980fc
... ... @@ -359,6 +359,8 @@ var PublicFunctions = function () {
359 359 $('#stationRouteLineInput').val(editStationParmas.stationRouteLine);
360 360 // 线路编码
361 361 $('#lineCodeInput').val(editStationParmas.stationRouteLIneCode);
  362 + // 行业标准
  363 + $('#industryCodeInput').val(editStationParmas.industryCode);
362 364 // 百度坐标点图形集合
363 365 $('#bPolygonGridInput').val(editStationParmas.stationBPolygonGrid);
364 366 // 获取站点名称元素设值
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
  View file @0d980fc
... ... @@ -225,7 +225,7 @@ window.WorldsBMap = function () {
225 225 // 信息窗口宽度
226 226 width: (width < 240 ? 240 : width),
227 227 // 信息窗口高度
228   - height: shapes=="r" ?330:300,
  228 + // height: shapes=="r" ?380:350,
229 229 // 信息窗位置偏移值。
230 230 offset: new BMap.Size(10,-20),
231 231 //设置不允许信窗发送短息
... ... @@ -246,6 +246,7 @@ window.WorldsBMap = function () {
246 246 }
247 247 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>' +
248 248 '<span class="help-block" >站点编码：' + objStation.stationCode + '</span>' +
  249 + '<span class="help-block" >行业编号：' + (objStation.industryCode == null ? "":objStation.industryCode)+ '</span>' +
249 250 '<span class="help-block" >站点序号：' + objStation.stationRouteCode + '</span>' +
250 251 '<span class="help-block" >站点类型：' + markTypeStr + '</span>' +
251 252 '<span class="help-block" >经度：&nbsp&nbsp' + BJwpoints[0] + '</span>' +
... ...
src/main/resources/static/pages/forms/mould/calcIntervalCount.xls
View file @0d980fc
No preview for this file type
src/main/resources/static/pages/forms/mould/calcIntervalList1.xls
View file @0d980fc
No preview for this file type
src/main/resources/static/pages/forms/mould/calcIntervalSum.xls 0 → 100644
View file @0d980fc
No preview for this file type
src/main/resources/static/pages/report/sheet/intervalCount.html
  View file @0d980fc
... ... @@ -434,7 +434,7 @@
434 434 // +dateTime+"-"+lineName+"-发车到站准点率");
435 435 // }else{
436 436 window.open("/downloadFile/download?fileName="
437   - +dateTime+"-"+lineName+"-大间情况表");
  437 + +dateTime+"-"+lineName+"-大间隔情况表");
438 438 // }
439 439  
440 440 layer.close(i);
... ...
src/main/resources/static/pages/report/sheet/intervalSum.html
  View file @0d980fc
... ... @@ -18,7 +18,7 @@
18 18  
19 19 <div class="page-head">
20 20 <div class="page-title">
21   - <h1>大间隔统计表</h1>
  21 + <h1>大间隔发生次数汇总</h1>
22 22 </div>
23 23 </div>
24 24  
... ... @@ -27,7 +27,7 @@
27 27 <div class="portlet light porttlet-fit bordered">
28 28 <div class="portlet-title">
29 29 <form class="form-inline" action="">
30   - <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
  30 + <div style="display: inline-block; margin-left: 42px;" id="gsdmDiv">
31 31 <span class="item-label" style="width: 80px;">公司: </span>
32 32 <select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
33 33 </div>
... ... @@ -35,16 +35,16 @@
35 35 <span class="item-label" style="width: 80px;">分公司: </span>
36 36 <select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
37 37 </div>
38   -<!-- <div style="display: inline-block;margin-left: 18px;"> -->
39   -<!-- <span class="item-label" style="width: 80px;">线路性质: </span> -->
40   -<!-- <select -->
41   -<!-- class="form-control" name="nature" id="nature" -->
42   -<!-- style="width: 180px;"> -->
43   -<!-- <option value="0">全部线路</option> -->
44   -<!-- <option value="1" selected="selected">营运线路</option> -->
45   -<!-- <option value="2">非营运线路</option> -->
46   -<!-- </select> -->
47   -<!-- </div> -->
  38 + <div style="display: inline-block;margin-left: 18px;">
  39 + <span class="item-label" style="width: 80px;">线路性质: </span>
  40 + <select
  41 + class="form-control" name="nature" id="nature"
  42 + style="width: 180px;">
  43 + <option value="0" selected="selected">全部线路</option>
  44 + <option value="1">营运线路</option>
  45 + <option value="2">非营运线路</option>
  46 + </select>
  47 + </div>
48 48 <div style="margin-top: 10px">
49 49 </div>
50 50 <div style="display: inline-block;">
... ... @@ -56,10 +56,10 @@
56 56 <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
57 57 </div>
58 58  
59   - <div class="form-group">
  59 + <div class="form-group" style="margin-left: 8px;">
60 60 <input type="hidden" id="id"/>
61 61 <input class="btn btn-default" type="button" id="query" value="查询"/>
62   -<!-- <input class="btn btn-default" type="button" id="export" value="导出"/> -->
  62 + <input class="btn btn-default" type="button" id="export" value="导出"/>
63 63 </div>
64 64 </form>
65 65 </div>
... ... @@ -72,8 +72,8 @@
72 72 <td>公司</td>
73 73 <td>分公司</td>
74 74 <td>线路等级</td>
75   - <td>发生次数</td>
76   - <td>班次数</td>
  75 + <td>大间隔发生次数</td>
  76 + <td>全日班次数</td>
77 77 <td>万班次发生率</td>
78 78 </tr>
79 79 </thead>
... ... @@ -166,9 +166,9 @@
166 166 var endDate = $("#endDate").val();
167 167 var fgs=$('#fgsdm').val();
168 168 var gs=$('#gsdm').val();
169   -// var nature=$("#nature").val();
  169 + var nature=$("#nature").val();
170 170 var i = layer.load(2);
171   - $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,type:'query'},function(result){
  171 + $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:'query'},function(result){
172 172 var intervalList_sum = template('intervalList_sum',{list:result});
173 173 $('#forms_djg_sum tbody').html(intervalList_sum);
174 174  
... ... @@ -185,13 +185,13 @@
185 185 var endDate = $("#endDate").val();
186 186 var fgs=$('#fgsdm').val();
187 187 var gs=$('#gsdm').val();
188   -// var nature=$('#nature').val();
  188 + var nature=$('#nature').val();
189 189 var lineName = $('#fgsdm option:selected').text();
190 190 if(lineName=="全部分公司")
191 191 lineName = $('#gsdm option:selected').text();
192 192  
193 193 var i = layer.load(2);
194   - $get('/calcInterval/countList',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:"export",lineName:lineName},function(result){
  194 + $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:"export",lineName:lineName},function(result){
195 195 var dateTime = "";
196 196 if(date == endDate){
197 197 dateTime = moment(date).format("YYYYMMDD");
... ... @@ -200,7 +200,7 @@
200 200 moment(endDate).format("YYYYMMDD");
201 201 }
202 202 window.open("/downloadFile/download?fileName="
203   - +dateTime+"-"+lineName+"-大间统计表");
  203 + +dateTime+"-"+lineName+"-大间隔发生次数汇总");
204 204  
205 205 layer.close(i);
206 206 });
... ...