方向处理

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/HoloEventMapper.java

@@ -45,9 +45,6 @@ public interface HoloEventMapper extends BaseMapper<HoloEventInfoPO> {
 
     /**
      * 查看路口为结束的报警状态
-     * @param realtimeType
-     * @param eventType
-     * @param name
      * @return
      */
     List<EventAlarmInfo> findNotFinishAlarmInfo();

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

@@ -554,6 +554,8 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
         bo.setScope(objectType);
         List<String> scopeList = mainlineEvaluateService.bottomMenu(bo);
 
+        TBaseCrossInfo tBaseCrossInfo = baseCrossInfoMapper.selectByPrimaryKey(crossId);
+        String crossName = tBaseCrossInfo.getName();
 
         for (Map.Entry<String, List<CrossLaneDataHistPoExtend>> entry : groupByDir.entrySet()) {
             String key = entry.getKey();
@@ -566,7 +568,6 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
                 dirName = BaseEnum.SignalDirectionEnum.getNameByCode(Integer.valueOf(dirType));
             }
             String dirTurnDesc = dirName + "进口";
-
             Map<String, Object> mapList = new HashMap<>();
 
             List<CrossLaneDataHistPoExtend> value = entry.getValue().stream().sorted(Comparator.comparing(o -> o.getTurnType())).collect(Collectors.toList());
@@ -608,7 +609,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
                         tmp.setCrossId(cid);
                         tmp.setDirType(BaseEnum.SignalDirectionEnum.getCodeByName(scopeName1.substring(0, scopeName1.indexOf("进口"))));
                         tmp.setDirTypeName(dirTurnDesc);
-                        tmp.setTurnTypeName(scopeName1.substring(dirTurnDesc.length()));
+                        tmp.setTurnTypeName(scopeName1.substring(scopeName1.indexOf(dirTurnDesc) + dirTurnDesc.length()));
                         tmp.setTurnType(TurnConvertEnum.getKeyByDesc(tmp.getTurnTypeName()));
                         hasDataScopeList.add(tmp.getDirTypeName() + tmp.getTurnTypeName());
                         //利用正则表达式取车道号
@@ -635,6 +636,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
 
             mapList.put("scopeCode", key);
             mapList.put("dirName", dirTurnDesc);
+            mapList.put("scopeName",crossName);
             mapList.put("dirType", BaseEnum.SignalDirectionEnum.getCodeByName(dirTurnDesc.substring(0, dirTurnDesc.indexOf("进口"))));
             mapList.put("list", value);
             allList.add(mapList);
@@ -679,6 +681,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
                 mapList.put("scopeCode", null);
                 mapList.put("isLost", true);
                 mapList.put("dirName", dirDesc + "进口");
+                mapList.put("scopeName",crossName);
                 mapList.put("dirType", tmpEntry.getKey());
                 mapList.put("list", tmpEntry.getValue());
                 allList.add(mapList);