From 709914b92b814f9f93ec38ed78054a8c831cc0fd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 06 Jul 2021 14:00:02 +0800
Subject: [PATCH] redis常量update
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 2 +
screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 2 +
screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java | 2 +
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 11 +++--
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 2 +
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 4 +
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java | 2
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 2 +
screen-job/src/main/java/com/moral/api/task/TestController.java | 18 ++++++++
screen-job/src/main/java/com/moral/api/entity/Device.java | 9 ++--
screen-common/src/main/java/com/moral/constant/Constants.java | 2
screen-common/src/main/java/com/moral/util/AmendUtils.java | 1
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 4 +
screen-common/src/main/java/com/moral/constant/RedisConstants.java | 12 +++---
screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java | 2 +
15 files changed, 54 insertions(+), 21 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/Constants.java b/screen-common/src/main/java/com/moral/constant/Constants.java
index d20f4af..6351a17 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -122,7 +122,7 @@
/*
* ���������������������
* */
- public static final String DEVICE_STATE_OFFLINE = "4";
+ public static final String DEVICE_STATE_OFFLINE = "0";
/*
* ������code
diff --git a/screen-common/src/main/java/com/moral/constant/RedisConstants.java b/screen-common/src/main/java/com/moral/constant/RedisConstants.java
index 05e95cd..4066f8f 100644
--- a/screen-common/src/main/java/com/moral/constant/RedisConstants.java
+++ b/screen-common/src/main/java/com/moral/constant/RedisConstants.java
@@ -30,9 +30,9 @@
public static final String SENSOR_KEY = "sensor";
/*
- * ������������������
+ * redis���������������key
* */
- public static final String DEVICE = "device_";
+ public static final String DEVICE = "device";
/*
* ���������������������������������������������������������������
@@ -49,14 +49,14 @@
public static final String ADJUST = "adjust_";
/*
- * ������������������
+ * redis���������������������key
* */
- public static final String DEVICE_DATA = "data_";
+ public static final String DEVICE_DATA = "data";
/*
- * ������������������
+ * redis���aqi������key
* */
- public static final String AQI_DATA = "aqi_";
+ public static final String AQI_DATA = "aqi_data";
}
diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index 809598a..9e15cb5 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -122,7 +122,6 @@
int n = data.size();
Collections.sort(data);
double v = n / (100 / p);
- System.out.println(n % (100 / p));
if (n % (100 / p) == 0) {
if (v == n) {
return data.get(n - 1);
diff --git a/screen-job/src/main/java/com/moral/api/entity/Device.java b/screen-job/src/main/java/com/moral/api/entity/Device.java
index 842a27f..c676a49 100644
--- a/screen-job/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-job/src/main/java/com/moral/api/entity/Device.java
@@ -3,8 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -101,17 +102,17 @@
/**
* ������(������)������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
*/
- private LocalDateTime installTime;
+ private Date installTime;
/**
* ������������,0���������������1���������
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 3f4df42..b66f7b9 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
@@ -42,7 +43,7 @@
//������������������������
List<Device> devices = deviceMapper.selectList(queryWrapper);
for (Device device : devices) {
- Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE_DATA + device.getMac());;
+ Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE_DATA, device.getMac());
device.setState(Constants.DEVICE_STATE_OFFLINE);
if (data != null && data.containsKey("DataTime")) {
Date time = DateUtils.getDate((String) data.get("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
@@ -57,6 +58,7 @@
}
@Override
+ @Transactional
public void updateDeviceState(Device device) {
UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", device.getId()).set("state", device.getState());
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
index ee1f372..bb4287b 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.client.RestTemplate;
@@ -43,6 +44,7 @@
private RedisTemplate redisTemplate;
@Override
+ @Transactional
public void insertHistoryAqi() {
RestTemplate restTemplate = new RestTemplate();
//������aqi������������
@@ -72,7 +74,7 @@
//���������������������
historyAqiMapper.insert(historyAqi);
//������redis
- redisTemplate.opsForHash().putAll(RedisConstants.AQI_DATA + cityCode, value);
+ redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, cityCode, value);
}
}
}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
index e184847..fb62517 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
@@ -48,6 +49,7 @@
private HistoryHourlyService historyHourlyService;
@Override
+ @Transactional
public void insertHistoryDaily() {
String format = DateUtils.yyyy_MM_dd_EN;
Date now = new Date();
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 7b31e16..4fc7ac3 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -2,6 +2,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
@@ -42,6 +43,7 @@
}
@Override
+ @Transactional
public void insertHistoryFiveMinutely() {
//������������������yyyy-MM-dd HH:mm
String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
index 16f1cac..8acb57a 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
@@ -48,6 +49,7 @@
private HistoryDailyService historyDailyService;
@Override
+ @Transactional
public void insertHistoryMonthly() {
//���������������������1���
Date start = DateUtils.getFirstDayOfLastMonth();
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java
index a2cff3c..b19cd67 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
@@ -48,6 +49,7 @@
private HistoryDailyService historyDailyService;
@Override
+ @Transactional
public void insertHistoryWeekly() {
//������������������������
Date start = DateUtils.getLastWeekMonday();
diff --git a/screen-job/src/main/java/com/moral/api/task/TestController.java b/screen-job/src/main/java/com/moral/api/task/TestController.java
index 678c2a5..125b355 100644
--- a/screen-job/src/main/java/com/moral/api/task/TestController.java
+++ b/screen-job/src/main/java/com/moral/api/task/TestController.java
@@ -13,8 +13,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.mapper.HistoryHourlyMapper;
+import com.moral.api.service.DeviceService;
+import com.moral.api.service.HistoryAqiService;
import com.moral.api.service.HistoryDailyService;
+import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.api.service.HistoryHourlyService;
+import com.moral.api.service.HistoryMonthlyService;
@Slf4j
@@ -27,10 +31,22 @@
private HistoryHourlyService historyHourlyService;
@Autowired
+ private HistoryFiveMinutelyService historyFiveMinutelyService;
+
+ @Autowired
private HistoryHourlyMapper historyHourlyMapper;
@Autowired
private HistoryDailyService historyDailyService;
+
+ @Autowired
+ private HistoryMonthlyService historyMonthlyService;
+
+ @Autowired
+ private DeviceService deviceService;
+
+ @Autowired
+ private HistoryAqiService historyAqiService;
@ApiOperation(value = "job������", notes = "job������")
@ApiImplicitParams({
@@ -38,7 +54,7 @@
})
@RequestMapping(value = "jobTest", method = RequestMethod.GET)
public void jobTest() {
- historyDailyService.insertHistoryDaily();
+ historyAqiService.insertHistoryAqi();
}
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
index adc3c81..4d1f804 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
@@ -133,7 +133,7 @@
//������������
data = deviceService.adjustDeviceData(data);
//������redis
- redisTemplate.opsForValue().set(RedisConstants.DEVICE_DATA + mac, data);
+ redisTemplate.opsForHash().put(RedisConstants.DEVICE_DATA, mac, data);
//���������������������������
deviceService.judgeDeviceState(data);
ack.acknowledge();
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 6e0e9b3..5d4d805 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -90,21 +90,21 @@
* ���redis������������������
* */
private Map<String, Object> getDeviceInfoFromRedis(String mac) {
- return (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE + mac);
+ return (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
}
/*
* ������������������redis
*/
private void setDeviceInfoToRedis(String mac, Map<String, Object> deviceInfo) {
- redisTemplate.opsForValue().set(RedisConstants.DEVICE + mac, deviceInfo);
+ redisTemplate.opsForHash().put(RedisConstants.DEVICE, mac, deviceInfo);
}
/*
* ���redis������������������
*/
private void delDeviceInfoFromRedis(String mac) {
- redisTemplate.delete(RedisConstants.DEVICE + mac);
+ redisTemplate.opsForHash().delete(RedisConstants.DEVICE, mac);
}
@Override
@@ -428,9 +428,9 @@
Object areaCode = monitorPoint.get("areaCode");
Object cityCode = monitorPoint.get("cityCode");
- Map<String, Object> aqiMap = redisTemplate.opsForHash().entries(RedisConstants.AQI_DATA + areaCode);
+ Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);
if (ObjectUtils.isEmpty(aqiMap)) {
- aqiMap = redisTemplate.opsForHash().entries(RedisConstants.AQI_DATA + cityCode);
+ aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
}
return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
}
@@ -438,6 +438,7 @@
}
@Override
+ @Transactional
public void judgeDeviceState(Map<String, Object> deviceData) {
String mac = deviceData.remove("mac").toString();
Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index c0caeda..f21db4c 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -11,6 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
@@ -34,6 +35,7 @@
private DeviceService deviceService;
@Override
+ @Transactional
public void insertHistoryHourly(Map<String, Object> data) {
Map<String, Object> dataAdjust = new HashMap<>(data);
String mac = data.remove("mac").toString();
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
index 216be2a..ccd2c8a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
@@ -2,6 +2,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
@@ -24,6 +25,7 @@
private DeviceService deviceService;
@Override
+ @Transactional
public void insertHistoryMinutely(Map<String, Object> data) {
Map<String, Object> result = new HashMap<>();
Map<String, Object> dataAdjust = new HashMap<>(data);
--
Gitblit v1.8.0