From a3646e32c81cd62886405a77c4c89aad7fb857e7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 31 Aug 2021 13:05:14 +0800
Subject: [PATCH] screen-common 更新kafka主题名称常量类
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 45 +++++++++++++++++----------------------------
1 files changed, 17 insertions(+), 28 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..4ff6a07 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,33 +2,24 @@
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.SpecialDevice;
-import com.moral.api.entity.SysDictData;
+import com.moral.api.entity.SpecialDeviceHistory;
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.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;
import com.moral.util.GeodesyUtils;
import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* <p>
@@ -45,29 +36,27 @@
private HistorySecondSpecialMapper historySecondSpecialMapper;
@Autowired
- private SensorService sensorService;
-
- @Autowired
- private SysDictDataService sysDictDataService;
-
- @Autowired
- private RedisTemplate redisTemplate;
+ private SpecialDeviceHistoryService specialDeviceHistoryService;
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");
--
Gitblit v1.8.0