From 234b0ac195934b34c06045b2d2ef0f10e239dd8e Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期三, 23 四月 2025 00:06:54 +0800 Subject: [PATCH] 系统合并 --- cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java index 4c73996..8bea151 100644 --- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java +++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java @@ -28,7 +28,7 @@ * 璁惧鍋滅敤/鍚敤 鍓嶇鎺у埗鍣� * </p> * - * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃 + * @author * @since 2024-09-26 09:51:40 */ @RestController @@ -63,9 +63,9 @@ return Result.success(deviceStateService.removeById(stateId)); } - @PostMapping("/deviceStateExport") + @GetMapping("/deviceStateExport") public Result deviceStateExport(@RequestParam("deviceId") Integer deviceId, String processNumber, HttpServletResponse response) throws Exception { - IPage<DeviceStateDto> deviceBorrows = deviceStateService.getDeviceStatePage(deviceId, new Page<>(1, -1), processNumber); + IPage<DeviceStateDto> deviceBorrows = deviceStateService.getDeviceStatePage(deviceId, new Page<>(-1, -1), processNumber); List<DeviceStateExport> studentList = JSONObject.parseArray(JSON.toJSONString(deviceBorrows.getRecords()), DeviceStateExport.class); response.setHeader("requestType", "excel"); response.setHeader("Access-Control-Expose-Headers", "requestType"); -- Gitblit v1.9.3