|
@ -45,7 +45,7 @@ public class WarningService { |
|
|
WarningQueDto data = Optional.ofNullable(sp.getData()).orElse(new WarningQueDto()); |
|
|
WarningQueDto data = Optional.ofNullable(sp.getData()).orElse(new WarningQueDto()); |
|
|
LambdaQueryWrapper<DeviceCheckingRecordView> wrapper = Wrappers.<DeviceCheckingRecordView>lambdaQuery() |
|
|
LambdaQueryWrapper<DeviceCheckingRecordView> wrapper = Wrappers.<DeviceCheckingRecordView>lambdaQuery() |
|
|
.like(StringUtils.isNotBlank(data.getName()), DeviceCheckingRecordView::getName, sp.getData().getName()) |
|
|
.like(StringUtils.isNotBlank(data.getName()), DeviceCheckingRecordView::getName, sp.getData().getName()) |
|
|
.likeLeft(StringUtils.isNotBlank(data.getAdcd()), DeviceCheckingRecordView::getAdcd, sp.getData().getAdcd()) |
|
|
.likeLeft(StringUtils.isNotBlank(data.getAdcd()), DeviceCheckingRecordView::getAdcd, remove00(sp.getData().getAdcd())) |
|
|
.eq(StringUtils.isNotBlank(data.getCode()), DeviceCheckingRecordView::getCode, sp.getData().getCode()) |
|
|
.eq(StringUtils.isNotBlank(data.getCode()), DeviceCheckingRecordView::getCode, sp.getData().getCode()) |
|
|
.in(CollectionUtils.isNotEmpty(data.getTypes()), DeviceCheckingRecordView::getType, sp.getData().getTypes()); |
|
|
.in(CollectionUtils.isNotEmpty(data.getTypes()), DeviceCheckingRecordView::getType, sp.getData().getTypes()); |
|
|
|
|
|
|
|
@ -63,6 +63,14 @@ public class WarningService { |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private String remove00(String str) { |
|
|
|
|
|
if (str.endsWith("00")) { |
|
|
|
|
|
return str.substring(0, str.length() - 2); |
|
|
|
|
|
} else if (str.endsWith("0000")) { |
|
|
|
|
|
return str.substring(0, str.length() - 4); |
|
|
|
|
|
} |
|
|
|
|
|
return str; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
//计算指定小时数前的时间
|
|
|
//计算指定小时数前的时间
|
|
|
private Date getBeforeTime(Integer fromTime) { |
|
|
private Date getBeforeTime(Integer fromTime) { |
|
|