From 3dbc786738cdf005fac8ae5c27023e39a0554a68 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Wed, 24 Jan 2024 15:43:42 +0800
Subject: [PATCH] fix：疾控中心设备分钟数据导出
---
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 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 eae61a6..0ecca0e 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;
@@ -15,6 +16,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 +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);
}
}
}
@@ -64,4 +66,18 @@
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;
+ }
+
+ @Override
+ public List<DeviceExcelDTO> ListDeviceExcel(String startTime, String endTime, int id) {
+ return this.baseMapper.ListDeviceExcel(startTime,endTime,id);
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0