|
|
@ -421,28 +421,29 @@ public class PatrolTaskController extends BaseController { |
|
|
}).collect(Collectors.toList()); |
|
|
}).collect(Collectors.toList()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 生产设备 模糊匹配 |
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceName())) { |
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceName())) { |
|
|
newList = newList.stream().filter((element) -> { |
|
|
|
|
|
return patrolTaskStatus.getDeviceName().equals(element.getDeviceName()); |
|
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
newList = newList.stream().filter((element) -> |
|
|
|
|
|
element.getDeviceName().contains(patrolTaskStatus.getDeviceName()) |
|
|
|
|
|
).collect(Collectors.toList()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 点位名称 模糊匹配 |
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getPointName())) { |
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getPointName())) { |
|
|
newList = newList.stream().filter((element) -> { |
|
|
|
|
|
return patrolTaskStatus.getPointName().equals(element.getPointName()); |
|
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
newList = newList.stream().filter((element) -> |
|
|
|
|
|
element.getPointName().contains(patrolTaskStatus.getPointName()) |
|
|
|
|
|
).collect(Collectors.toList()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 相机名称 模糊匹配 |
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getChannelName())) { |
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getChannelName())) { |
|
|
newList = newList.stream().filter((element) -> { |
|
|
|
|
|
return patrolTaskStatus.getChannelName().equals(element.getChannelName()); |
|
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
newList = newList.stream().filter((element) -> |
|
|
|
|
|
element.getChannelName().contains(patrolTaskStatus.getChannelName()) |
|
|
|
|
|
).collect(Collectors.toList()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 来源系统 模糊匹配 |
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceSource())) { |
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceSource())) { |
|
|
newList = newList.stream().filter((element) -> { |
|
|
|
|
|
return patrolTaskStatus.getDeviceSource().equals(element.getDeviceSource()); |
|
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
newList = newList.stream().filter((element) -> |
|
|
|
|
|
element.getDeviceSource().contains(patrolTaskStatus.getDeviceSource()) |
|
|
|
|
|
).collect(Collectors.toList()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getPointStatus())) { |
|
|
if (StringUtils.isNotEmpty(patrolTaskStatus.getPointStatus())) { |
|
|
|