18 changed files with 199 additions and 117 deletions
@ -1,33 +0,0 @@ |
|||
/** |
|||
* Copyright © 2016-2018 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0
|
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
package org.thingsboard.server.common.data.kv; |
|||
|
|||
import lombok.Data; |
|||
|
|||
@Data |
|||
public class BaseQuery implements Query { |
|||
|
|||
private final String key; |
|||
private final long startTs; |
|||
private final long endTs; |
|||
|
|||
public BaseQuery(String key, long startTs, long endTs) { |
|||
this.key = key; |
|||
this.startTs = startTs; |
|||
this.endTs = endTs; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
/** |
|||
* Copyright © 2016-2018 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0
|
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
package org.thingsboard.server.common.data.kv; |
|||
|
|||
import lombok.Data; |
|||
|
|||
@Data |
|||
public class BaseReadTsKvQuery extends BaseTsKvQuery implements ReadTsKvQuery { |
|||
|
|||
private final long interval; |
|||
private final int limit; |
|||
private final Aggregation aggregation; |
|||
private final String orderBy; |
|||
|
|||
public BaseReadTsKvQuery(String key, long startTs, long endTs, long interval, int limit, Aggregation aggregation) { |
|||
this(key, startTs, endTs, interval, limit, aggregation, "DESC"); |
|||
} |
|||
|
|||
public BaseReadTsKvQuery(String key, long startTs, long endTs, long interval, int limit, Aggregation aggregation, |
|||
String orderBy) { |
|||
super(key, startTs, endTs); |
|||
this.interval = interval; |
|||
this.limit = limit; |
|||
this.aggregation = aggregation; |
|||
this.orderBy = orderBy; |
|||
} |
|||
|
|||
public BaseReadTsKvQuery(String key, long startTs, long endTs) { |
|||
this(key, startTs, endTs, endTs - startTs, 1, Aggregation.AVG, "DESC"); |
|||
} |
|||
|
|||
} |
|||
Loading…
Reference in new issue