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

1.完善稳态指标符合性占比树形结构

Browse Source 
2.完成终端评价和异常终端详情联调
This commit is contained in:
wr
2025-05-13 16:14:03 +08:00
parent 9eab6c28e4
commit bac81db2c7
13 changed files with 219 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,8 @@ import java.util.List;
@ApiModel
public class DevRunEvaluateParam {
@ApiModelProperty(name = "orgId", value = "部门id")
private String orgId;
@ApiModelProperty(name = "deptIndex", value = "部门id")
private String deptIndex;
/**
* 0-电网侧

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

@@ -3,6 +3,7 @@ package com.njcn.device.pq.pojo.param;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.device.biz.enums.LineFlagEnum;
import com.njcn.device.pq.enums.PowerFlagEnum;
import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -16,6 +17,7 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.util.List;
import java.util.Objects;
/**
* @author hongawen
@@ -30,11 +32,11 @@ public class DeviceInfoParam implements Serializable {
/**
* 统计类型
*/
@ApiModelProperty(name = "statisticalType", value = "统计类型",required = true)
@ApiModelProperty(name = "statisticalType", value = "统计类型", required = true)
@NotNull(message = "统计类型不可为空")
private SimpleDTO statisticalType;
@ApiModelProperty(name = "deptIndex", value = "部门索引",required = true)
@ApiModelProperty(name = "deptIndex", value = "部门索引", required = true)
@NotBlank(message = "部门索引不可为空")
private String deptIndex;
@@ -102,9 +104,11 @@ public class DeviceInfoParam implements Serializable {
@ApiModelProperty("监测点运行状态")
@Range(min = 0, max = 2, message = "监测点运行状态" + ValidMessage.PARAM_FORMAT_ERROR)
private Integer lineRunFlag;
/**
* 默认全部监测点
* @param deptIndex 部门索引
*
* @param deptIndex 部门索引
* @param serverName 服务名
*/
public DeviceInfoParam(String deptIndex, String serverName) {
@@ -117,7 +121,8 @@ public class DeviceInfoParam implements Serializable {
/**
* 默认全部监测点
* @param deptIndex 部门索引
*
* @param deptIndex 部门索引
* @param serverName 服务名
*/
public DeviceInfoParam(SimpleDTO statisticalType, String deptIndex, String serverName, List<SimpleDTO> scale, List<SimpleDTO> manufacturer, List<SimpleDTO> loadType) {
@@ -147,7 +152,7 @@ public class DeviceInfoParam implements Serializable {
@Data
@EqualsAndHashCode(callSuper = true)
public static class BusinessParam extends DeviceInfoParam{
public static class BusinessParam extends DeviceInfoParam {
@ApiModelProperty("开始时间")
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
@@ -168,7 +173,7 @@ public class DeviceInfoParam implements Serializable {
@Data
@EqualsAndHashCode(callSuper = true)
public static class CompareBusinessParam extends BusinessParam{
public static class CompareBusinessParam extends BusinessParam {
@ApiModelProperty("比较开始时间")
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
@@ -182,7 +187,7 @@ public class DeviceInfoParam implements Serializable {
@Data
@EqualsAndHashCode(callSuper = true)
public static class CompareLimitParam extends BusinessParam{
public static class CompareLimitParam extends BusinessParam {
@ApiModelProperty("查询条数")
@NotNull(message = " 查询条数查询条数不能为空")
@@ -192,7 +197,7 @@ public class DeviceInfoParam implements Serializable {
@Data
@EqualsAndHashCode(callSuper = true)
public static class GridDiagram extends BusinessParam{
public static class GridDiagram extends BusinessParam {
@ApiModelProperty("查询总数监测点")
private List<String> coutList;
@@ -201,7 +206,13 @@ public class DeviceInfoParam implements Serializable {
private List<String> alarmList;
@ApiModelProperty("是否是冀北电网一张图树 0:否 1:是")
private Integer type=0;
private Integer type = 0;
}
public Boolean isUserLedger() {
if (Objects.isNull(this.powerFlag) || !PowerFlagEnum.GRID_SIDE.getCode().equals(this.powerFlag)) {
return true;
}
return false;
}
}

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

@@ -3,15 +3,9 @@ package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.Transient;
/**
* <p>
@@ -33,8 +27,14 @@ public class RStatIntegrityD {
@MppMultiId
private String lineIndex;
/**
* 应收数量
*/
private Integer dueTime;
/**
* 实收数量
*/
private Integer realTime;
@TableField(exist = false)

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

@@ -19,6 +19,7 @@ public class DeviceRunEvaluateVO {
@ApiModelProperty("变电站名称")
private String subName;
@ApiModelProperty("评价")
private BigDecimal evaluate;