Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

调整influx

Browse Source
This commit is contained in:
hongawen
2023-09-25 15:52:42 +08:00
parent a76c98cde6
commit f48ef25666
41 changed files with 105 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pqs-event/event-boot/src/test/java/com/njcn/event/EventBootApplicationTest.java
View File

@@ -1,6 +1,5 @@
package com.njcn.event;
import com.njcn.event.enums.EventResponseEnum;
import com.njcn.event.file.component.WaveFileComponent;
import com.njcn.event.file.pojo.dto.EigenvalueDTO;
import com.njcn.event.file.pojo.dto.WaveDataDTO;
@@ -9,8 +8,9 @@ import com.njcn.event.pojo.PqsEventDetail;
import com.njcn.event.pojo.PqsOnlinerateAggregate;
import com.njcn.event.pojo.PqsEventDetailCount;
import com.njcn.huawei.obs.util.OBSUtil;
import com.njcn.influxdb.config.InfluxDbConfig;
import com.njcn.influxdb.utils.InfluxDbUtils;
import com.njcn.influx.config.InfluxDbConfig;
import com.njcn.influx.deprecated.InfluxDBPublicParam;
import com.njcn.influx.utils.InfluxDbUtils;
import com.njcn.oss.constant.OssPath;
import org.influxdb.dto.QueryResult;
import org.influxdb.impl.InfluxDBResultMapper;
@@ -34,7 +34,6 @@ import java.util.List;
import java.util.Objects;
import static com.njcn.influxdb.param.InfluxDBPublicParam.PQS_EVENT_DETAIL;
import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.*;
import static org.influxdb.querybuilder.FunctionFactory.sum;
@@ -63,7 +62,7 @@ public class EventBootApplicationTest {
// or 条件数据
List<Clause> clauses = getClauses();
SelectQueryImpl selectQuery = select().column("line_id").column("eventass_index").from(influxDbConfig.getDatabase(), PQS_EVENT_DETAIL);
SelectQueryImpl selectQuery = select().column("line_id").column("eventass_index").from(influxDbConfig.getDatabase(), InfluxDBPublicParam.PQS_EVENT_DETAIL);
WhereQueryImpl<SelectQueryImpl> where = selectQuery.where();
// WHERE (line_id = '1' OR line_id = '2' OR line_id = '3') 加上前后()
@@ -84,7 +83,7 @@ public class EventBootApplicationTest {
// or 条件数据
List<Clause> clauses = getClauses();
SelectQueryImpl selectQuery = select().count("eventass_index").from(influxDbConfig.getDatabase(), PQS_EVENT_DETAIL);
SelectQueryImpl selectQuery = select().count("eventass_index").from(influxDbConfig.getDatabase(), InfluxDBPublicParam.PQS_EVENT_DETAIL);
WhereQueryImpl<SelectQueryImpl> where = selectQuery.where();
// WHERE (line_id = '1' OR line_id = '2' OR line_id = '3') 加上前后()

4
pqs-event/event-boot/src/test/java/com/njcn/event/pojo/PqsEventDetail.java
View File

@@ -1,15 +1,15 @@
package com.njcn.event.pojo;
import com.njcn.influx.deprecated.InfluxDBPublicParam;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
import java.time.Instant;
import static com.njcn.influxdb.param.InfluxDBPublicParam.PQS_EVENT_DETAIL;
@Data
@Measurement(name = PQS_EVENT_DETAIL)
@Measurement(name = InfluxDBPublicParam.PQS_EVENT_DETAIL)
public class PqsEventDetail {
@Column(name = "line_id")

4
pqs-event/event-boot/src/test/java/com/njcn/event/pojo/PqsEventDetailCount.java
View File

@@ -1,15 +1,15 @@
package com.njcn.event.pojo;
import com.njcn.influx.deprecated.InfluxDBPublicParam;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
import java.time.Instant;
import static com.njcn.influxdb.param.InfluxDBPublicParam.PQS_EVENT_DETAIL;
@Data
@Measurement(name = PQS_EVENT_DETAIL)
@Measurement(name = InfluxDBPublicParam.PQS_EVENT_DETAIL)
public class PqsEventDetailCount {
@Column(name = "time")