运管处bug修改

zq
1 parent f0d23567
Showing 1 changed file with 33 additions and 8 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -37,6 +37,8 @@ import java.sql.ResultSet;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
+
 /**
  *
  * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
@@ -299,6 +301,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 */
 	public String setLD(){
 		String result = "failure";
+		Line line;
 		// 取昨天 的日期
 		String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
 		StringBuffer sf = new StringBuffer();
@@ -312,6 +315,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					//根据车辆自编号查询车牌号
 					map.put("insideCode_eq", schRealInfo.getClZbh());
 					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
+					// 获取线路是否使用标识，如果未使用，则不查该线路数据
+					line = lineRepository.findByLineCode(schRealInfo.getXlBm());
+					if(line.getInUse() == null || line.getInUse() == 0){
+						continue;
+					}
 					sf.append("<DLD>");
 					sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
 					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
@@ -557,14 +565,14 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Override
 	public String setJHBC() {
 		String result = "failure";
+		Line line;
 		StringBuffer sBuffer =new StringBuffer();
 		try {
 			sBuffer.append("<JHBCs>");
 			// 声明变量
-			SchedulePlanInfo schedulePlanInfo = null;
-			String xlbm = "",zbh = "";
+			SchedulePlanInfo schedulePlanInfo;
+			String xlbm,zbh = "";
 			Long lp = 0L;
-			int startSerialNum = 0,endSerialNum = 0;;
 			// 取明天的日期
 			String tomorrow = sdfnyr.format(DateUtils.addDays(new Date(), +1));
 			// 查询所有班次
@@ -573,8 +581,13 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				int size = schedulePlanList.size();
 				for (int i = 0; i < size; i++) {
 					schedulePlanInfo = schedulePlanList.get(i);
+					xlbm = schedulePlanInfo.getXlBm();
+					// 获取线路是否使用标识，如果未使用，则不查该线路数据
+					line = lineRepository.findByLineCode(xlbm);
+					if(line.getInUse() == null || line.getInUse() == 0){
+						continue;
+					}
 					if(i == 0){// 第一次，则初始化值
-						xlbm = schedulePlanInfo.getXlBm();
 						zbh = schedulePlanInfo.getClZbh();
 						lp = schedulePlanInfo.getLp();
 						// 拼装XML
@@ -605,18 +618,28 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sBuffer.append("</JHBC>");
 						}
 					}else{
-						xlbm = schedulePlanInfo.getXlBm();
 						zbh = schedulePlanInfo.getClZbh();
 						lp = schedulePlanInfo.getLp();
 						sBuffer.append("</BCList>");
 						sBuffer.append("</JHBC>");
-						startSerialNum = 0;
-						endSerialNum = 0;
 						// 拼装XML
 						assembleJHBC(sBuffer, schedulePlanInfo, xlbm, zbh, lp);
 					}
 				}
 			}
+			// 判断XML是否以</BCList>结尾，如果不是，则加上
+			String regex = "^*</JHBC>$";
+			Pattern p = Pattern.compile(regex);
+			java.util.regex.Matcher m = p.matcher(sBuffer);
+			boolean isEndWithTrueFlag = false;
+			while (m.find()) {
+				isEndWithTrueFlag = true;
+			}
+			// 加上缺失的标签
+			if(!isEndWithTrueFlag){
+				sBuffer.append("</BCList>");
+				sBuffer.append("</JHBC>");
+			}
 			sBuffer.append("</JHBCs>");
 			if(ssop.setJHBC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
@@ -643,7 +666,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			StringBuffer sBufferA;
 			StringBuffer sBufferB;
 			TTInfo ttInfo;
-			TTInfoDetail ttInfoDetail = null;
+			TTInfoDetail ttInfoDetail;
 			Iterator<TTInfoDetail> ttInfoDetailIterator;
 			HashMap<String,Object> param = new HashMap<String, Object>();
 			String lineCode ;
@@ -1027,6 +1050,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			company = "浦东金高公交公司";
 		}else if(company.equals("南汇公司")){
 			company = "浦东南汇公交公司";
+		}else if(company.equals("青浦公交")){
+			company = "浦东青浦公交公司";
 		}
 	}
 	/**