李进 2 жил өмнө
parent
commit
47f15b187e

+ 4 - 13
device-api/src/main/java/com/xy/dto/DeviceLogDto.java

@@ -8,7 +8,6 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -28,21 +27,13 @@ public class DeviceLogDto {
         @ApiModelProperty(value = "分页对象", required = true)
         private PageBean page;
 
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty(value = "日志截取开始时间-起")
-        private LocalDate beginLogBeginTime;
+        private LocalDateTime beginLogBeginTime;
 
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty(value = "日志截取开始时间-始")
-        private LocalDate endLogBeginTime;
-
-        public LocalDateTime getBeginLogBeginTime() {
-            return beginLogBeginTime == null ? null : beginLogBeginTime.atTime(0, 0, 0);
-        }
-
-        public LocalDateTime getEndLogBeginTime() {
-            return endLogBeginTime == null ? null : endLogBeginTime.atTime(23, 59, 59);
-        }
+        private LocalDateTime endLogBeginTime;
 
     }