修改bug

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java

@@ -830,7 +830,7 @@ private FanHealthIndexDayMapper fanHealthIndexDayMapper;
 
         List<IdxBizFanHealthLevel> healthLevelInfoList = idxBizFanHealthIndexMapper.getHealthLevelInfoList(gatewayIds);
 
-        List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall();
+        List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall(null);
         Map<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> resultMap = list.stream()
                 .collect(Collectors.groupingBy(FullViewRecallDataDTO::getArea,
                         Collectors.groupingBy(FullViewRecallDataDTO::getStation,

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/KafkaAnalyseController.java

@@ -181,7 +181,7 @@ public class KafkaAnalyseController {
 
         List<IdxBizFanHealthLevel> healthLevelInfoList = idxBizFanHealthIndexMapper.getHealthLevelInfoList(gatewayIds);
 
-        List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall();
+        List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall(gatewayIds);
         Map<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> resultMap = list.stream()
                 .collect(Collectors.groupingBy(FullViewRecallDataDTO::getArea,
                         Collectors.groupingBy(FullViewRecallDataDTO::getStation,

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -936,7 +936,7 @@ public class TDBigScreenAnalyseController extends BaseController {
 
 		List<IdxBizFanHealthLevel> healthLevelInfoList = idxBizFanHealthIndexMapper.getHealthLevelInfoList(gatewayIds);
 
-		List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall();
+		List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall(null);
 		Map<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> resultMap = list
 				.stream()
 				.collect(Collectors.groupingBy(FullViewRecallDataDTO::getArea,

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthIndexMapper.java

@@ -100,7 +100,7 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 	String getPointNameByIndexAddress(@Param("varDesc") String varDesc, @Param("tableName") String tableName,
 			@Param("gatewayId") String gatewayId);
 
-	List<FullViewRecallDataDTO> getFullViewRecall();
+	List<FullViewRecallDataDTO> getFullViewRecall(@Param("gatewayIds") List<String> gatewayIds);
 
 	List<Map<String, Object>> getStationIndexInfo();
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -742,6 +742,11 @@
                    AND SUB_SYSTEM is not null
                    AND POINT_NAME is not null
                    AND INDEX_ADDRESS is not null
+                    <if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
+                        <foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
+                            #{item}
+                        </foreach>
+                    </if>
                      )
                  UNION ALL
                  (SELECT ARAE           AS area,
@@ -759,6 +764,11 @@
                    AND EQUIPMENT_NAME is not null
                    AND POINT_NAME is not null
                    AND INDEX_ADDRESS is not null
+                    <if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
+                        <foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
+                            #{item}
+                        </foreach>
+                    </if>
                 )
              ) a
         ORDER BY a.station ASC, a.equipmentName ASC, a.equipmentName asc, a.subSystem asc