From a6f582f020df0c244024f8705fb44bc8621e7bee Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 03 Aug 2020 10:39:27 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/mapper/RealWeatherMapper.java | 2
src/main/java/com/moral/service/ForecastWeatherService.java | 2
src/main/java/com/moral/mapper/ForecastWeatherMapper.java | 2
src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java | 4 +-
src/main/java/com/moral/task/RealWeatherInsertTask.java | 8 +++-
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 38 ++++++++++---------
src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java | 9 +++-
src/main/java/com/moral/service/AlarmService.java | 2
src/main/java/com/moral/task/AlarmTableInsertTask.java | 7 ++-
src/main/java/com/moral/task/ForecastWeatherInsertTask.java | 8 +++-
src/main/java/com/moral/service/RealWeatherService.java | 2
11 files changed, 50 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/moral/mapper/ForecastWeatherMapper.java b/src/main/java/com/moral/mapper/ForecastWeatherMapper.java
index 4a46ee7..a963304 100644
--- a/src/main/java/com/moral/mapper/ForecastWeatherMapper.java
+++ b/src/main/java/com/moral/mapper/ForecastWeatherMapper.java
@@ -5,7 +5,7 @@
public interface ForecastWeatherMapper {
- void insertForecastWeather(List<Map<String,Object>> list);
+ int insertForecastWeather(List<Map<String,Object>> list);
void deleteByTime(Map<String,Object> parameters);
}
diff --git a/src/main/java/com/moral/mapper/RealWeatherMapper.java b/src/main/java/com/moral/mapper/RealWeatherMapper.java
index 3899a07..1e6cb2d 100644
--- a/src/main/java/com/moral/mapper/RealWeatherMapper.java
+++ b/src/main/java/com/moral/mapper/RealWeatherMapper.java
@@ -5,5 +5,5 @@
public interface RealWeatherMapper {
- void insertRealWeather(List<Map<String,Object>> list);
+ int insertRealWeather(List<Map<String,Object>> list);
}
diff --git a/src/main/java/com/moral/service/AlarmService.java b/src/main/java/com/moral/service/AlarmService.java
index f4c852b..47b0821 100644
--- a/src/main/java/com/moral/service/AlarmService.java
+++ b/src/main/java/com/moral/service/AlarmService.java
@@ -5,7 +5,7 @@
public interface AlarmService {
- void insertAlarmDaily();
+ int insertAlarmDaily();
void createTable(String yearAndMonth);
}
diff --git a/src/main/java/com/moral/service/ForecastWeatherService.java b/src/main/java/com/moral/service/ForecastWeatherService.java
index 0f1bb59..10a61dd 100644
--- a/src/main/java/com/moral/service/ForecastWeatherService.java
+++ b/src/main/java/com/moral/service/ForecastWeatherService.java
@@ -4,6 +4,6 @@
public interface ForecastWeatherService {
- void insertForecastWeather() throws ParseException;
+ int insertForecastWeather() throws ParseException;
}
diff --git a/src/main/java/com/moral/service/RealWeatherService.java b/src/main/java/com/moral/service/RealWeatherService.java
index 6ceef30..f96b5f9 100644
--- a/src/main/java/com/moral/service/RealWeatherService.java
+++ b/src/main/java/com/moral/service/RealWeatherService.java
@@ -4,6 +4,6 @@
public interface RealWeatherService {
- void insertRealWeather() throws ParseException;
+ int insertRealWeather() throws ParseException;
}
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index 475e587..ad715cb 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -27,7 +27,7 @@
private AlarmMapper alarmMapper;
@Override
- public void insertAlarmDaily() {
+ public int insertAlarmDaily() {
LocalDateTime time = LocalDateTime.now();
LocalDateTime endTime = time.truncatedTo(ChronoUnit.DAYS);
LocalDateTime startTime = endTime.minusDays(1);
@@ -45,6 +45,7 @@
devices.put("end", endTime);
devices.put("yearAndMonth", yearAndMonth);
List<String> macs = alarmMapper.getMacs(devices);
+ int count = 0;
for (String mac : macs) {
List<Map<String, Object>> resultList = new ArrayList<>();
devices.put("mac", mac);
@@ -52,12 +53,12 @@
List<Map<String, Object>> newList = list.stream().distinct().collect(Collectors.toList());
for (Map<String, Object> map : newList) {
for (String key : map.keySet()) {
- String[] strings = map.get(key).toString().replace("$.", "")
- .replace("[", "").replace("]", "")
- .replace("\"", "").replace(" ", "").split(",");
+ String[] strings = map.get(key).toString().replace("$.", "")
+ .replace("[", "").replace("]", "")
+ .replace("\"", "").replace(" ", "").split(",");
- List<String> sensors = new ArrayList<String>(Arrays.asList(strings));
- map.put(key, sensors);
+ List<String> sensors = new ArrayList<String>(Arrays.asList(strings));
+ map.put(key, sensors);
}
}
@@ -81,20 +82,21 @@
}
for (String key : hashMap.keySet()) {
- Map<String, Object> jsonMap = new HashMap<>();
- Map<String, Object> map = new HashMap<>();
- map.put("mac",mac);
- map.put("time",startTime);
- map.put("state", key);
- Set<String> sensors = (Set<String>) hashMap.get(key);
- for (String sensor : sensors) {
- jsonMap.put(sensor,1);
- }
- map.put("json",JSONUtils.toJSONString(jsonMap));
- resultList.add(map);
+ Map<String, Object> jsonMap = new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
+ map.put("mac", mac);
+ map.put("time", startTime);
+ map.put("state", key);
+ Set<String> sensors = (Set<String>) hashMap.get(key);
+ for (String sensor : sensors) {
+ jsonMap.put(sensor, 1);
+ }
+ map.put("json", JSONUtils.toJSONString(jsonMap));
+ resultList.add(map);
}
- alarmMapper.insertAlarmDaily(resultList);
+ count = count + alarmMapper.insertAlarmDaily(resultList);
}
+ return count;
}
@Override
diff --git a/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java b/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java
index 00accb9..b24dc2b 100644
--- a/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java
@@ -50,7 +50,7 @@
private ProvinceMapper provinceMapper;
@Override
- public void insertForecastWeather() throws ParseException {
+ public int insertForecastWeather() throws ParseException {
Calendar c = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -123,11 +123,13 @@
}
}
+ int count=0;
+
for (Map<String, Object> map : hashSet) {
String id = map.get("cityID").toString();
Map<String, Object> dataMap = restTemplate.getForObject("https://api.heweather.net/v7/weather/72h?key=da05c6c4852d4f7aa3364a9236ee9e26&gzip=n&location={1}", Map.class, id);
if (dataMap == null) {
- dataMap = new HashMap<>();
+ return count;
}
String json = JSONObject.toJSONString(dataMap);
dataMap = (Map<String, Object>) JSONObject.parse(json);
@@ -177,7 +179,8 @@
jsonMap.remove("fxTime");
map.put("json", JSONObject.toJSONString(jsonMap));
}
- forecastWeatherMapper.insertForecastWeather(arrayList);
+ count = count+forecastWeatherMapper.insertForecastWeather(arrayList);
}
+ return count;
}
}
diff --git a/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java b/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
index 7becf4b..f3b7ec1 100644
--- a/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/RealWeatherServiceImpl.java
@@ -50,7 +50,7 @@
private ProvinceMapper provinceMapper;
@Override
- public void insertRealWeather() throws ParseException {
+ public int insertRealWeather() throws ParseException {
Calendar c = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -146,6 +146,6 @@
for (Map<String, Object> map : resultList) {
map.remove("name");
}
- realWeatherMapper.insertRealWeather(resultList);
+ return realWeatherMapper.insertRealWeather(resultList);
}
}
diff --git a/src/main/java/com/moral/task/AlarmTableInsertTask.java b/src/main/java/com/moral/task/AlarmTableInsertTask.java
index b33f4c0..5eff935 100644
--- a/src/main/java/com/moral/task/AlarmTableInsertTask.java
+++ b/src/main/java/com/moral/task/AlarmTableInsertTask.java
@@ -24,9 +24,12 @@
@XxlJob("alarmDaily")
public ReturnT insertAlarmDailyTable(String param) {
- alarmService.insertAlarmDaily();
+ int count = alarmService.insertAlarmDaily();
+ if(count>0){
return new ReturnT(200, "������������������");
-
+ }else {
+ return new ReturnT(200, "������������������");
+ }
}
@XxlJob("createAlarmSubTable")
diff --git a/src/main/java/com/moral/task/ForecastWeatherInsertTask.java b/src/main/java/com/moral/task/ForecastWeatherInsertTask.java
index c81b7e8..fe103e7 100644
--- a/src/main/java/com/moral/task/ForecastWeatherInsertTask.java
+++ b/src/main/java/com/moral/task/ForecastWeatherInsertTask.java
@@ -21,7 +21,11 @@
@XxlJob("forecastWeatherHour")
public ReturnT insertForecastWeather(String param) throws ParseException {
- forecastWeatherService.insertForecastWeather();
- return new ReturnT(200, "������������");
+ int count = forecastWeatherService.insertForecastWeather();
+ if (count > 0) {
+ return new ReturnT(200, "������������");
+ }else {
+ return new ReturnT(200, "������������");
+ }
}
}
diff --git a/src/main/java/com/moral/task/RealWeatherInsertTask.java b/src/main/java/com/moral/task/RealWeatherInsertTask.java
index e511bc7..405b0d7 100644
--- a/src/main/java/com/moral/task/RealWeatherInsertTask.java
+++ b/src/main/java/com/moral/task/RealWeatherInsertTask.java
@@ -21,7 +21,11 @@
@XxlJob("realWeatherHour")
public ReturnT insertRealWeather(String param) throws ParseException {
- realWeatherService.insertRealWeather();
- return new ReturnT(200, "������������");
+ int count = realWeatherService.insertRealWeather();
+ if (count > 0) {
+ return new ReturnT(200, "������������");
+ }else {
+ return new ReturnT(200, "������������");
+ }
}
}
--
Gitblit v1.8.0