Merge remote-tracking branch 'origin/master'

Administrator

2023-08-25 7f21d4f22ec711d6aa89900b07e0b5ac31dbac42

 ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java

@@ -41,7 +41,6 @@
    @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,9 +50,9 @@

        return AjaxResult.success(nearMap);
    }
    @GetMapping("/getPolygonVehiPersonCam")
    @PostMapping("/getPolygonVehiPersonCam")
    @ApiOperation("获取附近的车人相机(多边形)")
    AjaxResult getPolygonVehiPersonCam(SchedulingParam param) {
    AjaxResult getPolygonVehiPersonCam(@RequestBody SchedulingParam param) {
        Map<String, Object> nearMap = new HashMap<>();
        List<Map<String, Object>> Cars = iArdSyCarService.getNearCarWithPolygon(param);
        nearMap.put("car", Cars);