更新

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

@@ -390,7 +390,8 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 			startTimeTop = formatter.format(startDate);
 		}
-		List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, null);
+		List<String> gatewayIds = this.getGatewayIds();
+		List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, gatewayIds);
 
 		fanHealthIndexDays.forEach(item -> {
 			double roundedNumber = Double.parseDouble(df.format(item.getHealthIndex()));
@@ -436,7 +437,8 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 			startTimeTop = formatter.format(startDate);
 		}
-		List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null, null);
+		List<String> gatewayIds = this.getGatewayIds();
+		List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null, gatewayIds);
 
 		Map<String,Object> map = new HashMap<>();
 		map.put("value",Double.parseDouble(df.format(Double.parseDouble(fanHealthIndexDays.get(0).getValue()))));
@@ -451,7 +453,8 @@ public class IdxBizFanHealthIndexController extends BaseController {
 																			  @RequestParam(value = "station",required = false) String station,
 																			  @RequestParam(value = "analysisObjType",required = false) String analysisObjType
 																			  ) {
-		List<Map<String, Object>> maps = fanHealthIndexDayMapper.selectEquipStatusByStation(area, analysisObjType, station);
+		List<String> gatewayIds = this.getGatewayIds();
+		List<Map<String, Object>> maps = fanHealthIndexDayMapper.selectEquipStatusByStation(area, analysisObjType, station, gatewayIds);
 		if (maps.size() == 4){
 			for (Map<String, Object> map : maps) {
 				map.put("name",map.get("healthlevel"));
@@ -764,7 +767,6 @@ public class IdxBizFanHealthIndexController extends BaseController {
 
 			Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 				startTimeTop = formatter.format(startDate);
-
 			List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null, gatewayIds);
 			fanHealthIndexDays=	fanHealthIndexDays.stream().sorted(Comparator.comparing(FanHealthIndexDay::getAnalysisTime)).collect(Collectors.toList());
 

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

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRuleSet;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRuleSet;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanPointProcessVariableClassificationMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IPermissionService;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanWarningRecordServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanWarningRuleSetServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvWarningRuleSetServiceImpl;
@@ -54,6 +55,8 @@ public class IdxBizFanWarningRecordController extends BaseController {
     @Autowired
     FanWaringRecordMapper fanWaringRecordMapper;
 
+    @Autowired
+    private IPermissionService permissionService;
 
     @Autowired
     IdxBizFanPointProcessVariableClassificationMapper idxBizFanPointProcessVariableClassificationMapper;
@@ -357,7 +360,8 @@ public class IdxBizFanWarningRecordController extends BaseController {
 
 
         Map<String, Object> resultMap = new HashMap<>();
-        List<Map<String, Object>> maps = fanWaringRecordMapper.selectFanWarningNum(station);
+        List<String> gatewayIds = this.getGatewayIds();
+        List<Map<String, Object>> maps = fanWaringRecordMapper.selectFanWarningNum(station, gatewayIds);
         Map<String, Map<String, Object>> equipmentNameInfoMap = maps.stream().collect(Collectors.toMap(t -> t.get("EQUIPMENT_NAME").toString(), t -> t));
 
         List<Integer> wxList = new ArrayList<>();
@@ -403,8 +407,8 @@ public class IdxBizFanWarningRecordController extends BaseController {
     @GetMapping(value = "/selectEquipWarningTotal")
     @ApiOperation(httpMethod = "GET", value = "预警信息统计富文本", notes = "预警信息统计富文本")
     public ResponseModel<Map<String, Object>> selectEquipWarningTotal(@RequestParam String STATION, @RequestParam String EQUIPMENTNAME) {
-        Map<String, Object> maps = fanWaringRecordMapper.selectEquipWarningTotal(STATION, EQUIPMENTNAME);
-
+        List<String> gatewayIds = this.getGatewayIds();
+        Map<String, Object> maps = fanWaringRecordMapper.selectEquipWarningTotal(STATION, EQUIPMENTNAME, gatewayIds);
         return ResponseHelper.buildResponse(maps);
     }
 
@@ -415,11 +419,20 @@ public class IdxBizFanWarningRecordController extends BaseController {
         Page<FanWarningRecord> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        List<FanWarningRecord> maps = fanWaringRecordMapper.selectWarningPoint(STATION, EQUIPMENTNAME, (current - 1) * size, size);
+        List<String> gatewayIds = this.getGatewayIds();
+        List<FanWarningRecord> maps = fanWaringRecordMapper.selectWarningPoint(STATION, EQUIPMENTNAME, (current - 1) * size, size, gatewayIds);
         page.setRecords(maps);
         int total = fanWaringRecordMapper.selectWarningPointTotal(STATION, EQUIPMENTNAME);
         page.setTotal(total);
         return ResponseHelper.buildResponse(page);
     }
 
+    private List<String> getGatewayIds() {
+        List<String> permissions = permissionService.getCurrentUserPermissions();
+        if (Objects.isNull(permissions)) {
+            permissions = Collections.emptyList();
+        }
+        return permissions;
+    }
+
 }

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

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.kafka.FanConditionVariablesMessage
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthIndexMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthLevelMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvHealthLevelMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IPermissionService;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,10 +25,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.yeejoin.amos.boot.module.jxiop.biz.kafka.Constant.*;
@@ -43,6 +41,8 @@ public class KafkaAnalyseController {
     @Autowired
     RedisUtils redisUtils;
 
+    @Autowired
+    IPermissionService permissionService;
 
     @Autowired
     IdxBizFanHealthLevelMapper idxBizFanHealthLevelMapper;
@@ -162,23 +162,24 @@ public class KafkaAnalyseController {
     @ApiOperation(value = "全景诊断回溯")
     @GetMapping("/getFullViewRecall")
     public ResponseModel<List<FullViewRecallInfoDTO>> getFullViewRecall(@RequestParam(required = false, value = "analysisType") String analysisType) {
-        List<Map<String, Object>> stationIndexInfo = idxBizFanHealthIndexMapper.getStationIndexInfoByParam(analysisType);
+        List<String> gatewayIds = this.getGatewayIds();
+        List<Map<String, Object>> stationIndexInfo = idxBizFanHealthIndexMapper.getStationIndexInfoByParam(analysisType, gatewayIds);
         Map<String, Double> stationHealthIndexMap = stationIndexInfo.stream().collect(Collectors.toMap(t -> t.get("station").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
 
 
-        List<Map<String, Object>> equipmentIndexInfo = idxBizFanHealthIndexMapper.getEquipmentIndexInfoByParam(analysisType);
+        List<Map<String, Object>> equipmentIndexInfo = idxBizFanHealthIndexMapper.getEquipmentIndexInfoByParam(analysisType, gatewayIds);
         Map<String, Double> equipmentIndexInfoMap = equipmentIndexInfo.stream().collect(Collectors.toMap(t -> t.get("equipmentName").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
 
 
-        List<Map<String, Object>> subSystemIndexInfo = idxBizFanHealthIndexMapper.getSubSystemIndexInfoByParam(analysisType);
+        List<Map<String, Object>> subSystemIndexInfo = idxBizFanHealthIndexMapper.getSubSystemIndexInfoByParam(analysisType, gatewayIds);
         Map<String, Double> subSystemIndexInfoMap = subSystemIndexInfo.stream().collect(Collectors.toMap(t -> t.get("subSystem").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
 
 
-        List<Map<String, Object>> pointNameIndexInfo = idxBizFanHealthIndexMapper.getPointNameIndexInfoByParam(analysisType);
+        List<Map<String, Object>> pointNameIndexInfo = idxBizFanHealthIndexMapper.getPointNameIndexInfoByParam(analysisType, gatewayIds);
         Map<String, Double> pointNameIndexInfoMap = pointNameIndexInfo.stream().collect(Collectors.toMap(t -> t.get("gatewayIndexAddress").toString(), t -> Double.parseDouble(t.get("healthIndex").toString())));
 
 
-        List<IdxBizFanHealthLevel> healthLevelInfoList = idxBizFanHealthIndexMapper.getHealthLevelInfoList();
+        List<IdxBizFanHealthLevel> healthLevelInfoList = idxBizFanHealthIndexMapper.getHealthLevelInfoList(gatewayIds);
 
         List<FullViewRecallDataDTO> list = idxBizFanHealthIndexMapper.getFullViewRecall();
         Map<String, Map<String, Map<String, Map<String, Map<String, List<FullViewRecallDataDTO>>>>>> resultMap = list.stream()
@@ -384,4 +385,12 @@ public class KafkaAnalyseController {
         return resultDto;
     }
 
+    private List<String> getGatewayIds() {
+        List<String> permissions = permissionService.getCurrentUserPermissions();
+        if (Objects.isNull(permissions)) {
+            permissions = Collections.emptyList();
+        }
+        return permissions;
+    }
+
 }

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

@@ -110,15 +110,15 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 
 	List<Map<String, Object>> getPointNameIndexInfo();
 
-	List<Map<String, Object>> getStationIndexInfoByParam(@Param("analysisType") String analysisType);
+	List<Map<String, Object>> getStationIndexInfoByParam(@Param("analysisType") String analysisType, @Param("gatewayIds") List<String> gatewayIds);
 
-	List<Map<String, Object>> getEquipmentIndexInfoByParam(@Param("analysisType") String analysisType);
+	List<Map<String, Object>> getEquipmentIndexInfoByParam(@Param("analysisType") String analysisType, @Param("gatewayIds") List<String> gatewayIds);
 
-	List<Map<String, Object>> getSubSystemIndexInfoByParam(@Param("analysisType") String analysisType);
+	List<Map<String, Object>> getSubSystemIndexInfoByParam(@Param("analysisType") String analysisType, @Param("gatewayIds") List<String> gatewayIds);
 
-	List<Map<String, Object>> getPointNameIndexInfoByParam(@Param("analysisType") String analysisType);
+	List<Map<String, Object>> getPointNameIndexInfoByParam(@Param("analysisType") String analysisType, @Param("gatewayIds") List<String> gatewayIds);
 
-	List<IdxBizFanHealthLevel> getHealthLevelInfoList();
+	List<IdxBizFanHealthLevel> getHealthLevelInfoList(@Param("gatewayIds") List<String> gatewayIds);
 
 	List<String> getAddressInfo();
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexDayMapper.java

@@ -50,9 +50,10 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
             "SELECT  station, health_level as healthlevel,( CASE HEALTH_LEVEL WHEN '危险' THEN 4 WHEN '警告' THEN 3 WHEN '注意' THEN 2 ELSE 1 END ) AS sort, count( 1 ) AS `value` FROM analysis_data.fan_health_index_day WHERE analysis_obj_type = #{analysisObjType} AND ts >= TODAY()-8h" +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='station!= null'>AND station = #{station} </if>" +
+            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
             " GROUP BY station,health_level  order by sort"+
             "</script>")
-    List<Map<String,Object>> selectEquipStatusByStation(@Param("area")String area,@Param("analysisObjType")String analysisObjType,@Param("station")String station);
+    List<Map<String,Object>> selectEquipStatusByStation(@Param("area")String area,@Param("analysisObjType")String analysisObjType,@Param("station")String station, @Param("gatewayIds") List<String> gatewayIds);
 
     List<Map<String, Object>> getHealthInfoByArea();
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanWaringRecordMapper.java

@@ -14,15 +14,15 @@ import java.util.Map;
 
 public interface FanWaringRecordMapper  extends BaseMapper<FanWarningRecord> {
 
- public List<Map<String,Object>> selectFanWarningNum(String station);
+ public List<Map<String,Object>> selectFanWarningNum(String station, @Param("gatewayIds") List<String> gatewayIds);
 
 
  public List<FanWarningRecord> warningData(String STATION,String EQUIPMENTNAME,String SUBSYSTEM);
 
- public List<FanWarningRecord> selectWarningPoint(String STATION,String EQUIPMENTNAME,Integer current,Integer size);
+ public List<FanWarningRecord> selectWarningPoint(String STATION,String EQUIPMENTNAME,Integer current,Integer size, @Param("gatewayIds") List<String> gatewayIds);
  public int selectWarningPointTotal(String STATION,String EQUIPMENTNAME);
 
- public Map<String,Object> selectEquipWarningTotal(String STATION,String EQUIPMENTNAME);
+ public Map<String,Object> selectEquipWarningTotal(String STATION,String EQUIPMENTNAME, @Param("gatewayIds") List<String> gatewayIds);
 
  int saveBatchWarningRecords(@Param("list") List<FanWarningRecord> list);
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexDayMapper.java

@@ -52,16 +52,18 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
             "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
             "</script>")
-    int selectDataTotal(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName);
+    int selectDataTotal(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName, @Param("gatewayIds") List<String> gatewayIds);
 
     @Select("<script>"+
             "SELECT  station, health_level as healthlevel,( CASE HEALTH_LEVEL WHEN '危险' THEN 4 WHEN '警告' THEN 3 WHEN '注意' THEN 2 ELSE 1 END ) AS sort, count( 1 ) AS `value` FROM analysis_data.pv_health_index_day WHERE analysis_obj_type = #{analysisObjType} AND ts >= TODAY()-8h" +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='station!= null'>AND station = #{station} </if>" +
+            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
             " GROUP BY station,health_level  order by sort"+
             "</script>")
-    List<Map<String,Object>> selectEquipStatusByStationPv(@Param("area")String area, @Param("analysisObjType")String analysisObjType, @Param("station")String station);
+    List<Map<String,Object>> selectEquipStatusByStationPv(@Param("area")String area, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("gatewayIds") List<String> gatewayIds);
 
 
     @Select("<script>"+
@@ -69,8 +71,9 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "<if test='station!= null'>AND station = #{station} </if>" +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "<if test='subarray!= null'>AND subarray = #{subarray} </if>" +
+            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
             " GROUP BY station,health_level,equipment_name  order by sort"+
             "</script>")
-    List<Map<String,Object>> selectEquipStatusByEquipment(@Param("analysisObjType")String analysisObjType,@Param("station")String station,@Param("equipmentName")String equipmentName, @Param("subarray") String subarray);
+    List<Map<String,Object>> selectEquipStatusByEquipment(@Param("analysisObjType")String analysisObjType,@Param("station")String station,@Param("equipmentName")String equipmentName, @Param("subarray") String subarray, @Param("gatewayIds") List<String> gatewayIds);
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexHourMapper.java

@@ -39,7 +39,8 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
             "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
             "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
             "</script>")
-    int selectDataTotal(@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop);
+    int selectDataTotal(@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("gatewayIds") List<String> gatewayIds);
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexMomentMapper.java

@@ -40,7 +40,8 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
             "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
             "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
             "</script>")
-    int selectDataTotal(@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop);
+    int selectDataTotal(@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("gatewayIds") List<String> gatewayIds);
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvWaringRecordMapper.java

@@ -15,12 +15,12 @@ public interface PvWaringRecordMapper extends BaseMapper<PvWarningRecord> {
 
     public List<PvWarningRecord> warningData(String STATION,String EQUIPMENTNAME,String SUBARRAY);
 
-    public List<Map<String,Object>> selectFanWarningNum(String station);
+    public List<Map<String,Object>> selectFanWarningNum(String station, @Param("gatewayIds") List<String> gatewayIds);
 
-    List<PvWarningRecord> selectWarningPoint(String STATION, String EQUIPMENTNAME, String SUBARRAY,Integer current,Integer size);
-    int selectWarningPointTotal(String STATION, String EQUIPMENTNAME, String SUBARRAY);
+    List<PvWarningRecord> selectWarningPoint(String STATION, String EQUIPMENTNAME, String SUBARRAY,Integer current,Integer size, @Param("gatewayIds") List<String> gatewayIds);
+    int selectWarningPointTotal(String STATION, String EQUIPMENTNAME, String SUBARRAY, @Param("gatewayIds") List<String> gatewayIds);
 
-    Map<String, Object> selectEquipWarningTotal(String STATION, String EQUIPMENTNAME, String SUBARRAY);
+    Map<String, Object> selectEquipWarningTotal(String STATION, String EQUIPMENTNAME, String SUBARRAY, @Param("gatewayIds") List<String> gatewayIds);
 
 
     List<PvWarningRecord> getInfoByPage(@Param("dto") FanHealthIndexDto dto);

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

@@ -871,6 +871,11 @@
         FROM idx_biz_fan_health_level
         WHERE STATUS IS NOT NULL
            OR STATUS != ''
+        <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 CONCAT(`STATUS`, '_', ANALYSIS_OBJ_TYPE) AS analysisObjType,
                HEALTH_LEVEL                             AS healthLevel,
@@ -879,6 +884,11 @@
         FROM idx_biz_pv_health_level
         WHERE STATUS IS NOT NULL
            OR STATUS != ''
+        <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>
     </select>
 	<select id="getAddressInfo" resultType="java.lang.String">
         select index_address
@@ -1333,6 +1343,11 @@
                             AND ANALYSIS_TYPE = '按时刻'
                             AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
                          </if>
+            <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>
 		</where>
 		GROUP BY STATION
                  UNION ALL
@@ -1354,6 +1369,11 @@
                                     AND ANALYSIS_TYPE = '按时刻'
                                     AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
                                 </if>
+            <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>
 		</where>
 		GROUP BY STATION
                  )
@@ -1381,6 +1401,11 @@
                 AND ANALYSIS_TYPE = '按时刻'
                 AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
             </if>
+            <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>
 		</where>
 		GROUP BY EQUIPMENT_NAME
                  UNION ALL
@@ -1402,6 +1427,11 @@
                 AND ANALYSIS_TYPE = '按时刻'
                 AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
             </if>
+            <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>
 		</where>
 		GROUP BY SUBARRAY
                  )
@@ -1432,6 +1462,11 @@
                 AND ANALYSIS_TYPE = '按时刻'
                 AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
             </if>
+            <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>
 		</where>
 		GROUP BY SUB_SYSTEM
                  UNION ALL
@@ -1453,6 +1488,11 @@
                 AND ANALYSIS_TYPE = '按时刻'
                 AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
             </if>
+            <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>
 		</where>
 		GROUP BY EQUIPMENT_NAME
                  )
@@ -1481,6 +1521,11 @@
                 AND ANALYSIS_TYPE = '按时刻'
                 AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
             </if>
+            <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>
 		</where>
 		GROUP BY INDEX_ADDRESS
         UNION ALL
@@ -1502,6 +1547,11 @@
                 AND ANALYSIS_TYPE = '按时刻'
                 AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
             </if>
+            <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>
 		</where>
 		GROUP BY INDEX_ADDRESS
         )

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanWarningRecord.xml

@@ -81,6 +81,11 @@
         <if test="station != null">
             and station = #{station}
         </if>
+        <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>
         group by `station`,
         `equipment_name`,
         `warning_name`) a
@@ -129,6 +134,11 @@
         <if test="EQUIPMENTNAME != '' and EQUIPMENTNAME != null">
             AND a.equipment_name = #{EQUIPMENTNAME}
         </if>
+        <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>
         group by
         station,
         equipment_name,
@@ -198,6 +208,11 @@
         <if test="EQUIPMENTNAME != '' and EQUIPMENTNAME != null">
             AND z.equipment_name = #{EQUIPMENTNAME}
         </if>
+        <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>
         group by
         `z`.`station`,
         `z`.`warning_name`,

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/PvWarningRecord.xml

@@ -105,6 +105,11 @@
         <if test="station != null">
             and station = #{station}
         </if>
+        <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>
         group by
         re.station,
         re.subarray,
@@ -140,6 +145,11 @@
         <if test="SUBARRAY != '' and SUBARRAY != null">
             AND a.subarray = #{SUBARRAY}
         </if>
+        <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>
         group by
         station,
         equipment_name,
@@ -173,6 +183,11 @@
         <if test="SUBARRAY != '' and SUBARRAY != null">
             AND a.subarray = #{SUBARRAY}
         </if>
+        <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>
         group by
         station,
         equipment_name,
@@ -216,6 +231,11 @@
         <if test="SUBARRAY != '' and SUBARRAY != null">
             AND z.subarray = #{SUBARRAY}
         </if>
+        <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>
         group by
         `z`.`station`,
         `z`.`warning_name`,