From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 6f1f9a9..47beefb 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
@@ -197,6 +197,9 @@
private void judgeDeviceState(String mac,Map<String, Object> dataMap){
List<String> sensorList = Arrays.asList("a34004","a34002","a21026","a21004","a21005","a05024","a99054");
Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
+ if(Objects.isNull(device)){
+ return;
+ }
List<Sensor> sensors = device.getVersion().getSensors();
Expression expression;
int state = 1;
@@ -403,12 +406,16 @@
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);
+ redisTemplate.opsForHash().put(RedisConstants.DATA_FIVE_MINUTES, key, jsonMap);
+ insertData.add(dataMap);
+ System.out.println(">>>"+key+"->>>"+jsonMap.toString());
judgeDeviceState(key,jsonMap);
- System.out.println(dataMap);
- });
+ });
+ //5���������������
+ // String insertTimeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
+ //���������������
+ // historyFiveMinutelyMapper.insertHistoryFiveMinutely(insertData, insertTimeUnits);
}
}
--
Gitblit v1.8.0