From 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 08:24:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java | 74 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
index 0b2e9af..36574a2 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
@@ -12,6 +12,7 @@
import com.moral.api.service.HistorySecondCruiserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.SpecialDeviceService;
+import com.moral.api.util.RoadUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@@ -24,9 +25,14 @@
import org.springframework.util.ObjectUtils;
import java.sql.Wrapper;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -97,6 +103,7 @@
@Override
public List<SpecialDevice> selectCruisers() {
QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
+ wrapper.select("name","mac");
wrapper.eq("is_delete",Constants.NOT_DELETE);
List<SpecialDevice> specialDevices = specialDeviceMapper.selectList(wrapper);
return specialDevices;
@@ -108,26 +115,57 @@
* @return
*/
@Override
- public List<CruiserDTO> getCruiserInFo(Map<String, Object> params) {
+ public Map<String,Object> getCruiserInFo(Map<String, Object> params) {
+ HashMap<String, Object> map = new HashMap<>();
+ String mac = params.get("mac").toString();
+ String time1 = params.get("time1").toString();
params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
- List<CruiserDTO> data = historySecondCruiserMapper.getCruiserInfo(params);
- List<CruiserDTO> rsCruiser = data.stream().distinct().collect(Collectors.toList());
- rsCruiser.removeIf(o->{
- if (ObjectUtils.isEmpty(o.getFlyLon()) || ObjectUtils.isEmpty(o.getFlyLat())) {
- return true;
- }
- double lon = o.getFlyLon();
- double lat = o.getFlyLat();
- if (lon < 70 || lon > 150 || lat < 20 || lat > 60) {
- return true;
- }
- return false;
- });
- if(CollectionUtils.isEmpty(data)){
- return null;
+ ArrayList<Object> list = new ArrayList<>();
+ List<CruiserDTO> data = (List<CruiserDTO>) redisTemplate.opsForHash().get(RedisConstants.DATE_COORDINATE, mac + time1);
+// List<CruiserDTO> data = (List<CruiserDTO>) redisTemplate.opsForValue().get(mac + time1);
+ if (ObjectUtils.isEmpty(data)){
+ data = historySecondCruiserMapper.getCruiserInfo(params);
+ data = data.stream().distinct().collect(Collectors.toList());
+ data.removeIf(o->{
+ if (ObjectUtils.isEmpty(o.getFlyLon()) || ObjectUtils.isEmpty(o.getFlyLat())) {
+ return true;
+ }
+ double lon = o.getFlyLon();
+ double lat = o.getFlyLat();
+ double[] doubles = RoadUtils.transformWGS84ToBD09(lon, lat);
+ Matcher matcher = Pattern.compile("\\d*\\.\\d{8}").matcher(""+doubles[0]);
+ matcher.find();
+ String s = matcher.group();
+ Matcher matcher1 = Pattern.compile("\\d*\\.\\d{8}").matcher(""+doubles[1]);
+ matcher1.find();
+ String s1 = matcher1.group();
+ o.setFlyLon(Double.parseDouble(s));
+ o.setFlyLat(Double.parseDouble(s1));
+ o.setData(lon+"_"+lat);
+// o.setFlyLon(doubles[0]);
+// o.setFlyLat(doubles[1]);
+ if (lon < 70 || lon > 150 || lat < 20 || lat > 60) {
+ return true;
+ }
+ return false;
+ });
+
+ redisTemplate.opsForHash().put(RedisConstants.DATE_COORDINATE,mac+time1,data);
+ //������������������
+ redisTemplate.opsForHash().getOperations().expire(RedisConstants.DATE_COORDINATE,600, TimeUnit.SECONDS);
+
}
+
+// redisTemplate.opsForValue().set(mac+time1,rsCruiser,600, TimeUnit.SECONDS);
+
+ map.put("rsData",data);
+ map.put("data",list);
log.info(data.size()+"");
- log.info(rsCruiser.size()+"");
- return rsCruiser;
+ log.info(data.size()+"");
+ return map;
}
+
+
+
+
}
--
Gitblit v1.8.0