From f26786e162241b6b803ada6d19d80e1f5fb615e5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:36:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-job/src/main/java/com/moral/api/task/InformationTask.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/task/InformationTask.java b/screen-job/src/main/java/com/moral/api/task/InformationTask.java
index 62d9d0a..cab0ba1 100644
--- a/screen-job/src/main/java/com/moral/api/task/InformationTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/InformationTask.java
@@ -86,7 +86,7 @@
HistoryAqi beforeHistoryAqi = new HistoryAqi();
beforeHistoryAqi = historyAqiService.getHistoryApiByTimeAndGuid(guid,beforeTime);
if (!ObjectUtils.isEmpty(beforeHistoryAqi)){
- String value = beforeHistoryAqi.getJson();
+ String value = beforeHistoryAqi.getValue();
if (!ObjectUtils.isEmpty(value)){
JSONObject jsonObject = new JSONObject();
jsonObject = JSONObject.parseObject(value);
@@ -104,7 +104,7 @@
HistoryAqi nowHistoryAqi = new HistoryAqi();
nowHistoryAqi = historyAqiService.getHistoryApiByTimeAndGuid(guid,nowTime);
if (!ObjectUtils.isEmpty(nowHistoryAqi)){
- String value = nowHistoryAqi.getJson();
+ String value = nowHistoryAqi.getValue();
if (!ObjectUtils.isEmpty(value)){
JSONObject jsonObject = JSONObject.parseObject(value);
if (!ObjectUtils.isEmpty(jsonObject.get("pm2_5"))){
--
Gitblit v1.8.0