Commit bec7ff00f65a673a27cce70860064e8b05d8f9ac

Authored by 王通
1 parent b6838416

1.青浦上传至运管所的电子路单需按线路分割上传,同一条线路被分割会只认一条数据

src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -445,10 +445,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -445,10 +445,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{
445 Map<String,Object> map = new HashMap(); 445 Map<String,Object> map = new HashMap();
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 = "";  
449 - StringBuilder ygsXml = new StringBuilder(); 448 + String oldXlbm = null;
  449 + StringBuilder ygsXml = new StringBuilder(), lineXml = new StringBuilder();
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 //根据车辆自编号查询车牌号 453 //根据车辆自编号查询车牌号
453 map.put("insideCode_eq", schRealInfo.get("clZbh")+""); 454 map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
454 Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map)); 455 Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
@@ -467,13 +468,13 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -467,13 +468,13 @@ public class TrafficManageServiceImpl implements TrafficManageService{
467 if(logXlbmMap.get(xlbm) == null){ 468 if(logXlbmMap.get(xlbm) == null){
468 logXlbmMap.put(xlbm,xlbm); 469 logXlbmMap.put(xlbm,xlbm);
469 } 470 }
470 - sf.append("<DLD>");  
471 - sf.append("<RQ>"+date+"</RQ>");  
472 - sf.append("<XLBM>"+xlbm+"</XLBM>");  
473 - sf.append("<LPBH>"+schRealInfo.get("lpName")+"</LPBH>");  
474 - sf.append("<CPH>"+car.getCarPlate()+"</CPH>");  
475 - sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");  
476 - sf.append("<LDList>"); 471 + sri.append("<DLD>");
  472 + sri.append("<RQ>"+date+"</RQ>");
  473 + sri.append("<XLBM>"+xlbm+"</XLBM>");
  474 + sri.append("<LPBH>"+schRealInfo.get("lpName")+"</LPBH>");
  475 + sri.append("<CPH>"+car.getCarPlate()+"</CPH>");
  476 + sri.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
  477 + sri.append("<LDList>");
477 478
478 for(ScheduleRealInfo scheduleRealInfo:list){ 479 for(ScheduleRealInfo scheduleRealInfo:list){
479 if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"") 480 if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
@@ -494,43 +495,45 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -494,43 +495,45 @@ public class TrafficManageServiceImpl implements TrafficManageService{
494 continue; 495 continue;
495 } 496 }
496 497
497 - sf.append("<LD>");  
498 - sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");  
499 - sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");  
500 - sf.append("<FCZDMC>"+scheduleRealInfo.getQdzName()+"</FCZDMC>"); 498 + sri.append("<LD>");
  499 + sri.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
  500 + sri.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
  501 + sri.append("<FCZDMC>"+scheduleRealInfo.getQdzName()+"</FCZDMC>");
501 // 起点站的参数 502 // 起点站的参数
502 otherMap.put("stationMark","B"); 503 otherMap.put("stationMark","B");
503 paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap); 504 paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
504 - sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null) + "</FCZDXH>");  
505 - sf.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");  
506 - sf.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");  
507 - sf.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");  
508 - sf.append("<SJFCSJ>"+scheduleRealInfo.getFcsjActual()+"</SJFCSJ>");  
509 - sf.append("<FCZDLX>"+""+"</FCZDLX>");  
510 - sf.append("<DDZDMC>"+scheduleRealInfo.getZdzName()+"</DDZDMC>"); 505 + sri.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null) + "</FCZDXH>");
  506 + sri.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");
  507 + sri.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");
  508 + sri.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");
  509 + sri.append("<SJFCSJ>"+scheduleRealInfo.getFcsjActual()+"</SJFCSJ>");
  510 + sri.append("<FCZDLX>"+""+"</FCZDLX>");
  511 + sri.append("<DDZDMC>"+scheduleRealInfo.getZdzName()+"</DDZDMC>");
511 // 终点站的参数 512 // 终点站的参数
512 otherMap.put("stationMark","E"); 513 otherMap.put("stationMark","E");
513 paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap); 514 paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
514 - sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null) +"</DDZDXH>");  
515 - sf.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");  
516 - sf.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");  
517 - sf.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");  
518 - sf.append("<DDZDLX>"+""+"</DDZDLX>");  
519 - sf.append("<LDSCBZ>"+0+"</LDSCBZ>");  
520 - sf.append("<DDBZ>").append(scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).append("</DDBZ>");  
521 - sf.append("</LD>"); 515 + sri.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null) +"</DDZDXH>");
  516 + sri.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");
  517 + sri.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");
  518 + sri.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");
  519 + sri.append("<DDZDLX>"+""+"</DDZDLX>");
  520 + sri.append("<LDSCBZ>"+0+"</LDSCBZ>");
  521 + sri.append("<DDBZ>").append(scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).append("</DDBZ>");
  522 + sri.append("</LD>");
522 } 523 }
523 } 524 }
524 - sf.append("</LDList>");  
525 - sf.append("</DLD>"); 525 + sri.append("</LDList>");
  526 + sri.append("</DLD>");
  527 + sf.append(sri);
  528 + lineXml.append(sri);
526 } 529 }
527 if(counter % per == per - 1){ 530 if(counter % per == per - 1){
528 counter = 0; 531 counter = 0;
529 sf.append("</DLDS>"); 532 sf.append("</DLDS>");
530 str = sf.toString().replace("'","");// 去掉'号 533 str = sf.toString().replace("'","");// 去掉'号
531 - results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str)); 534 + //results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
532 // 记录日志 535 // 记录日志
533 - result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str); 536 + //result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str);
534 // 发送到青浦运管处 537 // 发送到青浦运管处
535 /*try { 538 /*try {
536 logger.info("xml:"+StringEscapeUtils.unescapeHtml(str)); 539 logger.info("xml:"+StringEscapeUtils.unescapeHtml(str));
@@ -548,7 +551,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -548,7 +551,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
548 if (oldXlbm != null) { 551 if (oldXlbm != null) {
549 ygsXml.append("</DLDS>"); 552 ygsXml.append("</DLDS>");
550 try { 553 try {
551 - logger.info("xml:"+StringEscapeUtils.unescapeHtml(ygsXml.toString())); 554 + logger.info("xml:"+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
552 com.bsth.webService.trafficManage.qp.Results res 555 com.bsth.webService.trafficManage.qp.Results res
553 = qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'",""))); 556 = qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
554 logger.info("青浦路单是否上传成功:"+res.isSuccess()); 557 logger.info("青浦路单是否上传成功:"+res.isSuccess());
@@ -558,8 +561,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -558,8 +561,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{
558 } 561 }
559 } 562 }
560 ygsXml = new StringBuilder("<DLDS>"); 563 ygsXml = new StringBuilder("<DLDS>");
  564 + lineXml = new StringBuilder();
  565 + oldXlbm = String.valueOf(schRealInfo.get("xlBm"));
561 } else { 566 } else {
562 - ygsXml.append(sf.toString().replace("<DLDS>", "").replace("</DLDS>", "")); 567 + ygsXml.append(lineXml);
563 } 568 }
564 } 569 }
565 // 每per条线路上传后剩下的数据再上传 570 // 每per条线路上传后剩下的数据再上传
@@ -567,10 +572,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -567,10 +572,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{
567 ygsXml.append("</DLDS>"); 572 ygsXml.append("</DLDS>");
568 sf.append("</DLDS>"); 573 sf.append("</DLDS>");
569 str = sf.toString().replace("'","");// 去掉'号 574 str = sf.toString().replace("'","");// 去掉'号
570 - results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str)); 575 + //results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
571 // 发送到青浦运管处 576 // 发送到青浦运管处
572 try { 577 try {
573 - logger.info("xml:"+StringEscapeUtils.unescapeHtml(str)); 578 + logger.info("xml:"+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
574 com.bsth.webService.trafficManage.qp.Results res 579 com.bsth.webService.trafficManage.qp.Results res
575 = qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'",""))); 580 = qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'","")));
576 logger.info("青浦路单是否上传成功:"+res.isSuccess()); 581 logger.info("青浦路单是否上传成功:"+res.isSuccess());
@@ -579,7 +584,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -579,7 +584,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
579 } 584 }
580 } 585 }
581 // 记录日志 586 // 记录日志
582 - result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str); 587 + //result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str);
583 } catch (Exception e) { 588 } catch (Exception e) {
584 logger.error("setLD:",e); 589 logger.error("setLD:",e);
585 logFailure.append(e).append("<br/>"); 590 logFailure.append(e).append("<br/>");