修改FeignClient接口名称和服务降级处理类名称及路径
This commit is contained in:
@@ -147,12 +147,16 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRela
|
||||
List<DataFlicker> list = dataFlickerMapper.selectByQueryWrapper(influxQueryWrapper);
|
||||
if (CollUtil.isNotEmpty(list)) {
|
||||
Map<String, List<String>> abnormalTime = lineParam.getAbnormalTime();
|
||||
if (abnormalTime.containsKey(lineParam.getLineId().get(0))) {
|
||||
List<String> timeList = abnormalTime.get(lineParam.getLineId().get(0));
|
||||
//有异常数据,当前监测点自身的异常数据
|
||||
if (CollectionUtil.isNotEmpty(timeList)) {
|
||||
result.addAll(list.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()));
|
||||
if (CollUtil.isNotEmpty(abnormalTime)){
|
||||
if (abnormalTime.containsKey(lineParam.getLineId().get(0))) {
|
||||
List<String> timeList = abnormalTime.get(lineParam.getLineId().get(0));
|
||||
//有异常数据,当前监测点自身的异常数据
|
||||
if (CollectionUtil.isNotEmpty(timeList)) {
|
||||
result.addAll(list.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()));
|
||||
}
|
||||
}
|
||||
}else{
|
||||
result.addAll(list);
|
||||
}
|
||||
}
|
||||
return result.size();
|
||||
|
||||
@@ -185,12 +185,16 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
|
||||
List<DataV> list = dataVMapper.selectByQueryWrapper(influxQueryWrapper);
|
||||
if (CollUtil.isNotEmpty(list)) {
|
||||
Map<String, List<String>> abnormalTime = lineParam.getAbnormalTime();
|
||||
if (abnormalTime.containsKey(lineParam.getLineId().get(0))) {
|
||||
List<String> timeList = abnormalTime.get(lineParam.getLineId().get(0));
|
||||
//有异常数据,当前监测点自身的异常数据
|
||||
if (CollectionUtil.isNotEmpty(timeList)) {
|
||||
result.addAll(list.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()));
|
||||
if(CollUtil.isNotEmpty(abnormalTime)){
|
||||
if (abnormalTime.containsKey(lineParam.getLineId().get(0))) {
|
||||
List<String> timeList = abnormalTime.get(lineParam.getLineId().get(0));
|
||||
//有异常数据,当前监测点自身的异常数据
|
||||
if (CollectionUtil.isNotEmpty(timeList)) {
|
||||
result.addAll(list.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()));
|
||||
}
|
||||
}
|
||||
}else{
|
||||
result.addAll(list);
|
||||
}
|
||||
}
|
||||
return result.size();
|
||||
|
||||
Reference in New Issue
Block a user