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 findAllByEqmid(Integer eqmid); - List findAllByEqmidInAndColnameIsNotNull(List eqmidList); + List findAllByEqmidInAndColnameIsNotNullAndTablenameIsNotNull(List eqmidList); List 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 rptList = rptparamindexRepository.findAllByEqmidInAndColnameIsNotNull(eqmidList); + List rptList = rptparamindexRepository.findAllByEqmidInAndColnameIsNotNullAndTablenameIsNotNull(eqmidList); List dlList = dlConfigRepository.findByDevIdIn(eqmidList); if (CollectionUtils.isEmpty(rptList) && CollectionUtils.isEmpty(dlList)) { return;