[update] 诊断优化，相邻路口增加是否信控路口筛选

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

@@ -125,9 +125,9 @@ public class DiagnoServiceImpl implements DiagnoService {
         String crossId = crossIdDTO.getCrossId();
         List<Integer> inDirs = crossDirInfoMapper.selectInDirsByCrossId(crossId);
         for (Integer inDir : inDirs) {
-            CrossIdAndLocationVO crossIdAndLocationVO = new CrossIdAndLocationVO();
             RidInfoEntity ridInfo = ridInfoMapper.selectByEndInDir(crossId, inDir);
             if (ridInfo != null) {
+                CrossIdAndLocationVO crossIdAndLocationVO = new CrossIdAndLocationVO();
                 // 关联路口坐标
                 String startCrossId = ridInfo.getStartCrossId();
                 crossIdAndLocationVO.setId(startCrossId);
@@ -149,8 +149,8 @@ public class DiagnoServiceImpl implements DiagnoService {
                     throw new RuntimeException("没有该路口实时数据");
                 }
                 crossIdAndLocationVO.setRealtimeStatus(crossDataRealtimePO.getStatus());
+                crossIdAndLocationVOList.add(crossIdAndLocationVO);
             }
-            crossIdAndLocationVOList.add(crossIdAndLocationVO);
         }
         return crossIdAndLocationVOList;
     }

wj-databus/src/main/resources/mapper/RidInfoMapper.xml

@@ -70,9 +70,10 @@
     </select>
 
     <select id="selectByEndInDir" resultType="net.wanji.databus.dao.entity.RidInfoEntity">
-        SELECT id,name,road_id,road_name,road_dir_id,start_cross_id,end_cross_id,out_dir,in_dir,start_angle,end_angle,
-               direction,sort,trend,level,area_code,length,width,is_oneway,type,wkt,sc_id,sc_name,sc_sort,gmt_create,gmt_modified
-        FROM t_base_rid_info
-        WHERE end_cross_id = #{endCrossId} and in_dir = #{spilloverDirInt}
+        SELECT t1.id,t1.name,t1.road_id,t1.road_name,t1.road_dir_id,t1.start_cross_id,t1.end_cross_id,t1.out_dir,
+               t1.in_dir,t1.start_angle,t1.end_angle,t1.direction,t1.sort,t1.trend,t1.level,t1.area_code,t1.length,
+               t1.width,t1.is_oneway,t1.type,t1.wkt,t1.sc_id,t1.sc_name,t1.sc_sort,t1.gmt_create,t1.gmt_modified
+        FROM t_base_rid_info t1 JOIN t_base_cross_info t2 ON t1.start_cross_id = t2.id
+        WHERE t1.end_cross_id = #{endCrossId} and t1.in_dir = #{spilloverDirInt} and t2.is_signal = 1
     </select>
 </mapper>