1.修改异常区域

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -411,9 +411,8 @@ public class View3dServiceImpl implements IView3dService {
         if (optional.isPresent()) {
             List<RiskSource> regionList = iRiskSourceDao.findByParentIdAndIsRegion(optional.get().getId(),RiskSourceRegionEum.TRUE.getCode());
             exceptionList = regionList.stream().filter(riskSource -> {
-                //TODO:待毛颖确认，增加判断故障的规则（统计数据：故障或者rpn上升）
-                BigDecimal rpnBig = riskSource.getRpn() == null ? new  BigDecimal("0") : riskSource.getRpn();
-                return rpnBig.subtract(riskSource.getRpni()).doubleValue() > 0;
+                BigDecimal rpn = riskSource.getRpn() == null ? new  BigDecimal("0") : riskSource.getRpn();
+                return rpn.subtract(riskSource.getRpni()).doubleValue() > 0;
             }).map(riskSource -> {
                 ExceptionRegionVo regionVo = new ExceptionRegionVo();
                 regionVo.setId(riskSource.getId());
@@ -421,7 +420,8 @@ public class View3dServiceImpl implements IView3dService {
                 regionVo.setUe4Rotation(getInitJSONArray(riskSource.getUe4Rotation()));
                 regionVo.setUe4Extent(getInitJSONArray(riskSource.getUe4Extent()));
                 regionVo.setSafetyIndex(changeRpnToSafetyIndex(riskSource.getRpn()));
-                regionVo.setBreakdown(isBreakDown(riskSource.getId()));
+                regionVo.setBreakdown(isBreakDown(riskSource.getId()));//待后期去掉，前端图标显示统一不在细分
+                regionVo.setRoutePath(this.changeStringToJson(riskSource.getRoutePath()));
                 return regionVo;
             }).collect(Collectors.toList());
         }
@@ -436,8 +436,15 @@ public class View3dServiceImpl implements IView3dService {
         }
     }
 
+    private JSONObject changeStringToJson(String str){
+        if(StringUtil.isNotEmpty(str)){
+            return JSON.parseObject(str);
+        }else {
+            return new JSONObject();
+        }
+    }
+
     private Boolean isBreakDown(Long id){
-        //TODO:判断是否故障,待毛颖确认
         return true;
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/ExceptionRegionVo.java

 package com.yeejoin.amos.fas.business.vo;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import springfox.documentation.spring.web.json.Json;
+
 /**
  * @author suhg
  */
@@ -32,6 +36,11 @@ public class ExceptionRegionVo {
      */
     private JSONArray ue4Extent;
 
+    /**
+     * 自研3维区域参数
+     */
+    private JSONObject routePath;
+
     public Long getId() {
         return id;
     }
@@ -68,6 +77,14 @@ public class ExceptionRegionVo {
         return ue4Extent;
     }
 
+    public JSONObject getRoutePath() {
+        return routePath;
+    }
+
+    public void setRoutePath(JSONObject routePath) {
+        this.routePath = routePath;
+    }
+
     public void setUe4Extent(JSONArray ue4Extent) {
         this.ue4Extent = ue4Extent;
     }