From d32bc8f5fa5cd1a9ef293614124420b17acdaa5f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 23 Sep 2021 15:21:08 +0800
Subject: [PATCH] screen-api 增加小时和五分钟跨表查询
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 9448820..b0bb025 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
import com.moral.api.entity.SpecialDevice;
import com.moral.api.entity.SpecialDeviceHistory;
import com.moral.api.mapper.HistorySecondCruiserMapper;
@@ -12,7 +13,7 @@
import com.moral.api.service.SpecialDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
-import com.moral.constant.RedisConstants;
+
import com.moral.util.DateUtils;
import com.moral.util.GeodesyUtils;
import com.moral.util.TokenUtils;
@@ -60,7 +61,7 @@
private final static Double dis = 50d;
@Override
- public List<Map<String, Object>> getCarsInfo() {
+ public List<Map<String, Object>> selectCruisers() {
//������������������������
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
@@ -68,7 +69,7 @@
QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();
queryWrapper.select("mac", "name")
.eq("organization_id", orgId)
- .eq("special_type", Constants.SPECIAL_DEVICE_CAR)
+ .eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)
.eq("is_delete", Constants.NOT_DELETE);
return specialDeviceHistoryService.listMaps(queryWrapper);
}
@@ -104,14 +105,7 @@
}
@Override
- public Map<String, Object> getSpecialDeviceMapByMac(String mac) {
- //������������������
- Map<String, Object> specialDeviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
- return specialDeviceMap;
- }
-
- @Override
- public SpecialDevice getSpecialDeviceByMac(String mac) {
+ public SpecialDevice getSpecialDeviceMapByMac(String mac) {
QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
queryWrapper.eq("mac", mac);
queryWrapper.eq("is_delete", Constants.NOT_DELETE);
@@ -119,6 +113,7 @@
return specialDevice;
}
+
@Override
public List<String> getDatesByMac(String mac) {
Map<String, Object> userInfo = (Map) TokenUtils.getUserInfo();
--
Gitblit v1.8.0