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

合并代码

Browse Source
This commit is contained in:
hongawen
2022-12-19 10:33:53 +08:00
parent a16f573eae
commit 5df53ce872
24 changed files with 1014 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java
View File

@@ -32,6 +32,7 @@ public enum PmsDeviceResponseEnum {
GENWIRE_SAME("A00373","母线编号重复"),
POWER_CODE_SAME("A00374","台区名称或编号重复"),
POWER_CLIENT_DIS_EMPTY("A00375","发电用电用户参数不可为空"),
DIS_ADD_REPEAT("A00376","当前配网中存在该监测点"),
POWER_CLIENT_NOT_FIND("A00380","查无此用电用户"),

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

@@ -25,8 +25,8 @@ public class DistributionMonitorParam {
/**
* 监测点ID
*/
@ApiModelProperty(value = "监测点类别(字典)")
@NotBlank(message = "监测点类别不能为空")
@ApiModelProperty(value = "监测点编号")
@NotBlank(message = "监测点编号不能为空")
private String monitorId;
/**

28
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java
View File

@@ -60,6 +60,34 @@ public class DistributionMonitor extends BaseEntity {
*/
private Integer status;
/**
* 关联的监测终端编号(外键)
*/
private String terminalId;
/**
* 监测终端接线方式(字典)
*/
private String terminalWiringMethod;
/**
* pt变比
*/
private Float pt1;
/**
* pt变比
*/
private Float pt2;
/**
* ct变比
*/
private Float ct1;
/**
* ct变比
*/
private Float ct2;
}

18
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java
View File

@@ -187,6 +187,24 @@ public class Monitor extends BaseEntity {
*/
private Integer isSpecialMonitor;
/**
* pt变比
*/
private Float pt1;
/**
* pt变比
*/
private Float pt2;
/**
* ct变比
*/
private Float ct1;
/**
* ct变比
*/
private Float ct2;
}

93
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java
View File

@@ -20,7 +20,7 @@ public class SpecialAnalysisMonitorVO implements Serializable {
* 监测点信息
*/
@ApiModelProperty(name = "specialAnalysisVOList", value = "监测点信息")
List<SpecialAnalysisMonitorVO.SpecialAnalysisVO> specialAnalysisVOList;
Map<String,List<SpecialAnalysisMonitorVO.SpecialAnalysisVO>> specialAnalysisVOList;
/**
* 电压等级分布（监测点）
@@ -53,6 +53,18 @@ public class SpecialAnalysisMonitorVO implements Serializable {
@ApiModelProperty(name = "name", value = "监测点名称")
private String name;
/**
* 监测点名称
*/
@ApiModelProperty(name = "orgName", value = "单位名称")
private String orgName;
/**
* 监测点名称
*/
@ApiModelProperty(name = "orgId", value = "单位Code")
private String orgId;
/**
* 电站ID(外键)
*/
@@ -92,8 +104,8 @@ public class SpecialAnalysisMonitorVO implements Serializable {
/**
* 监测点标签
*/
@ApiModelProperty(name = "monitorTag", value = "监测点标签")
private String monitorTag;
// @ApiModelProperty(name = "monitorTag", value = "监测点标签")
// private String monitorTag;
/**
* 关联的监测终端编号(外键)
@@ -219,4 +231,79 @@ public class SpecialAnalysisMonitorVO implements Serializable {
private String ringCapacity4;
}
/**
* 专项分析电气化铁路展示详情
*/
@Data
public static class SpecialAnalysisRailwayVO {
private static final long serialVersionUID = 1L;
/**
* 监测点ID
*/
@ApiModelProperty(name = "id", value = "监测点ID")
private String id;
/**
* 监测点名称
*/
@ApiModelProperty(name = "name", value = "监测点名称")
private String name;
/**
* 监测点名称
*/
@ApiModelProperty(name = "orgName", value = "单位名称")
private String orgName;
/**
* 监测点名称
*/
@ApiModelProperty(name = "orgId", value = "单位Code")
private String orgId;
/**
* 电站ID(外键)
*/
@ApiModelProperty(name = "powerrId", value = "电站ID(外键)")
private String powerrId;
/**
* 变电站名称
*/
@ApiModelProperty(name = "powerrName", value = "变电站名称")
private String powerrName;
/**
* 经度
*/
@ApiModelProperty(name = "longitude", value = "经度")
private Double longitude;
/**
* 维度
*/
@ApiModelProperty(name = "latitude", value = "维度")
private Double latitude;
/**
* 电压等级(字典)
*/
@ApiModelProperty(name = "voltageLevel", value = "电压等级(字典)")
private String voltageLevel;
/**
* 监测点容量
*/
@ApiModelProperty(name = "capacity", value = "监测点容量")
private Double capacity;
/**
* 关联的监测终端编号(外键)
*/
@ApiModelProperty(name = "RailwayLineName", value = "铁路名称")
private String railwayLineName;
}
}