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

事件去掉位置字段

Browse Source
This commit is contained in:
hzj
2024-09-23 15:32:31 +08:00
parent 86ad89d06c
commit 65afb4eddc
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java
View File

@@ -45,6 +45,8 @@ public enum AlgorithmResponseEnum {
FILE_DOWNLOADING("A00516","下载失败,系统正在响应其他下载任务,请稍后重试"), FILE_DOWNLOADING("A00516","下载失败,系统正在响应其他下载任务,请稍后重试"),
FILE_UPLOADING("A00516","上传失败,系统正在响应其他上传任务,请稍后重试"), FILE_UPLOADING("A00516","上传失败,系统正在响应其他上传任务,请稍后重试"),
FILE_BUSY("A00516","正在进行其他文件操作,请稍后重试"), FILE_BUSY("A00516","正在进行其他文件操作,请稍后重试"),
RECORD_FILE_LOST("A00516","record.bin文件缺失，请检查上传文件夹"),
LINE_NUM_MISMATCH("A00516","上传文件的监测点序号和选择的监测点不匹配，请检查"),
; ;

15
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
View File

@@ -94,17 +94,22 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
for (EleEvtParm eleEvtParm : data1) { for (EleEvtParm eleEvtParm : data1) {
EventDataSetDTO eventDataSetDTO = new EventDataSetDTO(); EventDataSetDTO eventDataSetDTO = new EventDataSetDTO();
BeanUtils.copyProperties(eleEvtParm, eventDataSetDTO); BeanUtils.copyProperties(eleEvtParm, eventDataSetDTO);
if (Objects.equals(eventDataSetDTO.getName(),"Evt_Param_Position")) {
continue;
// eventDataSetDTO.setValue(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
}
EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName()); EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName());
if (evtData == null) { if (evtData == null) {
eventDataSetDTO.setValue("3.1415926"); eventDataSetDTO.setValue("3.1415926");
} else { } else {
eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("3.1415926")); eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("3.1415926"));
} }
if (Objects.equals(temp.getEvtParamPosition(),"-") || Objects.isNull(temp.getEvtParamPosition())) { //优化，删除监测点位置
if (!Objects.isNull(temp.getLocation())) { // if (Objects.equals(temp.getEvtParamPosition(),"-") || Objects.isNull(temp.getEvtParamPosition())) {
temp.setEvtParamPosition(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧"); // if (!Objects.isNull(temp.getLocation())) {
} // temp.setEvtParamPosition(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
} // }
// }
eventDataSetDTOS.add(eventDataSetDTO); eventDataSetDTOS.add(eventDataSetDTO);
} }
temp.setDataSet(eventDataSetDTOS); temp.setDataSet(eventDataSetDTOS);

10
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
View File

@@ -288,6 +288,10 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
for (EleEvtParm eleEvtParm : data1) { for (EleEvtParm eleEvtParm : data1) {
EventDataSetDTO eventDataSetDTO = new EventDataSetDTO(); EventDataSetDTO eventDataSetDTO = new EventDataSetDTO();
BeanUtils.copyProperties(eleEvtParm,eventDataSetDTO); BeanUtils.copyProperties(eleEvtParm,eventDataSetDTO);
if (Objects.equals(eventDataSetDTO.getName(),"Evt_Param_Position")) {
continue;
// eventDataSetDTO.setValue(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
}
EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName()); EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName());
if (evtData == null) { if (evtData == null) {
eventDataSetDTO.setValue("-"); eventDataSetDTO.setValue("-");
@@ -295,9 +299,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("-")); eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("-"));
} }
if (Objects.equals(eventDataSetDTO.getName(),"Evt_Param_Position")) { // if (Objects.equals(eventDataSetDTO.getName(),"Evt_Param_Position")) {
eventDataSetDTO.setValue(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧"); // eventDataSetDTO.setValue(Objects.equals(temp.getLocation(),"grid")?"电网侧":"负载侧");
} // }
eventDataSetDTOS.add(eventDataSetDTO); eventDataSetDTOS.add(eventDataSetDTO);
} }
temp.setDataSet(eventDataSetDTOS); temp.setDataSet(eventDataSetDTOS);