Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-22 8c94232e63a6f28682e629dbfa92873d3cbf964a

 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);
    }
}