恢复线路文件上传功能版本，之前被人还原到最初的版本了。

李强
1 parent a4b0b9bd
Showing 1 changed file with 70 additions and 49 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
@@ -668,25 +668,23 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 * @return String
 	 */ 
 	public String  newTextFileToFTP(List<Object[]> objects,Integer lineId) {
-		
 		// 返回值String
 		String stationRStr = "";
-		
 		// windows下的文本文件换行符
 		//String enterStr = "\r\n";
-		
 		// linux/unix下的文本文件换行符
 		String enterStr = "\r";
-		
+		int defaultZdxh = 0;
 		if(objects.size()>0) {
-			
 			for(int i = 0; i<objects.size();i++) {
-				
+				defaultZdxh ++ ;
 				// 经度
-				String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+				String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
 				// 纬度
-				String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+				String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
+				
+				Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
 				lat = "\t" +  lat;
@@ -696,23 +694,32 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				String stationMake = "";
 				if(stationMakeStr.equals("E")) {
-					
 					stationMake = "\t2";
-					
 				}else {
-					
 					stationMake ="\t1";
-					
 				}
 				// 站点序号 
-				String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				String stationNo =  String.valueOf(defaultZdxh);
 				stationNo = "\t" + stationNo;
 				// 站点编码
 				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+				int len = stationCode.length();
+				if(len<8) {
+					int dx = 8 - len;
+					String addStr = "";
+					for(int p =0;p<dx;p++) {
+						addStr  = addStr + "0";
+					}
+					stationCode = addStr + stationCode;
+				}else if(len>8){
+					stationCode = stationCode.substring(8);
+				}
+				
 				stationCode =  "\t" +stationCode;
 				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
@@ -732,41 +739,33 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 限速
 				String sleepStr = "";
-				
 				// 方向
 				int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
-				
 				/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 				List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
-				
 				if(sobje.size()==1) {
-					
-					double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
-					
-					sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
-					
+					int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+					sleepStr =  "\t" +  String.valueOf(dsleepStr);
 				}else if(sobje.size()>1){
-					
-					/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 					for(int j =0;j<sobje.size();j++) {
-						
-						String sectionName = sobje.get(j)[3].toString();
-						
-						String sectionNameA[] = sectionName.split("至");
-						
-						if(stationName.equals(sectionNameA[0])){
-							
-							/*sleepStr = sobje.get(j)[2].toString();*/
-							
-							double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
-							
-							sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
-							
+						double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+						String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
+						pointsStr = pointsStr.substring(11, pointsStr.length()-1);
+						List<Point> ps = new ArrayList<>();
+						String[] pArray = pointsStr.split(",");
+						for(int a = 0; a <pArray.length; a++) {
+							String[] tmepA = pArray[a].split(" ");
+							Point temp = new Point(Double.valueOf(tmepA[0]), Double.valueOf(tmepA[1]));
+							ps.add(temp);
+						}
+						if(GeoUtils.isInSection(ps, point)) {
+							sleepStr = "\t" + String.valueOf((int)dsleepStrt);
+							break;
 						}
-						
 					}
 				}
-				
+				if(sleepStr.equals("")) 
+					sleepStr  =  "\t" + "60";
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 			}
@@ -785,9 +784,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			for(int i = 0; i<objects.size();i++) {
 				if(Integer.valueOf(objects.get(i)[8].toString())==0) {
 					// 经度
-					String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+					String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
+					
 					// 纬度
-					String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+					String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
+					
+					Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
 					lat = "\t" +  lat;
 					// 站点类型
 					String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
@@ -802,6 +804,17 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					String stationNo = "\t" + xh;
 					// 站点编码
 					String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+					int len = stationCode.length();
+					if(len<8) {
+						int dx = 8 - len;
+						String addStr = "";
+						for(int p =0;p<dx;p++) {
+							addStr  = addStr + "0";
+						}
+						stationCode = addStr + stationCode;
+					}else if(len>8){
+						stationCode = stationCode.substring(8);
+					}
 					stationCode =  "\t" +stationCode;
 					double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
 					String tempDistc = String.valueOf((int) dis);
@@ -817,20 +830,28 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 					List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
 					if(sobje.size()==1) {
-						double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
-						sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
+						int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+						sleepStr =  "\t" +  String.valueOf(dsleepStr);
 					}else if(sobje.size()>1){
-						/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 						for(int j =0;j<sobje.size();j++) {
-							String sectionName = sobje.get(j)[3].toString();
-							String sectionNameA[] = sectionName.split("至");
-							if(stationName.equals(sectionNameA[0])){
-								/*sleepStr = sobje.get(j)[2].toString();*/
-								double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
-								sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
+							double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+							String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
+							pointsStr = pointsStr.substring(11, pointsStr.length()-1);
+							List<Point> ps = new ArrayList<>();
+							String[] pArray = pointsStr.split(",");
+							for(int a = 0; a <pArray.length; a++) {
+								String[] tmepA = pArray[a].split(" ");
+								Point temp = new Point(Double.valueOf(tmepA[0]), Double.valueOf(tmepA[1]));
+								ps.add(temp);
+							}
+							if(GeoUtils.isInSection(ps, point)) {
+								sleepStr = "\t" + String.valueOf((int)dsleepStrt);
+								break;
 							}
 						}
 					}
+					if(sleepStr.equals("")) 
+						sleepStr  =  "\t" + "60";
 					xh++;
 					restStr = restStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 				}