Browse Source

feat: 巡视详情新增生产设备、点位名称、相机名称、来源系统模糊匹配

master
yinhuaiwei 14 hours ago
parent
commit
d1ff442f3c
1 changed files with 16 additions and 15 deletions
  1. +16
    -15
      inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

+ 16
- 15
inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java View File

@ -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())) {


Loading…
Cancel
Save