Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

事件、波形文件解析功能调整

Browse Source
This commit is contained in:
xuyang
2023-09-26 20:31:56 +08:00
parent 4808106429
commit b76aed1a56
16 changed files with 474 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/data/AlmDto.java
View File

@@ -37,4 +37,8 @@ public class AlmDto implements Serializable {
@ApiModelProperty("相别")
private String phase;
@SerializedName("Code")
@ApiModelProperty("告警编码")
private String code;
}

120
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
View File

@@ -208,12 +208,14 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
eleEpdPqdParam.setPhase(apf.getPhase());
}
eleEpdPqdParam.setClassId(classId);
if (Objects.equals(apf.getHarmStart(),0.5) && Objects.equals(apf.getHarmEnd(),49.5)){
eleEpdPqdParam.setHarmStart((int)(apf.getHarmStart()+0.5));
eleEpdPqdParam.setHarmEnd((int)(apf.getHarmEnd()+49.5));
} else {
eleEpdPqdParam.setHarmStart((int)(apf.getHarmStart()*1.0));
eleEpdPqdParam.setHarmEnd((int)(apf.getHarmEnd()*1.0));
if (!Objects.isNull(apf.getHarmStart())){
if (Objects.equals(apf.getHarmStart(),0.5) && Objects.equals(apf.getHarmEnd(),49.5)){
eleEpdPqdParam.setHarmStart((int)(apf.getHarmStart()+0.5));
eleEpdPqdParam.setHarmEnd((int)(apf.getHarmEnd()+49.5));
} else {
eleEpdPqdParam.setHarmStart((int)(apf.getHarmStart()*1.0));
eleEpdPqdParam.setHarmEnd((int)(apf.getHarmEnd()*1.0));
}
}
result.add(eleEpdPqdParam);
}
@@ -265,6 +267,12 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
eleEvtParam.setPid(dictId);
eleEvtParam.setData(param.getData());
eleEvtParam.setName(param.getName());
String showName = dataSetName(param.getName());
if (Objects.isNull(showName)){
eleEvtParam.setShowName(param.getName());
} else {
eleEvtParam.setShowName(showName);
}
eleEvtParam.setType(param.getType());
eleEvtParam.setUnit(param.getUnit());
eleEvtFeignClient.add(eleEvtParam);
@@ -287,6 +295,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
eleEpdPqdParam.setShowName(alm.getName());
eleEpdPqdParam.setSort(alm.getIdx());
eleEpdPqdParam.setDataType(id);
//告警code，到时候推送给用户告警码+事件时间
eleEpdPqdParam.setDefaultValue(alm.getCode());
if (Objects.isNull(alm.getPhase())){
eleEpdPqdParam.setPhase("M");
} else {
@@ -437,12 +447,14 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
eleEpdPqdParam.setPhase(epd.getPhase());
}
eleEpdPqdParam.setUnit(epd.getUnit());
if (Objects.equals(epd.getHarmStart(),0.5) && Objects.equals(epd.getHarmEnd(),49.5)){
eleEpdPqdParam.setHarmStart((int)(epd.getHarmStart()+0.5));
eleEpdPqdParam.setHarmEnd((int)(epd.getHarmEnd()+49.5));
} else {
eleEpdPqdParam.setHarmStart((int)(epd.getHarmStart()*1.0));
eleEpdPqdParam.setHarmEnd((int)(epd.getHarmEnd()*1.0));
if (!Objects.isNull(epd.getHarmStart())){
if (Objects.equals(epd.getHarmStart(),0.5) && Objects.equals(epd.getHarmEnd(),49.5)){
eleEpdPqdParam.setHarmStart((int)(epd.getHarmStart()+0.5));
eleEpdPqdParam.setHarmEnd((int)(epd.getHarmEnd()+49.5));
} else {
eleEpdPqdParam.setHarmStart((int)(epd.getHarmStart()*1.0));
eleEpdPqdParam.setHarmEnd((int)(epd.getHarmEnd()*1.0));
}
}
eleEpdPqdParam.setStatMethod(epd.getStatMethod());
eleEpdPqdParam.setDataType(id);
@@ -471,12 +483,14 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
eleEpdPqdParam.setPhase(pqd.getPhase());
}
eleEpdPqdParam.setUnit(pqd.getUnit());
if (Objects.equals(pqd.getHarmStart(),0.5) && Objects.equals(pqd.getHarmEnd(),49.5)){
eleEpdPqdParam.setHarmStart((int)(pqd.getHarmStart()+0.5));
eleEpdPqdParam.setHarmEnd((int)(pqd.getHarmEnd()+49.5));
} else {
eleEpdPqdParam.setHarmStart((int)(pqd.getHarmStart()*1.0));
eleEpdPqdParam.setHarmEnd((int)(pqd.getHarmEnd()*1.0));
if (!Objects.isNull(pqd.getHarmStart())){
if (Objects.equals(pqd.getHarmStart(),0.5) && Objects.equals(pqd.getHarmEnd(),49.5)){
eleEpdPqdParam.setHarmStart((int)(pqd.getHarmStart()+0.5));
eleEpdPqdParam.setHarmEnd((int)(pqd.getHarmEnd()+49.5));
} else {
eleEpdPqdParam.setHarmStart((int)(pqd.getHarmStart()*1.0));
eleEpdPqdParam.setHarmEnd((int)(pqd.getHarmEnd()*1.0));
}
}
eleEpdPqdParam.setDataType(id);
eleEpdPqdParam.setClassId(classId);
@@ -633,7 +647,12 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
CsWaveParam csWaveParam = new CsWaveParam();
csWaveParam.setPid(dictId);
csWaveParam.setName(param.getName());
csWaveParam.setShowName(param.getName());
String showName = dataSetName(param.getName());
if (Objects.isNull(showName)){
csWaveParam.setShowName(param.getName());
} else {
csWaveParam.setShowName(showName);
}
csWaveParam.setType(param.getType());
csWaveParam.setData(param.getData().toString());
waveFeignClient.add(csWaveParam);
@@ -1008,6 +1027,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
public String dataSetName(String name){
String showName = null;
switch (name) {
//数据集
case "Ds$Apf$Master$01":
showName = "主模块数据";
break;
@@ -1023,12 +1043,74 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
case "Ds$Apf$module$04":
showName = "模块4数据";
break;
case "Ds$Apf$module$05":
showName = "模块5数据";
break;
case "Ds$Apf$module$06":
showName = "模块6数据";
break;
case "Ds$Apf$module$07":
showName = "模块7数据";
break;
case "Ds$Apf$module$08":
showName = "模块8数据";
break;
case "Ds$Pqd$Stat$01":
showName = "电网侧数据";
break;
case "Ds$Pqd$Stat$02":
showName = "负载侧数据";
break;
//波形参数名称
case "Wave_Param_Position":
showName = "录波记录位置";
break;
case "Wave_Param_RcdName":
showName = "录波记录名称";
break;
case "Wave_Param_RcdIdx":
showName = "录波记录序号";
break;
case "Wave_Param_RcdKeepTime":
showName = "录波文件持续时间";
break;
//暂态事件参数名称
case "Evt_Param_Position":
showName = "事件发生位置";
break;
case "Evt_Param_VVa":
showName = "特征幅值";
break;
case "Evt_Param_VVaDepth":
showName = "暂降深度";
break;
case "Evt_Param_Tm":
showName = "持续时间";
break;
case "Evt_Param_Phase":
showName = "相别";
break;
case "Evt_Param_Rms":
showName = "有效值";
break;
case "Evt_Param_UDev":
showName = "电压偏差";
break;
case "Evt_Param_Freq":
showName = "频率";
break;
case "Evt_Param_Thd":
showName = "畸变率";
break;
case "Evt_Param_Con":
showName = "含有率";
break;
case "Evt_Param_ImbNg":
showName = "不平衡度";
break;
case "Evt_Param_Flk":
showName = "闪变";
break;
default:
break;
}