From 52ff3bda72646a532c3297e4843bc4d5aee8b949 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 03 九月 2024 17:20:49 +0800
Subject: [PATCH] 采集数据增加employeeid的设置
---
collect/src/main/java/com/qianwen/mdc/collect/handler/DeviceStatusDataHandler.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/handler/DeviceStatusDataHandler.java b/collect/src/main/java/com/qianwen/mdc/collect/handler/DeviceStatusDataHandler.java
index 317a32c..7089893 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/handler/DeviceStatusDataHandler.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/handler/DeviceStatusDataHandler.java
@@ -1,36 +1,29 @@
package com.qianwen.mdc.collect.handler;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
+import java.util.Date;
-import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.write.record.Tablet;
-import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.qianwen.mdc.collect.cache.WorkstationCache;
-import com.qianwen.mdc.collect.config.IotDBSessionConfig;
-import com.qianwen.mdc.collect.constants.IOTDBConstant;
import com.qianwen.mdc.collect.dto.PackedTelemetryData;
import com.qianwen.mdc.collect.entity.iotdb.DeviceState;
import com.qianwen.mdc.collect.entity.mgr.GlobalWcsOfRps;
import com.qianwen.mdc.collect.enums.FeedbackTimePointEnum;
import com.qianwen.mdc.collect.service.DeviceStateService;
-import com.qianwen.mdc.collect.service.IotDBCommonService;
@Component
public class DeviceStatusDataHandler implements TelemetryDataHandler {
private static final Logger log = LoggerFactory.getLogger(DeviceStatusDataHandler.class);
@Autowired
private WorkstationCache workstationCache;
- @Autowired
- private IotDBSessionConfig iotdbCfg;
- @Autowired
- private IotDBCommonService iotDBCommonService;
+ //@Autowired
+ //private IotDBSessionConfig iotdbCfg;
+ //@Autowired
+ //private IotDBCommonService iotDBCommonService;
@Autowired
private DeviceStateService deviceStateService;
@Override
@@ -46,7 +39,9 @@
state.setIsFixPoint(false);
state.setIsSync(false);
state.setIsDeleted(false);
- //state.setEmployeeId(WorkstationCache.getBelongToEmployeeForWorkstation(entity.getWorkstationId(), new Date(entity.getTs().longValue())));
+
+ state.setEmployeeId(workstationCache.getBelongToEmployeeForWorkstation(data.getWorkstationId(), new Date(data.getTime())));
+
state.setFeedbackPointType(FeedbackTimePointEnum.NO_FEED_BACK_POINT.getValue());
//WorkstationState propertyData = (WorkstationState) Objects.requireNonNull(BeanUtil.copy(entity, WorkstationState.class));
state.setValueCollect(Integer.valueOf(data.getValue()));
--
Gitblit v1.9.3