From 9cd15ff6bfab4cded03e54e181a5a555511cb089 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 1 Aug 2025 14:47:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E9=99=8D=E7=B1=BB=E5=9E=8B=E6=9A=82?= =?UTF-8?q?=E4=B8=8D=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EventCauseController.java | 2 +- .../service/impl/EventAdvanceServiceImpl.java | 72 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) rename pqs-advance/advance-boot/src/main/java/com/njcn/advance/{event => }/controller/EventCauseController.java (97%) diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/event/controller/EventCauseController.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventCauseController.java similarity index 97% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/event/controller/EventCauseController.java rename to pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventCauseController.java index f14c8a623..8d954750d 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/event/controller/EventCauseController.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventCauseController.java @@ -1,4 +1,4 @@ -package com.njcn.advance.event.controller; +package com.njcn.advance.controller; import com.njcn.advance.pojo.dto.EventAnalysisDTO; import com.njcn.advance.event.service.IEventAdvanceService; diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/event/service/impl/EventAdvanceServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/event/service/impl/EventAdvanceServiceImpl.java index d82186600..d2f1d3909 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/event/service/impl/EventAdvanceServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/event/service/impl/EventAdvanceServiceImpl.java @@ -88,9 +88,7 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService { } } - List> listWaveData = waveDataDTO.getListWaveData(); - // 暂降原因JNA的方式 com.njcn.advance.event.cause.jna.QvvrCauseDLL.QvvrDataStruct causeDataStruct = new com.njcn.advance.event.cause.jna.QvvrCauseDLL.QvvrDataStruct(); causeDataStruct.smp_rate = waveDataDTO.getComtradeCfgDTO().getFinalSampleRate(); @@ -112,43 +110,45 @@ public class EventAdvanceServiceImpl implements IEventAdvanceService { eventAnalysis.setCause(DataFeature.CAUSE_TYPE0); eventAnalysis.setCauseFlag(0); } + System.out.println("暂降原因分析完毕==============="); + System.out.println("cause:" + eventAnalysis); // 暂降类型 // 创建数据结构 - com.njcn.advance.event.type.jna.QvvrDLL.QvvrDataStruct typeDataStruct = new com.njcn.advance.event.type.jna.QvvrDLL.QvvrDataStruct(); - typeDataStruct.smp_rate = waveDataDTO.getComtradeCfgDTO().getFinalSampleRate(); - typeDataStruct.smp_len = listWaveData.size(); - // 获取ABC三相的瞬时数据 - for (int i = 0; i < listWaveData.size(); i++) { - typeDataStruct.smp_va[i] = listWaveData.get(i).get(1); - typeDataStruct.smp_vb[i] = listWaveData.get(i).get(2); - typeDataStruct.smp_vc[i] = listWaveData.get(i).get(3); - } - // 执行算法分析 - 直接调用C DLL - try { - QvvrDLL.INSTANCE.qvvr_fun(typeDataStruct); - if (typeDataStruct.evt_num > 0) { - // 全局比较找出最小三相电压特征值 - float globalMinVoltage = Float.MAX_VALUE; - int globalFaultType = 10; - for (int i = 0; i < typeDataStruct.evt_num; i++) { - QvvrDLL.EventBuffer evt = typeDataStruct.evt_buf[i]; - for (int j = 0; j < evt.u_min_num; j++) { - float u3min = evt.u3_min[j]; - if (u3min < globalMinVoltage) { - globalMinVoltage = u3min; - globalFaultType = evt.qvvr_cata_type[j]; - } - } - } - eventAnalysis.setType(globalFaultType); - } else { - eventAnalysis.setType(DataFeature.TYPE10); - } - } catch (Exception e) { - eventAnalysis.setType(DataFeature.TYPE10); - eventAnalysis.setTypeFlag(0); - } +// com.njcn.advance.event.type.jna.QvvrDLL.QvvrDataStruct typeDataStruct = new com.njcn.advance.event.type.jna.QvvrDLL.QvvrDataStruct(); +// typeDataStruct.smp_rate = waveDataDTO.getComtradeCfgDTO().getFinalSampleRate(); +// typeDataStruct.smp_len = listWaveData.size(); +// // 获取ABC三相的瞬时数据 +// for (int i = 0; i < listWaveData.size(); i++) { +// typeDataStruct.smp_va[i] = listWaveData.get(i).get(1); +// typeDataStruct.smp_vb[i] = listWaveData.get(i).get(2); +// typeDataStruct.smp_vc[i] = listWaveData.get(i).get(3); +// } +// // 执行算法分析 - 直接调用C DLL +// try { +// QvvrDLL.INSTANCE.qvvr_fun(typeDataStruct); +// if (typeDataStruct.evt_num > 0) { +// // 全局比较找出最小三相电压特征值 +// float globalMinVoltage = Float.MAX_VALUE; +// int globalFaultType = 10; +// for (int i = 0; i < typeDataStruct.evt_num; i++) { +// QvvrDLL.EventBuffer evt = typeDataStruct.evt_buf[i]; +// for (int j = 0; j < evt.u_min_num; j++) { +// float u3min = evt.u3_min[j]; +// if (u3min < globalMinVoltage) { +// globalMinVoltage = u3min; +// globalFaultType = evt.qvvr_cata_type[j]; +// } +// } +// } +// eventAnalysis.setType(globalFaultType); +// } else { +// eventAnalysis.setType(DataFeature.TYPE10); +// } +// } catch (Exception e) { +// eventAnalysis.setType(DataFeature.TYPE10); +// eventAnalysis.setTypeFlag(0); +// } return eventAnalysis; }