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);