From 7ef593e1e3c35aaeecf9318f0b3941230d3ed002 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 09 十月 2024 11:22:54 +0800
Subject: [PATCH] 增加在数据点计算规则后数据点名称加_n的适配
---
collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java
index ce4d550..99392cd 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java
@@ -47,7 +47,6 @@
private WorkstationCache workstationCache;
@Autowired
private TimeSliceCache timeSliceCache;
- //private static String TEMPLATE_NAME = "process_param";
static {
PROCESS_PARAM_MAP.put(1, "STATE");
@@ -62,7 +61,7 @@
public void handle(List<TelemetryData> telemetryDataList) {
List<PackedTelemetryData> pdataList = packetData(telemetryDataList);
- System.out.print(pdataList);
+ //System.out.print(pdataList);
for (PackedTelemetryData pdt : pdataList) {
TelemetryDataHandler handler = handlerSelector.select(pdt.getParamType());
if (handler == null) {
@@ -91,6 +90,7 @@
String[] keys = map.keySet().toArray(new String[0]);
for (int j = 0; j < keys.length; j++) {
+ //TODO: 杩欓噷锛屽師绯荤粺杩涜浜嗚繃婊ゃ�俉orkstationCollectDataServiceImpl.handlerWorkstationCollectData閲�
PackedTelemetryData pkData = new PackedTelemetryData();
pkData.setWorkstationId(tdata.getWorkstationId());
pkData.setValue(map.get(keys[j]));
@@ -99,6 +99,7 @@
pkData.setName(keys[j]);//鍙傛暟鍚嶇О
fillByCalendar(pkData);
+
result.add(pkData);
}
@@ -129,8 +130,8 @@
pdata.setCalendarCode("#default#");
}
- pdata.setShiftIndex(1);//涓存椂
- pdata.setShiftTimeType(1);//涓存椂
+ //pdata.setShiftIndex(1);//涓存椂
+ //pdata.setShiftTimeType(1);//涓存椂
// TelemetryPropertyWrapper涓璸ackWorkstationCalendarInfo
//------------start
--
Gitblit v1.9.3