From 1af7d5e48d6cfaac6123ea67c9223d32b291a564 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 14 Sep 2021 10:31:32 +0800
Subject: [PATCH] screen-api 修改接口bug
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 7fe9dd9..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
@@ -6,6 +6,7 @@
import com.moral.api.entity.Organization;
import com.moral.api.entity.SpecialDevice;
import com.moral.api.entity.SpecialDeviceHistory;
+import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.HistorySecondSpecialMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.service.OrganizationService;
@@ -14,6 +15,7 @@
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;
@@ -23,6 +25,8 @@
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -48,6 +52,10 @@
@Autowired
SpecialDeviceMapper specialDeviceMapper;
+
+ @Autowired
+ private HistorySecondCruiserMapper historySecondCruiserMapper;
+
@Autowired
RedisTemplate redisTemplate;
@@ -99,15 +107,6 @@
@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);
- }
-
- @Override
- public SpecialDevice getSpecialDeviceByMac(String mac) {
QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
queryWrapper.eq("mac",mac);
queryWrapper.eq("is_delete",Constants.NOT_DELETE);
@@ -116,6 +115,21 @@
}
+ @Override
+ public List<String> getDatesByMac(String mac) {
+ Map<String, Object> userInfo = (Map) TokenUtils.getUserInfo();
+ Map<String, Object> orgInfo = (Map) userInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("orgId", orgId);
+ params.put("mac", mac);
+ Date start = DateUtils.addMonths(new Date(), -6);
+ params.put("start", DateUtils.dateToDateString(start));
+ return historySecondCruiserMapper.getDates(params);
+ }
+
+
//������������������������
private List<Map<String, Object>> filterData(List<Map<String, Object>> data) {
List<Map<String, Object>> result = new ArrayList<>();
--
Gitblit v1.8.0