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-08-09 13:57:13 +08:00
parent e388a06937
commit a5d1048bb8
43 changed files with 151 additions and 2196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Communicate.java
View File

@@ -1,52 +0,0 @@
package com.njcn.device.pq.pojo.po;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
import java.time.Instant;
/**
* <p>
*
* </p>
*
* @author cdf
* @since 2022-01-07
*/
@Data
@Measurement(name = "pqs_communicate")
public class Communicate {
private static final long serialVersionUID = 1L;
/**
* 更新时间
*/
@Column(name = "time")
private Instant updateTime;
/**
* 监测点id
*/
@Column(name = "line_id")
private String id;
/**
* 终端Id
*/
@Column(name = "dev_id")
private String devId;
/**
* 事件类型(0：中断；1：正常；2：退出)
*/
@Column(name = "type")
private Integer type;
/**
* 备注
*/
@Column(name = "description")
private String remark;
}

28
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/influxdb/DeviceDayFlow.java
View File

@@ -1,28 +0,0 @@
package com.njcn.device.pq.pojo.po.influxdb;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
import java.time.Instant;
import java.time.LocalDateTime;
@Data
@Measurement(name = "cld_statis_flow")
public class DeviceDayFlow {
@Column(name="time")
private Instant time;
@Column(name="actual_value")
private Integer actualValue;
@Column(name="dev_id")
private String devId;
private float dailyActualValue;
private String date;
private String month;
}

5
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java
View File

@@ -1,14 +1,13 @@
package com.njcn.device.pq.pojo.vo;
import com.njcn.device.pq.pojo.po.DevFuction;
import com.njcn.device.pq.pojo.po.influxdb.DeviceDayFlow;
import com.njcn.influx.pojo.dto.DeviceDayFlowDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
import java.util.List;
@Data
@@ -32,7 +31,7 @@ public class TerminalDaliyFlowVO {
@ApiModelProperty(name = "flowMeal",value = "套餐流量(基础+拓展)")
private Float flowMeal;
@ApiModelProperty(name = "deviceDayFlowsList",value = "装置日流量统计集合")
private List<DeviceDayFlow> deviceDayFlowsList;
private List<DeviceDayFlowDTO> deviceDayFlowsList;
@ApiModelProperty(name = "functions",value = "装置功能码集合")
private List<DevFuction> functions;