From ae686d229625ef5cb7ee467ee5d0c909a9aab654 Mon Sep 17 00:00:00 2001 From: jshixiong <1466642966@qq.com> Date: Fri, 5 Jan 2024 10:55:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/imitate/web/persistence/beans/AlgorithmConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/java/com/imitate/web/persistence/beans/AlgorithmConfig.java b/web/src/main/java/com/imitate/web/persistence/beans/AlgorithmConfig.java index c27e6a0..2986727 100644 --- a/web/src/main/java/com/imitate/web/persistence/beans/AlgorithmConfig.java +++ b/web/src/main/java/com/imitate/web/persistence/beans/AlgorithmConfig.java @@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; public class AlgorithmConfig extends AbstractDO { @Column(name = "algorithm_id") - @NotBlank(message = "对应算法id不能为空") + @NotNull(message = "对应算法id不能为空") private Long algorithmId; @NotNull(message = "设备id不能为空") From 9cdd7a6c6a8f86a9558c6458047f7b68605faad0 Mon Sep 17 00:00:00 2001 From: tanzf <1751524287@qq.com> Date: Fri, 5 Jan 2024 11:08:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simulation/service/DeviceHardService.java | 13 +++++++++---- .../simulation/service/DeviceHardServiceTest.java | 7 +++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceHardService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceHardService.java index f1c7c6d..c586bed 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceHardService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceHardService.java @@ -115,12 +115,17 @@ public class DeviceHardService { if (param.getConnFlag() != null){ criteria.andEqualTo("connFlag", param.getConnFlag()); } + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); Date startDate = param.getStartDate(); + if (startDate != null){ + String start = formatter.format(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + criteria.andGreaterThanOrEqualTo("createTime", start); + } Date endDate = param.getEndDate(); - if (startDate != null && endDate != null) { - LocalDateTime start = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); - LocalDateTime end = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); - criteria.andBetween("createTime", start, end); + if (endDate != null) { + String end = formatter.format(endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + criteria.andLessThanOrEqualTo("createTime", end); } List list = deviceHardMapper.selectByExample(example); diff --git a/web/src/test/java/com/imitate/web/module/simulation/service/DeviceHardServiceTest.java b/web/src/test/java/com/imitate/web/module/simulation/service/DeviceHardServiceTest.java index 7f120f1..abbea15 100644 --- a/web/src/test/java/com/imitate/web/module/simulation/service/DeviceHardServiceTest.java +++ b/web/src/test/java/com/imitate/web/module/simulation/service/DeviceHardServiceTest.java @@ -10,6 +10,11 @@ import org.springframework.boot.test.context.SpringBootTest; import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.Date; + import static org.junit.jupiter.api.Assertions.*; @@ -26,6 +31,8 @@ class DeviceHardServiceTest { deviceHard.setDeviceName("a"); deviceHardParam.setDeviceHard(deviceHard); + deviceHardParam.setEndDate(new Date()); + deviceHardParam.setStartDate(new Date()); PageInfo deviceHardPageInfo = deviceHardService.deviceHardSelect(deviceHardParam); System.out.println(deviceHardPageInfo); }