From 79c31167ea77b9fc5e790b4caa29521709f69dd2 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Thu, 27 Mar 2025 17:15:31 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=A2=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xydl/cac/service/DataService.java | 2 ++ src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java | 3 +-- src/main/java/com/xydl/cac/task/I2syncTask.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xydl/cac/service/DataService.java b/src/main/java/com/xydl/cac/service/DataService.java index 5820210..51d8fba 100644 --- a/src/main/java/com/xydl/cac/service/DataService.java +++ b/src/main/java/com/xydl/cac/service/DataService.java @@ -14,6 +14,8 @@ public interface DataService { List getDataTableColumns(String tableName); + String getFieldType(String tableName, String field); + OnePage> getData(String tableName, Integer devId, List points, ConditionModel model) throws Exception; void clearAllBind(); 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 223979f..dd241ad 100644 --- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java @@ -235,8 +235,7 @@ public class DataServiceImpl implements DataService { String sqlSelect = "SELECT DATE_FORMAT(" + timeField + ", '%Y-%m-%d %H:%i:%s') as acquisitionTime"; for (ModevTypePoint point : points) { if (StringUtils.isNotBlank(point.getField())) { - String type = this.getFieldType(tableName, point.getField()); - if (Constants.DateTime.equalsIgnoreCase(type)) { + if (Constants.DateTime.equalsIgnoreCase(point.getType())) { sqlSelect = sqlSelect + ", " + "DATE_FORMAT(" + point.getField() + ", '%Y-%m-%d %H:%i:%s') as " + point.getField(); } else { sqlSelect = sqlSelect + ", " + point.getField(); diff --git a/src/main/java/com/xydl/cac/task/I2syncTask.java b/src/main/java/com/xydl/cac/task/I2syncTask.java index 7e20204..b7e890d 100644 --- a/src/main/java/com/xydl/cac/task/I2syncTask.java +++ b/src/main/java/com/xydl/cac/task/I2syncTask.java @@ -89,6 +89,8 @@ public class I2syncTask { for (I2syncField field : fieldList) { ModevTypePoint point = new ModevTypePoint(); point.setField(field.getFieldName()); + String type = dataService.getFieldType(config.getTableName(), point.getField()); + point.setType(type); points.add(point); } List list = sensorRepository.findByTypeId(config.getModevtypeId());