BUG修复（上传线路站级，出现站点序号为0的情况）

zlz
1 parent fa0b3cfb
Showing 3 changed files with 58 additions and 12 deletions
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/static/pages/trafficManage/js/lineStationUpload.js
@@ -274,6 +274,17 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			"ORDER BY " +
 			"lineCode,directions,stationRouteCode")
 	List<Map<String, String>> findAllLineWithYgc();
+
+	@Query("SELECT new map(" +
+			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
+			"FROM " +
+			"StationRoute s " +
+			"WHERE " +
+			"s.destroy = 0 and s.lineCode = ?1 " +
+			"ORDER BY " +
+			"lineCode,directions,stationRouteCode")
+	List<Map<String, String>> findLineWithYgcByLine(String lineCode);
     @Modifying
     @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1 ", nativeQuery=true)
@@ -200,13 +200,14 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				// 先查上行
 				upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
+				Map<String, Integer> stationNumMap = getStationName2YgcNumberMap(line.getLineCode());
 				int startId = 1;
-				startId = packagStationXml(upStationsList, sBuffer, startId);
+				startId = packagStationXml(upStationsList, sBuffer, startId,stationNumMap);
 				// 环线不查下行
 				if(line.getLinePlayType() != 1){
 					// 再查下行
 					downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
-					packagStationXml(downStationsList, sBuffer, startId);
+					packagStationXml(downStationsList, sBuffer, startId,stationNumMap);
 				}
 				sBuffer.append("</StationList>");
@@ -223,6 +224,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				sBuffer.append("</LinePointList>");
 				sBuffer.append("</XL>");
 				sBuffer.append("</XLs>");
+				// 临时添加，后面删除
+				if(sBuffer.indexOf("<ZDXH>0</ZDXH>") != -1){
+					return "0";
+				}
 				// 调用上传方法
 				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,sBuffer.toString()).isSuccess()){
 					result = "success";
@@ -240,6 +245,28 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * 加载运管处的站点及序号
+	 * 上行从1开始，下行顺序续编
+	 */
+	private Map<String, Integer> getStationName2YgcNumberMap (String lineCode){
+		Map<String, Integer> resultMap = new HashMap<>();
+		List<Map<String, String>> ygcLines = stationRouteRepository.findLineWithYgcByLine(lineCode);
+		if(ygcLines != null && ygcLines.size() > 0){
+			int size = ygcLines.size();
+			Map<String, String> tempMap ;
+			int num = 1;
+			String key;
+			for (int i = 0; i < size; i ++){
+				tempMap = ygcLines.get(i);
+				key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
+						+ "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
+				resultMap.put(key,num++);
+			}
+		}
+		return resultMap;
+	}
+
+	/**
 	 * 上传线路信息(按in_use上传)
 	 */
 	@Override
@@ -431,7 +458,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							// 起点站的参数
 							otherMap.put("stationMark","B");
 							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
-							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap) + "</FCZDXH>");
+							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null) + "</FCZDXH>");
 							sf.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");
 							sf.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");
 							sf.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");
@@ -441,7 +468,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							// 终点站的参数
 							otherMap.put("stationMark","E");
 							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
-							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap) +"</DDZDXH>");
+							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null) +"</DDZDXH>");
 							sf.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");
 							sf.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");
 							sf.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");
@@ -768,13 +795,13 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
-						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</DDXH>");
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
 								.append("</JHDDSJ>");
 						sBuffer.append("</BC>");
@@ -883,14 +910,14 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
 								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</DDXH>");
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBuffer.append("</BC>");
 					}
@@ -1214,7 +1241,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 *
 	 * @return 站点序号累加后的ID
 	 */
-	private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
+	private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId,Map<String, Integer> stationNumMap){
 		int size = stationsList.size();
 		StationRoute srRoute;
 		HashMap<String,String> paraMap;
@@ -1231,7 +1258,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}
 			paraMap = packageYgcStationNumParam(srRoute,null);
 			sBuffer.append("<Station>");
-			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</ZDXH>");
+			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap,stationNumMap)).append("</ZDXH>");
 			sBuffer.append("<SXX>").append(srRoute.getDirections()).append("</SXX>");
 			sBuffer.append("<ZDMC>").append(srRoute.getStationName()).append("</ZDMC>");
 			sBuffer.append("<ZDBM>").append(srRoute.getStationCode()).append("</ZDBM>");
@@ -1287,7 +1314,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * @param map
 	 * @return 运管处站点序号
 	 */
-	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(HashMap<String,String> map){
+	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(HashMap<String,String> map,Map<String, Integer> stationNumMap){
 		// 线路编码
 		String lineCode = map.get("lineCode");
 		// 线路走向 0：上行  1：下行
@@ -1305,9 +1332,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		}else if(stationMark.equals("Z")){
 			marks= new String[]{"Z"};
 		}
+		// 默认从缓存BasicData.stationName2YgcNumber
+		Map<String, Integer> tempMap = BasicData.stationName2YgcNumber;
+		// 如果传入的stationNumMap不为空，则不是缓存取，而从stationNumMap取
+		if(stationNumMap != null){
+			tempMap = stationNumMap;
+		}
 		Integer number = null;
 		for (int i = 0 ;i < marks.length ; i ++){
-			number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationCode+"_"+marks[i]);
+			number = tempMap.get(lineCode+"_"+direction+"_"+stationCode+"_"+marks[i]);
 			if(number != null){
 				break;
 			}
@@ -111,6 +111,8 @@
             success:function(data) {
                 if(data == 'success'){
                     alert("上传成功");
+                }else if(data == '0'){
+                    alert("上传失败，线路编号有0");
                 }else{
                     alert("上传失败");
                 }