Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-16 f26786e162241b6b803ada6d19d80e1f5fb615e5

 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"))){