基础数据撤销站点功能

李强
1 parent dd6977d1
Showing 10 changed files with 61 additions and 39 deletions
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/SectionRouteService.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/impl/SectionRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
@@ -40,4 +40,9 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 		return routeService.getSectionRoute(map);
 	}
  
+	@RequestMapping(value = "/stationRouteIsDestroy" , method = RequestMethod.POST)
+	public Map<String, Object> stationRouteIsDestroy(@RequestParam Map<String, Object> map) {
+		return routeService.stationRouteIsDestroy(map);
+	}
+	
 }
@@ -59,8 +59,4 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
 		return service.getStationRouteCenterPoints(map);
 	}
  
-	@RequestMapping(value = "/stationRouteIsDestroy" , method = RequestMethod.POST)
-	public Map<String, Object> stationRouteIsDestroy(@RequestParam Map<String, Object> map) {
-		return service.stationRouteIsDestroy(map);
-	}
 }
@@ -2,8 +2,10 @@ package com.bsth.repository;
  
 import java.util.List;
  
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
  
 import com.bsth.entity.SectionRoute;
  
@@ -60,4 +62,10 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 								"	LEFT JOIN bsth_c_section b  ON a.sectionrouteSection = b.id", nativeQuery=true)
 	List<Object[]> getSectionRoute(int lineId, int directions);
  
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_stationroute SET " +
+				"destroy = ?2 WHERE id = ?1", nativeQuery=true)
+	public void stationRouteIsDestroyUpd(Integer stationRouteId, Integer destroy);
+	
 }
@@ -74,7 +74,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 								"r.first_time AS 'stationRoute.firstTime'," +
 								"r.end_time AS 'stationRoute.endTime'," +
 								"r.descriptions AS 'stationRoute.descriptions'," +
-								"r.versions AS 'stationRoute.versions' FROM bsth_c_stationroute r  WHERE  r.line = ?1 and r.directions = ?2) a " +
+								"r.versions AS 'stationRoute.versions' FROM bsth_c_stationroute r  WHERE  r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
 							"LEFT JOIN bsth_c_station b " +
 							"ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
 	List<Object[]> findPoints(int line,int directions);
@@ -92,9 +92,4 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)
 	List<Object[]> getSelectStationRouteCenterPoints(Integer lineId,Integer direction);
  
-	@Transactional
-    @Modifying
-	@Query(value="UPDATE bsth_c_stationroute SET " +
-				"destroy = ?2 WHERE id = ?1", nativeQuery=true)
-	public void stationRouteIsDestroyUpd(Integer stationRouteId, Integer destroy);
 }
@@ -23,4 +23,6 @@ import com.bsth.entity.SectionRoute;
 public interface SectionRouteService extends BaseService<SectionRoute, Integer> {
  
 	List<Map<String, Object>> getSectionRoute(Map<String, Object> map);
+	
+	Map<String, Object> stationRouteIsDestroy(Map<String, Object> map);
 }
@@ -29,6 +29,4 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	 List<Map<String, Object>> findUpStationRouteCode(Map<String, Object> map);
  
 	 List<Map<String, Object>> getStationRouteCenterPoints(Map<String, Object> map);
-	 
-	 Map<String, Object> stationRouteIsDestroy(Map<String, Object> map);
 }
@@ -8,6 +8,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.SectionRoute;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.service.SectionRouteService;
@@ -82,5 +83,30 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
  
 		return resultList;
 	}
+	
+	@Override
+	public Map<String, Object> stationRouteIsDestroy(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String,Object>();
+		
+		try {
+			
+			Integer stationRouteId = map.get("stationRouteId").equals("") ? 0 : Integer.parseInt(map.get("stationRouteId").toString());
+			
+			Integer destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
+			
+			repository.stationRouteIsDestroyUpd(stationRouteId, destroy);
+			
+			resultMap.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+			
+			resultMap.put("status", ResponseCode.ERROR);
+			
+			logger.error("save erro.", e);
+			
+		}
+		
+		return resultMap;
+	}
  
 }
@@ -373,30 +373,4 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 		return resultList;
 	}
-
-	@Override
-	public Map<String, Object> stationRouteIsDestroy(Map<String, Object> map) {
-		Map<String, Object> resultMap = new HashMap<String,Object>();
-		
-		try {
-			
-			Integer stationRouteId = map.get("stationRouteId").equals("") ? 0 : Integer.parseInt(map.get("stationRouteId").toString());
-			
-			Integer destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
-			
-			repository.stationRouteIsDestroyUpd(stationRouteId, destroy);
-			
-			resultMap.put("status", ResponseCode.SUCCESS);
-			
-		} catch (Exception e) {
-			
-			resultMap.put("status", ResponseCode.ERROR);
-			
-			logger.error("save erro.", e);
-			
-		}
-		
-		return resultMap;
-	}
-
 }
@@ -134,6 +134,11 @@ var GetAjaxData = function(){
  
 			stationRouteIsDestroy : function(stationRoute,callback) {
  
+				$post('/sectionroute/stationRouteIsDestroy',stationRoute,function(data) {
+					
+					callback && callback(data);
+					
+				})
  
 			},
  
@@ -466,13 +466,15 @@ $(function(){
 			layer.msg('请先选择要删除的站点！');
 			return;
 		}
-		
+		console.log(obj);
 		layer.confirm('你确定要撤销【'+obj[0].text+'】站点吗?', {btn : [ '确定撤销','返回' ],icon: 3, title:'提示' }, function(index){
  
 			 var stationRouteId = obj[0].original.stationRouteId;
  
 			 var params = {stationRouteId:stationRouteId,destroy:'1'};
  
+			 var stationRouteDirections = obj[0].original.stationRouteDirections;
+			 
 			 GetAjaxData.stationRouteIsDestroy(params,function(result) {
  
 				 layer.close(index);
@@ -480,6 +482,17 @@ $(function(){
 				 if(result.status=='SUCCESS'){
  
 					layer.msg('撤销上行站点【'+obj[0].text+'】成功！');
+					
+					mapB.clearOverlays();
+					GetAjaxData.getSectionRouteInfo(id,stationRouteDirections,function(data) {
+						
+						// 刷新树
+						resjtreeDate(id,stationRouteDirections);
+						
+						// linePanlThree(data,stationRouteDirections);
+						
+					});
+					
  
 				 }else{