From 58b642f356ea7b55cf36400aef87b9c212ac1339 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 5 Nov 2025 10:00:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(device):=20=E6=9B=B4=E6=96=B0=E6=99=AF?=
 =?UTF-8?q?=E5=8C=BA=E8=AE=BE=E5=A4=87=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除冗余的景区IPC设备和激活设备查询接口
- 合并设备查询逻辑到统一接口 /scenic/{scenicId}
- 新增设备名称、类型、编号作为可选查询参数
- 简化控制器代码结构，提升维护性
-保留分页功能支持大规模数据展示
- 统一异常处理流程增强系统健壮性
---
 .../controller/pc/DeviceV2Controller.java     | 41 +++----------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/controller/pc/DeviceV2Controller.java b/src/main/java/com/ycwl/basic/controller/pc/DeviceV2Controller.java
index 784e1269..4758372c 100644
--- a/src/main/java/com/ycwl/basic/controller/pc/DeviceV2Controller.java
+++ b/src/main/java/com/ycwl/basic/controller/pc/DeviceV2Controller.java
@@ -368,50 +368,19 @@ public class DeviceV2Controller {
 
     // ========== 景区设备管理操作 ==========
 
-    /**
-     * 获取景区IPC设备列表
-     */
-    @GetMapping("/scenic/{scenicId}/ipc")
-    public ApiResponse<PageResponse<DeviceV2DTO>> getScenicIpcDevices(@PathVariable Long scenicId,
-                                                               @RequestParam(defaultValue = "1") Integer page,
-                                                               @RequestParam(defaultValue = "10") Integer pageSize) {
-        log.info("获取景区IPC设备列表, scenicId: {}, page: {}, pageSize: {}", scenicId, page, pageSize);
-        try {
-            PageResponse<DeviceV2DTO> response = deviceIntegrationService.getScenicIpcDevices(scenicId, page, pageSize);
-            return ApiResponse.success(response);
-        } catch (Exception e) {
-            log.error("获取景区IPC设备列表失败, scenicId: {}", scenicId, e);
-            return ApiResponse.fail("获取景区IPC设备列表失败: " + e.getMessage());
-        }
-    }
-
-    /**
-     * 获取景区激活设备列表
-     */
-    @GetMapping("/scenic/{scenicId}/active")
-    public ApiResponse<PageResponse<DeviceV2DTO>> getScenicActiveDevices(@PathVariable Long scenicId,
-                                                                  @RequestParam(defaultValue = "1") Integer page,
-                                                                  @RequestParam(defaultValue = "10") Integer pageSize) {
-        log.info("获取景区激活设备列表, scenicId: {}, page: {}, pageSize: {}", scenicId, page, pageSize);
-        try {
-            PageResponse<DeviceV2DTO> response = deviceIntegrationService.getScenicActiveDevices(scenicId, page, pageSize);
-            return ApiResponse.success(response);
-        } catch (Exception e) {
-            log.error("获取景区激活设备列表失败, scenicId: {}", scenicId, e);
-            return ApiResponse.fail("获取景区激活设备列表失败: " + e.getMessage());
-        }
-    }
-
     /**
      * 获取景区所有设备列表
      */
-    @GetMapping("/scenic/{scenicId}/all")
+    @GetMapping("/scenic/{scenicId}")
     public ApiResponse<PageResponse<DeviceV2DTO>> getScenicAllDevices(@PathVariable Long scenicId,
+                                                               @RequestParam(required = false) String name,
+                                                               @RequestParam(required = false) String type,
+                                                               @RequestParam(required = false) String no,
                                                                @RequestParam(defaultValue = "1") Integer page,
                                                                @RequestParam(defaultValue = "10") Integer pageSize) {
         log.info("获取景区所有设备列表, scenicId: {}, page: {}, pageSize: {}", scenicId, page, pageSize);
         try {
-            PageResponse<DeviceV2DTO> response = deviceIntegrationService.listDevices(page, pageSize, null, null, null, null, scenicId);
+            PageResponse<DeviceV2DTO> response = deviceIntegrationService.listDevices(page, pageSize, name, no, type, null, scenicId);
             return ApiResponse.success(response);
         } catch (Exception e) {
             log.error("获取景区所有设备列表失败, scenicId: {}", scenicId, e);