|
|
@@ -6,6 +6,7 @@ import com.global.base.log.LogPrintMgr;
|
|
|
import com.shkpr.service.customgateway.core.components.DeviceRegistry;
|
|
|
import com.shkpr.service.customgateway.core.constants.LogFlagBusiType;
|
|
|
import com.shkpr.service.customgateway.core.domain.Device;
|
|
|
+import com.shkpr.service.customgateway.core.domain.DeviceTag;
|
|
|
import com.shkpr.service.customgateway.core.properties.CallingProperties;
|
|
|
import com.shkpr.service.customgateway.core.utils.CallingUtil;
|
|
|
import com.shkpr.service.customgateway.core.utils.InfluxDbUtil;
|
|
|
@@ -16,6 +17,7 @@ import org.influxdb.dto.Point;
|
|
|
import org.springframework.http.HttpMethod;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Collections;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -64,7 +66,7 @@ public class DataCollector {
|
|
|
//请求地址
|
|
|
String url = endpoint.getUrl() + ScadaPlatformMetadata.Uri.REAL_TIME_DATA;
|
|
|
|
|
|
- //数据即可
|
|
|
+ //数据集合
|
|
|
List<ScadaPlatformData> allItems = new ArrayList<>();
|
|
|
//设备
|
|
|
List<Device> devices = deviceRegistry.findAll(ScadaPlatformMetadata.NAME);
|