潘钊 / bsth_control · Commits

Commit 94525eb03c89624b3d2b783a62c3d2bbb9b57d60

Authored by zlz
1 parent 2f8d0f5f
build: skipped

ttinfoDetail起/终点站取值更换字段

Inline Side-by-side
Showing 1 changed file with 10 additions and 17 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @94525eb
@@ -69,10 +69,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -69,10 +69,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
69 @Autowired 69 @Autowired
70 private StationRouteRepository stationRouteRepository; 70 private StationRouteRepository stationRouteRepository;
71 71
72 - // 线路标准信息repository  
73 - @Autowired  
74 - private LineInformationRepository lineInformationRepository;  
75 -  
76 // 车辆repository 72 // 车辆repository
77 @Autowired 73 @Autowired
78 private CarsRepository carsRepository; 74 private CarsRepository carsRepository;
@@ -89,14 +85,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -89,14 +85,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
89 @Autowired 85 @Autowired
90 private TTInfoDetailRepository ttInfoDetailRepository; 86 private TTInfoDetailRepository ttInfoDetailRepository;
91 87
92 - // 车辆配置信息repository  
93 - @Autowired  
94 - private CarConfigInfoRepository carConfigInfoRepository;  
95 -  
96 - // 人员配置信息repository  
97 - @Autowired  
98 - private EmployeeConfigInfoRepository employeeConfigInfoRepository;  
99 -  
100 // 排班计划明细repository 88 // 排班计划明细repository
101 @Autowired 89 @Autowired
102 private SchedulePlanInfoRepository schedulePlanInfoRepository; 90 private SchedulePlanInfoRepository schedulePlanInfoRepository;
@@ -109,6 +97,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -109,6 +97,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{
109 @Autowired 97 @Autowired
110 private SKBUploadLoggerRepository skbUploadLoggerRepository; 98 private SKBUploadLoggerRepository skbUploadLoggerRepository;
111 99
  100 + // 线路站点repository
  101 + @Autowired
  102 + private StationRepository stationRepository;
  103 +
112 104
113 // 运管处接口 105 // 运管处接口
114 private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint(); 106 private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
@@ -367,7 +359,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -367,7 +359,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
367 continue; 359 continue;
368 } 360 }
369 361
370 - scheduleRealInfo.getQdzCode();  
371 sf.append("<LD>"); 362 sf.append("<LD>");
372 sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>"); 363 sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
373 sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>"); 364 sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
@@ -822,13 +813,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -822,13 +813,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{
822 sBuffer.append("<BC>"); 813 sBuffer.append("<BC>");
823 sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>"); 814 sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
824 sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>"); 815 sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
825 - sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>"); 816 + sBuffer.append("<FCZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
  817 + +"_"+ttInfoDetail.getQdzCode())).append("</FCZDMC>");
826 // 起点站的参数 818 // 起点站的参数
827 otherMap.put("stationMark","B"); 819 otherMap.put("stationMark","B");
828 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap); 820 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
829 sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>"); 821 sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
830 sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>"); 822 sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
831 - sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>"); 823 + sBuffer.append("<DDZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
  824 + +"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
832 // 起点站的参数 825 // 起点站的参数
833 otherMap.put("stationMark","E"); 826 otherMap.put("stationMark","E");
834 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap); 827 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
@@ -1331,9 +1324,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1331,9 +1324,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1331 if(otherParam != null && otherParam.get("stationMark") != null){ 1324 if(otherParam != null && otherParam.get("stationMark") != null){
1332 stationMark = otherParam.get("stationMark"); 1325 stationMark = otherParam.get("stationMark");
1333 if(stationMark.equals("B")){ // 起点站 1326 if(stationMark.equals("B")){ // 起点站
1334 - stationCode = ttid.getQdz().getStationCod(); 1327 + stationCode = ttid.getQdzCode();
1335 }else if(stationMark.equals("E")){ // 终点站 1328 }else if(stationMark.equals("E")){ // 终点站
1336 - stationCode = ttid.getZdz().getStationCod(); 1329 + stationCode = ttid.getZdzCode();
1337 } 1330 }
1338 } 1331 }
1339 } 1332 }