From d8310f6bc609440fa352c0e5a9436c7c78caa287 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 29 Nov 2021 11:09:48 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job
---
src/main/java/com/moral/service/impl/RealWeatherDailyImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/RealWeatherDailyImpl.java b/src/main/java/com/moral/service/impl/RealWeatherDailyImpl.java
index ea95a1b..f8fe867 100644
--- a/src/main/java/com/moral/service/impl/RealWeatherDailyImpl.java
+++ b/src/main/java/com/moral/service/impl/RealWeatherDailyImpl.java
@@ -28,7 +28,7 @@
import com.moral.mapper.MonitorPointMapper;
import com.moral.mapper.ProvinceMapper;
import com.moral.mapper.RealWeatherDailyMapper;
-import com.moral.mapper.RealWeatherMapper;
+import com.moral.mapper.WeatherMapper;
import com.moral.service.RealWeatherDailyService;
import com.moral.util.Dom4jUtils;
@@ -48,7 +48,7 @@
private ProvinceMapper provinceMapper;
@Resource
- private RealWeatherMapper realWeatherMapper;
+ private WeatherMapper weatherMapper;
@Resource
private RealWeatherDailyMapper realWeatherDailyMapper;
@@ -158,7 +158,7 @@
Map<String, Object> dailyMap = (Map<String, Object>) JSONObject.parse(string);
//���������������
dailyMap.remove("date");
- Map<String, Object> dayData = realWeatherMapper.getDayData(map);
+ Map<String, Object> dayData = weatherMapper.getDayData(map);
for (String key : dayData.keySet()) {
if (!key.equals("precip")) {
dayData.put(key, String.valueOf(Math.round(Double.valueOf(dayData.get(key).toString()))));
@@ -202,12 +202,12 @@
}
//������������������������������
- Map<String, Object> timeMaxTemp = realWeatherMapper.getTimeMaxTemp(map);
+ Map<String, Object> timeMaxTemp = weatherMapper.getTimeMaxTemp(map);
String hour1 = timeMaxTemp.get("time").toString().substring(11, 13);
System.out.println(hour1);
dayData.put("maxTempTime", hour1);
- Map<String, Object> timeMinTemp = realWeatherMapper.getTimeMinTemp(map);
+ Map<String, Object> timeMinTemp = weatherMapper.getTimeMinTemp(map);
String hour2 = timeMinTemp.get("time").toString().substring(11, 13);
dayData.put("minTempTime", hour2);
System.out.println(hour2);
--
Gitblit v1.8.0