Merge branch 'pudong' of http://222.66.0.204:8090//panzhaov5/bsth_control into pudong

徐烜
2 parents 5c838643 49f3e8a9
Showing 1 changed file with 21 additions and 6 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -948,8 +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;
+		Map<String,String> lsStationCode2NameMap = null;
+		Map<String, Integer> lsStationName2YgcNumber = null;
 		try {
 			String[] idArray = ids.split(",");
 			StringBuffer sBufferA ,sBufferB ,sBufferC ;
@@ -963,16 +963,21 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			Iterator<TTInfoDetail> ttInfoDetailIterator;
 			HashMap<String,Object> param ;
 			sBuffer.append("<SKBs>");
-			HashMap<String,String> paramMap;
+			HashMap<String,String> paramMap = null;
 			HashMap<String,String> otherMap = new HashMap<>();
+			// 得到时刻表版本号
+			int lineVersion = -1;
+			long ttinfoId = -1L;
+			// 是否输出站点信息
+			boolean isLogStation;
 			for (int i = 0; i < idArray.length; i++) {
-				long ttinfoId = Long.valueOf(idArray[i]);
+				ttinfoId = Long.valueOf(idArray[i]);
 				ttInfo = ttInfoRepository.findOne(ttinfoId);
 				if(ttInfo == null)
 					continue;
 				ttinfoList.add(ttInfo); // 保存时刻表
 				// 得到时刻表版本号
-				int lineVersion = ttInfo.getLineVersion();
+				lineVersion = ttInfo.getLineVersion();
 				// 查询历史站点路由
 				lsStationCode2NameMap = getLsStationCode(ttInfo.getXl().getLineCode(),lineVersion);
 				// 查询历史站点路由
@@ -988,6 +993,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				param = new HashMap();
 				param.put("line.id_eq", ttInfo.getXl().getId());
 				lineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(param));
+				// 初始化
+				isLogStation = true;
 				if(ttInfoDetailIterator.hasNext()){
 					sBuffer.append("<SKB>");
 					sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(ttInfo.getXl().getId()))
@@ -1029,13 +1036,20 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
+						if(isLogStation){// 输出起点站信息
+							logger.info("setSKB:"+"起点站信息："+paramMap);
+						}
 						sBufferC.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</ZDXH>");
 						sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
 						sBufferC.append("<DDZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
 								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
-						// 起点站的参数
+						// 终点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
+						if(isLogStation){// 输出终点站信息
+							logger.info("setSKB:"+"终点站信息："+paramMap);
+						}
+						isLogStation = false; // 一条线路只输出一次，后面的不输出了
 						sBufferC.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</DDXH>");
 						sBufferC.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBufferC.append("</BC>");
@@ -1055,6 +1069,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sBufferA.append("<JHYYLC>").append(df.format(yylc)).append("</JHYYLC>");
 					sBuffer.append(sBufferA).append(sBufferB).append(sBufferC);
 				}
+				logger.info("setSKB:"+"ttinfoId:"+ttinfoId+";当前站点版本号："+lineVersion+"；查询历史站点路由:"+lsStationCode2NameMap+";查询历史站点编号:"+lsStationName2YgcNumber);
 			}
 			sBuffer.append("</SKBs>");
 			if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){