From 2058f9a0686d1b2d5543d369fb768c9bd40e0e63 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 30 八月 2023 16:52:29 +0800
Subject: [PATCH] 增加电子围栏关联用户
---
ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java b/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java
index 63029af..b5cba4a 100644
--- a/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java
+++ b/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java
@@ -38,10 +38,9 @@
IArdAppPositionService iArdAppPositionService;
@GetMapping("/getNearVehiPersonCam")
- @ApiOperation("鑾峰彇闄勮繎鐨勮溅浜虹浉鏈�")
+ @ApiOperation("鑾峰彇闄勮繎鐨勮溅浜虹浉鏈�(鍗婂緞)")
AjaxResult getNearVehiPersonCam(SchedulingParam param) {
Map<String, Object> nearMap = new HashMap<>();
-
List<Map<String, Object>> Cars = iArdSyCarService.getNearCar(param);
nearMap.put("car", Cars);
List<ArdCameras> Cameras = iArdCamerasService.getNearCameras(param);
@@ -51,4 +50,16 @@
return AjaxResult.success(nearMap);
}
+ @PostMapping("/getPolygonVehiPersonCam")
+ @ApiOperation("鑾峰彇闄勮繎鐨勮溅浜虹浉鏈�(澶氳竟褰�)")
+ AjaxResult getPolygonVehiPersonCam(@RequestBody SchedulingParam param) {
+ Map<String, Object> nearMap = new HashMap<>();
+ List<Map<String, Object>> Cars = iArdSyCarService.getNearCarWithPolygon(param);
+ nearMap.put("car", Cars);
+ List<ArdCameras> Cameras = iArdCamerasService.getNearCamerasWithPolygon(param);
+ nearMap.put("camera", Cameras);
+ List<SysUser> AppUsers = iArdAppPositionService.getNearAppUsersWithPolygon(param);
+ nearMap.put("users", AppUsers);
+ return AjaxResult.success(nearMap);
+ }
}
--
Gitblit v1.9.3