From e58507190b23f09a5f4bb184164382cc519f33c4 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 16 三月 2024 11:48:28 +0800
Subject: [PATCH] 增加报警历史查询按name模糊查询 增加雷达报警不存在井下载接口
---
ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
index ac527be..df6b92e 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
@@ -107,21 +107,18 @@
@ApiOperation("鏌ヨ鑼冨洿鍐呯殑浜�")
@PostMapping("/getWellListByPolygon")
AjaxResult getWellListByPolygon(@RequestBody List<Point> points) {
- List<List<ArdAlarmpointsWell>> listOfLists = new ArrayList<>();
- List<SysDept> depts = deptService.selectDeptList(new SysDept());
- depts.stream().forEach(dept -> {
- ArdAlarmpointsWell ardAlarmpointsWell = new ArdAlarmpointsWell();
- ardAlarmpointsWell.setDeptId(dept.getDeptId());
- List<ArdAlarmpointsWell> wellList = ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell);
- List<ArdAlarmpointsWell> wells = wellList.stream()
- .filter(well -> well.getLongitude() != null && well.getLatitude() != null)
- .filter(well -> GisUtil.isInPolygon(new Point(well.getLongitude(), well.getLatitude()), points)
- ).collect(Collectors.toList());
- listOfLists.add(wells);
- });
- List<ArdAlarmpointsWell> inPolygonWellList = listOfLists.stream()
+ List<ArdAlarmpointsWell> inPolygonWellList = deptService.selectDeptList(new SysDept()).stream()
+ .map(dept -> {
+ ArdAlarmpointsWell ardAlarmpointsWell = new ArdAlarmpointsWell();
+ ardAlarmpointsWell.setDeptId(dept.getDeptId());
+ return ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell).stream()
+ .filter(well -> well.getLongitude() != null && well.getLatitude() != null)
+ .filter(well -> GisUtil.isInPolygon(new Point(well.getLongitude(), well.getLatitude()), points))
+ .collect(Collectors.toList());
+ })
.flatMap(List::stream)
.collect(Collectors.toList());
+
return AjaxResult.success(inPolygonWellList);
}
}
--
Gitblit v1.9.3