From 86829c206c03210763bf5389b345e097bd46efb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Fri, 18 Aug 2023 08:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AE=97=E6=B3=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EventRelevantAnalysisServiceImpl.java |  9 +++++++--
 .../java/com/njcn/advance/utils/JnaCallDllOrSo.java    |  2 +-
 .../java/com/njcn/advance/utils/UtilNormalization.java | 10 +---------
 3 files changed, 9 insertions(+), 12 deletions(-)

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<RmpEventAdvanc
         LocalDateTime date = LocalDateTime.now();
         HandleEvent handleEvent = new HandleEvent();
         // 分析的事件进行处理
-        List<EntityGroupEvtData> baseList = handleEvent.getData(generalDeviceInfoClient, startTime, endTime);
+        List<EntityGroupEvtData> baseList = handleEvent.getData(startTime, endTime);
+        if(CollectionUtil.isEmpty(baseList)){
+            throw new BusinessException("当前时间段暂无可分析事件");
+        }
 
         // 传入的处理事件根据物理隔绝进行分组
 
@@ -219,6 +222,8 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
             entityPqsRelevance.setTimeId(date);
             relevantLogMapper.insert(entityPqsRelevance);
 
+        }else {
+            throw new BusinessException("当前无变压器策略,请先配置策略");
         }
 
         log.info("事件关联分析用时：" + timeInterval.interval() / 1000 + "秒");
@@ -492,7 +497,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
             return group_buf;
         }
 
-        public List<EntityGroupEvtData> getData(GeneralDeviceInfoClient generalDeviceInfoClient, LocalDateTime startTime, LocalDateTime endTime) {
+        public List<EntityGroupEvtData> getData(LocalDateTime startTime, LocalDateTime endTime) {
             List<EntityGroupEvtData> entityGroupEvtDataList = new ArrayList<>();
 
             List<DictData> 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++) {