1.线路翻版本修正

王通
1 parent adddaad6
Showing 5 changed files with 15 additions and 8 deletions
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/java/com/bsth/service/impl/LsSectionRouteServiceImpl.java
src/main/java/com/bsth/service/impl/LsStationRouteServiceImpl.java
@@ -111,8 +111,8 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	 * @param version
 	 */
 	@Modifying
-	@Query(value="delete from SectionRoute sr where sr.line.id = ?1  and sr.versions = ?2")
-	void deleteByLineAndVersion(Integer lineId, Integer version);
+	@Query(value="delete from SectionRoute sr where sr.line.id = ?1")
+	void deleteByLineAndVersion(Integer lineId);
  
 	/**
 	 * 历史路由表变更之后从历史表批量更新当前版本至当前表
@@ -213,8 +213,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	 * @param version
 	 */
 	@Modifying
-	@Query(value="delete from StationRoute sr where sr.line.id = ?1  and sr.versions = ?2")
-	void deleteByLineAndVersion(Integer lineId, Integer version);
+	@Query(value="delete from StationRoute sr where sr.line.id = ?1")
+	void deleteByLineAndVersion(Integer lineId);
  
 	/**
 	 * 历史路由表变更之后从历史表批量更新当前版本至当前表
@@ -123,9 +123,9 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
     		String lineCode = lineVersions.getLineCode();
     		Integer versions = lineVersions.getVersions();
  
-    		stationRouteRepository.deleteByLineAndVersion(lineId, versions);
+    		stationRouteRepository.deleteByLineAndVersion(lineId);
     		stationRouteRepository.updateFromHistory(lineId, versions);
-    		sectionRouteRepository.deleteByLineAndVersion(lineId, versions);
+    		sectionRouteRepository.deleteByLineAndVersion(lineId);
     		sectionRouteRepository.updateFromHistory(lineId, versions);
 			// 更新线路版本
 			repository.updateOdlVersions(lineId, lineCode);
@@ -116,7 +116,7 @@ public class LsSectionRouteServiceImpl extends BaseServiceImpl&lt;LsSectionRoute, I
 	}
  
 	protected void refreshCurrent(int lineId, int version) {
-		sectionRouteRepository.deleteByLineAndVersion(lineId, version);
+		sectionRouteRepository.deleteByLineAndVersion(lineId);
 		sectionRouteRepository.updateFromHistory(lineId, version);
 	}
 }
 \ No newline at end of file
@@ -8,6 +8,8 @@ import com.bsth.service.LsStationRouteService;
 import com.bsth.util.CoordinateConverter;
 import com.bsth.util.CustomBeanUtils;
 import com.bsth.util.GeoConverter;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.geolatte.geom.LineString;
 import org.geolatte.geom.Point;
 import org.geolatte.geom.Polygon;
@@ -244,6 +246,11 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
             bufferPolygon(stationRoute);
         }
  
+        try {
+            logger.error(new ObjectMapper().writeValueAsString(stationRoute));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
         lsStationRouteRepository.updateStatiouRouteCode(stationRoute);
         CustomBeanUtils.copyPropertiesIgnoredNull(stationRoute, stationRoute1);
         lsStationRouteRepository.save(stationRoute1);
@@ -353,7 +360,7 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
     }
  
     protected void refreshCurrent(int lineId, int version) {
-        stationRouteRepository.deleteByLineAndVersion(lineId, version);
+        stationRouteRepository.deleteByLineAndVersion(lineId);
         stationRouteRepository.updateFromHistory(lineId, version);
     }
 }