From eccde23ea401394aed432865bfbbbcb89539ba20 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 18 Aug 2021 15:33:45 +0800
Subject: [PATCH] 特殊设备历史表数据查询、删除，校准接口判断特殊设备表
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 24 +++++++-----------------
1 files changed, 7 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 ccd2c8a..4481338 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
@@ -28,38 +28,28 @@
@Transactional
public void insertHistoryMinutely(Map<String, Object> data) {
Map<String, Object> result = new HashMap<>();
+ Object ver = data.remove("ver");
+
Map<String, Object> dataAdjust = new HashMap<>(data);
+
Object mac = data.remove("mac");
+
result.put("mac", mac);
- result.put("version", data.remove("ver"));
+ result.put("version", ver);
+
Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
result.put("time", time);
result.put("value", JSONObject.toJSONString(data));
String timeUnits = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);
- result.put("timeUnits", tableSuffix(timeUnits, Constants.UN_ADJUST));
+ result.put("timeUnits", timeUnits + "_" + Constants.UN_ADJUST);
//���������������������������
historyMinutelyMapper.insertHistoryMinutely(result);
//������������
dataAdjust = deviceService.adjustDeviceData(dataAdjust);
- dataAdjust.remove("mac");
- dataAdjust.remove("DataTime");
- dataAdjust.remove("ver");
result.put("timeUnits", timeUnits);
result.put("value", JSONObject.toJSONString(dataAdjust));
historyMinutelyMapper.insertHistoryMinutely(result);
-
-
- }
-
- //���������
- private String tableSuffix(String... keys) {
- StringBuilder key = new StringBuilder(keys[0]);
- for (int i = 1; i < keys.length; i++) {
- key.append("_");
- key.append(keys[i]);
- }
- return key.toString();
}
}
--
Gitblit v1.8.0