From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
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 b9366a4..b7b5c69 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
@@ -6,6 +6,7 @@
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.DeviceExcelDTO;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@@ -40,21 +41,20 @@
@Override
public void judgeOffLineDevice() {
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
- queryWrapper.ne("state", Constants.DEVICE_STATE_OFFLINE);
+ queryWrapper.eq("state", Constants.DEVICE_STATE_OFFLINE);
queryWrapper.eq("is_delete",Constants.NOT_DELETE);
//������������������������
List<Device> devices = deviceMapper.selectList(queryWrapper);
for (Device device : devices) {
- Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DATA_SECOND, device.getMac());
+ Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DATA_FIVE_MINUTES, 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);
+ if (data != null && data.containsKey("dataTime")) {
+ Date time = DateUtils.getDate((String) data.get("dataTime"), DateUtils.yyyyMMddHHmmss_EN);
//���������������������������������
- if (DateUtils.getDateOfMin(time, 2).getTime() < new Date().getTime()) {
+ if (DateUtils.getDateOfMin(time, 12).getTime() > new Date().getTime()) {
+ device.setState("1");
updateDeviceState(device);
}
- } else {
- updateDeviceState(device);
}
}
}
@@ -75,4 +75,9 @@
devices = deviceMapper.selectList(wrapper_device);
return devices;
}
+
+ @Override
+ public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String mon, int id) {
+ return this.baseMapper.ListDeviceExcel(startTime,mon,id);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0