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

实体类调整

Browse Source
This commit is contained in:
雨木c
2023-06-12 14:39:59 +08:00
parent d760da9820
commit 1036db9a03
8 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationM.java
View File

@@ -35,7 +35,7 @@ public class RStatSubstationM implements Serializable {
private String substationId;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationQ.java
View File

@@ -35,7 +35,7 @@ public class RStatSubstationQ implements Serializable {
private String substationId;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationY.java
View File

@@ -35,7 +35,7 @@ public class RStatSubstationY implements Serializable {
private String substationId;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java
View File

@@ -35,7 +35,7 @@ public class RStatSubstationM implements Serializable {
private String substationId;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java
View File

@@ -35,7 +35,7 @@ public class RStatSubstationQ implements Serializable {
private String substationId;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java
View File

@@ -35,7 +35,7 @@ public class RStatSubstationY implements Serializable {
private String substationId;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;

43
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
View File

@@ -46,13 +46,43 @@ public enum DicDataEnum {
/**
* 监测点类型
* 监测点类别
*/
ONE_LINE("I类监测点", "One_Line"),
TWO_LINE("II类监测点", "Two_Line"),
THREE_LINE("III类监测点", "Three_Line"),
/**
* 监测点类型
*/
Power_Supply_Point("供电点","Power_Supply_Point"),
Pub_Connect_Point("公共连接点PCC","Pub_Connect_Point"),
Parallel_Point("并网点","Parallel_Point"),
Other("其他","Other"),
/**
* 电压互感器类型
*/
Cap_V("电容式电压互感器","Cap_V"),
Pele_V("光电式电压互感器","Pele_V"),
A_V("A类测试电压互感器","A_V"),
Elec_V("电子式电压互感器","Elec_V"),
Other_S("其他","Other"),
Ele_V("电磁式电压互感器","Ele_V"),
/**
* 中性点接地方式
*/
Ground_Res("经非线性电阻接地-消谐器","Ground_Res"),
Ground_Trans("经互感器接地-4PT","Ground_Trans"),
Ground_Dir("直接接地-3PT","Ground_Dir"),
A_Center("A类测试中性点接地方式","A_Center"),
Ground_Other("其他","Other"),
/**
* 终端类型
@@ -377,6 +407,17 @@ public enum DicDataEnum {
ALARM("告警", "Alarm"),
FAULT("故障", "Fault"),
/**
* 装置级别
*/
MOST_IMPORMENT("极重要","Vital"),
/**
* 测量信号输入形式
*/
NUMBER_SIGNAL("数字信号","Digital_Signal"),
SIMULATION_SIGNAL("模拟信号","Analog_Signal")
;
private final String name;

8
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
View File

@@ -75,6 +75,14 @@ public enum DicDataTypeEnum {
CS_DATA_TYPE("治理数据模型", "Cs_Data_Type"),
//pms
DEV_CATEGORY("装置类别","Device_Category"),
DEV_GRADE("装置级别","Dev_Level"),
INPUT_SIGNAL("测量信号输入形式","Signal_form"),
VOLTAGE_TRANSFORMER("电压互感器类型","Voltage_Transformer"),
Neutral_Point("中性点接地方式","Neutral_Point")
;