From 35c044451268550405ed69c5b2e8491153a07e25 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Wed, 2 Apr 2025 15:04:41 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=A1=A8=E5=90=8D?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E6=97=B6=E7=9A=84=E5=85=A5=E5=BA=93=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xydl/cac/repository/RptparamindexRepository.java    | 2 +-
 .../java/com/xydl/cac/service/impl/DataServiceImpl.java     | 6 ++++++
 src/main/java/com/xydl/cac/task/Client61850Task.java        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xydl/cac/repository/RptparamindexRepository.java b/src/main/java/com/xydl/cac/repository/RptparamindexRepository.java
index 0a4fa6a..ef85c51 100644
--- a/src/main/java/com/xydl/cac/repository/RptparamindexRepository.java
+++ b/src/main/java/com/xydl/cac/repository/RptparamindexRepository.java
@@ -13,7 +13,7 @@ public interface RptparamindexRepository extends JpaRepository<Rptparamindex, St
 
     List<Rptparamindex> findAllByEqmid(Integer eqmid);
 
-    List<Rptparamindex> findAllByEqmidInAndColnameIsNotNull(List<Integer> eqmidList);
+    List<Rptparamindex> findAllByEqmidInAndColnameIsNotNullAndTablenameIsNotNull(List<Integer> eqmidList);
 
     List<Rptparamindex> findAllByParamindexStartingWith(String param);
 
diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
index f434504..c883298 100644
--- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
@@ -295,6 +295,12 @@ public class DataServiceImpl implements DataService {
 
     @Override
     public void insertData(String tableName, Integer devId, String time, String colname, String value) {
+        if (StringUtils.isBlank(tableName)) {
+            return;
+        }
+        if (StringUtils.isBlank(colname)) {
+            return;
+        }
         String devField = DataTable.getDevidField(tableName);
         String timeField = this.getTimeField(tableName);
         String sqlFrom = " FROM " + tableName;
diff --git a/src/main/java/com/xydl/cac/task/Client61850Task.java b/src/main/java/com/xydl/cac/task/Client61850Task.java
index 69f693a..b4bc83c 100644
--- a/src/main/java/com/xydl/cac/task/Client61850Task.java
+++ b/src/main/java/com/xydl/cac/task/Client61850Task.java
@@ -85,7 +85,7 @@ public class Client61850Task {
             return;
         }
 
-        List<Rptparamindex> rptList = rptparamindexRepository.findAllByEqmidInAndColnameIsNotNull(eqmidList);
+        List<Rptparamindex> rptList = rptparamindexRepository.findAllByEqmidInAndColnameIsNotNullAndTablenameIsNotNull(eqmidList);
         List<IedDlConfig> dlList = dlConfigRepository.findByDevIdIn(eqmidList);
         if (CollectionUtils.isEmpty(rptList) && CollectionUtils.isEmpty(dlList)) {
             return;