Merge remote-tracking branch 'origin/master'

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

@@ -138,6 +138,9 @@ public class DiagnoServiceImpl implements DiagnoService {
                     startLocation.add(startLonLat[1]);
                     crossIdAndLocationVO.setLocation(startLocation);
                 }
+                // 关联路口wkt
+                String wkt = ridInfo.getWkt();
+                crossIdAndLocationVO.setWkt(wkt);
                 CrossDataRealtimePO crossDataRealtimePO = crossDataRealtimeMapper.selectByCrossId(startCrossId);
                 if (crossDataRealtimePO == null) {
                     throw new RuntimeException("没有该路口实时数据");
@@ -308,7 +311,12 @@ public class DiagnoServiceImpl implements DiagnoService {
         CrossInfoPO crossInfoPO = crossInfoMapper.selectById(crossId);
         optEffectVO.setCrossName(crossInfoPO.getName());
         List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossId(crossId);
-        CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0);
+        CrossSchemeOptLogPO crossSchemeOptLogPO = null;
+        try {
+            crossSchemeOptLogPO = maxList.get(0);
+        } catch (IndexOutOfBoundsException e) {
+            throw new RuntimeException("优化日志数据库中无此路口记录");
+        }
         String dataExtend = crossSchemeOptLogPO.getDataExtend();
         OptDataExtend optDataExtend = gson.fromJson(dataExtend, OptDataExtend.class);
         optEffectVO.setSceneName(optDataExtend.getSceneName());

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

@@ -23,4 +23,6 @@ public class CrossIdAndLocationVO {
     List<Double> location;
     @ApiModelProperty(value = "路口状态：0正常；1失衡；2拥堵；3溢出")
     Integer realtimeStatus;
+    @ApiModelProperty(name = "空间对象", notes = "空间对象")
+    private String wkt;
 }

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

@@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.exception.FeignServiceException;
 import net.wanji.common.framework.rest.JsonViewObject;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -121,6 +122,14 @@ public class GlobalExceptionHandler {
         return JsonViewObject.newInstance().fail("feign远程服务调用异常！位置在：" + errorMessage);
     }
 
+    /**
+     * 输入值与数据类型不匹配
+     */
+    @ExceptionHandler(value = HttpMessageNotReadableException.class)
+    public JsonViewObject httpMessageNotReadableExceptionHandler() {
+        return JsonViewObject.newInstance().fail("输入值与数据类型不匹配");
+    }
+
     /**
      * 处理其他异常
      */