From c88aae3f484331fcde0588bd6c913a76226a80ea Mon Sep 17 00:00:00 2001 From: wanxiaoli Date: Wed, 24 Dec 2025 17:12:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/controller/AlgorithmController.java | 18 +++++++---- .../controller/CriticalDataController.java | 20 ++++++++----- .../css/controller/DeviceController.java | 25 +++++++++++----- .../css/controller/MaterialController.java | 30 ++++++++++++++----- .../css/controller/ProjectController.java | 21 +++++++++---- .../css/controller/ScenarioController.java | 16 +++++++--- 6 files changed, 93 insertions(+), 37 deletions(-) diff --git a/business-css/src/main/java/com/yfd/business/css/controller/AlgorithmController.java b/business-css/src/main/java/com/yfd/business/css/controller/AlgorithmController.java index 9fe11ad..2314d58 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/AlgorithmController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/AlgorithmController.java @@ -65,13 +65,21 @@ public class AlgorithmController { @GetMapping("/search") public Page searchAlgorithms(@RequestParam(required = false) String name, @RequestParam(defaultValue = "1") long pageNum, - @RequestParam(defaultValue = "10") long pageSize) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + @RequestParam(defaultValue = "20") long pageSize) { + long offset = Math.max(0, (pageNum - 1) * pageSize); + QueryWrapper qw = new QueryWrapper<>(); if (name != null && !name.isEmpty()) { - queryWrapper.like("name", name); + qw.like("name", name); } - Page page = new Page<>(pageNum, pageSize); - return algorithmService.page(page, queryWrapper); + qw.orderByDesc("updated_at").last("LIMIT " + offset + "," + pageSize); + java.util.List records = algorithmService.list(qw); + long total = (name != null && !name.isEmpty()) + ? algorithmService.count(new QueryWrapper().like("name", name)) + : algorithmService.count(); + Page page = new Page<>(pageNum, pageSize, true); + page.setRecords(records); + page.setTotal(total); + return page; } private String currentUsername() { diff --git a/business-css/src/main/java/com/yfd/business/css/controller/CriticalDataController.java b/business-css/src/main/java/com/yfd/business/css/controller/CriticalDataController.java index 251412e..245debf 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/CriticalDataController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/CriticalDataController.java @@ -94,13 +94,17 @@ public class CriticalDataController { @GetMapping("/by-device-type") public Page listByDeviceType(@RequestParam String deviceType, @RequestParam(defaultValue = "1") long pageNum, - @RequestParam(defaultValue = "10") long pageSize) { - Page page = new Page<>(pageNum, pageSize); - return criticalDataService.page( - page, - new QueryWrapper() - .eq("device_type", deviceType) - .orderByDesc("created_at") - ); + @RequestParam(defaultValue = "20") long pageSize) { + long offset = Math.max(0, (pageNum - 1) * pageSize); + QueryWrapper qw = new QueryWrapper() + .eq("device_type", deviceType) + .orderByDesc("created_at") + .last("LIMIT " + offset + "," + pageSize); + java.util.List records = criticalDataService.list(qw); + long total = criticalDataService.count(new QueryWrapper().eq("device_type", deviceType)); + Page page = new Page<>(pageNum, pageSize, true); + page.setRecords(records); + page.setTotal(total); + return page; } } diff --git a/business-css/src/main/java/com/yfd/business/css/controller/DeviceController.java b/business-css/src/main/java/com/yfd/business/css/controller/DeviceController.java index 9395d64..ccc0cdd 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/DeviceController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/DeviceController.java @@ -124,17 +124,28 @@ public class DeviceController { @RequestParam(required = false) String name, @RequestParam(defaultValue = "1") long pageNum, @RequestParam(defaultValue = "20") long pageSize) { - Page page = new Page<>(pageNum, pageSize); - QueryWrapper wrapper = new QueryWrapper<>(); - + long offset = Math.max(0, (pageNum - 1) * pageSize); + QueryWrapper qw = new QueryWrapper<>(); if (type != null && !type.isEmpty()) { - wrapper.eq("type", type); + qw.eq("type", type); } if (name != null && !name.isEmpty()) { - wrapper.like("name", name); + qw.like("name", name); } - - return deviceService.page(page, wrapper.orderByDesc("created_at")); + qw.orderByDesc("created_at").last("LIMIT " + offset + "," + pageSize); + java.util.List records = deviceService.list(qw); + QueryWrapper countQw = new QueryWrapper<>(); + if (type != null && !type.isEmpty()) { + countQw.eq("type", type); + } + if (name != null && !name.isEmpty()) { + countQw.like("name", name); + } + long total = deviceService.count(countQw); + Page page = new Page<>(pageNum, pageSize, true); + page.setRecords(records); + page.setTotal(total); + return page; } private String currentUsername() { diff --git a/business-css/src/main/java/com/yfd/business/css/controller/MaterialController.java b/business-css/src/main/java/com/yfd/business/css/controller/MaterialController.java index bae544b..6785128 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/MaterialController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/MaterialController.java @@ -102,23 +102,37 @@ public class MaterialController { public Page search(@RequestParam(required = false) String name, @RequestParam(defaultValue = "1") long pageNum, @RequestParam(defaultValue = "20") long pageSize) { - QueryWrapper wrapper = new QueryWrapper<>(); + long offset = Math.max(0, (pageNum - 1) * pageSize); + QueryWrapper qw = new QueryWrapper().orderByDesc("created_at"); if (name != null && !name.isEmpty()) { - wrapper.like("name", name); + qw.like("name", name); } - Page page = new Page<>(pageNum, pageSize); - return materialService.page(page, wrapper.orderByDesc("created_at")); + qw.last("LIMIT " + offset + "," + pageSize); + java.util.List records = materialService.list(qw); + long total = (name != null && !name.isEmpty()) + ? materialService.count(new QueryWrapper().like("name", name)) + : materialService.count(); + Page page = new Page<>(pageNum, pageSize, true); + page.setRecords(records); + page.setTotal(total); + return page; } @GetMapping("/by-project") public Page pageByProject(@RequestParam String projectId, @RequestParam(defaultValue = "1") long pageNum, @RequestParam(defaultValue = "20") long pageSize) { - QueryWrapper wrapper = new QueryWrapper() + long offset = Math.max(0, (pageNum - 1) * pageSize); + QueryWrapper qw = new QueryWrapper() .eq("project_id", projectId) - .orderByDesc("created_at"); - Page page = new Page<>(pageNum, pageSize); - return materialService.page(page, wrapper); + .orderByDesc("created_at") + .last("LIMIT " + offset + "," + pageSize); + java.util.List records = materialService.list(qw); + long total = materialService.count(new QueryWrapper().eq("project_id", projectId)); + Page page = new Page<>(pageNum, pageSize, true); + page.setRecords(records); + page.setTotal(total); + return page; } private String currentUsername() { diff --git a/business-css/src/main/java/com/yfd/business/css/controller/ProjectController.java b/business-css/src/main/java/com/yfd/business/css/controller/ProjectController.java index f675f4f..575565c 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/ProjectController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/ProjectController.java @@ -155,13 +155,24 @@ public class ProjectController { @Operation(summary = "搜索项目并分页返回", description = "按名称关键词模糊查询，返回分页结果") public Page search(@RequestParam(required = false) @Parameter(description = "项目名称关键词，可为空") String name, @RequestParam(defaultValue = "1") @Parameter(description = "页码，默认1") long pageNum, - @RequestParam(defaultValue = "10") @Parameter(description = "每页条数，默认10") long pageSize) { - QueryWrapper wrapper = new QueryWrapper<>(); + @RequestParam(defaultValue = "20") @Parameter(description = "每页条数，默认20") long pageSize) { + long offset = Math.max(0, (pageNum - 1) * pageSize); + QueryWrapper qw = new QueryWrapper().orderByDesc("created_at"); if (name != null && !name.isEmpty()) { - wrapper.like("name", name); + qw.like("name", name); } - Page page = new Page<>(pageNum, pageSize); - return projectService.page(page, wrapper.orderByDesc("created_at")); + qw.last("LIMIT " + offset + "," + pageSize); + java.util.List records = projectService.list(qw); + long total; + if (name != null && !name.isEmpty()) { + total = projectService.count(new QueryWrapper().like("name", name)); + } else { + total = projectService.count(); + } + Page page = new Page<>(pageNum, pageSize, true); + page.setRecords(records); + page.setTotal(total); + return page; } /** diff --git a/business-css/src/main/java/com/yfd/business/css/controller/ScenarioController.java b/business-css/src/main/java/com/yfd/business/css/controller/ScenarioController.java index c7d7141..c7a286c 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/ScenarioController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/ScenarioController.java @@ -103,12 +103,20 @@ public class ScenarioController { @RequestParam(required = false) String name, @RequestParam(defaultValue = "1") long pageNum, @RequestParam(defaultValue = "20") long pageSize) { - Page page = new Page<>(pageNum, pageSize); - QueryWrapper wrapper = new QueryWrapper().eq("project_id", projectId); + long offset = Math.max(0, (pageNum - 1) * pageSize); + QueryWrapper qw = new QueryWrapper().eq("project_id", projectId).orderByDesc("created_at"); if (name != null && !name.isEmpty()) { - wrapper.like("name", name); + qw.like("name", name); } - return scenarioService.page(page, wrapper.orderByDesc("created_at")); + qw.last("LIMIT " + offset + "," + pageSize); + java.util.List records = scenarioService.list(qw); + long total = (name != null && !name.isEmpty()) + ? scenarioService.count(new QueryWrapper().eq("project_id", projectId).like("name", name)) + : scenarioService.count(new QueryWrapper().eq("project_id", projectId)); + Page page = new Page<>(pageNum, pageSize, true); + page.setRecords(records); + page.setTotal(total); + return page; } private String currentUsername() {