From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/task/AlarmTask.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/task/AlarmTask.java b/screen-job/src/main/java/com/moral/api/task/AlarmTask.java
index 190a091..3ac44c2 100644
--- a/screen-job/src/main/java/com/moral/api/task/AlarmTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/AlarmTask.java
@@ -246,7 +246,7 @@
HistoryAqi historyAqi = null;
historyAqi = historyAqiMapper.selectOne(historyAqiQueryWrapper);
if (!com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(historyAqi)){
- String cityAqiValue = historyAqi.getJson();
+ String cityAqiValue = historyAqi.getValue();
JSONObject JsonObject = new JSONObject();
JSONObject previousJsonObject = new JSONObject();
previousJsonObject = JSONObject.parseObject(cityAqiValue);
@@ -367,7 +367,7 @@
HistoryAqi historyAqi = null;
historyAqi = historyAqiMapper.selectOne(historyAqiQueryWrapper);
if (!com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(historyAqi)){
- String cityAqiValue = historyAqi.getJson();
+ String cityAqiValue = historyAqi.getValue();
JSONObject JsonObject = new JSONObject();
JSONObject previousJsonObject = new JSONObject();
previousJsonObject = JSONObject.parseObject(cityAqiValue);
@@ -488,7 +488,7 @@
HistoryAqi historyAqi = null;
historyAqi = historyAqiMapper.selectOne(historyAqiQueryWrapper);
if (!com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(historyAqi)){
- String cityAqiValue = historyAqi.getJson();
+ String cityAqiValue = historyAqi.getValue();
JSONObject JsonObject = new JSONObject();
JSONObject previousJsonObject = new JSONObject();
previousJsonObject = JSONObject.parseObject(cityAqiValue);
@@ -609,7 +609,7 @@
HistoryAqi historyAqi = null;
historyAqi = historyAqiMapper.selectOne(historyAqiQueryWrapper);
if (!com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(historyAqi)){
- String cityAqiValue = historyAqi.getJson();
+ String cityAqiValue = historyAqi.getValue();
JSONObject JsonObject = new JSONObject();
JSONObject previousJsonObject = new JSONObject();
previousJsonObject = JSONObject.parseObject(cityAqiValue);
@@ -730,7 +730,7 @@
HistoryAqi historyAqi = null;
historyAqi = historyAqiMapper.selectOne(historyAqiQueryWrapper);
if (!com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(historyAqi)){
- String cityAqiValue = historyAqi.getJson();
+ String cityAqiValue = historyAqi.getValue();
JSONObject JsonObject = new JSONObject();
JSONObject previousJsonObject = new JSONObject();
previousJsonObject = JSONObject.parseObject(cityAqiValue);
@@ -851,7 +851,7 @@
HistoryAqi historyAqi = null;
historyAqi = historyAqiMapper.selectOne(historyAqiQueryWrapper);
if (!com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(historyAqi)){
- String cityAqiValue = historyAqi.getJson();
+ String cityAqiValue = historyAqi.getValue();
JSONObject JsonObject = new JSONObject();
JSONObject previousJsonObject = new JSONObject();
previousJsonObject = JSONObject.parseObject(cityAqiValue);
--
Gitblit v1.8.0