运管处路单上传BUG修改

zlz
1 parent 816bbcd4
Showing 1 changed file with 30 additions and 51 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -16,6 +16,7 @@ import com.bsth.repository.schedule.*;
 import com.bsth.repository.traffic.SKBUploadLoggerRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.TrafficManageService;
+import com.bsth.service.traffic.YgcBasicDataService;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
@@ -99,7 +100,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
  
 	// 线路站点repository
 	@Autowired
-	private StationRepository stationRepository;
+	private YgcBasicDataService ygcBasicDataService;
  
  
 	// 运管处接口
@@ -122,11 +123,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	DecimalFormat format = new DecimalFormat("0.00");
  
 	// 用户名
-	private final String userNameXl = "pudong";
-	// 密码
-	private final String passwordXl = "pudong123";
-
-	// 用户名
 	private final String userNameOther = "user";
 	// 密码
 	private final String passwordOther = "user";
@@ -134,34 +130,25 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * 上传线路信息
 	 */
 	@Override
-	public String setXL(Map<String, Object> param) {
+	public String setXL(String ids) {
 		String result = "failure";
 		StringBuffer sBuffer = new StringBuffer();
+		String[] idArray = ids.split(",");
 		try {
-			Map<String,Object> map = new HashMap<String,Object>();
-			map.put("lineCode_eq", param.get("xl.lineCode_like")+"");
-			Iterator<Line> lineIterator;
-			Line line = null;
-			if(param.get("xl.lineCode_like").equals("")){
-				lineIterator = lineRepository.findAll().iterator();
-			}else {
+			for (String id : idArray) {
+				Map<String,Object> map = new HashMap<>();
+				map.put("lineCode_eq", id);
+				Line line ;
 				line = lineRepository.findOne(new CustomerSpecs<Line>(map));
-			}
-			List<StationRoute> upStationsList = null;// 上行站点路由集
-			List<StationRoute> downStationsList = null;// 下行站点路由集
-			List<LineInformation> lineInformationsList = null;
-			LineInformation lineInformation = null;
-			sBuffer.append("<Data>");
-			sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
-			sBuffer.append("<DataList>");
-//			while(lineIterator.hasNext()){
-//				line = lineIterator.next();
-//				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
-//						|| line.getInUse() == 0){
-//					continue;
-//				}
-			if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
-						|| line.getInUse() == 0){
+				if(line == null){
+					continue;
+				}
+				List<StationRoute> upStationsList ;// 上行站点路由集
+				List<StationRoute> downStationsList = null;// 下行站点路由集
+				sBuffer.append("<Data>");
+				sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
+				sBuffer.append("<DataList>");
+				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
 					return result;
 				}
 				sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");
@@ -190,32 +177,24 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					packagStationPointXml(downStationsList, sBuffer, startId);
 				}
 				sBuffer.append("</LinePointList>");
-//			}
-			sBuffer.append("</DataList>");
-			sBuffer.append("</Data>");
-			System.out.println(sBuffer.toString());
-			if(sBuffer.indexOf("<XL>") != -1){
-				portType = new Internal().getInternalHttpSoap11Endpoint();
-				String portResult = portType.setXL(userNameXl, passwordXl, sBuffer.toString());
-				String portArray[] = portResult.split("\n");
-				if(portArray.length >= 4){
-					// 返回数据的编码
-					String returnCode = portArray[1].substring(portArray[1].indexOf(">")+1,portArray[1].indexOf("</"));
-					// 返回的信息
-					String returnDescription = portArray[2].substring(portArray[2].indexOf(">")+1,portArray[2].indexOf("</"));
-					if(returnCode.equals("1")){
-						result = "success";
-					}else{
-						result = returnDescription;
-					}
+				sBuffer.append("</DataList>");
+				sBuffer.append("</Data>");
+				// 调用上传方法
+				result = ygcBasicDataService.invokeMethod("UpdateBusLineStation",sBuffer.toString());
+				String str = "ReturnCode";
+				// 解析返回值
+				result = result.substring(result.indexOf(str)+str.length()+1,result.lastIndexOf(str)-2);
+				if(result.equals("1")){
+					result = "success";
+				}else{
+					result = "failure";
 				}
+				logger.info("setXL:"+sBuffer.toString());
+				logger.info("setXL:"+result);
 			}
 		} catch (Exception e) {
 			logger.error("setXL:",e);
 			e.printStackTrace();
-		}finally{
-			logger.info("setXL:"+sBuffer.toString());
-			logger.info("setXL:"+result);
 		}
 		return result;
 	}