潘钊 / bsth_control · Commits

Commit 03dfab905df48b45dc36179aa488fee86de5165f

Authored by 游瑞烽
1 parent 0a1f7fb4

站点路由添加 行业编码字段

Inline Side-by-side
Showing 18 changed files with 221 additions and 80 deletions
src/main/java/com/bsth/entity/LsStationRoute.java
  View file @03dfab9
@@ -41,7 +41,9 @@ public class LsStationRoute { @@ -41,7 +41,9 @@ public class LsStationRoute {
41 41
42 // 线路编码 42 // 线路编码
43 private String lineCode; 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,6 +147,14 @@ public class LsStationRoute {
145 this.lineCode = lineCode; 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 public String getStationMark() { 158 public String getStationMark() {
149 return stationMark; 159 return stationMark;
150 } 160 }
src/main/java/com/bsth/entity/StationRoute.java
  View file @03dfab9
@@ -43,6 +43,9 @@ public class StationRoute { @@ -43,6 +43,9 @@ public class StationRoute {
43 43
44 // 线路编码 44 // 线路编码
45 private String lineCode; 45 private String lineCode;
  46 +
  47 + // 行业编码
  48 + private String industryCode;
46 49
47 /** 50 /**
48 * 站点类型 51 * 站点类型
@@ -147,6 +150,14 @@ public class StationRoute { @@ -147,6 +150,14 @@ public class StationRoute {
147 this.lineCode = lineCode; 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 public String getStationMark() { 161 public String getStationMark() {
151 return stationMark; 162 return stationMark;
152 } 163 }
src/main/java/com/bsth/entity/StationRouteCache.java
  View file @03dfab9
@@ -44,7 +44,9 @@ public class StationRouteCache { @@ -44,7 +44,9 @@ public class StationRouteCache {
44 44
45 // 线路编码 45 // 线路编码
46 private String lineCode; 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,6 +150,14 @@ public class StationRouteCache {
148 this.lineCode = lineCode; 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 public String getStationMark() { 161 public String getStationMark() {
152 return stationMark; 162 return stationMark;
153 } 163 }
src/main/java/com/bsth/repository/StationRouteCacheRepository.java
  View file @03dfab9
@@ -57,11 +57,11 @@ public interface StationRouteCacheRepository extends BaseRepository<StationRoute @@ -57,11 +57,11 @@ public interface StationRouteCacheRepository extends BaseRepository<StationRoute
57 */ 57 */
58 @Modifying 58 @Modifying
59 @Query(value="delete from bsth_c_stationroute_cache where line_code = ?1 and directions = ?2 ", nativeQuery=true) 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 @Modifying 62 @Modifying
63 @Query(value="delete from bsth_c_stationroute_cache where line = ?1 and directions = ?2 ", nativeQuery=true) 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 @Query(value = "SELECT a.`stationRoute.id`," + 67 @Query(value = "SELECT a.`stationRoute.id`," +
@@ -95,7 +95,9 @@ public interface StationRouteCacheRepository extends BaseRepository<StationRoute @@ -95,7 +95,9 @@ public interface StationRouteCacheRepository extends BaseRepository<StationRoute
95 "ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," + 95 "ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
96 "b.destroy AS 'station.destroy'," + 96 "b.destroy AS 'station.destroy'," +
97 "b.versions AS 'station.versions'," + 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 "SELECT r.id AS 'stationRoute.id'," + 101 "SELECT r.id AS 'stationRoute.id'," +
100 " r.line AS 'stationRoute.line'," + 102 " r.line AS 'stationRoute.line'," +
101 "r.station AS 'stationRoute.station'," + 103 "r.station AS 'stationRoute.station'," +
@@ -110,7 +112,7 @@ public interface StationRouteCacheRepository extends BaseRepository<StationRoute @@ -110,7 +112,7 @@ public interface StationRouteCacheRepository extends BaseRepository<StationRoute
110 "r.first_time AS 'stationRoute.firstTime'," + 112 "r.first_time AS 'stationRoute.firstTime'," +
111 "r.end_time AS 'stationRoute.endTime'," + 113 "r.end_time AS 'stationRoute.endTime'," +
112 "r.descriptions AS 'stationRoute.descriptions'," + 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 "LEFT JOIN bsth_c_station b " + 116 "LEFT JOIN bsth_c_station b " +
115 "ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true) 117 "ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
116 List<Object[]> findCachePoint(int lineId, int dir); 118 List<Object[]> findCachePoint(int lineId, int dir);
src/main/java/com/bsth/repository/StationRouteRepository.java
  View file @03dfab9
@@ -66,7 +66,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int @@ -66,7 +66,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
66 "ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," + 66 "ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
67 "b.destroy AS 'station.destroy'," + 67 "b.destroy AS 'station.destroy'," +
68 "b.versions AS 'station.versions'," + 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 "SELECT r.id AS 'stationRoute.id'," + 72 "SELECT r.id AS 'stationRoute.id'," +
71 " r.line AS 'stationRoute.line'," + 73 " r.line AS 'stationRoute.line'," +
72 "r.station AS 'stationRoute.station'," + 74 "r.station AS 'stationRoute.station'," +
@@ -81,7 +83,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int @@ -81,7 +83,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
81 "r.first_time AS 'stationRoute.firstTime'," + 83 "r.first_time AS 'stationRoute.firstTime'," +
82 "r.end_time AS 'stationRoute.endTime'," + 84 "r.end_time AS 'stationRoute.endTime'," +
83 "r.descriptions AS 'stationRoute.descriptions'," + 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 "LEFT JOIN bsth_c_station b " + 89 "LEFT JOIN bsth_c_station b " +
86 "ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true) 90 "ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
87 List<Object[]> findPoints(int line,int directions); 91 List<Object[]> findPoints(int line,int directions);
@@ -149,29 +153,33 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int @@ -149,29 +153,33 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
149 " b.create_date AS stationCreateDate," + 153 " b.create_date AS stationCreateDate," +
150 " b.update_by AS stationUpdateBy," + 154 " b.update_by AS stationUpdateBy," +
151 " b.update_date AS stationUpdateDate," + 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 " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true) 183 " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
176 List<Object[]> findDownStationRoute(Integer id,Integer direction,Integer stationRouteCode); 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,27 +286,30 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
278 " b.create_date AS stationCreateDate," + 286 " b.create_date AS stationCreateDate," +
279 " b.update_by AS stationUpdateBy," + 287 " b.update_by AS stationUpdateBy," +
280 " b.update_date AS stationUpdateDate," + 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 " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true) 313 " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
303 List<Object[]> findStationRouteInfo(Integer id); 314 List<Object[]> findStationRouteInfo(Integer id);
304 315
@@ -348,27 +359,30 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int @@ -348,27 +359,30 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
348 " b.create_date AS stationCreateDate," + 359 " b.create_date AS stationCreateDate," +
349 " b.update_by AS stationUpdateBy," + 360 " b.update_by AS stationUpdateBy," +
350 " b.update_date AS stationUpdateDate," + 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 " FROM ( SELECT s.id AS stationRouteId," + 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 " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true) 386 " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true)
373 List<Object[]> getStationRouteList(Integer lineId, Integer dir); 387 List<Object[]> getStationRouteList(Integer lineId, Integer dir);
374 388
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @03dfab9
@@ -262,6 +262,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -262,6 +262,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
262 tempM.put("stationVersions", stationList.get(i)[30]); 262 tempM.put("stationVersions", stationList.get(i)[30]);
263 // 站点说明 263 // 站点说明
264 tempM.put("stationDescriptions", stationList.get(i)[31]); 264 tempM.put("stationDescriptions", stationList.get(i)[31]);
  265 + // 行业标准
  266 + tempM.put("industryCode", stationList.get(i)[32]);
265 tempM.put("zdmc", stationList.get(i)[3]); 267 tempM.put("zdmc", stationList.get(i)[3]);
266 tempM.put("text", stationList.get(i)[3]); 268 tempM.put("text", stationList.get(i)[3]);
267 tempM.put("icon", "fa fa-bus"); 269 tempM.put("icon", "fa fa-bus");
@@ -590,6 +592,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -590,6 +592,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
590 592
591 tempM.put("stationRouteId", objects.get(i)[39]); 593 tempM.put("stationRouteId", objects.get(i)[39]);
592 tempM.put("zdmc", objects.get(i)[40]); 594 tempM.put("zdmc", objects.get(i)[40]);
  595 + // 行业编码
  596 + tempM.put("industryCode", objects.get(i)[41]);
593 597
594 resultList.add(tempM); 598 resultList.add(tempM);
595 } 599 }
@@ -1384,6 +1388,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -1384,6 +1388,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
1384 1388
1385 // 站点说明 1389 // 站点说明
1386 tempM.put("stationDescriptions", stationList.get(i)[31]); 1390 tempM.put("stationDescriptions", stationList.get(i)[31]);
  1391 + // 行业编码
  1392 + tempM.put("industryCode", stationList.get(i)[32]);
1387 1393
1388 staitonRouteList.add(tempM); 1394 staitonRouteList.add(tempM);
1389 } 1395 }
src/main/java/com/bsth/service/impl/StationServiceImpl.java
  View file @03dfab9
@@ -757,6 +757,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem @@ -757,6 +757,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
757 Integer stationId = null; 757 Integer stationId = null;
758 // 站点名称 758 // 站点名称
759 String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString(); 759 String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
  760 + // 行业编码
  761 + String industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
760 // 方向 762 // 方向
761 Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString()); 763 Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
762 // 原坐标点 764 // 原坐标点
@@ -858,6 +860,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem @@ -858,6 +860,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
858 // 线路 860 // 线路
859 arg0.setLine(resultLine); 861 arg0.setLine(resultLine);
860 arg0.setLineCode(resultLine.getLineCode()); 862 arg0.setLineCode(resultLine.getLineCode());
  863 + arg0.setIndustryCode(industryCode);
861 // 站点 864 // 站点
862 arg0.setStation(station); 865 arg0.setStation(station);
863 // 站点路由名称 866 // 站点路由名称
@@ -898,8 +901,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem @@ -898,8 +901,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
898 public Map<String, Object> stationCacheSave(Map<String, Object> map) { 901 public Map<String, Object> stationCacheSave(Map<String, Object> map) {
899 Map<String, Object> resultMap = new HashMap<String, Object>(); 902 Map<String, Object> resultMap = new HashMap<String, Object>();
900 try { 903 try {
901 - // 站点编码  
902 - String stationCod = ""; 904 + // 站点编码 , 行业编码
  905 + String stationCod = "",industryCode = "";
903 // 站点ID 906 // 站点ID
904 Integer stationId = null; 907 Integer stationId = null;
905 // 站点名称 908 // 站点名称
@@ -984,6 +987,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem @@ -984,6 +987,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
984 } 987 }
985 Station station = repository.findOne(stationId); 988 Station station = repository.findOne(stationId);
986 StationRouteCache arg0 = new StationRouteCache(); 989 StationRouteCache arg0 = new StationRouteCache();
  990 + // 行业编码
  991 + industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
987 // 距离 992 // 距离
988 Double distances = map.get("distances").equals("") ? 0.0d : Double.parseDouble(map.get("distances").toString()); 993 Double distances = map.get("distances").equals("") ? 0.0d : Double.parseDouble(map.get("distances").toString());
989 // 时间 994 // 时间
@@ -1010,6 +1015,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem @@ -1010,6 +1015,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1010 arg0.setLineCode(resultLine.getLineCode()); 1015 arg0.setLineCode(resultLine.getLineCode());
1011 // 站点 1016 // 站点
1012 arg0.setStation(station); 1017 arg0.setStation(station);
  1018 + // 行业编码
  1019 + arg0.setIndustryCode(industryCode);
1013 // 站点路由名称 1020 // 站点路由名称
1014 arg0.setStationName(stationName); 1021 arg0.setStationName(stationName);
1015 // 站点路由编码 1022 // 站点路由编码
@@ -1062,6 +1069,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem @@ -1062,6 +1069,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1062 // 站点Id 1069 // 站点Id
1063 Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString()); 1070 Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString());
1064 String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString(); 1071 String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
  1072 + String industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
1065 String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString(); 1073 String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
1066 // 站点名称 1074 // 站点名称
1067 String stationRouteName = map.get("stationName").equals("") ? "" : map.get("stationName").toString(); 1075 String stationRouteName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
@@ -1156,6 +1164,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem @@ -1156,6 +1164,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1156 stationRoute.setStationRouteCode(stationRouteCode); 1164 stationRoute.setStationRouteCode(stationRouteCode);
1157 stationRoute.setStation(station); 1165 stationRoute.setStation(station);
1158 stationRoute.setStationCode(station.getStationCod()); 1166 stationRoute.setStationCode(station.getStationCod());
  1167 + stationRoute.setIndustryCode(industryCode);
1159 stationRoute.setLine(line); 1168 stationRoute.setLine(line);
1160 stationRoute.setLineCode(line.getLineCode()); 1169 stationRoute.setLineCode(line.getLineCode());
1161 stationRoute.setStationMark(stationMark); 1170 stationRoute.setStationMark(stationMark);
@@ -1751,6 +1760,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem @@ -1751,6 +1760,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1751 Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString()); 1760 Integer stationId = map.get("stationId").equals("") ? null : Integer.parseInt(map.get("stationId").toString());
1752 String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString(); 1761 String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
1753 String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString(); 1762 String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
  1763 + // 行业编码
  1764 + String industryCode = map.get("industryCode").equals("") ? "" : map.get("industryCode").toString();
1754 // 站点路由名称 1765 // 站点路由名称
1755 String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString(); 1766 String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
1756 // 所在道路编码 1767 // 所在道路编码
@@ -1842,6 +1853,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem @@ -1842,6 +1853,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1842 stationRoute.setStationName(stationName); 1853 stationRoute.setStationName(stationName);
1843 stationRoute.setId(stationRouteId); 1854 stationRoute.setId(stationRouteId);
1844 stationRoute.setStationRouteCode(stationRouteCode); 1855 stationRoute.setStationRouteCode(stationRouteCode);
  1856 + stationRoute.setIndustryCode(industryCode);
1845 stationRoute.setStation(station); 1857 stationRoute.setStation(station);
1846 stationRoute.setStationCode(station.getStationCod()); 1858 stationRoute.setStationCode(station.getStationCod());
1847 stationRoute.setLine(line); 1859 stationRoute.setLine(line);
src/main/resources/static/pages/base/line/addstation.html
  View file @03dfab9
@@ -52,6 +52,17 @@ @@ -52,6 +52,17 @@
52 </div> 52 </div>
53 </div> 53 </div>
54 </div> 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 <div class="form-body"> 67 <div class="form-body">
57 <div class="form-group"> 68 <div class="form-group">
src/main/resources/static/pages/base/line/editstation.html
  View file @03dfab9
@@ -54,6 +54,17 @@ @@ -54,6 +54,17 @@
54 </div> 54 </div>
55 </div> 55 </div>
56 </div> 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 <div class="form-body"> 69 <div class="form-body">
59 <div class="form-group"> 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,5 +374,5 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,fun,s
363 } 374 }
364 return tel; 375 return tel;
365 }, '方向必须一致!'); 376 }, '方向必须一致!');
366 -}); 377 +});
367 </script> 378 </script>
368 \ No newline at end of file 379 \ No newline at end of file
src/main/resources/static/pages/base/line/js/map-function.js
  View file @03dfab9
@@ -61,6 +61,8 @@ var PublicFunctions = function () { @@ -61,6 +61,8 @@ var PublicFunctions = function () {
61 $('#stationNameInput').val(editStationParmas.stationRouteStationName); 61 $('#stationNameInput').val(editStationParmas.stationRouteStationName);
62 // 获取站点编码元素设值 62 // 获取站点编码元素设值
63 $('#stationCodInput').val(editStationParmas.stationStationCod); 63 $('#stationCodInput').val(editStationParmas.stationStationCod);
  64 + // 行业编码
  65 + $('#industryCodeInput').val(editStationParmas.industryCode);
64 // 获取站点类型元素设值 66 // 获取站点类型元素设值
65 // $('#stationMarkSelect').val(editStationParmas.stationRouteStationMark); 67 // $('#stationMarkSelect').val(editStationParmas.stationRouteStationMark);
66 // 获取站点方向元素设值 68 // 获取站点方向元素设值
src/main/resources/static/pages/base/line/js/map.js
  View file @03dfab9
@@ -559,12 +559,12 @@ var WorldsBMapLine = function () { @@ -559,12 +559,12 @@ var WorldsBMapLine = function () {
559 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+ 559 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
560 '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 560 '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
561 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' + 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 + '</span>' +
562 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' + 563 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
563 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' + 564 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
564 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' + 565 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
565 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' + 566 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
566 '<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.stationRouteDistances + '&nbsp;公里</span>' +
567 - '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +  
568 '<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' + 568 '<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
569 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+ 569 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
570 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+ 570 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
@@ -668,6 +668,7 @@ var WorldsBMapLine = function () { @@ -668,6 +668,7 @@ var WorldsBMapLine = function () {
668 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+ 668 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
669 '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 669 '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
670 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' + 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 + '</span>' +
671 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' + 672 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
672 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' + 673 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
673 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' + 674 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
src/main/resources/static/pages/base/station/edit.html
  View file @03dfab9
@@ -67,6 +67,17 @@ @@ -67,6 +67,17 @@
67 </div> 67 </div>
68 </div> 68 </div>
69 </div> 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 <div class="form-body"> 82 <div class="form-body">
72 <div class="form-group"> 83 <div class="form-group">
src/main/resources/static/pages/base/station/js/station-positions-function.js
  View file @03dfab9
@@ -28,13 +28,14 @@ var PositionsPublicFunctions = function () { @@ -28,13 +28,14 @@ var PositionsPublicFunctions = function () {
28 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+ 28 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
29 '<span style="color:#DDD;font-size: 15px;">站点名称：' + r[0].zdmc + '</span>' + 29 '<span style="color:#DDD;font-size: 15px;">站点名称：' + r[0].zdmc + '</span>' +
30 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + r[0].stationCode + '</span>' + 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 + '</span>' +
31 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + r[0].stationRouteCode + '</span>' + 32 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + r[0].stationRouteCode + '</span>' +
32 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' + 33 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
33 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + r[0].stationJwpoints + '</span>' + 34 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + r[0].stationJwpoints + '</span>' +
34 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + r[0].stationRouteToTime + '&nbsp;分钟</span>' + 35 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + r[0].stationRouteToTime + '&nbsp;分钟</span>' +
35 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + r[0].stationRouteDistances + '&nbsp;公里</span>' + 36 '<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + r[0].stationRouteDistances + '&nbsp;公里</span>' +
36 '<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].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 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+ 39 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
39 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+ 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 + '</span>' ;
@@ -118,6 +119,8 @@ var PositionsPublicFunctions = function () { @@ -118,6 +119,8 @@ var PositionsPublicFunctions = function () {
118 $('#stationRouteLineInput').val(stationObj.stationRouteLine); 119 $('#stationRouteLineInput').val(stationObj.stationRouteLine);
119 // 线路编码 120 // 线路编码
120 $('#lineCodeInput').val(stationObj.stationRouteLIneCode); 121 $('#lineCodeInput').val(stationObj.stationRouteLIneCode);
  122 + // 线路编码
  123 + $('#industryCodeInput').val(stationObj.industryCode);
121 // WGS坐标点图形集合 124 // WGS坐标点图形集合
122 $('#bPolygonGridInput').val(stationObj.stationBPolyonGrid); 125 $('#bPolygonGridInput').val(stationObj.stationBPolyonGrid);
123 // 获取站点名称元素设值 126 // 获取站点名称元素设值
@@ -201,6 +204,8 @@ var PositionsPublicFunctions = function () { @@ -201,6 +204,8 @@ var PositionsPublicFunctions = function () {
201 $('#versionsInput').val(stationObj.stationRouteVersions); 204 $('#versionsInput').val(stationObj.stationRouteVersions);
202 // 描述/说明 205 // 描述/说明
203 $('#descriptionsTextarea').val(stationObj.stationRouteDescriptions); 206 $('#descriptionsTextarea').val(stationObj.stationRouteDescriptions);
  207 + // 行业编码
  208 + $('#industryCodeInput').val(stationObj.industryCode);
204 }, 209 },
205 // 获取站点路由. 210 // 获取站点路由.
206 getzdlyInfo : function(params,callback) { 211 getzdlyInfo : function(params,callback) {
src/main/resources/static/pages/base/station/list_edit.html
  View file @03dfab9
@@ -249,7 +249,16 @@ @@ -249,7 +249,16 @@
249 249
250 <!-- 表单分组组件 form-group START --> 250 <!-- 表单分组组件 form-group START -->
251 <div class="form-group"> 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 <div class="col-md-6"> 262 <div class="col-md-6">
254 <label class="control-label col-md-5"><span class="required"></span>描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: 263 <label class="control-label col-md-5"><span class="required"></span>描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
255 </label> 264 </label>
src/main/resources/static/pages/base/stationroute/add.html
  View file @03dfab9
@@ -52,6 +52,17 @@ @@ -52,6 +52,17 @@
52 </div> 52 </div>
53 </div> 53 </div>
54 </div> 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 <div class="form-body"> 67 <div class="form-body">
57 <div class="form-group"> 68 <div class="form-group">
src/main/resources/static/pages/base/stationroute/edit.html
  View file @03dfab9
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <div class="form-body"> 30 <div class="form-body">
31 <div class="form-group"> 31 <div class="form-group">
32 <label class="control-label col-md-3"> 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 </label> 34 </label>
35 <div class="col-md-6"> 35 <div class="col-md-6">
36 <input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点名称" readonly="readonly"> 36 <input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点名称" readonly="readonly">
@@ -48,6 +48,18 @@ @@ -48,6 +48,18 @@
48 </div> 48 </div>
49 </div> 49 </div>
50 </div> 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 <div class="form-body"> 64 <div class="form-body">
53 <div class="form-group"> 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,7 +263,7 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
251 // 弹出添加成功提示消息 263 // 弹出添加成功提示消息
252 layer.msg('修改成功...'); 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 }else { 267 }else {
256 // 弹出添加失败提示消息 268 // 弹出添加失败提示消息
257 layer.msg('修改失败...'); 269 layer.msg('修改失败...');
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
  View file @03dfab9
@@ -359,6 +359,8 @@ var PublicFunctions = function () { @@ -359,6 +359,8 @@ var PublicFunctions = function () {
359 $('#stationRouteLineInput').val(editStationParmas.stationRouteLine); 359 $('#stationRouteLineInput').val(editStationParmas.stationRouteLine);
360 // 线路编码 360 // 线路编码
361 $('#lineCodeInput').val(editStationParmas.stationRouteLIneCode); 361 $('#lineCodeInput').val(editStationParmas.stationRouteLIneCode);
  362 + // 行业标准
  363 + $('#industryCodeInput').val(editStationParmas.industryCode);
362 // 百度坐标点图形集合 364 // 百度坐标点图形集合
363 $('#bPolygonGridInput').val(editStationParmas.stationBPolygonGrid); 365 $('#bPolygonGridInput').val(editStationParmas.stationBPolygonGrid);
364 // 获取站点名称元素设值 366 // 获取站点名称元素设值
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
  View file @03dfab9
@@ -246,6 +246,7 @@ window.WorldsBMap = function () { @@ -246,6 +246,7 @@ window.WorldsBMap = function () {
246 } 246 }
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>' + 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 '<span class="help-block" >站点编码：' + objStation.stationCode + '</span>' + 248 '<span class="help-block" >站点编码：' + objStation.stationCode + '</span>' +
  249 + '<span class="help-block" >行业编号：' + objStation.industryCode + '</span>' +
249 '<span class="help-block" >站点序号：' + objStation.stationRouteCode + '</span>' + 250 '<span class="help-block" >站点序号：' + objStation.stationRouteCode + '</span>' +
250 '<span class="help-block" >站点类型：' + markTypeStr + '</span>' + 251 '<span class="help-block" >站点类型：' + markTypeStr + '</span>' +
251 '<span class="help-block" >经度：&nbsp&nbsp' + BJwpoints[0] + '</span>' + 252 '<span class="help-block" >经度：&nbsp&nbsp' + BJwpoints[0] + '</span>' +