From 2c42977a1a38e4f079c5c44fe51a46c27b865f80 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 23 Oct 2020 10:29:27 +0800
Subject: [PATCH] 增加天气城市配置表，优化相关接口
---
src/main/java/com/moral/task/AlarmTableInsertTask.java | 84 +++++++-----------------------------------
1 files changed, 14 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/moral/task/AlarmTableInsertTask.java b/src/main/java/com/moral/task/AlarmTableInsertTask.java
index fd3423c..5eff935 100644
--- a/src/main/java/com/moral/task/AlarmTableInsertTask.java
+++ b/src/main/java/com/moral/task/AlarmTableInsertTask.java
@@ -1,103 +1,47 @@
package com.moral.task;
import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
+
+import com.moral.service.AlarmService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import com.alibaba.fastjson.JSONObject;
-import com.moral.service.AlarmService;
-import com.moral.service.DeviceService;
-import com.moral.service.SensorService;
-import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
-
@Component
public class AlarmTableInsertTask {
private static transient Logger logger = LoggerFactory.getLogger(AlarmTableInsertTask.class);
+
@Resource
private AlarmService alarmService;
- @Resource
- private SensorService sensorService;
-
- @Resource
- private DeviceService deviceService;
-
@XxlJob("alarmDaily")
- public ReturnT insertAlarmDailyTable(String params) {
- LocalDateTime time = LocalDateTime.now();
- LocalDateTime endTime = time.truncatedTo(ChronoUnit.DAYS);
- LocalDateTime startTime = endTime.minusDays(1);
- List<String> sensorKeys = sensorService.getSensorKeys();
- List<String> macs = deviceService.getMacs();
-
- String year = startTime.getYear() + "";
- String month = null;
- int monthValue = startTime.getMonthValue();
- if (monthValue < 10) {
- month = "0" + monthValue;
- } else {
- month = monthValue + "";
- }
- String yearAndMonth = year + month;
-
- Map<String, Object> devices = new HashMap<>();
- devices.put("sensorKeys", sensorKeys);
- devices.put("start", startTime);
- devices.put("end", endTime);
- devices.put("macs", macs);
- devices.put("yearAndMonth",yearAndMonth);
-
- List<Map<String, Object>> dailyData = alarmService.getAvgAlarmData(devices);
- List<Map<String, Object>> dailyDataList = new ArrayList<>();
- for (Map<String, Object> deviceData : dailyData) {
- Map<String, Object> map = new HashMap<>();
- for (String sensorKey : sensorKeys) {
- if (deviceData.get(sensorKey) != null) {
- map.put(sensorKey, deviceData.get(sensorKey).toString());
- }
- }
- JSONObject json = new JSONObject(map);
- deviceData.put("json", json);
- }
-
- for (Map<String, Object> dailyMap : dailyData) {
- Map<String, Object> map = new HashMap<>();
- String mac = dailyMap.get("mac").toString();
- String json = dailyMap.get("json").toString();
- String state = dailyMap.get("state").toString();
- map.put("mac", mac);
- map.put("json", json);
- map.put("state", state);
- map.put("time", startTime);
- dailyDataList.add(map);
- }
- if (!CollectionUtils.isEmpty(dailyDataList)) {
- alarmService.insertAlarmDaily(dailyDataList);
+ public ReturnT insertAlarmDailyTable(String param) {
+ int count = alarmService.insertAlarmDaily();
+ if(count>0){
+ return new ReturnT(200, "������������������");
+ }else {
return new ReturnT(200, "������������������");
}
- return new ReturnT(500, "������������������");
}
-
@XxlJob("createAlarmSubTable")
- public void createAlarmSubTable(String params) {
- LocalDateTime time = LocalDateTime.now().plusMonths(1);;
+ public ReturnT createAlarmSubTable(String param) {
+ LocalDateTime time = LocalDateTime.now().plusMonths(1);
String year = time.getYear() + "";
String month = time.getMonthValue() + "";
if (time.getMonthValue() < 10) {
month = "0" + time.getMonthValue();
}
alarmService.createTable(year + month);
+ ReturnT returnT = new ReturnT(200, "������alarm������������������");
+ return returnT;
}
}
--
Gitblit v1.8.0