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

潘钊
2 parents a600e484 f9b85d0d
Showing 3 changed files with 103 additions and 56 deletions
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -289,7 +289,7 @@ public class BasicData implements CommandLineRunner {
                         num = 1;
                         lineCode = tempArray[0]+"";
                     }
-                    key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
+                    key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[3];
                     tempStationName2YgcNumber.put(key,num++);
                 }
             }
@@ -3,7 +3,6 @@ package com.bsth.repository;
 import java.util.List;
 import java.util.Map;
-import com.bsth.entity.schedule.CarConfigInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -15,7 +14,6 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import com.bsth.entity.Line;
-import com.bsth.entity.LineInformation;
 import com.bsth.entity.StationRoute;
 /**
@@ -262,7 +260,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	List<StationRoute> findByLineCode(String lineCode);
 	@Query("SELECT " +
-			"lineCode,directions,stationName,stationRouteCode " +
+			"lineCode,directions,stationName,stationCode " +
 			"FROM " +
 			"StationRoute s " +
 			"WHERE " +
@@ -140,51 +140,45 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		try {
 			Iterator<Line> lineIterator = lineRepository.findAll().iterator();
 			Line line = null;
-			List<StationRoute> stationsList = null;// 站点路由集
+			List<StationRoute> upStationsList = null;// 上行站点路由集
+			List<StationRoute> downStationsList = null;// 下行站点路由集
 			List<LineInformation> lineInformationsList = null;
 			LineInformation lineInformation = null;
-			sBuffer.append("<XLs>");
+			sBuffer.append("<Data>");
+			sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
+			sBuffer.append("<DataList>");
 			while(lineIterator.hasNext()){
 				line = lineIterator.next();
+				if(!line.getName().equals("浦江4路")){
+					continue;
+				}
 				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
 						|| line.getInUse() == 0){
 					continue;
 				}
-				sBuffer.append("<XL>");
-				sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
-				sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
-				sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
-				sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
-				// 线路标准信息实体
-				lineInformationsList = lineInformationRepository.findByLine(line);
-				int size = lineInformationsList.size();
-				if(lineInformationsList != null && size > 0){
-					double upMileage = 0.0; // 上行里程
-					double downMileage = 0.0; // 下行里程
-					// 如果线路标准有多个，累加上行里程和下行里程
-					for (int i = 0; i < size; i++) {
-						lineInformation = lineInformationsList.get(i);
-						upMileage +=lineInformation.getUpMileage();
-						downMileage +=lineInformation.getDownMileage();
-					}
-					sBuffer.append("<QZLC>").append(upMileage).append("</QZLC>");
-					sBuffer.append("<ZQLC>").append(downMileage).append("</ZQLC>");
-				}
-				sBuffer.append("<XLGH>").append(line.getLinePlayType() == null ?"0":line.getLinePlayType())
-						.append("</XLGH>");
+				sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");
+				sBuffer.append("<LINE_CODE>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</LINE_CODE>");
+				sBuffer.append("<LINE_NAME>").append(line.getName()).append("</LINE_NAME>");
 				// 循环添加站点信息
-				sBuffer.append("<StationList>");
+				sBuffer.append("<LineStationList>");
 				// 先查上行
-				stationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
+				upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
 				int startId = 1;
-				startId = packagStationXml(stationsList, sBuffer, startId);
+				startId = packagStationXml(upStationsList, sBuffer, startId);
 				// 再查下行
-				stationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
-				packagStationXml(stationsList, sBuffer, startId);
-				sBuffer.append("</StationList>");
-				sBuffer.append("</XL>");
+				downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
+				packagStationXml(downStationsList, sBuffer, startId);
+				sBuffer.append("</LineStationList>");
+
+				// 循环添加站点点位信息
+				sBuffer.append("<LinePointList>");
+				startId = 1;
+				startId = packagStationPointXml(upStationsList, sBuffer, startId);
+				packagStationPointXml(downStationsList, sBuffer, startId);
+				sBuffer.append("</LinePointList>");
 			}
-			sBuffer.append("</XLs>");
+			sBuffer.append("</DataList>");
+			sBuffer.append("</Data>");
 			System.out.println(sBuffer.toString());
 			if(sBuffer.indexOf("<XL>") != -1){
 				portType = new Internal().getInternalHttpSoap11Endpoint();
@@ -329,7 +323,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
 					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
 					sf.append("<LDList>");
-
 					for(ScheduleRealInfo scheduleRealInfo:list){
 						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
 								.equals(scheduleRealInfo.getLpName())
@@ -355,7 +348,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
 							sf.append("<FCZDMC>"+scheduleRealInfo.getQdzName()+"</FCZDMC>");
 							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(
-									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getQdzName()) + "</FCZDXH>");
+									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getQdzCode()) + "</FCZDXH>");
 							sf.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");
 							sf.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");
 							sf.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");
@@ -363,7 +356,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sf.append("<FCZDLX>"+""+"</FCZDLX>");
 							sf.append("<DDZDMC>"+scheduleRealInfo.getZdzName()+"</DDZDMC>");
 							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(
-									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getZdzName()) +"</DDZDXH>");
+									scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getZdzCode()) +"</DDZDXH>");
 							sf.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");
 							sf.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");
 							sf.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");
@@ -382,6 +375,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					Results results = ssop.setLD(userNameOther, passwordOther, sf.toString());
 					if(results.isSuccess()){
 						result = "success";
+					}else{
+						result = "failure";
 					}
 					logger.info("setLD:"+sf.toString());
 					logger.info("setLD:"+result);
@@ -393,11 +388,33 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				Results results = ssop.setLD(userNameOther, passwordOther, sf.toString());
 				if(results.isSuccess()){
 					result = "success";
+				}else{
+					result = "failure";
 				}
 				logger.info("setLD:"+sf.toString());
 				logger.info("setLD:"+result);
 			}
+		} catch (Exception e) {
+			logger.error("setLD:",e);
+			e.printStackTrace();
+		}finally{
+		}
+		return result;
+	}
+
+	/**
+	 * 上传路单 xml来自文件
+	 * @return 上传成功标识
+	 */
+	public String setLDFile(){
+		String result = "failure";
+		try {
+			String tmp = readXmlFromFile("E:/ld.txt");
+			Results rss = ssop.setLD(userNameOther, passwordOther, tmp);
+			if(rss.isSuccess()){
+				result = "success";
+			}
 		} catch (Exception e) {
 			logger.error("setLD:",e);
 			e.printStackTrace();
@@ -660,11 +677,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>");
 						sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>");
 						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzName())).append("</ZDXH>");
+								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzCode())).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
 						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzName())).append("</DDXH>");
+								schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzCode())).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
 								.append("</JHDDSJ>");
 						sBuffer.append("</BC>");
@@ -767,11 +784,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
 						sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");
 						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationName())).append("</ZDXH>");
+								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationCod())).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");
 						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
-								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationName())).append("</DDXH>");
+								lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationCod())).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBuffer.append("</BC>");
 					}
@@ -1131,15 +1148,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				zdlx = "2";
 			}
 			sBuffer.append("<Station>");
-			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationName())).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>");
-			sBuffer.append("<ZDJD>").append(srRoute.getStation().getgLonx()).append("</ZDJD>");
-			sBuffer.append("<ZDWD>").append(srRoute.getStation().getgLaty()).append("</ZDWD>");
-			sBuffer.append("<ZZ>").append(srRoute.getStation().getAddr()).append("</ZZ>");//站点的具体地址
-			sBuffer.append("<ZDLX>").append(zdlx).append("</ZDLX>");
-			sBuffer.append("<ZJLC>").append(srRoute.getDistances()).append("</ZJLC>");
+			sBuffer.append("<STATION_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_ID>");
+			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
+			sBuffer.append("<STATION_NO>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_NO>");
+			sBuffer.append("<STATION_CODE>").append(srRoute.getStationCode()).append("</STATION_CODE>");
+			sBuffer.append("<STATION_NAME>").append(srRoute.getStationName()).append("</STATION_NAME>");
+			sBuffer.append("<STATION_LON>").append(srRoute.getStation().getgLonx()).append("</STATION_LON>");
+			sBuffer.append("<STATION_LAT>").append(srRoute.getStation().getgLaty()).append("</STATION_LAT>");
+			sBuffer.append("<STATION_TYPE>").append(zdlx).append("</STATION_TYPE>");
+			sBuffer.append("<STATION_DISTANCE>").append(srRoute.getDistances()).append("</STATION_DISTANCE>");
 			sBuffer.append("</Station>");
 			startId++;
 		}
@@ -1147,15 +1164,47 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * @param stationsList 站点路由集
+	 * @param sBuffer sBuffer
+	 * @param startId 站点序号起始ID
+	 *
+	 * @return 站点序号累加后的ID
+	 */
+	private int packagStationPointXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
+		int size = stationsList.size();
+		StationRoute srRoute;
+		String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
+		for (int i = 0; i < size; i++) {
+			srRoute = stationsList.get(i);
+			zdlx = srRoute.getStationMark();
+			if(zdlx.equals("B")){
+				zdlx = "0";
+			}else if(zdlx.equals("E")){
+				zdlx = "1";
+			}else{
+				zdlx = "2";
+			}
+			sBuffer.append("<Point>");
+			sBuffer.append("<POINT_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</POINT_ID>");
+			sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
+			sBuffer.append("<POINTLON>").append(srRoute.getStation().getgLonx()).append("</POINTLON>");
+			sBuffer.append("<POINTLAT>").append(srRoute.getStation().getgLaty()).append("</POINTLAT>");
+			sBuffer.append("</Point>");
+			startId++;
+		}
+		return startId;
+	}
+
+	/**
 	 *
 	 * @param lineCode 线路编码
 	 * @param direction 线路方向
-	 * @param stationName 让点名称
+	 * @param stationCode 让点名称
 	 * @return 运管处站点序号
 	 */
-	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationName){
+	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationCode){
 		Integer number = 0;
-		number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationName);
-		return number;
+		number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationCode);
+		return number == null ? 0 : number;
 	}
 }