From 69d00365e9f099b26c4fc7a298cabeb131956d8a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:35:05 +0800
Subject: [PATCH] 定时任务，kafka
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
index 6df638c..9360a70 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
@@ -7,7 +7,7 @@
import java.util.HashMap;
import java.util.Map;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.moral.api.mapper.HistoryMinutelyMapper;
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryMinutelyService;
@@ -24,30 +24,31 @@
private DeviceService deviceService;
@Override
- public void insertHistoryMinutely(Map<String, Object> deviceData) {
+ public void insertHistoryMinutely(Map<String, Object> data) {
Map<String, Object> result = new HashMap<>();
- Object mac = deviceData.remove("mac");
+ Map<String, Object> dataAdjust = new HashMap<>(data);
+ Object mac = data.remove("mac");
result.put("mac", mac);
- result.put("version", deviceData.remove("ver"));
- Date time = new Date((Long) deviceData.remove("DataTime"));
- result.put("time", DateUtils.dateToDateString(time));
- result.put("value", JSON.toJSONString(deviceData));
+ result.put("version", data.remove("ver"));
+ Date time = new Date(new Long((String) data.remove("DataTime")));
+ result.put("time", DateUtils.dataToTimeStampTime(time,DateUtils.yyyy_MM_dd_HH_mm_EN));
+ result.put("value", JSONObject.toJSONString(data));
String timeUnits = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);
result.put("timeUnits", tableSuffix(timeUnits, Constants.UN_ADJUST));
- //���������
+
+ //���������������������������
historyMinutelyMapper.insertHistoryMinutely(result);
- //������������
- Map<String, Object> deviceInfo = deviceService.getDeviceByMac(mac.toString());
-
- //���������������������������������������
+ //������������
+ dataAdjust = deviceService.adjustDeviceData(dataAdjust);
+ dataAdjust.remove("mac");
+ dataAdjust.remove("DataTime");
+ dataAdjust.remove("ver");
result.put("timeUnits", timeUnits);
- deviceData = deviceService.adjustDeviceData(deviceData, deviceInfo);
- result.put("value", JSON.toJSONString(deviceData));
+ result.put("value", JSONObject.toJSONString(dataAdjust));
historyMinutelyMapper.insertHistoryMinutely(result);
- //������������������
- Map<String, Object> deviceState = deviceService.judgeDeviceState(deviceData, deviceInfo);
+
}
//���������
@@ -59,5 +60,4 @@
}
return key.toString();
}
-
}
--
Gitblit v1.8.0