Merge branch 'master' of https://bdgit.educoder.net/p9ijcxv5q/imitsys

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) {
+        if (endDate != null) {
-            LocalDateTime start = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            String end = formatter.format(endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
-            LocalDateTime end = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            criteria.andLessThanOrEqualTo("createTime", end);
-            criteria.andBetween("createTime", start, end);
         }
 
         List<DeviceHard> list = deviceHardMapper.selectByExample(example);

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不能为空")

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<DeviceHard> deviceHardPageInfo = deviceHardService.deviceHardSelect(deviceHardParam);
         System.out.println(deviceHardPageInfo);
     }