1.运管处上传Optional<T>紧急处理

王通
1 parent 6fb6a87a
Showing 1 changed file with 12 additions and 6 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -186,7 +186,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				map.put("lineCode_eq", id);
 				Line line ;
 				LineInformation lineInformation;
-				line = lineRepository.findOne(new CustomerSpecs<Line>(map)).get();
+				Optional<Line> optionalLine = lineRepository.findOne(new CustomerSpecs<Line>(map));
+				line = optionalLine.isPresent() ? optionalLine.get() : null;
 				if(line == null){
 					continue;
 				}
@@ -195,7 +196,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				}
 				map = new HashMap<>();
 				map.put("line.id_eq",line.getId());
-				lineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(map)).get();
+				Optional<LineInformation> optionalLineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(map));
+				lineInformation = optionalLineInformation.isPresent() ? optionalLineInformation.get() : null;
 				if(lineInformation == null){
 					continue;
 				}
@@ -599,7 +601,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
 					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
-					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map)).get();
+					Optional<Cars> optionalCars = carsRepository.findOne(new CustomerSpecs<Cars>(map));
+					Cars car = optionalCars.isPresent() ? optionalCars.get() : null;
 					/**
 					 * 如果car==null，则说明该车辆是从线调中换车功能中加进去的，
 					 * 在cars基础信息中查不到车辆的信息，所以忽略该车辆
@@ -921,7 +924,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			boolean isLogStation;
 			for (int i = 0; i < idArray.length; i++) {
 				ttinfoId = Long.valueOf(idArray[i]);
-				ttInfo = ttInfoRepository.findById(ttinfoId).get();
+				Optional<TTInfo> optionalTTInfo = ttInfoRepository.findById(ttinfoId);
+				ttInfo = optionalTTInfo.isPresent() ? optionalTTInfo.get() : null;
 				if(ttInfo == null)
 					continue;
 				ttinfoList.add(ttInfo); // 保存时刻表
@@ -941,12 +945,14 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				// 获得lineInformation
 				param = new HashMap();
 				param.put("line.id_eq", ttInfo.getXl().getId());
-				lineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(param)).get();
+				Optional<LineInformation> optionalLineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(param));
+				lineInformation = optionalLineInformation.isPresent() ? optionalLineInformation.get() : null;
 				// 初始化
 				isLogStation = true;
 				if(ttInfoDetailIterator.hasNext()){
 					// 得到线路信息
-					Line line = lineRepository.findById(ttInfo.getXl().getId()).get();
+					Optional<Line> optionalLine = lineRepository.findById(ttInfo.getXl().getId());
+					Line line = optionalLine.isPresent() ? optionalLine.get() : null;
 					if(line == null){
 						result += "未找到相应的线路信息，请设置线路信息后再上传";
 						return result;