Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

# Conflicts: # src/main/resources/static/pages/base/timesmodel/add.html # src/main/resources/static/pages/base/timesmodel/fragments/addbc.html # src/main/resources/static/pages/base/timesmodel/fragments/deletelp.html # src/main/resources/static/pages/base/timesmodel/fragments/editbc.html # src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js # src/main/resources/static/pages/base/timesmodel/js/dateTimeTool.js # src/main/resources/static/pages/base/timesmodel/js/echartsDrawGanTT.js # src/main/resources/static/pages/base/timesmodel/js/gantt.js # src/main/resources/static/pages/base/timesmodel/js/systemTools.js # src/main/resources/static/pages/base/timesmodel/js/v1/AdjustTrip.js # src/main/resources/static/pages/base/timesmodel/js/v1/bcFun.js # src/main/resources/static/pages/base/timesmodel/js/v1/lpFun.js # src/main/resources/static/pages/base/timesmodel/js/v1/scheduleInitialize.js

Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
# Conflicts: # src/main/resources/static/pages/base/timesmodel/add.html # src/main/resources/static/pages/base/timesmodel/fragments/addbc.html # src/main/resources/static/pages/base/timesmodel/fragments/deletelp.html # src/main/resources/static/pages/base/timesmodel/fragments/editbc.html # src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js # src/main/resources/static/pages/base/timesmodel/js/dateTimeTool.js # src/main/resources/static/pages/base/timesmodel/js/echartsDrawGanTT.js # src/main/resources/static/pages/base/timesmodel/js/gantt.js # src/main/resources/static/pages/base/timesmodel/js/systemTools.js # src/main/resources/static/pages/base/timesmodel/js/v1/AdjustTrip.js # src/main/resources/static/pages/base/timesmodel/js/v1/bcFun.js # src/main/resources/static/pages/base/timesmodel/js/v1/lpFun.js # src/main/resources/static/pages/base/timesmodel/js/v1/scheduleInitialize.js
游瑞烽
1 parent 21398848
Showing 14 changed files with 108 additions and 55 deletions
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/service/geo_data/impl/GeoDataServiceImpl.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/geo_data_edit/js/search.js
src/main/resources/static/pages/base/lineversions/add.html
src/main/resources/static/pages/base/lineversions/edit.html
src/main/resources/static/pages/base/lineversions/js/lineversions-edit-from.js
src/main/resources/static/pages/base/lineversions/js/lineversions-list-table.js
src/main/resources/static/pages/base/lineversions/list.html
src/main/resources/static/pages/base/roadspeed/js/add-form-wizard.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
src/main/resources/static/pages/base/stationroute/list.html
 package com.bsth.controller;
-import java.util.List;
-import java.util.Map;
-
+import com.bsth.entity.LineVersions;
+import com.bsth.repository.LineRepository;
+import com.bsth.service.LineVersionsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.bsth.entity.LineVersions;
-import com.bsth.repository.LineRepository;
-import com.bsth.service.LineVersionsService;
+import java.util.List;
+import java.util.Map;
 /**
  * 
@@ -75,7 +74,11 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 	public Map<String, Object> add(@RequestParam Map<String, Object> map) {
 		return service.add(map);
 	}
-	
+	@RequestMapping(value = "delete", method = RequestMethod.POST)
+	public Map<String, Object> delete(@RequestParam (defaultValue = "id") int id) {
+		return service.delete(id);
+	}
+
 	/**
 	 * 根据线路id获取当前版本号
 	 * 
@@ -376,7 +376,7 @@ public class GeoDataServiceImpl implements GeoDataService {
             lVersion.setLineCode(lineCode);
             //如果有待启用的版本，设置为历史版本
-            jdbcTemplate.update("update bsth_c_line_versions set `status`=0, start_date=null,end_date=null where line_code='"+lineCode+"' and `status`=2");
+            jdbcTemplate.update("update bsth_c_line_versions set `status`=2, start_date=null,end_date=null where line_code='"+lineCode+"' and `status`=0");
             //入库线路版本
             jdbcTemplate.update("insert into bsth_c_line_versions(name, line, line_code, versions, start_date, create_date, update_date, remark,status, isupdate) " +
 package com.bsth.service.impl;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
@@ -31,6 +16,20 @@ import com.bsth.repository.LsStationRouteRepository;
 import com.bsth.service.LineVersionsService;
 import com.bsth.service.SectionRouteService;
 import com.bsth.service.StationRouteService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * 
@@ -97,8 +96,10 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 			int statu = repository.update(id,line,lineCode,new java.sql.Date(startDate.getTime()),
 					new java.sql.Date(endDate.getTime()),versions,status,remark);
 			LineVersions upLineVersions = repository.findBylineIdAndVersions(line.getId(),versions);
-			upLineVersions.setEndDate(new java.sql.Date(startDate.getTime()));
-			repository.save(upLineVersions);
+			if(upLineVersions != null){
+				upLineVersions.setEndDate(new java.sql.Date(startDate.getTime()));
+				repository.save(upLineVersions);
+			}
 			if (statu==1) {
 				resultMap.put("status", ResponseCode.SUCCESS);
 			} else {
 package com.bsth.service.impl;
 import com.bsth.common.ResponseCode;
-import com.bsth.entity.*;
+import com.bsth.entity.Line;
+import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.Station;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.StationRouteCache;
 import com.bsth.entity.search.CustomerSpecs;
-import com.bsth.repository.*;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.LsStationRouteRepository;
+import com.bsth.repository.SectionRouteRepository;
+import com.bsth.repository.StationRepository;
+import com.bsth.repository.StationRouteCacheRepository;
+import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationRouteService;
 import com.bsth.util.ExcelUtil;
 import com.bsth.util.FTPClientUtils;
-import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.Geo.GeoUtils;
 import com.bsth.util.Geo.Point;
+import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,13 +27,17 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.text.DecimalFormat;
-import java.util.*;
-
-import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 /**
  * 
@@ -93,7 +106,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	public Map<String, Object> getSectionRouteExport(Integer id, HttpServletResponse resp) {
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
-			// List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>(); 
+			// List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
 			Map<String,Object> resultExcel = new HashMap<String,Object>();//导出参数的对象
 			/* 添加表头*/
 			List<String> title = new ArrayList<String>();
@@ -113,10 +126,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			if(strtionList == null){
 				logger.info("没有数据导，出用户信息失败！");
 			} else {
-				
+
 				for (int i = 0; i < strtionList.size(); i++) {
 					StationRoute station = strtionList.get(i);
-					
+
 					List<String> varList = new ArrayList<String>();
 					varList.add(station.getLine().getId().toString());
 					varList.add(station.getDirections().toString());
@@ -1372,8 +1372,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 匹配到了用数据库中的点替换
 			if (GeoUtils.isPointInCircle(point, circle)) {
 				map.put("name", s.getStationName().toString());
-				map.put("potion_lng", points[0]);
-				map.put("potion_lat", points[1]);
+				// 匹配到站点后用这个站点的名字，但是使用gps点作为中心点
+//				map.put("potion_lng", points[0]);
+//				map.put("potion_lat", points[1]);
+				map.put("potion_lng", lon);
+				map.put("potion_lat", lat);
 				map.put("isHave", "true");
 				map.put("id", s.getId());
 				isMatch = true;
@@ -28,7 +28,7 @@ var gb_ct_search = function () {
     var searchComplete = function (e) {
         console.log('e.wr', e);
-        var htmlStr = template('geo_d_e_search_result-temp', {list: e.Br});
+        var htmlStr = template('geo_d_e_search_result-temp', {list: e.Ar});
         $('.ct_search_result').html(htmlStr);
     };
@@ -108,6 +108,7 @@
 	                  		<select name="status" class="form-control" id="statusInput">
 								<option value="">请选择...</option>
 								<option value="1">当前版本</option>
+
 								<option value="2">待更新版本</option>
 								<option value="0">历史版本</option>
 							</select>
@@ -54,7 +54,7 @@
           					<span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     	</label>
 	                    <div class="col-md-4">
-	                     	<select name="line" class="form-control" style="width:100%" id="lineSelect"></select>
+	                     	<select name="line" class="form-control" style="width:100%" id="lineSelect" disabled="true"></select>
 	                    </div>
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -87,7 +87,7 @@
           					<span class="required"> * </span>线路版本&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     	</label>
 	                    <div class="col-md-4">
-	                     	<input type="text" class="form-control" name="versions" id="versionsInput" placeholder="线路版本" />
+	                     	<input type="text" class="form-control" name="versions" id="versionsInput" placeholder="线路版本" readonly="true" />
 	                    </div>
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -207,7 +207,6 @@
 			submit();
 			// 提交
 			function submit() {
-				debugger
 				// 添加数据
 				$post('/lineVersions/update', params, function(result) {
 					// 如果返回结果不为空
@@ -299,6 +299,36 @@
         /** 表格数据分页加载 @param：<params：搜索参数；true：是否重新分页> */
         loadTableDate(params,true);
     });
+    // 删除待更新线路版本
+    $(document).on('click', 'a.update_delete_btn', function () {
+        var id = $(this).data('id');
+        swal({
+                title: "确认删除这个待更新线路版本！",
+                type: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#DD6B55",
+                confirmButtonText: "是的！",
+                cancelButtonText: "我在考虑下...",
+                closeOnConfirm: false },
+            function(isConfirm){
+                if(isConfirm){
+                    $post('/lineVersions/delete', {"id":id}, function(result) {
+                        // 如果返回结果不为空
+                        if(result){
+                            // 返回状态码为"SUCCESS" ，则添加成功；返回状态码为"ERROR" ，则添加失败
+                            if(result.status=='SUCCESS') {
+                                // 弹出添加成功提示消息
+                                layer.msg('删除成功...');
+                            } else if(result.status=='ERROR') {
+                                // 弹出添加失败提示消息
+                                layer.msg('删除失败...');
+                            }
+                        }
+                    });
+                    swal.close();
+                }
+            });
+    });
     // 线路版本编辑
     $(document).on('click', 'a.update_versions_route_btn', function () {
         var lineId = $(this).data('lineid');
@@ -145,9 +145,12 @@
 				{{obj.remark}}
 			</td>
 			<td>
-				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+				{{if obj.status != '0'}}
+					<a href="edit.html?no={{obj.id}}" class="btn btn-info btn-sm" data-pjax> 修改 </a>
+				{{/if}}
 				{{if obj.status == '2'}}
-					<a class="update_versions_route_btn btn default blue-stripe btn-sm" data-lineid="{{obj.line.id}}" data-pjax> 编辑版本路线 </a>
+					<a class="update_delete_btn btn btn-danger btn-sm"  data-id="{{obj.id}}" data-pjax> 删除 </a>
+					<a class="update_versions_route_btn btn btn-info btn-sm" data-lineid="{{obj.line.id}}" data-pjax> 编辑版本路线 </a>
 				{{/if}}
 				{{if obj.status == '2' && obj.isupdate!=1}}
 					<a class="issue_btn btn btn-danger btn-sm" data-id="{{obj.id}}" data-pjax>发布</a>
@@ -78,7 +78,6 @@ var FormWizard = function() {
 				submitHandler : function(f) {
 					// 防止用户多次提交
 					$("#submintBtn").addClass("disabled");
-					debugger
 					var params = form.serializeJSON();// 表单序列化.
 					if(params.roadVector=='') {
 						layer.msg('路段几何图形为空~请先在路段位置步骤中绘制出线路走向!');
@@ -66,9 +66,9 @@ window.WorldsBMap = function () {
     var dragMarkerDragEvent = function (e) {
         if (editPolygon) {
             // 中心点是否超出多边形
-            if (!BMapLib.GeoUtils.isPointInPolygon(e.target._position, editPolygon)) {
-                dragMarker.setPosition(dragMarker._old_point);//还原位置
-            }
+            // if (!BMapLib.GeoUtils.isPointInPolygon(e.target._position, editPolygon)) {
+            //     dragMarker.setPosition(dragMarker._old_point);//还原位置
+            // }
             centerPoint = e.target._position;
         }
         else if (editCircle) {
@@ -321,7 +321,7 @@ window.WorldsBMap = function () {
                 mapBValue.centerAndZoom(point, 18);
                 editCircle = circle;
                 // 允许覆盖物在map.clearOverlays方法中被清除
-                circle.enableMassClear();
+                // circle.enableMassClear();
                 // 百度地图添加覆盖物圆
                 mapBValue.addOverlay(circle);
                 // 开启编辑功能
@@ -349,7 +349,7 @@ window.WorldsBMap = function () {
                         $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap, GetAjaxData, EditStationObj, LineObj, PublicFunctions]);
                     });
                 });
-                // 编辑多变行
+                // 编辑多边行
             } else if (stationShapesTypeV == 'd') {
                 // 获取中心点坐标字符串
                 var testpointStr = station.stationJwpoints;
@@ -383,7 +383,9 @@ window.WorldsBMap = function () {
                 mapBValue.addOverlay(polygon);
                 // 开启编辑功能(自 1.1 新增)
                 polygon.enableEditing();
-                // 添加多变行编辑事件
+                //禁止覆盖物在map.clearOverlays方法中被清除
+                // polygon.disableMassClear();
+                // 添加多边形编辑事件
                 polygon.addEventListener('dblclick', function (e) {
                     // 获取编辑的多边形对象
                     var edit_pointE = polygon;
@@ -351,7 +351,9 @@
         function setPlace(){
             // myMap.clearOverlays();    //清除地图上所有覆盖物
-            WorldsBMap.clearOtherOverlay();
+            var local = new BMap.LocalSearch(myMap, { //智能搜索
+                onSearchComplete: myFun
+            });
             function myFun(){
                 var pp = local.getResults().getPoi(0) == undefined? null:local.getResults().getPoi(0).point;
                 if(pp) {
@@ -361,22 +363,19 @@
                     layer.msg('找不到您输入的位置！')
                 }
             }
-            var local = new BMap.LocalSearch(myMap, { //智能搜索
-                onSearchComplete: myFun
-            });
             local.search(myValue);
         }
         $("#searchInput").on('input propertychange change', function () {
             if($("#searchInput").val() != null && $("#searchInput").val() != "")
                 $('.search_panel .clear').removeClass('hide');
             else {
-                WorldsBMap.clearOtherOverlay();
+                // WorldsBMap.clearOtherOverlay();
                 $('.search_panel .clear').addClass('hide');
             }
         });
         $('.search_panel .clear').on('click',function () {
-            WorldsBMap.clearOtherOverlay();
+            // WorldsBMap.clearOtherOverlay();
             $("#searchInput").val('');
             $("#searchInput").change();
         });