From 8e5f2252675c9af9e633f4963b79ab78cc4d41d4 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 25 Feb 2025 10:41:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=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 |  4 +++-
 .../xydl/cac/service/impl/IedDlRecordServiceImpl.java | 11 ++++++++---
 3 files changed, 15 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 ec675c0..c6e3b64 100644
--- a/src/main/java/com/xydl/cac/controller/IedDlController.java
+++ b/src/main/java/com/xydl/cac/controller/IedDlController.java
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -68,11 +69,13 @@ public class IedDlController extends BasicController {
     @ApiOperation("查询下载记录列表")
     public Response<Page<IedDlRecord>> list(@ApiParam("配置Id") @RequestParam(value = "configId", required = false) Integer configId,
                                             @ApiParam("devId") @RequestParam(value = "devId", required = false) Integer devId,
+                                            @ApiParam("开始时间") @RequestParam(value = "startTime", required = false) Date startTime,
+                                            @ApiParam("结束时间") @RequestParam(value = "endTime", required = false) Date endTime,
                                             @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<IedDlRecord> result = recordService.list(configId, devId, pageNum, pageSize);
+        Page<IedDlRecord> result = recordService.list(configId, devId, startTime, endTime, 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 0597284..95c754d 100644
--- a/src/main/java/com/xydl/cac/service/IedDlRecordService.java
+++ b/src/main/java/com/xydl/cac/service/IedDlRecordService.java
@@ -4,9 +4,11 @@ import com.xydl.cac.entity.IedDlRecord;
 import com.xydl.cac.exception.BusinessException;
 import org.springframework.data.domain.Page;
 
+import java.util.Date;
+
 public interface IedDlRecordService {
 
-    Page<IedDlRecord> list(Integer configId, Integer devId, int pageNum, int pageSize) throws Exception;
+    Page<IedDlRecord> list(Integer configId, Integer devId, Date startTime, Date endTime, 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 08e2645..b9fffd6 100644
--- a/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/IedDlRecordServiceImpl.java
@@ -12,17 +12,16 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.persistence.criteria.Predicate;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
 @Service
 @Slf4j
-@Transactional(rollbackFor = Exception.class)
 public class IedDlRecordServiceImpl implements IedDlRecordService {
 
     @Resource
@@ -33,7 +32,7 @@ public class IedDlRecordServiceImpl implements IedDlRecordService {
     SpectrogramHandler spectrogramHandler;
 
     @Override
-    public Page<IedDlRecord> list(Integer configId, Integer devId, int pageNum, int pageSize) throws Exception {
+    public Page<IedDlRecord> list(Integer configId, Integer devId, Date startTime, Date endTime, int pageNum, int pageSize) throws Exception {
         PageRequest request = PageRequest.of(pageNum - 1, pageSize);
         Specification<IedDlRecord> specification = (root, query, builder) -> {
             Predicate predicate = builder.conjunction();
@@ -46,6 +45,12 @@ public class IedDlRecordServiceImpl implements IedDlRecordService {
             } else {
                 query.orderBy(builder.desc(root.get("id")));
             }
+            if (startTime != null) {
+                predicate.getExpressions().add(builder.greaterThan(root.get("createTime"), startTime));
+            }
+            if (endTime != null) {
+                predicate.getExpressions().add(builder.lessThanOrEqualTo(root.get("createTime"), endTime));
+            }
             return predicate;
         };
         Page<IedDlRecord> result = repository.findAll(specification, request);