解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MonitorFanIndicatorMapper.java

@@ -44,4 +44,6 @@ public interface MonitorFanIndicatorMapper extends BaseMapper<MonitorFanIndicato
 
     Map<String, String> getMajorBoosterStationInfoBySort(@Param("gatewayId") String gatewayId,
                                                          @Param("sort") String sort);
+
+    List<Map<String, String>> getBoosterStationInfo2(@Param("gatewayId") String boosterGatewayId);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/MonitorFanIndicatorMapper.xml

@@ -112,6 +112,47 @@
         ORDER BY sort ASC
     </select>
 
+    <select id="getBoosterStationInfo2" resultType="java.util.Map">
+        select * from
+        ((select
+        `sequence_nbr` as id,
+        `gateway_id` as gatewayId,
+        `booster_name` as text,
+        booster_name as boosterName,
+        `booster_code` as boosterCode,
+        `sort` as value
+        from booster_station_info
+        <where>
+            sort != 2
+            <if test="gatewayId != null and gatewayId != ''">
+                AND gateway_id = #{gatewayId}
+            </if>
+            <!--            <if test="sort != null and sort != ''">-->
+            <!--                AND sort = #{sort}-->
+            <!--            </if>-->
+            <!--            <if test="boosterName != null and boosterName != '' and (sort = null or sort = '')">-->
+            <!--                AND booster_name = #{boosterName}-->
+            <!--            </if>-->
+        </where>)
+        union all
+        (select
+        '99999' as id,
+        `gateway_id` as gatewayId,
+        '1主变' as text,
+        '1主变' as boosterName,
+        '2' as boosterCode,
+         2 as value
+        from booster_station_info
+        <where>
+            <if test="gatewayId != null and gatewayId != ''">
+                AND gateway_id = #{gatewayId}
+            </if>
+        </where>
+        limit 1)) a
+        ORDER BY a.value ASC
+    </select>
+
+
     <select id="getMajorBoosterStationInfo" resultType="java.util.Map">
         select
         `sequence_nbr` as id,

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -782,7 +782,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     public List<Map<String, String>> getBoosterStationInfo(String stationId) {
         StationBasic stationBasic = getOneByStationNumber(stationId);
-        List<Map<String, String>> boosterStationInfo = monitorFanIndicatorregionMapper.getBoosterStationInfo(stationBasic.getBoosterGatewayId());
+        List<Map<String, String>> boosterStationInfo = monitorFanIndicatorregionMapper.getBoosterStationInfo2(stationBasic.getBoosterGatewayId());
+//        List<Map<String, String>> value = boosterStationInfo.stream().filter(item -> !"2".equals(item.get("value"))).collect(Collectors.toList());
+//        HashMap<String, String> stringStringHashMap = new HashMap<>();
+//        stringStringHashMap.put();
+
+
         return boosterStationInfo;
     }
 
@@ -1009,6 +1014,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             resultMap.put("1svg", "1SVG");
             resultMap.put("2svg", "2SVG");
 
+            resultMap.put("xzsvg", "夏造 SVG");
+            resultMap.put("xzaggavc", "夏造 AGGAVC");
+            resultMap.put("xzgyxh", "夏造 公用信号");
+            resultMap.put("xzjzlp", "夏造 交直流屏");
+
             //下方重复列表数据
             List<Map<String, String>> boosterStationInfo = monitorFanIndicatorregionMapper.getMajorBoosterStationInfo(gatewayId, "ASC", 10);
             ArrayList<Map<String, String>> resultList = new ArrayList<>();