From 640955b151fe7e0fe6fa437f57cbdff72f96ac56 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 24 Feb 2025 15:43:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=8C=89=E8=A3=85?= =?UTF-8?q?=E7=BD=AE=E6=9F=A5=E8=AF=A2=E8=B0=B1=E5=9B=BE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xydl/cac/controller/IedDlController.java | 5 +++-- .../java/com/xydl/cac/service/IedDlRecordService.java | 2 +- .../xydl/cac/service/impl/IedDlRecordServiceImpl.java | 9 +++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xydl/cac/controller/IedDlController.java b/src/main/java/com/xydl/cac/controller/IedDlController.java index a257384..9526783 100644 --- a/src/main/java/com/xydl/cac/controller/IedDlController.java +++ b/src/main/java/com/xydl/cac/controller/IedDlController.java @@ -66,12 +66,13 @@ public class IedDlController extends BasicController { @GetMapping("listDownload") @ApiOperation("查询下载记录列表") - public Response> list(@ApiParam("类型") @RequestParam(value = "configId", required = false) Integer configId, + public Response> list(@ApiParam("配置Id") @RequestParam(value = "configId", required = false) Integer configId, + @ApiParam("devId") @RequestParam(value = "devId", required = false) Integer devId, @ApiParam("页码") @RequestParam(value = "pageNum", required = false) Integer pageNum, @ApiParam("每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) throws Exception { pageNum = this.initPageNum(pageNum); pageSize = this.initPageSize(pageSize); - Page result = recordService.list(configId, pageNum, pageSize); + Page result = recordService.list(configId, devId, pageNum, pageSize); return Response.success(result); } diff --git a/src/main/java/com/xydl/cac/service/IedDlRecordService.java b/src/main/java/com/xydl/cac/service/IedDlRecordService.java index a2e0901..658a42a 100644 --- a/src/main/java/com/xydl/cac/service/IedDlRecordService.java +++ b/src/main/java/com/xydl/cac/service/IedDlRecordService.java @@ -5,7 +5,7 @@ import org.springframework.data.domain.Page; public interface IedDlRecordService { - Page list(Integer configId, int pageNum, int pageSize) throws Exception; + Page list(Integer configId, Integer devId, int pageNum, int pageSize) throws Exception; void add(IedDlRecord item); diff --git a/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java index c1e8589..6256300 100644 --- a/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java @@ -31,14 +31,19 @@ public class IedDlRecordServiceImpl implements IedDlRecordService { SpectrogramHandler spectrogramHandler; @Override - public Page list(Integer configId, int pageNum, int pageSize) throws Exception { + public Page list(Integer configId, Integer devId, int pageNum, int pageSize) throws Exception { PageRequest request = PageRequest.of(pageNum - 1, pageSize); Specification specification = (root, query, builder) -> { Predicate predicate = builder.conjunction(); if (configId != null) { predicate.getExpressions().add(builder.equal(root.get("configId"), configId)); + query.orderBy(builder.desc(root.get("createTime"))); + } else if (devId != null) { + predicate.getExpressions().add(builder.equal(root.get("devId"), devId)); + query.orderBy(builder.desc(root.get("createTime"))); + } else { + query.orderBy(builder.desc(root.get("id"))); } - query.orderBy(builder.desc(root.get("id"))); return predicate; }; Page result = repository.findAll(specification, request);