From f502917e38fa5817aee2452fa7b1f9331269f0c8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Sep 2021 09:55:09 +0800
Subject: [PATCH] 修改device实体类
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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..3de0dad 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,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.entity.HistorySecondSpecial;
+import com.moral.api.entity.Organization;
import com.moral.api.entity.SpecialDevice;
import com.moral.api.entity.SpecialDeviceHistory;
import com.moral.api.mapper.HistorySecondCruiserMapper;
@@ -104,21 +106,15 @@
}
@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);
+ queryWrapper.eq("mac",mac);
+ queryWrapper.eq("is_delete",Constants.NOT_DELETE);
SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper);
return specialDevice;
}
+
@Override
public List<String> getDatesByMac(String mac) {
Map<String, Object> userInfo = (Map) TokenUtils.getUserInfo();
--
Gitblit v1.8.0