[update] 优化异常处理

signal-optimize-service/src/main/java/net/wanji/opt/controller/MainlineEvaluateController.java

@@ -13,7 +13,6 @@ import net.wanji.opt.vo.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.ws.rs.core.MediaType;
-import java.text.ParseException;
 import java.util.List;
 
 @Api(value = "MainlineEvaluateController", description = "干线评价")
@@ -46,7 +45,7 @@ public class MainlineEvaluateController {
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = MainlineEvaluateBottomCurveVO.class),
     })
-    public JsonViewObject bottomCurve(@RequestBody BottomCurveBO bo) throws ParseException {
+    public JsonViewObject bottomCurve(@RequestBody BottomCurveBO bo) throws Exception {
         List<MainlineEvaluateBottomCurveVO> res = mainlineEvaluateService.bottomCurve(bo);
         return JsonViewObject.newInstance().success(res);
     }
@@ -66,7 +65,7 @@ public class MainlineEvaluateController {
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = MainlineSchemeAnalysisVO.class),
     })
-    public JsonViewObject mainlineSchemeAnalysis(@RequestBody MainlineSchemeAnalysisBO bo) throws ParseException {
+    public JsonViewObject mainlineSchemeAnalysis(@RequestBody MainlineSchemeAnalysisBO bo) throws Exception {
         MainlineSchemeAnalysisVO res = mainlineEvaluateService.mainlineSchemeAnalysis(bo);
         return JsonViewObject.newInstance().success(res);
     }

signal-optimize-service/src/main/java/net/wanji/opt/controller/TrendController.java

@@ -84,7 +84,7 @@ public class TrendController {
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = GreenwaveDetailVO.class),
     })
-    public JsonViewObject currentGreenwaveDetail(@RequestBody GreenwaveIdBO bo) throws ParseException {
+    public JsonViewObject currentGreenwaveDetail(@RequestBody GreenwaveIdBO bo) throws Exception {
         GreenwaveDetailVO res = trendService.currentGreenwaveDetail(bo);
         return JsonViewObject.newInstance().success(res);
     }

signal-optimize-service/src/main/java/net/wanji/opt/service/MainlineEvaluateService.java

@@ -3,18 +3,17 @@ package net.wanji.opt.service;
 import net.wanji.opt.bo.*;
 import net.wanji.opt.vo.*;
 
-import java.text.ParseException;
 import java.util.List;
 
 public interface MainlineEvaluateService {
 
     List<String> bottomMenu(BottomMenuBO bo);
 
-    List<MainlineEvaluateBottomCurveVO> bottomCurve(BottomCurveBO bo) throws ParseException;
+    List<MainlineEvaluateBottomCurveVO> bottomCurve(BottomCurveBO bo) throws Exception;
 
     List<MainlineListVO> mainlineList();
 
-    MainlineSchemeAnalysisVO mainlineSchemeAnalysis(MainlineSchemeAnalysisBO bo) throws ParseException;
+    MainlineSchemeAnalysisVO mainlineSchemeAnalysis(MainlineSchemeAnalysisBO bo) throws Exception;
 
     MainlineSchemeEvaluateVO mainlineSchemeEvaluate(MainlineSchemeEvaluateBO bo);
 

signal-optimize-service/src/main/java/net/wanji/opt/service/TrendService.java

@@ -37,7 +37,7 @@ public interface TrendService {
 
     void saveGreenwaveStrategy(SaveGreenwaveStrategyBO saveGreenwaveStrategyBO);
 
-    GreenwaveDetailVO currentGreenwaveDetail(GreenwaveIdBO bo) throws ParseException;
+    GreenwaveDetailVO currentGreenwaveDetail(GreenwaveIdBO bo) throws Exception;
 
     CountRealTimeVO countRealTime(String crossId) throws Exception;
 

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/MainlineEvaluateServiceImpl.java

@@ -56,7 +56,6 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
     private final StrategyMapper strategyMapper;
     private final BaseCrossSectionMapper baseCrossSectionMapper;
     private final RidInfoMapper ridInfoMapper;
-    private final CrossPlanMapper crossPlanMapper;
     private final BaseCrossPlanMapper baseCrossPlanMapper;
     private final BaseCrossSchemeMapper baseCrossSchemeMapper;
     private final GreenwaveMergeMapper greenwaveMergeMapper;
@@ -74,7 +73,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                                        @Qualifier("baseCrossTurnInfoMapper") BaseCrossTurnInfoMapper baseCrossTurnInfoMapper,
                                        CrossBaseLaneInfoMapper crossBaseLaneInfoMapper,
                                        @Qualifier("laneInfoMapper") LaneInfoMapper laneInfoMapper,
-                                       CrossDirDataHistMapper crossDirDataHistMapper, CrossDataHistMapper crossDataHistMapper, CrossTurnDataHistMapper crossTurnDataHistMapper, CrossLaneDataHistMapper crossLaneDataHistMapper, @Qualifier("greenwaveInfoMapper") GreenwaveInfoMapper greenwaveInfoMapper, @Qualifier("greenwaveHistMapper") GreenwaveHistMapper greenwaveHistMapper, @Qualifier("greenwaveCrossMapper") GreenwaveCrossMapper greenwaveCrossMapper, @Qualifier("baseCrossInfoMapper") BaseCrossInfoMapper baseCrossInfoMapper, @Qualifier("greenwaveSceneMapper") GreenwaveSceneMapper greenwaveSceneMapper, @Qualifier("sceneStrategyMapper") SceneStrategyMapper sceneStrategyMapper, @Qualifier("strategyMapper") StrategyMapper strategyMapper, @Qualifier("baseCrossSectionMapper") BaseCrossSectionMapper baseCrossSectionMapper, @Qualifier("ridInfoMapper") RidInfoMapper ridInfoMapper, CrossPlanMapper crossPlanMapper, @Qualifier("baseCrossPlanMapper") BaseCrossPlanMapper baseCrossPlanMapper, @Qualifier("baseCrossSchemeMapper") BaseCrossSchemeMapper baseCrossSchemeMapper, @Qualifier("greenwaveMergeMapper") GreenwaveMergeMapper greenwaveMergeMapper) {
+                                       CrossDirDataHistMapper crossDirDataHistMapper, CrossDataHistMapper crossDataHistMapper, CrossTurnDataHistMapper crossTurnDataHistMapper, CrossLaneDataHistMapper crossLaneDataHistMapper, @Qualifier("greenwaveInfoMapper") GreenwaveInfoMapper greenwaveInfoMapper, @Qualifier("greenwaveHistMapper") GreenwaveHistMapper greenwaveHistMapper, @Qualifier("greenwaveCrossMapper") GreenwaveCrossMapper greenwaveCrossMapper, @Qualifier("baseCrossInfoMapper") BaseCrossInfoMapper baseCrossInfoMapper, @Qualifier("greenwaveSceneMapper") GreenwaveSceneMapper greenwaveSceneMapper, @Qualifier("sceneStrategyMapper") SceneStrategyMapper sceneStrategyMapper, @Qualifier("strategyMapper") StrategyMapper strategyMapper, @Qualifier("baseCrossSectionMapper") BaseCrossSectionMapper baseCrossSectionMapper, @Qualifier("ridInfoMapper") RidInfoMapper ridInfoMapper, @Qualifier("baseCrossPlanMapper") BaseCrossPlanMapper baseCrossPlanMapper, @Qualifier("baseCrossSchemeMapper") BaseCrossSchemeMapper baseCrossSchemeMapper, @Qualifier("greenwaveMergeMapper") GreenwaveMergeMapper greenwaveMergeMapper) {
         this.baseCrossDirInfoMapper = baseCrossDirInfoMapper;
         this.baseCrossTurnInfoMapper = baseCrossTurnInfoMapper;
         this.laneInfoMapper = laneInfoMapper;
@@ -91,7 +90,6 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
         this.strategyMapper = strategyMapper;
         this.baseCrossSectionMapper = baseCrossSectionMapper;
         this.ridInfoMapper = ridInfoMapper;
-        this.crossPlanMapper = crossPlanMapper;
         this.baseCrossPlanMapper = baseCrossPlanMapper;
         this.baseCrossSchemeMapper = baseCrossSchemeMapper;
         this.greenwaveMergeMapper = greenwaveMergeMapper;
@@ -114,7 +112,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
     }
 
     @Override
-    public List<MainlineEvaluateBottomCurveVO> bottomCurve(BottomCurveBO bo) throws ParseException {
+    public List<MainlineEvaluateBottomCurveVO> bottomCurve(BottomCurveBO bo) throws Exception {
         String crossId = bo.getCrossId();
         Integer scope = bo.getScope();
         List<String> scopeList = bo.getScopeList();
@@ -658,7 +656,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
     }
 
     @Override
-    public MainlineSchemeAnalysisVO mainlineSchemeAnalysis(MainlineSchemeAnalysisBO bo) throws ParseException {
+    public MainlineSchemeAnalysisVO mainlineSchemeAnalysis(MainlineSchemeAnalysisBO bo) throws Exception {
         lineSchemeBuffer.clear();
         String mainlineName = bo.getName();
         Date boStartTime = bo.getStartTime();
@@ -700,7 +698,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
     }
 
     private void fillLineSchemeBuffer(List<GreenwaveHistPO> filteredList, Map<String, LineSchemeDTO> lineSchemeBuffer)
-            throws ParseException {
+            throws Exception {
 
         List<GreenwaveCrossPO> greenwaveCrossPOList = greenwaveCrossMapper.selectAll();
         List<CrossSectionPO> baseCrossSectionPOList = baseCrossSectionMapper.selectAll();

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/TrendServiceImpl.java

@@ -1076,7 +1076,7 @@ public class TrendServiceImpl implements TrendService {
     }
 
     @Override
-    public GreenwaveDetailVO currentGreenwaveDetail(GreenwaveIdBO bo) throws ParseException {
+    public GreenwaveDetailVO currentGreenwaveDetail(GreenwaveIdBO bo) throws Exception {
 
         Integer greenwaveId = bo.getGreenwaveId();
         // 获取绿波名称，调用评价接口

wj-common/src/main/java/net/wanji/common/framework/exceptionhandler/GlobalExceptionHandler.java

@@ -81,13 +81,15 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(value = IndexOutOfBoundsException.class)
     public JsonViewObject exceptionHandler(HttpServletRequest req, IndexOutOfBoundsException e) {
         Throwable cause = e.getCause();
-        String errorMessage;
+        String errorMessage = null;
         if (cause != null) {
             errorMessage = cause.getMessage();
         } else {
+            if (e.getStackTrace().length > 0) {
                 StackTraceElement element = e.getStackTrace()[0];
                 errorMessage = element.getClassName() + " " + element.getLineNumber();
             }
+        }
         log.error("发生下标越界异常:", e);
         return JsonViewObject.newInstance().fail("发生下标越界异常！位置在：" + errorMessage);
     }