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

1.运行管理追加分页；

Browse Source 
2.新增终端在线率统计接口；
3.移植运行状态接口
This commit is contained in:
njcn_dhj
2022-08-12 13:55:05 +08:00
parent 49140e026b
commit a178d230e9
33 changed files with 638 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/HarmInHarmParam.java
View File

@@ -1,5 +1,6 @@
package com.njcn.harmonic.pojo.param;
import com.njcn.device.pojo.param.PulicTimeParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,7 +11,7 @@ import lombok.Data;
* @date 2022/3/17
*/
@Data
public class HarmInHarmParam extends PulicTimeParam{
public class HarmInHarmParam extends PulicTimeParam {
@ApiModelProperty("0--谐波电压含有率;1--谐波电流幅值")
private Integer harmState;

33
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/PulicTimeParam.java
View File

@@ -1,33 +0,0 @@
package com.njcn.harmonic.pojo.param;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.harmonic.constant.HarmonicValidMessage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
/**
* @author denghuajun
* @date 2022/2/28
*
*/
@Data
public class PulicTimeParam {
@ApiModelProperty("监测点id")
private String id;
@ApiModelProperty("开始时间")
@NotBlank(message = HarmonicValidMessage.DATA_NOT_BLANK)
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
private String searchBeginTime;
@ApiModelProperty("结束时间")
@NotBlank(message = HarmonicValidMessage.DATA_NOT_BLANK)
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
private String searchEndTime;
}

23
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/PulicTimeStatisParam.java
View File

@@ -1,23 +0,0 @@
package com.njcn.harmonic.pojo.param;
import com.njcn.common.pojo.constant.PatternRegex;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Pattern;
/**
* @author denghuajun
* @date 2022/3/1
*
*/
@Data
public class PulicTimeStatisParam extends PulicTimeParam {
@ApiModelProperty("比较开始时间")
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
private String periodBeginTime;
@ApiModelProperty("比较结束时间")
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
private String periodEndTime;
}

21
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CommunicateStatisticsVO.java
View File

@@ -1,21 +0,0 @@
package com.njcn.harmonic.pojo.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author denghuajun
* @date 2022/2/28
*
*/
@Data
public class CommunicateStatisticsVO implements Serializable {
private static final long serialVersionUID = 1L;
private List<Float> onlineRateData;
private List<Float> integrityData;
}