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

Revert "1.冀北：暂态暂降统计列表"

Browse Source 
This reverts commit 85fb7c843e.
This commit is contained in:
wr
2023-05-15 16:08:27 +08:00
parent 85fb7c843e
commit b035dbef82
22 changed files with 63 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CommunicateParam.java
View File

@@ -1,21 +0,0 @@
package com.njcn.device.pq.pojo.param;
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author wr
* @description
* @date 2023/5/15 9:53
*/
@Data
public class CommunicateParam extends StatisticsBizBaseParam {
/**
* 查询条数
*/
@ApiModelProperty("查询条数")
private Integer limit;
}

9
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
View File

@@ -168,14 +168,5 @@ public class DeviceInfoParam implements Serializable {
}
@Data
@EqualsAndHashCode(callSuper = true)
public static class CompareLimitParam extends BusinessParam{
@ApiModelProperty("查询条数")
@NotNull(message = "查询条数查询条数不能为空")
private Integer limit;
}
}

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

@@ -20,6 +20,9 @@ public class Communicate {
private static final long serialVersionUID = 1L;
/**
* 终端Id
*/
/**
* 更新时间
*/
@@ -28,11 +31,7 @@ public class Communicate {
@Column(name = "line_id")
private String id;
/**
* 终端Id
*/
@Column(name = "dev_id")
private String devId;
/**
* 事件类型(0：中断；1：正常；2：退出)

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

@@ -1,13 +1,8 @@
package com.njcn.device.pq.pojo.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.njcn.common.utils.serializer.InstantDateSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.influxdb.annotation.Column;
import java.io.Serializable;
import java.time.Instant;
import java.util.List;
/**
@@ -28,30 +23,4 @@ public class CommunicateVO implements Serializable {
* 事件类型(0：中断；1：正常；2：退出)
*/
private List<Integer> type;
/**
* 冀北分布式光伏概览通讯状态统计（专用）
*/
@Data
public static class PVCommunicateVO{
@ApiModelProperty("监测id")
private String id;
@ApiModelProperty("终端id")
private String devId;
@ApiModelProperty("类型")
private Integer type;
@JsonSerialize(using = InstantDateSerializer.class)
@ApiModelProperty("发生时间")
private Instant time;
@ApiModelProperty("描述")
private String remark;
@ApiModelProperty("终端ip(终端名称_ip)")
private String devIp;
}
}