From 82841afc4e140f72fdeb378102e0e9a978bbe14c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 14 Sep 2021 10:26:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java | 3 +++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 1 -
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 13 ++++++++-----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
index 4a2f53a..ae500b4 100644
--- a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
@@ -35,4 +35,7 @@
//���������������������������������������
List<String> getDatesByMac(String mac);
+ //���������������������������������������
+ List<String> getDatesByMac(String mac);
+
}
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 357a576..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;
@@ -103,12 +105,13 @@
return filterData(data);
}
-
+ @Override
public SpecialDevice getSpecialDeviceMapByMac(String mac) {
- QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
- wrapper.eq("mac", mac);
- wrapper.eq("is_delete", Constants.NOT_DELETE);
- return specialDeviceMapper.selectOne(wrapper);
+ QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
+ queryWrapper.eq("mac",mac);
+ queryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper);
+ return specialDevice;
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 1821541..66b431a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -12,7 +12,6 @@
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.api.service.GovMonitorPointService;
import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;
--
Gitblit v1.8.0