潘钊 / bsth_control · Commits

Commit 541bd234eb488667f089404ada6cd6ff7d664db2

Authored by 潘钊
2 parents 858fd839 4f92311e
build: skipped

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

Inline Side-by-side
Showing 14 changed files with 36 additions and 59 deletions
src/main/java/com/bsth/controller/StationRouteController.java
  View file @541bd23
... ... @@ -72,11 +72,11 @@ public class StationRouteController extends BaseController<StationRoute, Integer
72 72 }
73 73  
74 74 /**
75   - * @param String
  75 + * @param map
76 76 * @throws
77 77 * @Description: TODO(批量撤销站点)
78 78 */
79   - @RequestMapping(value = "/batchDestroy", method = RequestMethod.GET)
  79 + @RequestMapping(value = "/batchDestroy", method = RequestMethod.POST)
80 80 public Map<String, Object> updateBatch(@RequestParam Map<String, Object> map) {
81 81 return service.updateStationRouteInfoFormId(map);
82 82 }
... ...
src/main/java/com/bsth/repository/StationRouteRepository.java
  View file @541bd23
... ... @@ -369,7 +369,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
369 369 " s.create_date AS stationRouteCreateDate," +
370 370 " s.update_by AS stationRouteUpdateBy," +
371 371 " 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", nativeQuery=true)
  372 + " LEFT JOIN bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true)
373 373 List<Object[]> getStationRouteList(Integer lineId, Integer dir);
374 374  
375 375 List<StationRoute> findByLine(Line line);
... ...
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
  View file @541bd23
... ... @@ -147,7 +147,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
147 147 String startNode="";
148 148 String middleNode="";
149 149 String sectionType="";
150   - String csectionVector="";
  150 + String csectionVector=null;
151 151 // 撤销原有路段路由
152 152 routeRepository.sectionRouteUpdDestroy(sectionRouteLine,directions);
153 153 // 路段保存
... ... @@ -281,7 +281,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
281 281 String startNode="";
282 282 String middleNode="";
283 283 String sectionType="";
284   - String csectionVector="";
  284 + String csectionVector=null;
285 285 // 删除原有历史版本路段路由
286 286 lsRouteRepository.batchDelete(sectionRouteLine,directions,versions);
287 287 // 路段保存
... ... @@ -453,7 +453,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
453 453 if(!sectionsBpoints.equals("")) {
454 454 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
455 455 }
456   - repository.systemSave(sectionCode, sectionName, null, "", "", "", gsectionVector, bsectionVectorS, "", "", "", 0, 0, "", 0, "", 1, sectionId);
  456 + repository.systemSave(sectionCode, sectionName, null, "", "", "", gsectionVector, bsectionVectorS, "", null, "", 0, 0, "", 0, "", versions, sectionId);
457 457  
458 458 routeRepository.sectionUpdSectionRouteCode(lineId, directions,routeCode+i);
459 459 SectionRoute route = new SectionRoute();
... ...
src/main/java/com/bsth/service/impl/StationServiceImpl.java
  View file @541bd23
... ... @@ -1309,7 +1309,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1309 1309 // 原坐标点集合
1310 1310 String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
1311 1311 // 城建坐标点集合
1312   - String csectionVector = "";
  1312 + String csectionVector = null;
1313 1313 // 路段类型
1314 1314 String sectionType = "";
1315 1315 // 道路编码
... ... @@ -1700,7 +1700,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
1700 1700 // 原坐标点集合
1701 1701 String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
1702 1702 // 城建坐标点集合
1703   - String csectionVector = "";
  1703 + String csectionVector = null;
1704 1704 // 路段类型
1705 1705 String sectionType = "";
1706 1706 // 道路编码
... ...
src/main/resources/static/pages/base/carpark/js/carpark-list-table.js
  View file @541bd23
... ... @@ -30,7 +30,7 @@
30 30 var branchMap = new Map();
31 31 initCompanySelect2(function(array) {
32 32 $.each(array, function() {
33   - companyMap[this.businessCode] = this.busi nessName;
  33 + companyMap[this.businessCode] = this.businessName;
34 34 // companyMap.put(this.businessCode.toString(), this.businessName);
35 35 if(this.businessCode != null || this.businessCode !=''){
36 36 /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
... ...
src/main/resources/static/pages/base/section/js/section-ajax-getdata.js
  View file @541bd23
... ... @@ -10,7 +10,7 @@ var GetAjaxData = function(){
10 10 var ajaxData = {
11 11 // 根据ID查询路段信息.
12 12 getSectionRouteInfoById : function(sectionId,callback){
13   - $get('/sectionroute/findSectionRouteInfoFormId',{id:sectionId},function(r) {
  13 + $get('/sectionroute/findSectionRouteInfoFormId',{'id':sectionId},function(r) {
14 14 return callback && callback(r);
15 15 });
16 16 },
... ...
src/main/resources/static/pages/base/station/edit.html
  View file @541bd23
... ... @@ -52,7 +52,7 @@
52 52 <span class="required"> * </span> 站点路由名称:
53 53 </label>
54 54 <div class="col-md-6">
55   - <input type="text" class="form-control" name="stationRouteName" id="stationRouteNameInput" placeholder="站点路由名称">
  55 + <input type="text" class="form-control" name="stationName" id="stationRouteNameInput" placeholder="站点路由名称">
56 56 </div>
57 57 </div>
58 58 </div>
... ... @@ -246,7 +246,7 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
246 246 errorClass : 'help-block help-block-error',
247 247 focusInvalid : false,
248 248 rules : {
249   - 'stationRouteName' : {required : true},// 站点路由名称 必填项
  249 + 'stationName' : {required : true},// 站点路由名称 必填项
250 250 'stationCod': {required : true,},// 站点编码 必填项
251 251 'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项
252 252 'stationRouteCode' : {isStart : true},// 站点序号
... ...
src/main/resources/static/pages/base/station/js/station-list-edit.js
  View file @541bd23
... ... @@ -49,12 +49,12 @@
49 49 focusInvalid : false,
50 50 rules : {
51 51 'stationName' : {required : true},// 站点路由名称 必填项
52   - 'stationCod': {required : true,},// 站点编码 必填项
  52 + 'stationCod': {required : true},// 站点编码 必填项
53 53 'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项
54 54 'stationRouteCode' : {isStart : true},// 站点序号
55 55 'bJwpoints' : {required : true},// 经纬度坐标点 必填项
56 56 'shapesType' : {required : true},// 几何图形类型 必填项
57   - 'radius' : {required : true, number : true,},// 圆形半径 必填项
  57 + 'radius' : {number : true},// 圆形半径 必填项
58 58 'destroy' : {required : true},// 是否撤销 必填项
59 59 'toTime' : {number : true},// 到站时间 必须输入合法的数字（负数，小数）。
60 60 'distances' : {number : true},// 到站距离 // 到站距离
... ... @@ -145,13 +145,18 @@
145 145 }
146 146 function setZdlyValue() {
147 147 PositionsPublicFunctions.findUpStationRouteCode(editStation.stationRouteLine,editStation.stationRoutedirections,editStation.stationRouteCode,function(str) {
148   - /* if(str.length>0){
149   - var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke + '_' + editStation.stationRoutedirections;
150   - $('#stationrouteSelect').select2('val',upStationRouteCode);
151   - } */
  148 +
152 149 if(str.length>0){
153   - var upStationRouteCode = str[0].stationRouteCode + '_' + editStation.stationRouteStationMark + '_' + editStation.stationRoutedirections;
154   - $('#stationrouteSelect').select2('val',upStationRouteCode);
  150 + // var upStationRouteCode = str[0].stationRouteCode + '_' + editStation.stationRouteStationMark + '_' + editStation.stationRoutedirections;
  151 + // $('#stationrouteSelect').select2('val',upStationRouteCode);
  152 +
  153 + var upStationRouteCode;
  154 + if (editStation.stationRouteStationMark == 'E') {
  155 + upStationRouteCode = str[0].stationRouteCode + '_' + 'E' + '_' + editStation.stationRoutedirections;
  156 + } else{
  157 + upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke + '_' + editStation.stationRoutedirections;
  158 + }
  159 + $('#stationrouteSelect').select2('val',upStationRouteCode);
155 160 }else {
156 161 $('#stationrouteSelect').select2('val','请选择...');
157 162 }
... ...
src/main/resources/static/pages/base/station/js/station-positions-function.js
  View file @541bd23
... ... @@ -157,11 +157,12 @@ var PositionsPublicFunctions = function () {
157 157 },
158 158 setListEditFrom : function(stationObj) {
159 159 // WGS坐标点图形集合
160   - $('#bPolygonGridInput').val(stationObj.stationBPolyonGrid);
  160 + var stationBPolyonGrid = null;
  161 + if(stationObj.stationBPolyonGrid)
  162 + stationBPolyonGrid = stationObj.stationBPolyonGrid.substring(9, stationObj.stationBPolyonGrid.length -2);
  163 + $('#bPolygonGridInput').val(stationBPolyonGrid);
161 164 // 百度地图经纬度坐标中心点
162 165 $('#bJwpointsInput').val(stationObj.stationJwpoints);
163   - // 图形坐标点集合（百度坐标）
164   -// $('#bPolygonGridInput').val(stationObj.stationGPloyonGrid);
165 166 // 城建坐标x
166 167 $('#xInput').val(stationObj.stationGlonx);
167 168 // 城建坐标y
... ... @@ -183,7 +184,7 @@ var PositionsPublicFunctions = function () {
183 184 // 站点名称
184 185 $('#zdmcInput').val(stationObj.zdmc);
185 186 // 站点路由线路名称
186   - $('#stationRouteNameInput').val(stationObj.stationRouteName);
  187 + $('#stationNameInput').val(stationObj.stationRouteName);
187 188 // 获取站点类型元素设值
188 189 $('#stationMarkSelect').val(stationObj.stationRouteStationMark);
189 190 // 获取站点方向元素设值
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
  View file @541bd23
... ... @@ -155,7 +155,7 @@ var GetAjaxData = function(){
155 155 },
156 156 // 根据ID查询路段信息.
157 157 getSectionRouteInfoById : function(sectionRouteId,callback){
158   - $get('/sectionroute/findSectionRouteInfoFormId',{id:sectionRouteId},function(r) {
  158 + $get('/sectionroute/findSectionRouteInfoFormId',{'id':sectionRouteId},function(r) {
159 159 return callback && callback(r);
160 160 });
161 161 },
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
  View file @541bd23
... ... @@ -428,35 +428,6 @@ var PublicFunctions = function () {
428 428 $('#versionsInput').val(Section.versions);
429 429 },
430 430  
431   - //lineId,data,direction
432   - treeSectionClick: function(lineId,data,direction){
433   - /** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
434   - WorldsBMap.clearMarkAndOverlays();
435   - // 编辑路段数据
436   - for(var d= 0; d<data.length;d++){
437   - // 地图折线坐标点集合
438   - var polylineArray = [];
439   - // 获取路段折线坐标字符串
440   - var sectionBsectionVectorStr = data[d].sectionBsectionVector;
441   - if(sectionBsectionVectorStr==null) {
442   - continue;
443   - }
444   - // 切割段折线坐标字符串
445   - var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1);
446   - // 分割折线坐标字符串
447   - var lineArray = tempStr.split(',');
448   - for(var i = 0;i<lineArray.length;i++) {
449   - polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
450   - }
451   - var index = parseInt(polylineArray.length/2);
452   - var center = polylineArray[index];
453   - /** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */
454   - WorldsBMap.drawingUpline(polylineArray,center);
455   - /** 在地图上画点 @param：<point_center：中心坐标点> */
456   - WorldsBMap.drawingUpStationPoint(data[d], d+1);
457   - }
458   - },
459   -
460 431 /** 在地图上画出线路走向 @param:<Line.id：线路Id；0：上行；data：路段数据> */
461 432 linePanlThree : function(lineId,data,direction) {
462 433 /** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
  View file @541bd23
... ... @@ -226,7 +226,7 @@ window.WorldsBMap = function () {
226 226 // 信息窗口参数属性
227 227 var opts = {
228 228 // 信息窗口宽度
229   - width: (width < 200 ? 200 : width),
  229 + width: (width < 240 ? 240 : width),
230 230 // 信息窗口高度
231 231 height: shapes=="r" ?330:300,
232 232 // 信息窗位置偏移值。
... ... @@ -362,7 +362,7 @@ window.WorldsBMap = function () {
362 362 var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
363 363 //创建圆
364 364 circle = new BMap.Circle(point, station.stationRadius, {
365   - strokeColor: "red",
  365 + strokeColor: "blue",
366 366 strokeWeight: 2,
367 367 strokeOpacity: 0.7
368 368 });
... ... @@ -417,7 +417,7 @@ window.WorldsBMap = function () {
417 417 // 画多边形
418 418 polygon = new BMap.Polygon(polygonP, {
419 419 // 线条显色
420   - strokeColor: "red",
  420 + strokeColor: "blue",
421 421 // 边线的宽度，以像素为单位。
422 422 strokeWeight: 2,
423 423 // 边线透明度，取值范围0 - 1。
... ...
src/main/resources/static/pages/base/stationroute/tzzj.html
  View file @541bd23
... ... @@ -47,7 +47,7 @@
47 47 </td>
48 48 <td>
49 49 <!-- <input type="text" readonly class="form-control form-filter input-sm" name="station_{{i+1}}" value="{{obj.name}}">-->
50   - {{obj.name}}
  50 + {{obj.stationRouteName}}
51 51 </td>
52 52 <td>
53 53 <input type="text" class="form-control form-filter input-sm" name="dis_{{obj.stationRouteId}}" value="{{obj.stationRouteDistances * 1000}}">
... ...
src/main/resources/static/pages/trafficManage/timeTempletUpload.html
  View file @541bd23
... ... @@ -10,7 +10,7 @@
10 10 <form class="form-inline" action="">
11 11 <div style="display: inline-block;" class="param">
12 12 <span class="item-label" style="width: 80px;">线路: </span>
13   - <select class="form-control" name="xl.lineCode_like" id="line" style="width: 180px;"></select>
  13 + <select class="form-control" name="xl.id_eq" id="line" style="width: 180px;"></select>
14 14 </div>
15 15 <div style="display: inline-block;margin-left: 15px;" class="param">
16 16 <span class="item-label" style="width: 80px;">模板名称（关键字）： </span>
... ...