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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hongawen
2022-11-08 09:48:28 +08:00
parent 3abd49707f 26437349ca
commit edb5ba2b09
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,25 +25,24 @@ public enum DicDataEnum {
JXBDY_ENUM("间谐波电压", "JXBDY"),
/**
* 监测点类型
*/
ONE_LINE("I类监测点","One_Line"),
TWO_LINE("II类监测点","Two_Line"),
THREE_LINE("III类监测点","Three_Line"),
ONE_LINE("I类监测点", "One_Line"),
TWO_LINE("II类监测点", "Two_Line"),
THREE_LINE("III类监测点", "Three_Line"),
/**
* 终端类型
*/
DEV_QUALITY("电能质量监测终端","Dev_Quality"),
DEV_SMART("智能电表","Dev_Smart"),
DEV_MIX("智能融合终端","Dev_Mix"),
DEV_QUALITY("电能质量监测终端", "Dev_Quality"),
DEV_SMART("智能电表", "Dev_Smart"),
DEV_MIX("智能融合终端", "Dev_Mix"),
/***
* 告警类型
*/
COMM_ERR("通讯异常","Comm_Err"),
COMM_ERR("通讯异常", "Comm_Err"),
TOTAL_INDICATORS("总暂态指标", "Total_Indicators"),
@@ -51,15 +50,21 @@ public enum DicDataEnum {
VOLTAGE_RISE("电压暂升", "Voltage_Rise"),
SHORT_INTERRUPTIONS("短时中断", "Short_Interruptions"),
MAINNET_POINT("主网测点","Mainnet_Point"),
DISTRIBUTION_POINT("配网测点","Distribution_Point");
MAINNET_POINT("主网测点", "Mainnet_Point"),
DISTRIBUTION_POINT("配网测点", "Distribution_Point"),
RATE_0_25("0-25","Rate_0_25"),
RATE_25_50("25-50","Rate_25_50"),
RATE_50_75("50-75","Rate_50_75"),
RATE_75_100("75-100","Rate_75_100"),
RATE_100("100","Rate_100");
private final String name;
private final String code;
DicDataEnum(String name, String code){
this.name=name;
DicDataEnum(String name, String code) {
this.name = name;
this.code = code;
}

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

@@ -43,7 +43,8 @@ public enum DicDataTypeEnum {
POLLUTION_STATIS("污区图统计类型","Pollution_Statis"),
BENCHMARK_INDICATORS("基准水平评价指标","Benchmark_Indicator"),
LINE_SORT("监测点类别","Line_Sort"),
DATA_TYPE("数据类型","Data_Type")
DATA_TYPE("数据类型","Data_Type"),
PERMEABILITY_TYPE("分布式光伏台区渗透率水平","Permeability_Type")
;