feat，查询时间范围内上报的日志

server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java

@@ -127,7 +127,7 @@ public class IotProductDeviceService extends IotCommonService {
     public List<DeviceInfoContentBreathe> getDeviceLogByTimeRangeBreathe(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) {
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-        List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "reportProperty", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime));
+        List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "event", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime));
 
         List<DeviceInfoContentBreathe> deviceInfoContentBreatheList = StreamUtil.map(deviceOperationLogEntityList, e -> JsonUtil.toObj((String) e.getContent(), DeviceInfoContentBreathe.class));
 
@@ -137,7 +137,7 @@ public class IotProductDeviceService extends IotCommonService {
     public List<DeviceInfoContentSpace> getDeviceLogByTimeRangeSpace(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) {
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-        List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "reportProperty", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime));
+        List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "event", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime));
 
         List<DeviceInfoContentSpace> deviceInfoContentSpaceList = StreamUtil.map(deviceOperationLogEntityList, e -> JsonUtil.toObj((String) e.getContent(), DeviceInfoContentSpace.class));
 
@@ -198,16 +198,6 @@ public class IotProductDeviceService extends IotCommonService {
         IotQueryParam iotQueryParam = buildQueryParam(pageSize);
         List<Term> terms = Lists.newArrayList();
 
-        Term term = Term.builder()
-                .column("type")
-                .termType("btw")
-                .type(Term.Type.or)
-                .value(typeValue)
-                .terms(Lists.newArrayList())
-                .options(Lists.newArrayList())
-                .build();
-        terms.add(term);
-
         Term term1 = Term.builder()
                 .column("timestamp")
                 .termType("gte")
@@ -228,7 +218,7 @@ public class IotProductDeviceService extends IotCommonService {
                 .column("type")
                 .termType("eq")
                 .type(Term.Type.or)
-                .value("event")
+                .value(typeValue)
                 .terms(Lists.newArrayList())
                 .options(Lists.newArrayList())
                 .build();