From 1b440360d4e36a6844c4e557b01da29e5d151ff2 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 06 Sep 2022 17:20:45 +0800
Subject: [PATCH] 千灯数据转发bug修改
---
src/main/java/com/moral/task/RabbitMQInsertQiandengPark.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/task/RabbitMQInsertQiandengPark.java b/src/main/java/com/moral/task/RabbitMQInsertQiandengPark.java
index ccaa6d5..91b1e10 100644
--- a/src/main/java/com/moral/task/RabbitMQInsertQiandengPark.java
+++ b/src/main/java/com/moral/task/RabbitMQInsertQiandengPark.java
@@ -105,12 +105,16 @@
String yearMonthDay = sdf.format(new Date());
History guodu = historyMapper.selectLastDataByMac(yearMonthDay, "jsxlqxpc000001");
History baihua = historyMapper.selectLastDataByMac(yearMonthDay, "jsxlqxpc000002");
- Map<String,Object> guoduValue = JSONObject.parseObject(guodu.getValue().toString());
- JSONObject baihuaValue = JSONObject.parseObject(baihua.getValue().toString());
- guoduValue.put("mac","jsxlqxpc000001");
- baihuaValue.put("mac","jsxlqxpc000002");
- minutelyData.add(guoduValue);
- minutelyData.add(baihuaValue);
+ if (!ObjectUtils.isEmpty(guodu)){
+ Map<String,Object> guoduValue = JSONObject.parseObject(guodu.getValue().toString());
+ guoduValue.put("mac","jsxlqxpc000001");
+ minutelyData.add(guoduValue);
+ }
+ if (!ObjectUtils.isEmpty(baihua)){
+ JSONObject baihuaValue = JSONObject.parseObject(baihua.getValue().toString());
+ baihuaValue.put("mac","jsxlqxpc000002");
+ minutelyData.add(baihuaValue);
+ }
XxlJobLogger.log("RabbitMQMinutelyData:" + minutelyData.size());
if (!CollectionUtils.isEmpty(minutelyData)) {
for (Map<String, Object> deviceData : minutelyData) {
--
Gitblit v1.8.0