Commit 6998b1bbbd1cf8595cd86172306bde2db03e7f00

Authored by 王通
1 parent 5fbc5d5d

1.

src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -446,7 +446,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -446,7 +446,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
446 HashMap<String,String> paramMap; 446 HashMap<String,String> paramMap;
447 HashMap<String,String> otherMap = new HashMap(); 447 HashMap<String,String> otherMap = new HashMap();
448 String oldXlbm = null; 448 String oldXlbm = null;
449 - StringBuilder ygsXml = new StringBuilder(), lineXml = new StringBuilder(); 449 + StringBuilder ygsXml = new StringBuilder("<DLDS>");
450 for(Map<String,Object> schRealInfo:listGroup){ 450 for(Map<String,Object> schRealInfo:listGroup){
451 if(schRealInfo != null){ 451 if(schRealInfo != null){
452 StringBuilder sri = new StringBuilder(); 452 StringBuilder sri = new StringBuilder();
@@ -525,13 +525,13 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -525,13 +525,13 @@ public class TrafficManageServiceImpl implements TrafficManageService{
525 sri.append("</LDList>"); 525 sri.append("</LDList>");
526 sri.append("</DLD>"); 526 sri.append("</DLD>");
527 sf.append(sri); 527 sf.append(sri);
528 - lineXml.append(sri); 528 + ygsXml.append(sri);
529 } 529 }
530 if(counter % per == per - 1){ 530 if(counter % per == per - 1){
531 counter = 0; 531 counter = 0;
532 sf.append("</DLDS>"); 532 sf.append("</DLDS>");
533 str = sf.toString().replace("'","");// 去掉'号 533 str = sf.toString().replace("'","");// 去掉'号
534 - results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str)); 534 + //results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
535 // 记录日志 535 // 记录日志
536 result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str); 536 result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str);
537 // 发送到青浦运管处 537 // 发送到青浦运管处
@@ -559,12 +559,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -559,12 +559,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{
559 e.printStackTrace(); 559 e.printStackTrace();
560 continue; 560 continue;
561 } 561 }
  562 + ygsXml = new StringBuilder("<DLDS>");
562 } 563 }
563 - ygsXml = new StringBuilder("<DLDS>");  
564 - lineXml = new StringBuilder();  
565 oldXlbm = String.valueOf(schRealInfo.get("xlBm")); 564 oldXlbm = String.valueOf(schRealInfo.get("xlBm"));
566 - } else {  
567 - ygsXml.append(lineXml);  
568 } 565 }
569 } 566 }
570 // 每per条线路上传后剩下的数据再上传 567 // 每per条线路上传后剩下的数据再上传
@@ -572,7 +569,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -572,7 +569,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
572 ygsXml.append("</DLDS>"); 569 ygsXml.append("</DLDS>");
573 sf.append("</DLDS>"); 570 sf.append("</DLDS>");
574 str = sf.toString().replace("'","");// 去掉'号 571 str = sf.toString().replace("'","");// 去掉'号
575 - results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str)); 572 + //results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
576 // 发送到青浦运管处 573 // 发送到青浦运管处
577 try { 574 try {
578 logger.info("xml:"+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'",""))); 575 logger.info("xml:"+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
@@ -619,7 +616,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -619,7 +616,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
619 * @param str 616 * @param str
620 */ 617 */
621 private String logRecord(Results results,HashMap logXlbmMap,HashMap logXlbmSuccessMap,HashMap logXlbmFailureMap,StringBuffer logSuccess, 618 private String logRecord(Results results,HashMap logXlbmMap,HashMap logXlbmSuccessMap,HashMap logXlbmFailureMap,StringBuffer logSuccess,
622 - StringBuffer logFailure,String str){ 619 + StringBuffer logFailure,String str){
623 String result = "failure"; 620 String result = "failure";
624 // 记录日志 621 // 记录日志
625 if(results != null){ 622 if(results != null){
@@ -716,7 +713,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -716,7 +713,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
716 /** 713 /**
717 * 如果car==null,则说明该车辆是从线调中换车功能中加进去的, 714 * 如果car==null,则说明该车辆是从线调中换车功能中加进去的,
718 * 在cars基础信息中查不到车辆的信息,所以忽略该车辆 715 * 在cars基础信息中查不到车辆的信息,所以忽略该车辆
719 - */ 716 + */
720 if(car == null){ 717 if(car == null){
721 continue; 718 continue;
722 } 719 }