From f6ecfd331ec959d7daea3fa5ebc262e7a50e4e01 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 14 Jan 2022 15:20:54 +0800
Subject: [PATCH] 图片上传测试
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index f1a0a96..9aff155 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -88,7 +88,7 @@
data.forEach((key, value) -> {
Map<String, Object> dataMap = new HashMap<>();
dataMap.put("mac", key);
- dataMap.put("time", end);
+ dataMap.put("time", start);
Map<String, Object> jsonMap = new HashMap<>();
@@ -135,7 +135,7 @@
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
Object sensorValue = dataValue.get(sensorCode);
//������������������������
- Object flag = dataValue.get(sensorCode + Constants.MARKER_BIT_KEY);
+ Object flag = dataValue.get(sensorCode + "-" + Constants.MARKER_BIT_KEY);
if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
return null;
}
@@ -150,12 +150,12 @@
//������������������������������������
double aDouble = Double.parseDouble(sensorValue.toString());
if (!ObjectUtils.isEmpty(upper)) {
- if (aDouble < upper) {
+ if (aDouble > upper) {
return null;
}
}
if (!ObjectUtils.isEmpty(lower)) {
- if (aDouble > lower) {
+ if (aDouble < lower) {
return null;
}
}
@@ -177,7 +177,7 @@
});
//5���������������
- String insertTimeUnits = DateUtils.dateToDateString(now, DateUtils.yyyyMM_EN);
+ String insertTimeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
//���������������
historyFiveMinutelyMapper.insertHistoryFiveMinutely(insertData, insertTimeUnits);
}
--
Gitblit v1.8.0