From 856f1cf8ee52443ce616ce00ecff7cbb7c30f000 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 01 Nov 2023 16:21:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 b66f7b9..d624a60 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
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -39,20 +40,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.DEVICE_DATA, 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);
}
}
}
@@ -64,4 +65,13 @@
updateWrapper.eq("id", device.getId()).set("state", device.getState());
deviceMapper.update(null, updateWrapper);
}
-}
+
+ @Override
+ public List<Device> getDateByOrgId(int orgId) {
+ QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
+ wrapper_device.eq("is_delete",Constants.NOT_DELETE).eq("organization_id",orgId);
+ List<Device> devices = new ArrayList<>();
+ devices = deviceMapper.selectList(wrapper_device);
+ return devices;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0