[update] 修改路口管理全部路口返回逻辑

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

@@ -290,8 +290,13 @@ public class CrossManageServiceImpl implements CrossManageService {
         Integer isSend = areaDetailBO.getIsSend();
 
         PageHelper.startPage(pageNum, pageSize);
-        List<AreaDetailPOExt> areaDetailPOExtList = baseAreaInfoMapper.selectJoinDetail(
-                areaId, crossName, isSignal, isStart, isSend);
+        List<AreaDetailPOExt> areaDetailPOExtList = new ArrayList<>();
+        // 如果不传areaId或ID为0，则返回全部路口
+        if (areaId == null || areaId == 0) {
+            areaDetailPOExtList = baseAreaInfoMapper.selectAllJoinDetail(crossName, isSignal, isStart, isSend);
+        } else {
+            areaDetailPOExtList = baseAreaInfoMapper.selectJoinDetail(areaId, crossName, isSignal, isStart, isSend);
+        }
         PageInfo<AreaDetailPOExt> extPageInfo = new PageInfo<>(areaDetailPOExtList);
 
         PageInfo<AreaDetailVO> voPageInfo = new PageInfo<>();

signal-optimize-service/src/main/resources/bootstrap-devjinan.yaml

+spring:
+  application:
+    # dubbo启动需要程序名称
+    name: signal-optimize-service
+  cloud:
+    nacos:
+      config:
+        server-addr: 10.102.1.182:8848
+        file-extension: yaml
+        group: signal
+        namespace: signal
+        username: nacos
+        password: nacos
+  main:
+    allow-circular-references: true
\ No newline at end of file

wj-databus/src/main/java/net/wanji/databus/dao/mapper/BaseAreaInfoMapper.java

@@ -37,4 +37,6 @@ public interface BaseAreaInfoMapper {
                                            Integer isSend);
 
     List<BaseAreaInfoPO> selectAllArea(Integer type);
+
+    List<AreaDetailPOExt> selectAllJoinDetail(String crossName, Integer isSignal, Integer isStart, Integer isSend);
 }

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

@@ -107,4 +107,28 @@
         where type = #{type}
     </select>
 
+    <select id="selectAllJoinDetail" resultType="net.wanji.databus.po.AreaDetailPOExt">
+        SELECT t_area.id AS areaId, t_cross.id AS crossId, t_cross.name as crossName,
+        t_area.name AS areaName,  t_cross.is_signal AS isSignal, t_cross.is_start AS isStart,
+        t_cross.is_send AS isSend
+        FROM t_base_cross_info t_cross
+        LEFT JOIN t_base_area_cross t_area_cross ON t_cross.id = t_area_cross.cross_id
+        LEFT JOIN t_base_area_info t_area ON t_area_cross.area_id = t_area.id
+        <where>
+            <if test="crossName != null and crossName != ''">
+                AND t_cross.name like concat('%',#{crossName},'%')
+            </if>
+            <if test="isSignal != null">
+                AND t_cross.is_signal = #{isSignal}
+            </if>
+            <if test="isStart != null">
+                AND t_cross.is_start = #{isStart}
+            </if>
+            <if test="isSend != null">
+                AND t_cross.is_send = #{isSend}
+            </if>
+        </where>
+        ORDER BY t_cross.id
+    </select>
+
 </mapper>