Signed-off-by: YRF <YRF@DESKTOP-UNV37O6>

YRF
1 parent c4e0f3d2
Showing 8 changed files with 75 additions and 57 deletions
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/data/LineVersionsData.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/service/LineVersionsService.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/resources/static/pages/base/line/js/map.js
src/main/resources/static/pages/base/line/map.html
src/main/resources/static/pages/base/section/js/add-input-function.js
@@ -77,28 +77,7 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 	@RequestMapping(value = "add", method = RequestMethod.POST)
 	public Map<String, Object> add(@RequestParam Map<String, Object> map) {
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		
-		LineVersions lineVersions = new LineVersions();
-		try {
-			Date startDate = simpleDateFormat.parse(map.get("startDate").toString());
-			Date endDate = simpleDateFormat.parse(map.get("endDate").toString());
-			Line line = lineRepository.findOne(Integer.valueOf(map.get("lineId").toString())); 
-			lineVersions.setName(map.get("name").toString());
-			lineVersions.setLine(line);
-			lineVersions.setLineCode(map.get("lineCode").toString());
-			lineVersions.setStartDate(new java.sql.Date(startDate.getTime()));
-			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));
-			lineVersions.setVersions(Integer.valueOf(map.get("versions").toString()));
-			lineVersions.setStatus(Integer.valueOf(map.get("status").toString()));
-			lineVersions.setRemark(map.get("remark").toString());
-			
-			
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return service.save(lineVersions);
+		return service.add(map);
 	}
 }
@@ -45,9 +45,10 @@ public class LineVersionsData implements CommandLineRunner {
     			map.put("lineId", lineId);
     			stationRouteService.usingSingle(map);
     		}
+    		logger.info("待更新线路更新成功！");
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
+			logger.error("待更新线路更新出现异常!", e);
 		}
     }
 }
@@ -31,7 +31,7 @@ public interface LineVersionsRepository extends BaseRepository&lt;LineVersions, Int
 	 * 获取线路所有版本
 	 */
 	@Query(value = "  SELECT lv FROM LineVersions lv where lv.line.id = ?1")
-	public List<LineVersions> findBylineCode(int lineId);
+	public List<LineVersions> findBylineId(int lineId);
 	@Transactional
 	@Modifying
@@ -66,5 +66,11 @@ public interface LineVersionsRepository extends BaseRepository&lt;LineVersions, Int
 	 */
 	@Query(value = "select lv2 from LineVersions lv2 where lv2.line.id =?1 and lv2.versions=(SELECT max(lv.versions) FROM LineVersions lv where lv.line.id = ?1) ")
 	public LineVersions findLineVersionsMax(int lineId);
+
+	/**
+	 * 获取线路版本的上一个版本
+	 */
+	@Query(value = "  SELECT lv FROM LineVersions lv where lv.line.id = ?1 and lv.versions = (?2 - "+1+")")
+	public LineVersions findBylineIdAndVersions(Integer id, Integer versions);
 }
@@ -34,4 +34,6 @@ public interface LineVersionsService extends BaseService&lt;LineVersions, Integer&gt; 
 	LineVersions findLineVersionsMax(int lineId);
+	Map<String, Object> add(Map<String, Object> map);
+
 }
@@ -75,7 +75,7 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 	@Override
 	public List<LineVersions> findByLineCode(int lineId) {
-		return repository.findBylineCode(lineId);
+		return repository.findBylineId(lineId);
 	}
 	@Override
@@ -105,7 +105,6 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			resultMap.put("status", ResponseCode.ERROR);
-			return resultMap;
 		}
 		return resultMap;
 	}
@@ -200,18 +199,6 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 						return sectionRoutes.size();
 					}
 				} );
-    			/*for (SectionRoute sectionRoute : sectionRoutes) {
-    				sectionRouteService.save(sectionRoute);
-				}*/
-//    			sectionRouteService.bulkSave(sectionRoutes);
-    			//List<StationRoute> stationRoutes = JSONArray.parseArray(JSON.toJSONString(lsStationRoutes), StationRoute.class);
-//    			stationRouteService.batchUpdate(lineId, lineCode);
-    			
-    			//stationRouteRepository.batchDelete(lineId, lineCode);
-    			/*for (StationRoute stationRoute : stationRoutes) {
-    				stationRouteService.save(stationRoute);
-				}*/
-//    			stationRouteService.bulkSave(stationRoutes);
     			// 更新线路版本
     			repository.updateOdlVersions(lineId, lineCode);
     			repository.updateNewVersions(lineId,lineCode,versions);
@@ -220,9 +207,48 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
     	return list;
 	}
+	/**
+	 * 查询线路版本最大值
+	 */
 	@Override
 	public LineVersions findLineVersionsMax(int lineId) {
 		return repository.findLineVersionsMax(lineId);
 	}
+
+	/**
+	 * 线路版本添加
+	 */
+	@Override
+	public Map<String, Object> add(Map<String, Object> map) {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Map<String, Object> resultMap = new HashMap<>();
+		
+		LineVersions lineVersions = new LineVersions();
+		try {
+			Date startDate = simpleDateFormat.parse(map.get("startDate").toString());
+			Date endDate = simpleDateFormat.parse(map.get("endDate").toString());
+			Line line = lineRepository.findOne(Integer.valueOf(map.get("lineId").toString())); 
+			Integer versions = Integer.valueOf(map.get("versions").toString());
+			lineVersions.setName(map.get("name").toString());
+			lineVersions.setLine(line);
+			lineVersions.setLineCode(map.get("lineCode").toString());
+			lineVersions.setStartDate(new java.sql.Date(startDate.getTime()));
+			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));
+			lineVersions.setVersions(versions);
+			lineVersions.setStatus(Integer.valueOf(map.get("status").toString()));
+			lineVersions.setRemark(map.get("remark").toString());
+			repository.save(lineVersions);
+			// 更新上一版本时间
+			LineVersions upLineVersions = repository.findBylineIdAndVersions(line.getId(),versions);
+			upLineVersions.setEndDate(new java.sql.Date(startDate.getTime()));
+			repository.save(upLineVersions);
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			resultMap.put("status", ResponseCode.ERROR);
+		}
+		return resultMap;
+	}
 }
@@ -14,7 +14,7 @@ var WorldsBMapLine = function () {
 	/** WorldsBMapLine 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
 	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
-	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = {}, isCutSection = false;
+	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = null, isCutSection = false;
 	var Bmap = {
@@ -50,6 +50,10 @@ var WorldsBMapLine = function () {
 			getFirstPoint : function() {
 				return firstPoint;
 			},
+			/** 第一个切路段的点 */
+			setFirstPoint : function(Point) {
+				firstPoint = Point;
+			},
 			/** 获取地图对象 @return 地图对象map */
 			getmapBValue : function() {
@@ -329,17 +333,21 @@ var WorldsBMapLine = function () {
 			},
 			// 批量画点
 			batchPaintingPoint : function() {
+				// 画第一个点
+				var Point = WorldsBMapLine.getFirstPoint();
+				if(Point){
+					var marker = new BMap.Marker(new BMap.Point(Point.lng, Point.lat)); // 创建点
+					var label = new BMap.Label(1,{offset:new BMap.Size(4,0)});
+					label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
+					marker.setLabel(label);
+					marker.isFlag = true;
+					mapBValue.addOverlay(marker);// 添加覆盖物
+					
+					WorldsBMapLine.getFirstPoint();
+				}
 				$.each(sectionList, function(index, value) {
 					var section = value.section;
-					debugger
-					if(index == 0){
-						var marker = new BMap.Marker(new BMap.Point(section[0].lng, section[0].lat)); // 创建点
-						var label = new BMap.Label(index+1,{offset:new BMap.Size(index>8?0:4,0)});
-						label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
-						marker.setLabel(label);
-						marker.isFlag = true;
-						mapBValue.addOverlay(marker);// 添加覆盖物
-					}
+					
 					var marker = new BMap.Marker(new BMap.Point(section[1].lng, section[1].lat)); // 创建点
 					var label = new BMap.Label(index+2,{offset:new BMap.Size(index>7?0:4,0)});
 					label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
@@ -704,7 +712,6 @@ var WorldsBMapLine = function () {
 			  	  		mapBValue.panBy(10,-200,PanOptions_);
 			  	  		// 关闭按钮事件
-			  	  		debugger
 						PublicFunctions.addAChangeCssAddDisabled();
 						// 编辑圆监听事件
@@ -130,14 +130,15 @@ $(function(){
 			$(pjaxContainer).append(m);
 			$('#edit_route_mobal').trigger('editRouteMobal.show',[TransGPS,EditRoute,WorldsBMapLine,DrawingManagerObj,GetAjaxData,PublicFunctions]);
 		});
-		// 更新section_table 和缓存中的一切过的点数
+		// 更新section_table 和缓存中的切点
 		WorldsBMapLine.initCutSectionPoint();
 		WorldsBMapLine.setPointIndex(0);
+		WorldsBMapLine.setFirstPoint(null);// 删除点后清空数据(第一个点坐标)
 	});
 	// 提交截取事件
-	$('#cutSection').on('click', function() {		
-		if(WorldsBMapLine.getPointIndex() > 0) {
+	$('#cutSection').on('click', function() {
+		if(WorldsBMapLine.getSectionList().length != 0) {
 			var sectionList = WorldsBMapLine.getSectionList();
 			var data = {};
 			var section = EditSectionObj.getEitdSection();
@@ -169,12 +170,12 @@ $(function(){
 			WorldsBMapLine.deleteCutSectionPoint(point);
 			WorldsBMapLine.refreshCutSectionTable();
 		} else if(WorldsBMapLine.getPointIndex() == 1 ) {
-			// 点总数-1			
 			var pointIndex = WorldsBMapLine.getPointIndex() - 1;
 			WorldsBMapLine.setPointIndex(pointIndex);
 			var firstPoint = WorldsBMapLine.getFirstPoint();
 			WorldsBMapLine.deleteCutSectionPoint(firstPoint);
 			WorldsBMapLine.setIsCutSection(false);
+			WorldsBMapLine.setFirstPoint(null);// 删除点后清空数据
 		} else {
 			layer.msg("没有截取路段，不可以撤销！！！");
 		}
@@ -79,16 +79,12 @@ var PublicFunctions = function () {
 			// 获取某线路下的路段路由.
 			getSectionRouteInfo : function(line,callback) {
 				$get('/sectionroute/all',{'line.id_eq':line,'destroy_eq':0},function(result) {
-					/*if(result.length>0)
-						result.sort(function(a,b){return a.sectionrouteCode-b.sectionrouteCode});*/
 					callback && callback(result);
 				});
 			},
 			// 新增路段保存.
 			sectionSave : function(section,callback) {
-				debugger
 				$post('/section/sectionSave',section,function(data) {
-					debugger
 					callback && callback(data);
 				});
 			}