Merge remote-tracking branch 'origin/master'

signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java

@@ -17,7 +17,10 @@ import net.wanji.feign.pojo.vo.CrossInfoVO;
 import net.wanji.feign.pojo.vo.ManufacturerInfoOutVO;
 import net.wanji.feign.pojo.vo.ManufacturerVO;
 import net.wanji.feign.service.UtcFeignClients;
-import net.wanji.web.common.enums.*;
+import net.wanji.web.common.enums.ControlHistEnum;
+import net.wanji.web.common.enums.CrossAlarmEnum;
+import net.wanji.web.common.enums.DeviceStatusEnum;
+import net.wanji.web.common.enums.DeviceTypeEnum;
 import net.wanji.web.common.util.StringUtils;
 import net.wanji.web.dto.CrossIdNameDTO;
 import net.wanji.web.entity.*;
@@ -437,9 +440,9 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
             }
         }
 
-        List<JurisdictionAreaTreeVO> collect = resultList.stream().filter(vo -> StringUtils.equals("0", vo.getParentCode())).collect(Collectors.toList());
+        List<JurisdictionAreaTreeVO> result = resultList.stream().filter(vo -> StringUtils.equals("0", vo.getParentCode())).collect(Collectors.toList());
 
-        return collect;
+        return result;
     }
 
     /**
@@ -465,7 +468,22 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
             jurisdictionAreaVO.setChlidren(null);
             resultList.add(jurisdictionAreaVO);
         }
-        // 将路口转化为辖区实体
+        // 普通路口转化为辖区实体
+        List<String> areaCrossList = tBaseAreaCrosses.stream().map(TBaseAreaCross::getCrossId).collect(Collectors.toList());
+        for (TBaseCrossInfo crossInfo : tBaseCrossInfos) {
+            if (!areaCrossList.contains(crossInfo.getId())) {
+                JurisdictionAreaTreeVO jurisdictionAreaVO = new JurisdictionAreaTreeVO();
+                jurisdictionAreaVO.setId(String.valueOf(crossInfo.getId()));
+                jurisdictionAreaVO.setName(crossInfo.getName());
+                jurisdictionAreaVO.setType("1");
+                jurisdictionAreaVO.setPolylines(crossInfo.getLocation());
+                jurisdictionAreaVO.setLevel(0);
+                jurisdictionAreaVO.setParentCode("0");
+                jurisdictionAreaVO.setChlidren(null);
+                resultList.add(jurisdictionAreaVO);
+            }
+        }
+        // 将辖区内路口转化为辖区实体
         for (TBaseAreaInfo parent : tBaseAreaInfos) {
             Integer parentCode = parent.getCode();
             for (TBaseAreaCross tBaseAreaCross : tBaseAreaCrosses) {