From 499444f6b018d1c8d12fbfb11a5a413abd23e490 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 2 Mar 2023 15:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=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

---
 pom.xml                                          | 16 ++++++++--------
 .../majornetwork/Impl/TransientServiceImpl.java  |  9 ---------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index fb613a012..25a9777db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,20 +42,21 @@
     </distributionManagement>
     <properties>
         <!--中间件目标地址-->
-<!--        <middle.server.url>198.120.100.195</middle.server.url>-->
-        <middle.server.url>192.168.1.31</middle.server.url>
+        <!--        <middle.server.url>198.120.100.195</middle.server.url>-->
+        <middle.server.url>192.168.1.13</middle.server.url>
         <!--微服务模块发布地址-->
-<!--        <service.server.url>198.120.100.195</service.server.url>-->
+        <!--        <service.server.url>198.120.100.195</service.server.url>-->
         <service.server.url>192.168.1.111</service.server.url>
         <!--docker仓库地址-->
         <docker.server.url>192.168.1.13</docker.server.url>
         <!--nacos的ip:port-->
         <nacos.url>${middle.server.url}:18848</nacos.url>
         <!--服务器发布内容为空-->
-                        <nacos.namespace></nacos.namespace>
-<!--        <nacos.namespace>fd74182b-1fce-4dba-afa7-2623b0376205</nacos.namespace>-->
-<!--        <nacos.namespace>ba3ba5d1-3480-4755-8b87-6b1fce16201c</nacos.namespace>-->
-<!--        <nacos.namespace>f6df4a49-39cb-4355-a8fd-8aeb0c537eb1</nacos.namespace>-->
+<!--        <nacos.namespace></nacos.namespace>-->
+                <nacos.namespace>fd74182b-1fce-4dba-afa7-2623b0376205</nacos.namespace>
+        <!--        <nacos.namespace>ba3ba5d1-3480-4755-8b87-6b1fce16201c</nacos.namespace>-->
+        <!--        <nacos.namespace>f6df4a49-39cb-4355-a8fd-8aeb0c537eb1</nacos.namespace>-->
+        <!--        <nacos.namespace>02bcd264-c473-4bc1-b225-5fc4b937e32e</nacos.namespace>-->
         <!--sentinel:port-->
         <!--        <sentinel.url>192.168.1.14:8080</sentinel.url>-->
         <sentinel.url>${middle.server.url}:8080</sentinel.url>
@@ -86,7 +87,6 @@
         <mybatis.version>2.1.3</mybatis.version>
         <druid.version>1.2.5</druid.version>
         <mysql.version>8.0.19</mysql.version>
-        <mariadb.version>2.4.0</mariadb.version>
         <oracle.version>21.6.0.0</oracle.version>
         <orai18n.version>21.1.0.0</orai18n.version>
         <mybatis-plus.version>3.4.2</mybatis-plus.version>
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
index 0cd693df9..249b42321 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
@@ -173,15 +173,6 @@ public class TransientServiceImpl implements TransientService {
         EventDetail eventDetailByTime = eventDetailService.getEventDetailByTime(lineId, timeId);
         String ip = lineDetailData.getIp();
         String waveName = eventDetailByTime.getWaveName();
-        // TransientVO transientVO = transientMapper.getTransientDataById(lineId);
-        // String name = transientVO.getName();
-        // String substation = transientVO.getSubstation();
-        // Double eventValue = new BigDecimal(eventDetailByTime.getEventValue()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
-        // Double v = new BigDecimal(eventValue*100).setScale(0,BigDecimal.ROUND_HALF_UP).doubleValue();
-        // Double persistTime = eventDetailByTime.getPersistTime()/1000;
-
-        // waveDataVO.setName("变电站名称: "+ substation +" 监测点名称: "+ name +" 发生时刻: "+ timeId +" 暂降幅值: "+ v +"% 持续时间: "+ persistTime +"s");
-        // waveDataVO.setTargetName("相电压有效值");
         AnalyWave analyWave = new AnalyWave();
         WaveDataDTO comtrade = analyWave.getComtrade(generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + ".CFG", 1);
         if (Objects.isNull(comtrade.getComtradeCfgDTO())) {