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

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

@@ -177,7 +177,7 @@ public class IotProductDeviceService extends IotCommonService {
         Term term1 = Term.builder()
                 .column("timestamp")
                 .termType("gte")
-                .type(Term.Type.or)
+                .type(Term.Type.and)
                 .value(startTime)
                 .terms(Lists.newArrayList())
                 .options(Lists.newArrayList())
@@ -190,6 +190,15 @@ public class IotProductDeviceService extends IotCommonService {
                 .terms(Lists.newArrayList())
                 .options(Lists.newArrayList())
                 .build();
+        Term term3 = Term.builder()
+                .column("type")
+                .termType("eq")
+                .type(Term.Type.or)
+                .value("event")
+                .terms(Lists.newArrayList())
+                .options(Lists.newArrayList())
+                .build();
+        terms.add(term3);
         terms.add(term1);
         terms.add(term2);
         iotQueryParam.setTerms(terms);
@@ -225,7 +234,7 @@ public class IotProductDeviceService extends IotCommonService {
             List<Term> terms = Lists.newArrayList();
             Term term = Term.builder()
                     .column("type")
-                    .termType("btw")
+                    .termType("eq")
                     .type(Term.Type.or)
                     .value(typeValue)
                     .terms(Lists.newArrayList())