ThbTech/JavaProjectRepo
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css

Browse Source
This commit is contained in:
limengnan 2025-12-24 17:14:24 +08:00
commit 8c277528cb
6 changed files with 93 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) {
QueryWrapper<Algorithm> queryWrapper = new QueryWrapper<>();
@RequestParam(defaultValue = "20") long pageSize) {
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);
return algorithmService.page(page, queryWrapper);
qw.orderByDesc("updated_at").last("LIMIT " + offset + "," + pageSize);
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() {

20
business-css/src/main/java/com/yfd/business/css/controller/CriticalDataController.java
View File

@ -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) {
Page<CriticalData> page = new Page<>(pageNum, pageSize);
return criticalDataService.page(
page,
new QueryWrapper<CriticalData>()
.eq("device_type", deviceType)
.orderByDesc("created_at")
);
@RequestParam(defaultValue = "20") long pageSize) {
long offset = Math.max(0, (pageNum - 1) * pageSize);
QueryWrapper<CriticalData> qw = 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;
}
}

25
business-css/src/main/java/com/yfd/business/css/controller/DeviceController.java
View File

@ -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);
QueryWrapper<Device> wrapper = new QueryWrapper<>();
long offset = Math.max(0, (pageNum - 1) * pageSize);
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);
}
return deviceService.page(page, wrapper.orderByDesc("created_at"));
qw.orderByDesc("created_at").last("LIMIT " + offset + "," + pageSize);
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() {

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

@ -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);
return materialService.page(page, wrapper.orderByDesc("created_at"));
qw.last("LIMIT " + offset + "," + pageSize);
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");
Page<Material> page = new Page<>(pageNum, pageSize);
return materialService.page(page, wrapper);
.orderByDesc("created_at")
.last("LIMIT " + offset + "," + pageSize);
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() {

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

@ -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) {
QueryWrapper<Project> wrapper = new QueryWrapper<>();
@RequestParam(defaultValue = "20") @Parameter(description = "每页条数，默认20") long pageSize) {
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);
return projectService.page(page, wrapper.orderByDesc("created_at"));
qw.last("LIMIT " + offset + "," + pageSize);
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;
}
/**

16
business-css/src/main/java/com/yfd/business/css/controller/ScenarioController.java
View File

@ -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);
QueryWrapper<Scenario> wrapper = new QueryWrapper<Scenario>().eq("project_id", projectId);
long offset = Math.max(0, (pageNum - 1) * pageSize);
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() {