告警列表新增处理状态过滤

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

@@ -68,7 +68,7 @@ public class TdHygfJpInverterWarnServiceImpl
 		}
 		List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
 		if (tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
-
+			list = this.baseMapper.list(tdHygfJpInverterWarnDto);
 		} else {
 
 			list = this.baseMapper.list(tdHygfJpInverterWarnDto);
@@ -140,7 +140,16 @@ public class TdHygfJpInverterWarnServiceImpl
 	}
 
 	public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content, Integer current, Integer size,String handlerStatus){
-	return this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,(current-1)*size,size,handlerStatus);
+	     List<TdHygfJpInverterWarnDto> list = this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,(current-1)*size,size,handlerStatus);
+		 list.forEach(i -> {
+			 JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
+					.eq(JpStation::getThirdStationId, i.getThirdStationId()));
+			 if(ObjectUtil.isNotNull(jpStation)){
+				 i.setAddress(jpStation.getAddress());
+		         i.setArea(jpStation.getArea());
+			 }
+		 });
+		return list;
 	}
 	public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String>  stationId, String startTime, String endTime, String content,String handlerStatus){
 		return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus);