Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 6c06d528 by huangjy
Options

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

parent 4b83c884
Inline Side-by-side
Showing with 11 additions and 2 deletions
server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java
...@@ -177,7 +177,7 @@ public class IotProductDeviceService extends IotCommonService { ...@@ -177,7 +177,7 @@ public class IotProductDeviceService extends IotCommonService {
Term term1 = Term.builder() Term term1 = Term.builder()
.column("timestamp") .column("timestamp")
.termType("gte") .termType("gte")
.type(Term.Type.or) .type(Term.Type.and)
.value(startTime) .value(startTime)
.terms(Lists.newArrayList()) .terms(Lists.newArrayList())
.options(Lists.newArrayList()) .options(Lists.newArrayList())
...@@ -190,6 +190,15 @@ public class IotProductDeviceService extends IotCommonService { ...@@ -190,6 +190,15 @@ public class IotProductDeviceService extends IotCommonService {
.terms(Lists.newArrayList()) .terms(Lists.newArrayList())
.options(Lists.newArrayList()) .options(Lists.newArrayList())
.build(); .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(term1);
terms.add(term2); terms.add(term2);
iotQueryParam.setTerms(terms); iotQueryParam.setTerms(terms);
...@@ -225,7 +234,7 @@ public class IotProductDeviceService extends IotCommonService { ...@@ -225,7 +234,7 @@ public class IotProductDeviceService extends IotCommonService {
List<Term> terms = Lists.newArrayList(); List<Term> terms = Lists.newArrayList();
Term term = Term.builder() Term term = Term.builder()
.column("type") .column("type")
.termType("btw") .termType("eq")
.type(Term.Type.or) .type(Term.Type.or)
.value(typeValue) .value(typeValue)
.terms(Lists.newArrayList()) .terms(Lists.newArrayList())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment