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/handler/AlarmDataHandler.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java b/collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java
index 99c5984..bd0c2f2 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java
@@ -1,23 +1,58 @@
package com.qianwen.mdc.collect.handler;
+import java.util.Arrays;
+
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.dto.PackedTelemetryData;
+import com.qianwen.mdc.collect.entity.iotdb.Alarm;
+import com.qianwen.mdc.collect.service.AlarmService;
@Component
public class AlarmDataHandler implements TelemetryDataHandler {
private static final Logger log = LoggerFactory.getLogger(AlarmDataHandler.class);
+ @Autowired
+ private AlarmService alarmService;
@Override
public void handleData(PackedTelemetryData data) {
- /*
- WorkstationOutput workstationOutput = TelemetryOutputWrapper.build().entityVO(data);
- IOutputAggregateService outputAggregateService = (IOutputAggregateService) SpringUtil.getBean(IOutputAggregateService.class);
- outputAggregateService.outputRealTimeAggregate(workstationOutput);
- */
- log.info("鎶ヨtdengine 瀹炴椂鑱氬悎瀹屾垚:鏁版嵁{} ");
+ Alarm alarm = new Alarm();//Objects.requireNonNull(BeanUtil.copy(data, Alarm.class));
+ alarm.setTime(data.getTime());
+ alarm.setWorkstationId(data.getWorkstationId());
+ alarm.setCalendarCode(data.getCalendarCode());
+ alarm.setFactoryDate(data.getFactoryDate());
+ alarm.setFactoryMonth(data.getFactoryMonth());
+ alarm.setFactoryWeek(data.getFactoryWeek());
+ alarm.setFactoryYear(data.getFactoryYear());
+ alarm.setShiftIndex(data.getShiftIndex());
+ alarm.setShiftTimeType(data.getShiftTimeType());
+ fileAlarmDetail(alarm,data);
+ alarmService.saveAlarms(Arrays.asList(alarm));
+
+ log.info("鎶ヨ鏁版嵁澶勭悊瀹屾垚:鍛婅鏁版嵁{} ",alarm);
+
+ }
+
+ /**
+ * 濉厖鍛婅鐨勮缁嗕俊鎭紝绾у埆锛屼俊鎭紝浠ｇ爜
+ * @param alarm
+ */
+ void fileAlarmDetail(Alarm alarm,PackedTelemetryData data){
+ alarm.setCode(this.parseCode(data.getValue()));
+ alarm.setMessage(data.getValue());
+ }
+
+
+ /**
+ * 瑙ｆ瀽鎶ヨ浠ｇ爜
+ * @param collectText
+ * @return
+ */
+ String parseCode(String collectText) {
+ return "0000";
}
}
--
Gitblit v1.9.3