1.上传运管所电子路单逻辑修正

王通
1 parent fd03ccf3
Showing 1 changed file with 26 additions and 30 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -445,9 +445,31 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			Map<String,Object> map = new HashMap();
 			HashMap<String,String> paramMap;
 			HashMap<String,String> otherMap = new HashMap();
+			// 青浦运管所上传需按线路分割
 			String oldXlbm = null;
-			StringBuilder ygsXml = new StringBuilder("<DLDS>");
+			// 青浦运管所上传xml
+			StringBuilder ygsXml = new StringBuilder();
 			for(Map<String,Object> schRealInfo:listGroup){
+				// 青浦运管所需整条线路上传
+				if (oldXlbm == null || !oldXlbm.equals(schRealInfo.get("xlBm"))) {
+					// 如果线路编号变化 则将前面的xml闭合并上传
+					if (oldXlbm != null) {
+						ygsXml.append("</DLDS>");
+						try {
+							logger.info("xml："+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
+							com.bsth.webService.trafficManage.qp.Results res
+									= qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
+							logger.info("青浦路单是否上传成功："+res.isSuccess());
+						}catch (Exception e){
+							e.printStackTrace();
+							continue;
+						}
+					}
+					// 新起xml标签
+					ygsXml = new StringBuilder("<DLDS>");
+				}
+				// 老线路编码置为当前线路编码
+				oldXlbm = String.valueOf(schRealInfo.get("xlBm"));
 				if(schRealInfo != null){
 					StringBuilder sri = new StringBuilder();
 					//根据车辆自编号查询车牌号
@@ -525,6 +547,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sri.append("</LDList>");
 					sri.append("</DLD>");
 					sf.append(sri);
+					// 运管所xml加入路单信息
 					ygsXml.append(sri);
 				}
 				if(counter % per == per - 1){
@@ -534,43 +557,16 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
 					// 记录日志
 					result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str);
-					// 发送到青浦运管处
-					/*try {
-						logger.info("xml："+StringEscapeUtils.unescapeHtml(str));
-						com.bsth.webService.trafficManage.qp.Results res
-								= qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(str));
-						logger.info("青浦路单是否上传成功："+res.isSuccess());
-					}catch (Exception e){
-						e.printStackTrace();
-						continue;
-					}*/
-				}
-
-				// 青浦运管所需整条线路上传
-				if (oldXlbm == null || !oldXlbm.equals(schRealInfo.get("xlBm"))) {
-					if (oldXlbm != null) {
-						ygsXml.append("</DLDS>");
-						try {
-							logger.info("xml："+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
-							com.bsth.webService.trafficManage.qp.Results res
-									= qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
-							logger.info("青浦路单是否上传成功："+res.isSuccess());
-						}catch (Exception e){
-							e.printStackTrace();
-							continue;
-						}
-						ygsXml = new StringBuilder("<DLDS>");
-					}
-					oldXlbm = String.valueOf(schRealInfo.get("xlBm"));
 				}
 			}
 			// 每per条线路上传后剩下的数据再上传
 			if(counter > 0){
+				// 最后的路单一次上传
 				ygsXml.append("</DLDS>");
 				sf.append("</DLDS>");
 				str = sf.toString().replace("'","");// 去掉'号
 				results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
-				// 发送到青浦运管处
+				// 发送到青浦运管所
 				try {
 					logger.info("xml："+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
 					com.bsth.webService.trafficManage.qp.Results res