diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderController.java
index 3f1a416..8f72e29 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderController.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderController.java
@@ -1,41 +1,47 @@
 package com.zteits.urbanops.module.garden.controller.admin.device;
 
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.service.device.CameraRecorderHelper;
+import com.zteits.urbanops.module.garden.controller.admin.device.vo.RecordFileListReq;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Collections;
-import java.util.Map;
-
-import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
-
 @Tag(name = "管理后台 - 执法记录仪")
 @RestController
 @RequestMapping("/camera/recorder")
 public class CameraRecorderController {
 
+    @Resource
+    private CameraRecorderHelper cameraRecorderHelper;
+
     @GetMapping("/device/page")
     @Operation(summary = "设备-分页查询")
-    public CommonResult<Map<String,Object>> devicePage(@RequestParam(value = "device_name", required = false) String deviceName,
-                                                       @RequestParam(value = "enter_id", required = false) Integer enterId,
-                                                       @RequestParam(value = "group_id", required = false) Integer groupId,
-                                                       @RequestParam("page") Integer page,
-                                                       @RequestParam("pageSize") Integer pageSize) {
-        return success(Collections.emptyMap());
+    public CommonResult<Object> devicePage(@RequestParam(value = "device_name", required = false) String deviceName,
+                                           @RequestParam(value = "enter_id", required = false) Integer enterId,
+                                           @RequestParam(value = "group_id", required = false) Integer groupId,
+                                           @RequestParam("page") Integer page,
+                                           @RequestParam("pageSize") Integer pageSize) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return cameraRecorderHelper.devicePage(deviceName, enterId, groupId, page, pageSize, companyId);
     }
 
     @PostMapping("/device/recordFileList")
     @Operation(summary = "设备-设备执法记录信息")
-    public CommonResult<Map<String,Object>> deviceRecordFileList(@RequestBody Map<String,Object> req) {
-        return success(Collections.emptyMap());
+    public CommonResult<Object> deviceRecordFileList(@Valid @RequestBody RecordFileListReq req) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return cameraRecorderHelper.recordFileList(req, companyId);
     }
 
     @GetMapping("/group/group_list")
     @Operation(summary = "调度组-分页")
-    public CommonResult<Map<String,Object>> groupList(@RequestParam(value = "group_name", required = false) String groupName,
-                                                      @RequestParam("page") Integer page,
-                                                      @RequestParam("pageSize") Integer pageSize) {
-        return success(Collections.emptyMap());
+    public CommonResult<Object> groupList(@RequestParam(value = "group_name", required = false) String groupName,
+                                          @RequestParam("page") Integer page,
+                                          @RequestParam("pageSize") Integer pageSize) {
+        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
+        return cameraRecorderHelper.groupList(groupName, page, pageSize, companyId);
     }
-}
\ No newline at end of file
+}
diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderOldController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderOldController.java
deleted file mode 100644
index f3971cf..0000000
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderOldController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.zteits.urbanops.module.garden.controller.admin.device;
-
-import com.zteits.urbanops.framework.common.pojo.CommonResult;
-import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
-import com.zteits.urbanops.module.garden.service.device.CameraRecorderHelper;
-import com.zteits.urbanops.module.garden.controller.admin.device.vo.RecordFileListReq;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.web.bind.annotation.*;
-
-import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 执法记录仪")
-@RestController
-@RequestMapping("/camera/recorder")
-public class CameraRecorderOldController {
-
-    @Resource
-    private CameraRecorderHelper cameraRecorderHelper;
-
-    @GetMapping("/device/page")
-    @Operation(summary = "设备-分页查询")
-    public CommonResult<Object> devicePage(@RequestParam(value = "device_name", required = false) String deviceName,
-                                           @RequestParam(value = "enter_id", required = false) Integer enterId,
-                                           @RequestParam(value = "group_id", required = false) Integer groupId,
-                                           @RequestParam("page") Integer page,
-                                           @RequestParam("pageSize") Integer pageSize) {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
-        return cameraRecorderHelper.devicePage(deviceName, enterId, groupId, page, pageSize, companyId);
-    }
-
-    @PostMapping("/device/recordFileList")
-    @Operation(summary = "设备-设备执法记录信息")
-    public CommonResult<Object> deviceRecordFileList(@Valid @RequestBody RecordFileListReq req) {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
-        return cameraRecorderHelper.recordFileList(req, companyId);
-    }
-
-    @GetMapping("/group/group_list")
-    @Operation(summary = "调度组-分页")
-    public CommonResult<Object> groupList(@RequestParam(value = "group_name", required = false) String groupName,
-                                          @RequestParam("page") Integer page,
-                                          @RequestParam("pageSize") Integer pageSize) {
-        Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
-        return cameraRecorderHelper.groupList(groupName, page, pageSize, companyId);
-    }
-}
\ No newline at end of file