Browse Source

优化线程池

李进 2 năm trước cách đây
mục cha
commit
7f6543f3ed

+ 4 - 1
device-api-service/src/main/java/com/xy/service/DeviceLogServiceImpl.java

@@ -41,7 +41,10 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogMapper, DeviceLog
     @ApiOperation("分页查询")
     public R<PageBean<DeviceLogDto.Vo>> page(@RequestBody DeviceLogDto.Page page) {
         PageBean pageBean = page.getPage();
-        LambdaQueryWrapper<DeviceLog> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceLog.class).build();
+        LambdaQueryWrapper<DeviceLog> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceLog.class)
+                .ge(DeviceLog::getLogBeginTime, page.getBeginLogBeginTime())
+                .le(DeviceLog::getLogBeginTime, page.getEndLogBeginTime())
+                .build();
         IPage<DeviceLog> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
         return R.ok(toPageBean(DeviceLogDto.Vo.class, iPage));
     }

+ 17 - 0
device-api/src/main/java/com/xy/dto/DeviceLogDto.java

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -27,6 +28,22 @@ public class DeviceLogDto {
         @ApiModelProperty(value = "分页对象", required = true)
         private PageBean page;
 
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "日志截取开始时间-起")
+        private LocalDate beginLogBeginTime;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @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);
+        }
+
     }
 
     @Data