场景详细评价平均指标

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

@@ -569,10 +569,10 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
             if (Objects.nonNull(scopeList)) {
                 //补充
                 for (String scopeName1 : scopeList) {
-                    if (!hasDataScopeList.contains(scopeName1) && scopeName1.indexOf(dirTurnDesc) > 0) {
+                    if (!hasDataScopeList.contains(scopeName1) && scopeName1.contains(dirTurnDesc)) {
                         CrossLaneDataHistPoExtend tmp = new CrossLaneDataHistPoExtend();
                         tmp.setTurnTypeName(scopeName1.substring(dirTurnDesc.length()));
-                        tmp.setTurnType(TurnConvertEnum.getKeyByCode(tmp.getTurnTypeName()));
+                        tmp.setTurnType(TurnConvertEnum.getKeyByDesc(tmp.getTurnTypeName()));
                         value.add(tmp);
                     }
                 }

wj-common/src/main/java/net/wanji/common/enums/TurnConvertEnum.java

@@ -109,4 +109,13 @@ public enum TurnConvertEnum {
         return null;
     }
 
+    public static Integer getKeyByDesc(String desc){
+        for (TurnConvertEnum e : TurnConvertEnum.values()) {
+            if(e.desc.equals(desc)){
+                return e.key;
+            }
+        }
+        return null;
+    }
+
 }