接线组开关查询设备类型缺陷修复

common/common-core/src/main/java/com/hdkj/lt/base/constants/DictConstants.java

@@ -72,6 +72,10 @@ public final class DictConstants {
      * 设备类型：开关
      */
     public static final String KG_PSR_TYPE = "PD_11100000,PD_30700002,PD_30700000,PD_30500000,PD_30500089,PD_30500099,PD_11200000,PD_11400000";
+    /**
+     * 设备类型：接线组开关
+     */
+    public static final String JXZ_KG_PSR_TYPE = "PD_31100000,PD_32300000,PD_30000004,PD_11100000,PD_30700002,PD_30700000,PD_30500000,PD_30500089,PD_30500099,PD_11200000,PD_11400000";
     /**
      * 设备类型：配变  todo 确认配变包含的类型
      */

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/application/FeederGroupApplication.java

@@ -155,7 +155,7 @@ public class FeederGroupApplication {
      */
     public List<List<BreakerAreaVO>> getOverviewSwitchByFeederGroupId(String feederId){
         //获取开关类型
-        List<String> kgPsrTypes = Arrays.asList(DictConstants.KG_PSR_TYPE.split(","));
+        List<String> kgPsrTypes = Arrays.asList(DictConstants.JXZ_KG_PSR_TYPE.split(","));
         // 根据接线组ID获取线路
         List<TJxzXl> jxzList = tJxzXlMapper.selectJxzXlList(feederId);
         if(CollectionUtils.size(jxzList) > 0){

services/load-transfer-bf/src/main/resources/mapper/FhzgGridOperationAbnormalityMapper.xml

@@ -222,12 +222,12 @@
             from t_feeder_topo t
             where  t.feeder = #{feederId} and start_kg_id is null
               and t.psr_type in
-                  <foreach collection='kgPsrTypes' item='item' open="('PD_31100000'," separator=',' close=')'>#{item}</foreach>
+                  <foreach collection='kgPsrTypes' item='item' open="(" separator=',' close=')'>#{item}</foreach>
             union all
             select t.feeder,t.psr_id, t.name , t.psr_type,t.start_kg_id ,t.normal_open
             from t_feeder_topo t join res_tab p on t.start_kg_id = p.psr_id and t.feeder = p.feeder
-            where p.normal_open !='true'  and t.feeder = #{feederId} and t.psr_type in
-            <foreach collection='kgPsrTypes' item='item' open="('PD_31100000'," separator=',' close=')'>#{item}</foreach>
+            where (p.normal_open is null or p.normal_open = 'false')   and t.feeder = #{feederId} and t.psr_type in
+            <foreach collection='kgPsrTypes' item='item' open="(" separator=',' close=')'>#{item}</foreach>
             )
         select feeder, psr_id , name psrName, psr_type,
                if(start_kg_id is null,psr_id,'-') switchId,