bug修改：时刻表上传运管处，没有站点名称和站点序号，从历史路由中取到站点名称和站点序号

zlz
1 parent 3ced2fc6
Showing 2 changed files with 83 additions and 5 deletions
src/main/java/com/bsth/repository/LsStationRouteRepository.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
 package com.bsth.repository;
 import java.util.List;
+import java.util.Map;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
@@ -52,4 +53,21 @@ public interface LsStationRouteRepository extends BaseRepository&lt;LsStationRoute,
     @Modifying
     @Query(value="UPDATE bsth_c_ls_stationroute set destroy = 1 where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
     public void batchDestroy(Integer sectionRouteLine, Integer directions, Integer versions);
+
+    /**
+     * 按线路编码查询各站点的顺序号
+     * @param lineCode 线路编码
+     * @param lineVersion 版本号
+     * @return
+     */
+    @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 " +
+            "LsStationRoute s " +
+            "WHERE " +
+            "s.destroy = 0 AND s.lineCode = ?1 AND s.versions = ?2 " +
+            "ORDER BY " +
+            "lineCode,directions,stationRouteCode")
+    List<Map<String, String>> findLineWithLineCode4Ygc(String lineCode,Integer lineVersion);
 }
@@ -77,6 +77,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private StationRouteRepository stationRouteRepository;
+	// 历史站点路由repository
+	@Autowired
+	private LsStationRouteRepository lsStationRouteRepository;
+
 	@Autowired
 	private SectionRepository sectionRepository;
@@ -944,6 +948,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		String result = "failure";
 		StringBuffer sBuffer = new StringBuffer();
 		DecimalFormat df = new DecimalFormat("######0.000");
+		Map<String,String> lsStationCode2NameMap;
+		Map<String, Integer> lsStationName2YgcNumber;
 		try {
 			String[] idArray = ids.split(",");
 			StringBuffer sBufferA ,sBufferB ,sBufferC ;
@@ -960,10 +966,17 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			HashMap<String,String> paramMap;
 			HashMap<String,String> otherMap = new HashMap<>();
 			for (int i = 0; i < idArray.length; i++) {
-				ttInfo = ttInfoRepository.findOne(Long.valueOf(idArray[i]));
+				long ttinfoId = Long.valueOf(idArray[i]);
+				ttInfo = ttInfoRepository.findOne(ttinfoId);
 				if(ttInfo == null)
 					continue;
 				ttinfoList.add(ttInfo); // 保存时刻表
+				// 得到时刻表版本号
+				int lineVersion = ttInfo.getLineVersion();
+				// 查询历史站点路由
+				lsStationCode2NameMap = getLsStationCode(ttInfo.getXl().getLineCode(),lineVersion);
+				// 查询历史站点路由
+				lsStationName2YgcNumber = getLsStationRoute(ttInfo.getXl().getLineCode(),lineVersion);
 				zlc = 0.0f;
 				yylc = 0.0f;
 				// 获得时刻表
@@ -1007,19 +1020,19 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBufferC.append("<BC>");
 						sBufferC.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 						sBufferC.append("<SXX>").append(sxx).append("</SXX>");
-						sBufferC.append("<FCZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+						sBufferC.append("<FCZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
 								+"_"+ttInfoDetail.getQdzCode())).append("</FCZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
+						sBufferC.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</ZDXH>");
 						sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
-						sBufferC.append("<DDZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+						sBufferC.append("<DDZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
 								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
+						sBufferC.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</DDXH>");
 						sBufferC.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBufferC.append("</BC>");
 						// 0：上行；1：下行
@@ -1520,4 +1533,51 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		map.put("stationMark",stationMark); // 站点类型
 		return map;
 	}
+
+	/**
+	 * 取得历史站点编码和站点名称的对应关系
+	 * @return
+	 */
+	private Map<String, String> getLsStationCode(String lineCode,int lineVersion){
+		Map<String,Object> map = new HashMap<>();
+		map.put("lineCode_eq", lineCode);
+		map.put("versions_eq",lineVersion);
+		LsStationRoute lsroute;
+		Iterator<LsStationRoute> iterator = lsStationRouteRepository.findAll(new CustomerSpecs<LsStationRoute>(map)).iterator();
+		Map<String, String> stationCode2Name = new HashMap<>();
+		while (iterator.hasNext()) {
+			lsroute = iterator.next();
+			stationCode2Name.put(lsroute.getLineCode() + "_" + lsroute.getDirections() + "_" + lsroute.getStationCode(), lsroute.getStationName());
+		}
+		return stationCode2Name;
+	}
+
+	private Map<String, Integer> getLsStationRoute(String xlbm,int lineVersion){
+		Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
+		/**
+		 * 加载运管处的站点及序号
+		 * 上行从1开始，下行顺序续编
+		 */
+		List<Map<String, String>> ygcLines = lsStationRouteRepository.findLineWithLineCode4Ygc(xlbm,lineVersion);
+		if(ygcLines != null && ygcLines.size() > 0){
+			int size = ygcLines.size();
+			Map<String, String> tempMap ;
+			int num = 1;
+			String key;
+			String lineCode = "";
+			for (int i = 0; i < size; i ++){
+				tempMap = ygcLines.get(i);
+				if(lineCode.equals("")){
+					lineCode = tempMap.get("lineCode");
+				}else if(!lineCode.equals(tempMap.get("lineCode"))){
+					num = 1;
+					lineCode = tempMap.get("lineCode");
+				}
+				key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
+						+ "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
+				tempStationName2YgcNumber.put(key,num++);
+			}
+		}
+		return tempStationName2YgcNumber;
+	}
 }