From 9cc9f173f8db89135610eba2c8af79c17b24dfdf Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 08 Sep 2021 17:21:19 +0800 Subject: [PATCH] screen-api 增加获取组织所有无人机飞行时间接口 --- screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 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 4ff6a07..fd19d65 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,18 +2,23 @@ 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.HistorySecondSpecialMapper; import com.moral.api.mapper.SpecialDeviceMapper; +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.constant.Constants; +import com.moral.constant.RedisConstants; 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; @@ -37,6 +42,14 @@ @Autowired private SpecialDeviceHistoryService specialDeviceHistoryService; + + @Autowired + OrganizationService organizationService; + + @Autowired + SpecialDeviceMapper specialDeviceMapper; + @Autowired + RedisTemplate redisTemplate; private final static Double dis = 50d; @@ -84,6 +97,23 @@ return filterData(data); } + @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) { + QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper(); + queryWrapper.eq("mac",mac); + queryWrapper.eq("is_delete",Constants.NOT_DELETE); + SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper); + return specialDevice; + } + + //������������������������ private List<Map<String, Object>> filterData(List<Map<String, Object>> data) { List<Map<String, Object>> result = new ArrayList<>(); -- Gitblit v1.8.0