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/impl/SpecialDeviceServiceImpl.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 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 7e5d8c1..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
@@ -3,16 +3,16 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistorySecondSpecial;
-import com.moral.api.entity.Sensor;
+import com.moral.api.entity.Organization;
import com.moral.api.entity.SpecialDevice;
-import com.moral.api.entity.SysDictData;
+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.HistorySecondSpecialService;
-import com.moral.api.service.SensorService;
+import com.moral.api.service.OrganizationService;
+import com.moral.api.service.SpecialDeviceHistoryService;
import com.moral.api.service.SpecialDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.api.service.SysDictDataService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@@ -26,9 +26,9 @@
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* <p>
@@ -45,29 +45,39 @@
private HistorySecondSpecialMapper historySecondSpecialMapper;
@Autowired
- private SensorService sensorService;
+ private SpecialDeviceHistoryService specialDeviceHistoryService;
@Autowired
- private SysDictDataService sysDictDataService;
+ OrganizationService organizationService;
@Autowired
- private RedisTemplate redisTemplate;
+ SpecialDeviceMapper specialDeviceMapper;
+
+ @Autowired
+ private HistorySecondCruiserMapper historySecondCruiserMapper;
+
+ @Autowired
+ RedisTemplate redisTemplate;
private final static Double dis = 50d;
@Override
+ public List<Map<String, Object>> getCarsInfo() {
+ //������������������������
+ Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+ QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("mac", "name")
+ .eq("organization_id", orgId)
+ .eq("special_type", Constants.SPECIAL_DEVICE_CAR)
+ .eq("is_delete", Constants.NOT_DELETE);
+ return specialDeviceHistoryService.listMaps(queryWrapper);
+ }
+
+ @Override
public List<Map<String, Object>> carTrajectory(Map<String, Object> params) {
params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
-
- //���������������������
- /*QueryWrapper<Sensor> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("default_unit_key").eq("code", sensorCode);
- String defaultUnitKey = sensorService.getOne(queryWrapper).getDefaultUnitKey();
- QueryWrapper<SysDictData> sysDictDataQueryWrapper = new QueryWrapper<>();
- sysDictDataQueryWrapper.select("dataValue").eq("dict_type_id", 14).eq("dataKey", defaultUnitKey);
- String sensorUnit = sysDictDataService.getOne(sysDictDataQueryWrapper).getDataValue();
-
- params.put("sensorUnit", sensorUnit);*/
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
@@ -95,6 +105,31 @@
return filterData(data);
}
+ @Override
+ public SpecialDevice getSpecialDeviceMapByMac(String mac) {
+ QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
+ 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();
+ 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