refactor(device): 重构设备列表接口返回类型

- 将 DeviceV2ListResponse 和 DeviceV2WithConfigListResponse 替换为通用的 PageResponse 类
- 更新相关控制器、服务和客户端接口以使用新的返回类型
- 删除冗余的 DeviceV2ListResponse 和 DeviceV2WithConfigListResponse 类
- 调整 FilterDevicesByConfigsResponse 中的 total 字段类型

src/main/java/com/ycwl/basic/controller/pc/DeviceV2Controller.java

@@ -1,6 +1,7 @@
 package com.ycwl.basic.controller.pc;
 
 import com.ycwl.basic.integration.device.dto.config.*;
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.device.dto.device.*;
 import com.ycwl.basic.integration.device.service.DeviceConfigIntegrationService;
 import com.ycwl.basic.integration.device.service.DeviceIntegrationService;
@@ -35,7 +36,7 @@ public class DeviceV2Controller {
      * 设备V2核心信息分页列表
      */
     @GetMapping("/")
-    public ApiResponse<DeviceV2ListResponse> listDevices(@RequestParam(defaultValue = "1") Integer page,
+    public ApiResponse<PageResponse<DeviceV2DTO>> listDevices(@RequestParam(defaultValue = "1") Integer page,
                                                         @RequestParam(defaultValue = "10") Integer pageSize,
                                                         @RequestParam(required = false) String name,
                                                         @RequestParam(required = false) String no,
@@ -51,7 +52,7 @@ public class DeviceV2Controller {
         }
         
         try {
-            DeviceV2ListResponse response = deviceIntegrationService.listDevices(page, pageSize, name, no, type, isActive, scenicId);
+            PageResponse<DeviceV2DTO> response = deviceIntegrationService.listDevices(page, pageSize, name, no, type, isActive, scenicId);
             return ApiResponse.success(response);
         } catch (Exception e) {
             log.error("分页查询设备核心信息列表失败", e);
@@ -63,7 +64,7 @@ public class DeviceV2Controller {
      * 设备V2带配置信息分页列表
      */
     @GetMapping("/with-config")
-    public ApiResponse<DeviceV2WithConfigListResponse> listDevicesWithConfig(@RequestParam(defaultValue = "1") Integer page,
+    public ApiResponse<PageResponse<DeviceV2WithConfigDTO>> listDevicesWithConfig(@RequestParam(defaultValue = "1") Integer page,
                                                                            @RequestParam(defaultValue = "10") Integer pageSize,
                                                                            @RequestParam(required = false) String name,
                                                                            @RequestParam(required = false) String no,
@@ -79,7 +80,7 @@ public class DeviceV2Controller {
         }
         
         try {
-            DeviceV2WithConfigListResponse response = deviceIntegrationService.listDevicesWithConfig(page, pageSize, name, no, type, isActive, scenicId);
+            PageResponse<DeviceV2WithConfigDTO> response = deviceIntegrationService.listDevicesWithConfig(page, pageSize, name, no, type, isActive, scenicId);
             return ApiResponse.success(response);
         } catch (Exception e) {
             log.error("分页查询设备带配置信息列表失败", e);
@@ -431,12 +432,12 @@ public class DeviceV2Controller {
      * 获取景区IPC设备列表
      */
     @GetMapping("/scenic/{scenicId}/ipc")
-    public ApiResponse<DeviceV2ListResponse> getScenicIpcDevices(@PathVariable Long scenicId,
+    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 {
-            DeviceV2ListResponse response = deviceIntegrationService.getScenicIpcDevices(scenicId, page, pageSize);
+            PageResponse<DeviceV2DTO> response = deviceIntegrationService.getScenicIpcDevices(scenicId, page, pageSize);
             return ApiResponse.success(response);
         } catch (Exception e) {
             log.error("获取景区IPC设备列表失败, scenicId: {}", scenicId, e);
@@ -448,12 +449,12 @@ public class DeviceV2Controller {
      * 获取景区激活设备列表
      */
     @GetMapping("/scenic/{scenicId}/active")
-    public ApiResponse<DeviceV2ListResponse> getScenicActiveDevices(@PathVariable Long scenicId,
+    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 {
-            DeviceV2ListResponse response = deviceIntegrationService.getScenicActiveDevices(scenicId, page, pageSize);
+            PageResponse<DeviceV2DTO> response = deviceIntegrationService.getScenicActiveDevices(scenicId, page, pageSize);
             return ApiResponse.success(response);
         } catch (Exception e) {
             log.error("获取景区激活设备列表失败, scenicId: {}", scenicId, e);
@@ -465,12 +466,12 @@ public class DeviceV2Controller {
      * 获取景区所有设备列表
      */
     @GetMapping("/scenic/{scenicId}/all")
-    public ApiResponse<DeviceV2ListResponse> getScenicAllDevices(@PathVariable Long scenicId,
+    public ApiResponse<PageResponse<DeviceV2DTO>> getScenicAllDevices(@PathVariable Long scenicId,
                                                                @RequestParam(defaultValue = "1") Integer page,
                                                                @RequestParam(defaultValue = "10") Integer pageSize) {
         log.info("获取景区所有设备列表, scenicId: {}, page: {}, pageSize: {}", scenicId, page, pageSize);
         try {
-            DeviceV2ListResponse response = deviceIntegrationService.listDevices(page, pageSize, null, null, null, null, scenicId);
+            PageResponse<DeviceV2DTO> response = deviceIntegrationService.listDevices(page, pageSize, null, null, null, null, scenicId);
             return ApiResponse.success(response);
         } catch (Exception e) {
             log.error("获取景区所有设备列表失败, scenicId: {}", scenicId, e);

src/main/java/com/ycwl/basic/controller/pc/ScenicV2Controller.java

@@ -9,9 +9,8 @@ import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterPageResponse;
 import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterRequest;
 import com.ycwl.basic.integration.scenic.dto.scenic.CreateScenicRequest;
 import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
-import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2ListResponse;
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigDTO;
-import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigListResponse;
 import com.ycwl.basic.integration.scenic.dto.scenic.UpdateScenicRequest;
 import com.ycwl.basic.integration.scenic.service.ScenicConfigIntegrationService;
 import com.ycwl.basic.integration.scenic.service.ScenicIntegrationService;
@@ -52,7 +51,7 @@ public class ScenicV2Controller {
      * 景区V2核心信息分页列表
      */
     @GetMapping("/")
-    public ApiResponse<ScenicV2ListResponse> listScenics(@RequestParam(defaultValue = "1") Integer page,
+    public ApiResponse<PageResponse<ScenicV2DTO>> listScenics(@RequestParam(defaultValue = "1") Integer page,
                                                         @RequestParam(defaultValue = "10") Integer pageSize,
                                                         @RequestParam(required = false) Integer status,
                                                         @RequestParam(required = false) String name) {
@@ -64,7 +63,7 @@ public class ScenicV2Controller {
         }
         
         try {
-            ScenicV2ListResponse response = scenicIntegrationService.listScenics(page, pageSize, status, name);
+            PageResponse<ScenicV2DTO> response = scenicIntegrationService.listScenics(page, pageSize, status, name);
             return ApiResponse.success(response);
         } catch (Exception e) {
             log.error("分页查询景区核心信息列表失败", e);
@@ -76,7 +75,7 @@ public class ScenicV2Controller {
      * 景区V2带配置信息分页列表
      */
     @GetMapping("/with-config")
-    public ApiResponse<ScenicV2WithConfigListResponse> listScenicsWithConfig(@RequestParam(defaultValue = "1") Integer page,
+    public ApiResponse<PageResponse<ScenicV2WithConfigDTO>> listScenicsWithConfig(@RequestParam(defaultValue = "1") Integer page,
                                                                            @RequestParam(defaultValue = "10") Integer pageSize,
                                                                            @RequestParam(required = false) Integer status,
                                                                            @RequestParam(required = false) String name) {
@@ -88,7 +87,7 @@ public class ScenicV2Controller {
         }
         
         try {
-            ScenicV2WithConfigListResponse response = scenicIntegrationService.listScenicsWithConfig(page, pageSize, status, name);
+            PageResponse<ScenicV2WithConfigDTO> response = scenicIntegrationService.listScenicsWithConfig(page, pageSize, status, name);
             return ApiResponse.success(response);
         } catch (Exception e) {
             log.error("分页查询景区带配置信息列表失败", e);
@@ -178,11 +177,11 @@ public class ScenicV2Controller {
      * 只支持根据状态筛选
      */
     @GetMapping("/list")
-    public ApiResponse<ScenicV2ListResponse> listScenicsByStatus(@RequestParam(required = false) Integer status) {
+    public ApiResponse<PageResponse<ScenicV2DTO>> listScenicsByStatus(@RequestParam(required = false) Integer status) {
         log.info("查询景区列表, status: {}", status);
         try {
             // 默认查询1000条数据，第1页
-            ScenicV2ListResponse scenics = scenicIntegrationService.listScenics(1, 1000, status, null);
+            PageResponse<ScenicV2DTO> scenics = scenicIntegrationService.listScenics(1, 1000, status, null);
             return ApiResponse.success(scenics);
         } catch (Exception e) {
             log.error("查询景区列表失败, status: {}", status, e);

src/main/java/com/ycwl/basic/integration/device/client/DeviceV2Client.java

@@ -1,6 +1,7 @@
 package com.ycwl.basic.integration.device.client;
 
 import com.ycwl.basic.integration.common.response.CommonResponse;
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.device.dto.device.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -55,7 +56,7 @@ public interface DeviceV2Client {
      * 分页获取设备列表（核心信息）
      */
     @GetMapping("/")
-    CommonResponse<DeviceV2ListResponse> listDevices(
+    CommonResponse<PageResponse<DeviceV2DTO>> listDevices(
             @RequestParam(value = "page", defaultValue = "1") Integer page,
             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
             @RequestParam(value = "name", required = false) String name,
@@ -68,7 +69,7 @@ public interface DeviceV2Client {
      * 分页获取设备列表（含配置）
      */
     @GetMapping("/with-config")
-    CommonResponse<DeviceV2WithConfigListResponse> listDevicesWithConfig(
+    CommonResponse<PageResponse<DeviceV2WithConfigDTO>> listDevicesWithConfig(
             @RequestParam(value = "page", defaultValue = "1") Integer page,
             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
             @RequestParam(value = "name", required = false) String name,

src/main/java/com/ycwl/basic/integration/device/dto/device/DeviceV2ListResponse.java

@@ -1,13 +0,0 @@
-package com.ycwl.basic.integration.device.dto.device;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class DeviceV2ListResponse {
-    private List<DeviceV2DTO> list;
-    private Integer total;
-    private Integer page;
-    private Integer pageSize;
-}

src/main/java/com/ycwl/basic/integration/device/dto/device/DeviceV2WithConfigListResponse.java

@@ -1,13 +0,0 @@
-package com.ycwl.basic.integration.device.dto.device;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class DeviceV2WithConfigListResponse {
-    private List<DeviceV2WithConfigDTO> list;
-    private Integer total;
-    private Integer page;
-    private Integer pageSize;
-}

src/main/java/com/ycwl/basic/integration/device/dto/device/FilterDevicesByConfigsResponse.java

@@ -17,7 +17,7 @@ public class FilterDevicesByConfigsResponse {
     /**
      * 总数
      */
-    private String total;
+    private Integer total;
     
     /**
      * 页码

src/main/java/com/ycwl/basic/integration/device/example/DeviceIntegrationExample.java

@@ -1,5 +1,6 @@
 package com.ycwl.basic.integration.device.example;
 
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.device.dto.device.*;
 import com.ycwl.basic.integration.device.dto.config.*;
 import com.ycwl.basic.integration.device.service.DeviceConfigIntegrationService;
@@ -46,7 +47,7 @@ public class DeviceIntegrationExample {
         log.info("获取设备配置: {}", deviceWithConfig.getName());
         
         // 分页查询景区设备列表
-        DeviceV2ListResponse deviceList = deviceService.getScenicIpcDevices(1001L, 1, 10);
+        PageResponse<DeviceV2DTO> deviceList = deviceService.getScenicIpcDevices(1001L, 1, 10);
         log.info("景区设备列表: 总数={}", deviceList.getTotal());
         
         // 启用设备
@@ -80,7 +81,7 @@ public class DeviceIntegrationExample {
         log.info("更新摄像头1排序为1（置顶）");
         
         // 获取排序后的设备列表
-        DeviceV2ListResponse sortedList = deviceService.listDevices(1, 10, null, null, null, 1, scenicId);
+        PageResponse<DeviceV2DTO> sortedList = deviceService.listDevices(1, 10, null, null, null, 1, scenicId);
         log.info("排序后的设备列表:");
         for (DeviceV2DTO device : sortedList.getList()) {
             log.info("  - {}: 排序={}, 类型={}", device.getName(), device.getSort(), device.getType());
@@ -147,7 +148,7 @@ public class DeviceIntegrationExample {
         log.info("将普通摄像头置顶（排序值: 1）");
         
         // 查看最终排序结果
-        DeviceV2ListResponse finalList = deviceService.listDevices(1, 10, null, null, null, 1, scenicId);
+        PageResponse<DeviceV2DTO> finalList = deviceService.listDevices(1, 10, null, null, null, 1, scenicId);
         log.info("最终排序结果:");
         for (DeviceV2DTO device : finalList.getList()) {
             log.info("  - {}: 排序={}", device.getName(), device.getSort());

src/main/java/com/ycwl/basic/integration/device/service/DeviceIntegrationService.java

@@ -4,6 +4,7 @@ import com.ycwl.basic.integration.common.exception.IntegrationException;
 import com.ycwl.basic.integration.common.response.CommonResponse;
 import com.ycwl.basic.integration.common.service.IntegrationFallbackService;
 import com.ycwl.basic.integration.device.client.DeviceV2Client;
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.device.dto.device.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -91,20 +92,20 @@ public class DeviceIntegrationService {
         handleResponse(response, "删除设备失败");
     }
 
-    public DeviceV2ListResponse listDevices(Integer page, Integer pageSize, String name, String no,
+    public PageResponse<DeviceV2DTO> listDevices(Integer page, Integer pageSize, String name, String no,
                                           String type, Integer isActive, Long scenicId) {
         log.info("分页查询设备列表, page: {}, pageSize: {}, name: {}, no: {}, type: {}, isActive: {}, scenicId: {}",
                 page, pageSize, name, no, type, isActive, scenicId);
-        CommonResponse<DeviceV2ListResponse> response = deviceV2Client.listDevices(
+        CommonResponse<PageResponse<DeviceV2DTO>> response = deviceV2Client.listDevices(
                 page, pageSize, name, no, type, isActive, scenicId);
         return handleResponse(response, "分页查询设备列表失败");
     }
 
-    public DeviceV2WithConfigListResponse listDevicesWithConfig(Integer page, Integer pageSize, String name, String no,
+    public PageResponse<DeviceV2WithConfigDTO> listDevicesWithConfig(Integer page, Integer pageSize, String name, String no,
                                                                String type, Integer isActive, Long scenicId) {
         log.info("分页查询设备带配置列表, page: {}, pageSize: {}, name: {}, no: {}, type: {}, isActive: {}, scenicId: {}",
                 page, pageSize, name, no, type, isActive, scenicId);
-        CommonResponse<DeviceV2WithConfigListResponse> response = deviceV2Client.listDevicesWithConfig(
+        CommonResponse<PageResponse<DeviceV2WithConfigDTO>> response = deviceV2Client.listDevicesWithConfig(
                 page, pageSize, name, no, type, isActive, scenicId);
         return handleResponse(response, "分页查询设备带配置列表失败");
     }
@@ -196,14 +197,14 @@ public class DeviceIntegrationService {
     /**
      * 获取景区的IPC设备列表
      */
-    public DeviceV2ListResponse getScenicIpcDevices(Long scenicId, Integer page, Integer pageSize) {
+    public PageResponse<DeviceV2DTO> getScenicIpcDevices(Long scenicId, Integer page, Integer pageSize) {
         return listDevices(page, pageSize, null, null, "IPC", 1, scenicId);
     }
 
     /**
      * 获取景区的所有激活设备
      */
-    public DeviceV2ListResponse getScenicActiveDevices(Long scenicId, Integer page, Integer pageSize) {
+    public PageResponse<DeviceV2DTO> getScenicActiveDevices(Long scenicId, Integer page, Integer pageSize) {
         return listDevices(page, pageSize, null, null, null, 1, scenicId);
     }
 

src/main/java/com/ycwl/basic/integration/scenic/client/ScenicV2Client.java

@@ -6,8 +6,7 @@ import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterRequest;
 import com.ycwl.basic.integration.scenic.dto.scenic.CreateScenicRequest;
 import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
 import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigDTO;
-import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2ListResponse;
+import com.ycwl.basic.integration.common.response.PageResponse;
-import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigListResponse;
 import com.ycwl.basic.integration.scenic.dto.scenic.UpdateScenicRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -38,13 +37,13 @@ public interface ScenicV2Client {
     CommonResponse<ScenicFilterPageResponse> filterScenics(@RequestBody ScenicFilterRequest request);
 
     @GetMapping("/")
-    CommonResponse<ScenicV2ListResponse> listScenics(@RequestParam(defaultValue = "1") Integer page,
+    CommonResponse<PageResponse<ScenicV2DTO>> listScenics(@RequestParam(defaultValue = "1") Integer page,
                                                     @RequestParam(defaultValue = "10") Integer pageSize,
                                                     @RequestParam(required = false) Integer status,
                                                     @RequestParam(required = false) String name);
 
     @GetMapping("/with-config")
-    CommonResponse<ScenicV2WithConfigListResponse> listScenicsWithConfig(@RequestParam(defaultValue = "1") Integer page,
+    CommonResponse<PageResponse<ScenicV2WithConfigDTO>> listScenicsWithConfig(@RequestParam(defaultValue = "1") Integer page,
                                                                         @RequestParam(defaultValue = "10") Integer pageSize,
                                                                         @RequestParam(required = false) Integer status,
                                                                         @RequestParam(required = false) String name);

src/main/java/com/ycwl/basic/integration/scenic/dto/scenic/ScenicV2ListResponse.java

@@ -1,21 +0,0 @@
-package com.ycwl.basic.integration.scenic.dto.scenic;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ScenicV2ListResponse {
-    @JsonProperty("list")
-    private List<ScenicV2DTO> list;
-    
-    @JsonProperty("total")
-    private Integer total;
-    
-    @JsonProperty("page")
-    private Integer page;
-    
-    @JsonProperty("pageSize")
-    private Integer pageSize;
-}

src/main/java/com/ycwl/basic/integration/scenic/dto/scenic/ScenicV2WithConfigListResponse.java

@@ -1,21 +0,0 @@
-package com.ycwl.basic.integration.scenic.dto.scenic;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ScenicV2WithConfigListResponse {
-    @JsonProperty("list")
-    private List<ScenicV2WithConfigDTO> list;
-    
-    @JsonProperty("total")
-    private Integer total;
-    
-    @JsonProperty("page")
-    private Integer page;
-    
-    @JsonProperty("pageSize")
-    private Integer pageSize;
-}

src/main/java/com/ycwl/basic/integration/scenic/service/ScenicIntegrationService.java

@@ -10,8 +10,7 @@ import com.ycwl.basic.integration.scenic.dto.filter.ScenicFilterRequest;
 import com.ycwl.basic.integration.scenic.dto.scenic.CreateScenicRequest;
 import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
 import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigDTO;
-import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2ListResponse;
+import com.ycwl.basic.integration.common.response.PageResponse;
-import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigListResponse;
 import com.ycwl.basic.integration.scenic.dto.scenic.UpdateScenicRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -93,15 +92,15 @@ public class ScenicIntegrationService {
         return handleResponse(response, "筛选景区失败");
     }
 
-    public ScenicV2ListResponse listScenics(Integer page, Integer pageSize, Integer status, String name) {
+    public PageResponse<ScenicV2DTO> listScenics(Integer page, Integer pageSize, Integer status, String name) {
         log.info("分页查询景区列表, page: {}, pageSize: {}, status: {}, name: {}", page, pageSize, status, name);
-        CommonResponse<ScenicV2ListResponse> response = scenicV2Client.listScenics(page, pageSize, status, name);
+        CommonResponse<PageResponse<ScenicV2DTO>> response = scenicV2Client.listScenics(page, pageSize, status, name);
         return handleResponse(response, "分页查询景区列表失败");
     }
 
-    public ScenicV2WithConfigListResponse listScenicsWithConfig(Integer page, Integer pageSize, Integer status, String name) {
+    public PageResponse<ScenicV2WithConfigDTO> listScenicsWithConfig(Integer page, Integer pageSize, Integer status, String name) {
         log.info("分页查询景区带配置列表, page: {}, pageSize: {}, status: {}, name: {}", page, pageSize, status, name);
-        CommonResponse<ScenicV2WithConfigListResponse> response = scenicV2Client.listScenicsWithConfig(page, pageSize, status, name);
+        CommonResponse<PageResponse<ScenicV2WithConfigDTO>> response = scenicV2Client.listScenicsWithConfig(page, pageSize, status, name);
         return handleResponse(response, "分页查询景区带配置列表失败");
     }
 

src/main/java/com/ycwl/basic/repository/ScenicRepository.java

@@ -3,7 +3,7 @@ package com.ycwl.basic.repository;
 import com.ycwl.basic.facebody.enums.FaceBodyAdapterType;
 import com.ycwl.basic.integration.common.util.ConfigValueUtil;
 import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
-import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2ListResponse;
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2WithConfigDTO;
 import com.ycwl.basic.integration.scenic.service.ScenicIntegrationService;
 import com.ycwl.basic.integration.scenic.service.ScenicConfigIntegrationService;
@@ -209,7 +209,7 @@ public class ScenicRepository {
             String name = scenicReqQuery.getName();
             
             // 调用 zt-scenic 服务的 list 方法
-            ScenicV2ListResponse response = scenicIntegrationService.listScenics(page, pageSize, status, name);
+            PageResponse<ScenicV2DTO> response = scenicIntegrationService.listScenics(page, pageSize, status, name);
             
             // 将 ScenicV2DTO 列表转换为 ScenicEntity 列表
             if (response != null && response.getList() != null) {

src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java

@@ -5,7 +5,8 @@ import com.github.pagehelper.PageInfo;
 import com.ycwl.basic.integration.common.manager.DeviceConfigManager;
 import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
 import com.ycwl.basic.integration.device.service.DeviceIntegrationService;
-import com.ycwl.basic.integration.device.dto.device.DeviceV2ListResponse;
+import com.ycwl.basic.integration.device.dto.device.DeviceV2DTO;
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.mapper.ExtraDeviceMapper;
 import com.ycwl.basic.mapper.ScenicAccountMapper;
 import com.ycwl.basic.model.jwt.JwtInfo;
@@ -86,7 +87,7 @@ public class AppScenicServiceImpl implements AppScenicService {
     public ApiResponse<ScenicDeviceCountVO> deviceCountByScenicId(Long scenicId) {
         JwtInfo worker = JwtTokenUtil.getWorker();
         // 通过zt-device服务获取设备统计
-        DeviceV2ListResponse deviceListResponse = deviceIntegrationService.getScenicActiveDevices(scenicId, 1, 1000);
+        PageResponse<DeviceV2DTO> deviceListResponse = deviceIntegrationService.getScenicActiveDevices(scenicId, 1, 1000);
         ScenicDeviceCountVO scenicDeviceCountVO = new ScenicDeviceCountVO();
         if (deviceListResponse != null && deviceListResponse.getList() != null) {
             scenicDeviceCountVO.setTotalDeviceCount(deviceListResponse.getList().size());
@@ -120,7 +121,7 @@ public class AppScenicServiceImpl implements AppScenicService {
         }
         
         // 通过zt-device服务获取设备统计
-        DeviceV2ListResponse deviceListResponse = deviceIntegrationService.getScenicActiveDevices(id, 1, 1000);
+        PageResponse<DeviceV2DTO> deviceListResponse = deviceIntegrationService.getScenicActiveDevices(id, 1, 1000);
         ScenicDeviceCountVO scenicDeviceCountVO = new ScenicDeviceCountVO();
         if (deviceListResponse != null && deviceListResponse.getList() != null) {
             scenicDeviceCountVO.setTotalDeviceCount(deviceListResponse.getList().size());
@@ -276,7 +277,7 @@ public class AppScenicServiceImpl implements AppScenicService {
 
     @Override
     public ApiResponse<List<DeviceRespVO>> getDevices(Long scenicId) {
-        DeviceV2ListResponse deviceV2ListResponse = deviceIntegrationService.listDevices(1, 1000, null, null, null, 1, scenicId);
+        PageResponse<DeviceV2DTO> deviceV2ListResponse = deviceIntegrationService.listDevices(1, 1000, null, null, null, 1, scenicId);
         List<DeviceRespVO> deviceRespVOList = deviceV2ListResponse.getList().stream().map(device -> {
             DeviceRespVO deviceRespVO = new DeviceRespVO();
             deviceRespVO.setId(device.getId());

src/main/java/com/ycwl/basic/task/VideoPieceCleaner.java

@@ -5,7 +5,7 @@ import com.ycwl.basic.device.DeviceFactory;
 import com.ycwl.basic.device.operator.IDeviceStorageOperator;
 import com.ycwl.basic.integration.common.manager.DeviceConfigManager;
 import com.ycwl.basic.integration.device.service.DeviceIntegrationService;
-import com.ycwl.basic.integration.device.dto.device.DeviceV2ListResponse;
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.device.dto.device.DeviceV2DTO;
 import java.util.stream.Collectors;
 import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
@@ -37,9 +37,8 @@ public class VideoPieceCleaner {
     public void clean() {
         log.info("开始删除视频文件");
         // 通过zt-device服务获取所有激活设备
-        DeviceV2ListResponse deviceListResponse = deviceIntegrationService.listDevices(1, 10000, null, null, null, 1, null);
+        PageResponse<DeviceV2DTO> deviceListResponse = deviceIntegrationService.listDevices(1, 10000, null, null, null, 1, null);
-        List<DeviceEntity> deviceList;
+        if (deviceListResponse == null || deviceListResponse.getList() == null) {
-        if (deviceListResponse == null) {
             return;
         }
         for (DeviceV2DTO device : deviceListResponse.getList()) {