From c96aba58f5bf3991e18cb0adaa71e7bec339cb4b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 22 Dec 2022 16:00:16 +0800
Subject: [PATCH] 国控站数据维护问题3
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 fe84de2..f2b0a38 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
@@ -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;
}
}
@@ -172,12 +172,13 @@
});
dataMap.put("value", JSONObject.toJSONString(jsonMap));
//������redis
+ jsonMap.put("dataTime", DateUtils.dateToDateString(start));
redisTemplate.opsForHash().put(RedisConstants.DATA_FIVE_MINUTES, key, jsonMap);
insertData.add(dataMap);
});
//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