分页

business-css/src/main/java/com/yfd/business/css/controller/AlgorithmController.java

@@ -65,13 +65,21 @@ public class AlgorithmController {
     @GetMapping("/search")
     public Page<Algorithm> searchAlgorithms(@RequestParam(required = false) String name,
                                             @RequestParam(defaultValue = "1") long pageNum,
-                                            @RequestParam(defaultValue = "10") long pageSize) {
+                                            @RequestParam(defaultValue = "20") long pageSize) {
-        QueryWrapper<Algorithm> queryWrapper = new QueryWrapper<>();
+        long offset = Math.max(0, (pageNum - 1) * pageSize);
+        QueryWrapper<Algorithm> qw = new QueryWrapper<>();
         if (name != null && !name.isEmpty()) {
-            queryWrapper.like("name", name);
+            qw.like("name", name);
         }
-        Page<Algorithm> page = new Page<>(pageNum, pageSize);
+        qw.orderByDesc("updated_at").last("LIMIT " + offset + "," + pageSize);
-        return algorithmService.page(page, queryWrapper);
+        java.util.List<Algorithm> records = algorithmService.list(qw);
+        long total = (name != null && !name.isEmpty())
+                ? algorithmService.count(new QueryWrapper<Algorithm>().like("name", name))
+                : algorithmService.count();
+        Page<Algorithm> page = new Page<>(pageNum, pageSize, true);
+        page.setRecords(records);
+        page.setTotal(total);
+        return page;
     }
 
     private String currentUsername() {

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<CriticalData> listByDeviceType(@RequestParam String deviceType,
                                                @RequestParam(defaultValue = "1") long pageNum,
-                                               @RequestParam(defaultValue = "10") long pageSize) {
+                                               @RequestParam(defaultValue = "20") long pageSize) {
-        Page<CriticalData> page = new Page<>(pageNum, pageSize);
+        long offset = Math.max(0, (pageNum - 1) * pageSize);
-        return criticalDataService.page(
+        QueryWrapper<CriticalData> qw = new QueryWrapper<CriticalData>()
-                page,
-                new QueryWrapper<CriticalData>()
                 .eq("device_type", deviceType)
                 .orderByDesc("created_at")
-        );
+                .last("LIMIT " + offset + "," + pageSize);
+        java.util.List<CriticalData> records = criticalDataService.list(qw);
+        long total = criticalDataService.count(new QueryWrapper<CriticalData>().eq("device_type", deviceType));
+        Page<CriticalData> page = new Page<>(pageNum, pageSize, true);
+        page.setRecords(records);
+        page.setTotal(total);
+        return page;
     }
 }

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<Device> page = new Page<>(pageNum, pageSize);
+        long offset = Math.max(0, (pageNum - 1) * pageSize);
-        QueryWrapper<Device> wrapper = new QueryWrapper<>();
+        QueryWrapper<Device> 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);
         }
-
+        qw.orderByDesc("created_at").last("LIMIT " + offset + "," + pageSize);
-        return deviceService.page(page, wrapper.orderByDesc("created_at"));
+        java.util.List<Device> records = deviceService.list(qw);
+        QueryWrapper<Device> 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<Device> page = new Page<>(pageNum, pageSize, true);
+        page.setRecords(records);
+        page.setTotal(total);
+        return page;
     }
 
     private String currentUsername() {

business-css/src/main/java/com/yfd/business/css/controller/MaterialController.java

@@ -102,23 +102,37 @@ public class MaterialController {
     public Page<Material> search(@RequestParam(required = false) String name,
                                  @RequestParam(defaultValue = "1") long pageNum,
                                  @RequestParam(defaultValue = "20") long pageSize) {
-        QueryWrapper<Material> wrapper = new QueryWrapper<>();
+        long offset = Math.max(0, (pageNum - 1) * pageSize);
+        QueryWrapper<Material> qw = new QueryWrapper<Material>().orderByDesc("created_at");
         if (name != null && !name.isEmpty()) {
-            wrapper.like("name", name);
+            qw.like("name", name);
         }
-        Page<Material> page = new Page<>(pageNum, pageSize);
+        qw.last("LIMIT " + offset + "," + pageSize);
-        return materialService.page(page, wrapper.orderByDesc("created_at"));
+        java.util.List<Material> records = materialService.list(qw);
+        long total = (name != null && !name.isEmpty())
+                ? materialService.count(new QueryWrapper<Material>().like("name", name))
+                : materialService.count();
+        Page<Material> page = new Page<>(pageNum, pageSize, true);
+        page.setRecords(records);
+        page.setTotal(total);
+        return page;
     }
 
     @GetMapping("/by-project")
     public Page<Material> pageByProject(@RequestParam String projectId,
                                         @RequestParam(defaultValue = "1") long pageNum,
                                         @RequestParam(defaultValue = "20") long pageSize) {
-        QueryWrapper<Material> wrapper = new QueryWrapper<Material>()
+        long offset = Math.max(0, (pageNum - 1) * pageSize);
+        QueryWrapper<Material> qw = new QueryWrapper<Material>()
                 .eq("project_id", projectId)
-                .orderByDesc("created_at");
+                .orderByDesc("created_at")
-        Page<Material> page = new Page<>(pageNum, pageSize);
+                .last("LIMIT " + offset + "," + pageSize);
-        return materialService.page(page, wrapper);
+        java.util.List<Material> records = materialService.list(qw);
+        long total = materialService.count(new QueryWrapper<Material>().eq("project_id", projectId));
+        Page<Material> page = new Page<>(pageNum, pageSize, true);
+        page.setRecords(records);
+        page.setTotal(total);
+        return page;
     }
 
     private String currentUsername() {

business-css/src/main/java/com/yfd/business/css/controller/ProjectController.java

@@ -155,13 +155,24 @@ public class ProjectController {
     @Operation(summary = "搜索项目并分页返回", description = "按名称关键词模糊查询，返回分页结果")
     public Page<Project> search(@RequestParam(required = false) @Parameter(description = "项目名称关键词，可为空") String name,
                                       @RequestParam(defaultValue = "1") @Parameter(description = "页码，默认1") long pageNum,
-                                      @RequestParam(defaultValue = "10") @Parameter(description = "每页条数，默认10") long pageSize) {
+                                      @RequestParam(defaultValue = "20") @Parameter(description = "每页条数，默认20") long pageSize) {
-        QueryWrapper<Project> wrapper = new QueryWrapper<>();
+        long offset = Math.max(0, (pageNum - 1) * pageSize);
+        QueryWrapper<Project> qw = new QueryWrapper<Project>().orderByDesc("created_at");
         if (name != null && !name.isEmpty()) {
-            wrapper.like("name", name);
+            qw.like("name", name);
         }
-        Page<Project> page = new Page<>(pageNum, pageSize);
+        qw.last("LIMIT " + offset + "," + pageSize);
-        return projectService.page(page, wrapper.orderByDesc("created_at"));
+        java.util.List<Project> records = projectService.list(qw);
+        long total;
+        if (name != null && !name.isEmpty()) {
+            total = projectService.count(new QueryWrapper<Project>().like("name", name));
+        } else {
+            total = projectService.count();
+        }
+        Page<Project> page = new Page<>(pageNum, pageSize, true);
+        page.setRecords(records);
+        page.setTotal(total);
+        return page;
     }
 
     /**

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<Scenario> page = new Page<>(pageNum, pageSize);
+        long offset = Math.max(0, (pageNum - 1) * pageSize);
-        QueryWrapper<Scenario> wrapper = new QueryWrapper<Scenario>().eq("project_id", projectId);
+        QueryWrapper<Scenario> qw = new QueryWrapper<Scenario>().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<Scenario> records = scenarioService.list(qw);
+        long total = (name != null && !name.isEmpty())
+                ? scenarioService.count(new QueryWrapper<Scenario>().eq("project_id", projectId).like("name", name))
+                : scenarioService.count(new QueryWrapper<Scenario>().eq("project_id", projectId));
+        Page<Scenario> page = new Page<>(pageNum, pageSize, true);
+        page.setRecords(records);
+        page.setTotal(total);
+        return page;
     }
 
     private String currentUsername() {