diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java index a1b2e1c40..f283e7229 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java @@ -99,7 +99,10 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl baseList = handleEvent.getData(generalDeviceInfoClient, startTime, endTime); + List baseList = handleEvent.getData(startTime, endTime); + if(CollectionUtil.isEmpty(baseList)){ + throw new BusinessException("当前时间段暂无可分析事件"); + } // 传入的处理事件根据物理隔绝进行分组 @@ -219,6 +222,8 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl getData(GeneralDeviceInfoClient generalDeviceInfoClient, LocalDateTime startTime, LocalDateTime endTime) { + public List getData(LocalDateTime startTime, LocalDateTime endTime) { List entityGroupEvtDataList = new ArrayList<>(); List advanceType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_TYPE.getCode()).getData(); diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallDllOrSo.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallDllOrSo.java index bfef6c22d..d0b05a7a6 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallDllOrSo.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallDllOrSo.java @@ -26,7 +26,7 @@ public class JnaCallDllOrSo { int beginIndex = os != null && os.startsWith("Windows") ? 1 : 0; if(beginIndex == 0){ //linux操作系统 - this.nameDll = name+".os"; + this.nameDll = "lib"+name+".os"; this.path = URLDecoder.decode(this.getClass().getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8"); }else { this.nameDll = name+".dll"; diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/UtilNormalization.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/UtilNormalization.java index 4d68dae8b..5c03f278d 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/UtilNormalization.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/UtilNormalization.java @@ -18,15 +18,7 @@ public class UtilNormalization { } entityMtrans.getMtrans()[i][i] = 0; } - // 根据transformer设置元素 - for (i = 0; i < len; i++) { - node1 = transformer[i].getNode_h(); - node2 = transformer[i].getNode_l(); - con = transformer[i].getType(); - //TODO - //entityMtrans.getMtrans()[node1 - 1][node2 - 1] = con; - //entityMtrans.getMtrans()[node2 - 1][node1 - 1] = con; - } + StringBuilder str = new StringBuilder(); for (i = 0; i < FinalData.NODE_NUM; i++) { for (j = 0; j < FinalData.NODE_NUM; j++) {