Commit 630b2012fe1d3d842027eddab192cc6b6684600e
1 parent
fd03ccf3
1.上传运管所电子路单逻辑修正
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{ |
| 445 | 445 | Map<String,Object> map = new HashMap(); |
| 446 | 446 | HashMap<String,String> paramMap; |
| 447 | 447 | HashMap<String,String> otherMap = new HashMap(); |
| 448 | + // 青浦运管所上传需按线路分割 | |
| 448 | 449 | String oldXlbm = null; |
| 449 | - StringBuilder ygsXml = new StringBuilder("<DLDS>"); | |
| 450 | + // 青浦运管所上传xml | |
| 451 | + StringBuilder ygsXml = new StringBuilder(); | |
| 450 | 452 | for(Map<String,Object> schRealInfo:listGroup){ |
| 453 | + // 青浦运管所需整条线路上传 | |
| 454 | + if (oldXlbm == null || !oldXlbm.equals(schRealInfo.get("xlBm"))) { | |
| 455 | + // 如果线路编号变化 则将前面的xml闭合并上传 | |
| 456 | + if (oldXlbm != null) { | |
| 457 | + ygsXml.append("</DLDS>"); | |
| 458 | + try { | |
| 459 | + logger.info("xml:"+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'",""))); | |
| 460 | + com.bsth.webService.trafficManage.qp.Results res | |
| 461 | + = qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'",""))); | |
| 462 | + logger.info("青浦路单是否上传成功:"+res.isSuccess()); | |
| 463 | + }catch (Exception e){ | |
| 464 | + e.printStackTrace(); | |
| 465 | + continue; | |
| 466 | + } | |
| 467 | + } | |
| 468 | + // 新起xml标签 | |
| 469 | + ygsXml = new StringBuilder("<DLDS>"); | |
| 470 | + } | |
| 471 | + // 老线路编码置为当前线路编码 | |
| 472 | + oldXlbm = String.valueOf(schRealInfo.get("xlBm")); | |
| 451 | 473 | if(schRealInfo != null){ |
| 452 | 474 | StringBuilder sri = new StringBuilder(); |
| 453 | 475 | //根据车辆自编号查询车牌号 |
| ... | ... | @@ -525,6 +547,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ |
| 525 | 547 | sri.append("</LDList>"); |
| 526 | 548 | sri.append("</DLD>"); |
| 527 | 549 | sf.append(sri); |
| 550 | + // 运管所xml加入路单信息 | |
| 528 | 551 | ygsXml.append(sri); |
| 529 | 552 | } |
| 530 | 553 | if(counter % per == per - 1){ |
| ... | ... | @@ -534,43 +557,16 @@ public class TrafficManageServiceImpl implements TrafficManageService{ |
| 534 | 557 | results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str)); |
| 535 | 558 | // 记录日志 |
| 536 | 559 | result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str); |
| 537 | - // 发送到青浦运管处 | |
| 538 | - /*try { | |
| 539 | - logger.info("xml:"+StringEscapeUtils.unescapeHtml(str)); | |
| 540 | - com.bsth.webService.trafficManage.qp.Results res | |
| 541 | - = qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(str)); | |
| 542 | - logger.info("青浦路单是否上传成功:"+res.isSuccess()); | |
| 543 | - }catch (Exception e){ | |
| 544 | - e.printStackTrace(); | |
| 545 | - continue; | |
| 546 | - }*/ | |
| 547 | - } | |
| 548 | - | |
| 549 | - // 青浦运管所需整条线路上传 | |
| 550 | - if (oldXlbm == null || !oldXlbm.equals(schRealInfo.get("xlBm"))) { | |
| 551 | - if (oldXlbm != null) { | |
| 552 | - ygsXml.append("</DLDS>"); | |
| 553 | - try { | |
| 554 | - logger.info("xml:"+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'",""))); | |
| 555 | - com.bsth.webService.trafficManage.qp.Results res | |
| 556 | - = qp_ssop.setLD(userNameOther_qp,passwordOther_qp,StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'",""))); | |
| 557 | - logger.info("青浦路单是否上传成功:"+res.isSuccess()); | |
| 558 | - }catch (Exception e){ | |
| 559 | - e.printStackTrace(); | |
| 560 | - continue; | |
| 561 | - } | |
| 562 | - ygsXml = new StringBuilder("<DLDS>"); | |
| 563 | - } | |
| 564 | - oldXlbm = String.valueOf(schRealInfo.get("xlBm")); | |
| 565 | 560 | } |
| 566 | 561 | } |
| 567 | 562 | // 每per条线路上传后剩下的数据再上传 |
| 568 | 563 | if(counter > 0){ |
| 564 | + // 最后的路单一次上传 | |
| 569 | 565 | ygsXml.append("</DLDS>"); |
| 570 | 566 | sf.append("</DLDS>"); |
| 571 | 567 | str = sf.toString().replace("'","");// 去掉'号 |
| 572 | 568 | results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str)); |
| 573 | - // 发送到青浦运管处 | |
| 569 | + // 发送到青浦运管所 | |
| 574 | 570 | try { |
| 575 | 571 | logger.info("xml:"+StringEscapeUtils.unescapeHtml(ygsXml.toString().replace("'",""))); |
| 576 | 572 | com.bsth.webService.trafficManage.qp.Results res | ... | ... |