From 15369bf819ca82896bbcada782e6babf2a7d64c9 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:49:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java | 99 ++++++++++++++++++++++---------------------------
1 files changed, 44 insertions(+), 55 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
index eb13b3f..d8c1d64 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
@@ -1,31 +1,5 @@
package com.moral.api.service.impl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.ManageAccount;
@@ -40,6 +14,22 @@
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
import com.moral.util.TokenUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
@Service
@@ -74,11 +64,12 @@
List<Map<String, Object>> data = (List<Map<String, Object>>) params.get("data");
for (Map<String, Object> datum : data) {
- ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();
+
String code = datum.get("code").toString();
String state = datum.get("state").toString();
if (state.equals("2")){
+ ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();
String[] rs = code.split("_");
manageCoordinateDetail.setCoordinateId(coordinateId);
manageCoordinateDetail.setLongitude(Double.parseDouble(rs[0]));
@@ -101,7 +92,7 @@
return 2;
}
manageCoordinateDetailMapper.deleteById(Integer.parseInt(id1.toString()));
-// manageCoordinateDetailMapper.delete(wrapper);
+
}
}
return 200;
@@ -169,10 +160,15 @@
String[] rs = data.split("_");
String flyLon = rs[0];
String flyLat = rs[1];
+// double lonDouble = Double.parseDouble(flyLon);
+// double latDouble = Double.parseDouble(flyLat);
for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
String latitude = manageCoordinateDetail.getLatitude().toString();
String longitude = manageCoordinateDetail.getLongitude().toString();
- if (latitude.equals(flyLat) && longitude.equals(flyLon)){
+// double lonDouble1 = Double.parseDouble(longitude);
+// double latDouble1 = Double.parseDouble(latitude);
+// if (latDouble1==latDouble && lonDouble==lonDouble1){
+ if (flyLon.equals(longitude) && flyLat.equals(latitude)){
manageCoordinateDetail.setCode(data);
manageCoordinateDetail.setLongitude(cruiserDTO.getFlyLon());
manageCoordinateDetail.setLatitude(cruiserDTO.getFlyLat());
@@ -203,7 +199,7 @@
queryWrapper.eq("coordinate_id",coordinateId);
String time1 = params.remove("time1").toString();
String time2 = params.remove("time2").toString();
- long l = DateUtils.compareDateStr(time1, time2);
+ long l = DateUtils.compareDateStrDay(time1, time2);
if (l>0){
params.put("time1",time1);
params.put("time2",time2);
@@ -214,6 +210,7 @@
int j =0;
List<ManageCoordinateDetail> manageCoordinateDetails = manageCoordinateDetailMapper.selectList(queryWrapper);
List<CruiserDTO> cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
+ cruiserInfo = cruiserInfo.stream().distinct().collect(Collectors.toList());
if (ObjectUtils.isEmpty(manageCoordinateDetails)){
for (CruiserDTO cruiserDTO : cruiserInfo) {
Double flyLat = cruiserDTO.getFlyLat();
@@ -230,32 +227,24 @@
log.info(j+"");
}
}else {
- for (int i=cruiserInfo.size()-1;i>0;i--) {
- CruiserDTO cruiserDTO = cruiserInfo.get(i);
- Double flyLat = cruiserDTO.getFlyLat();
- Double flyLon = cruiserDTO.getFlyLon();
- for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
- String latitude = manageCoordinateDetail.getLatitude().toString();
- String longitude = manageCoordinateDetail.getLongitude().toString();
- if (latitude.equals(flyLat+"") && longitude.equals(flyLon+"")){
- cruiserInfo.remove(i);
- break;
- }
- }
- }
+ Map<String,Integer> map = new HashMap<>(manageCoordinateDetails.size()+50);
+ manageCoordinateDetails.forEach(it->map.put(it.getLatitude()+"_"+it.getLongitude(),it.getId()));
+ List<ManageCoordinateDetail> result = new ArrayList<>();
for (CruiserDTO cruiserDTO : cruiserInfo) {
- Double flyLat = cruiserDTO.getFlyLat();
- Double flyLon = cruiserDTO.getFlyLon();
- ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
- rsDTO.setLatitude(flyLat);
- rsDTO.setLongitude(flyLon);
- rsDTO.setState("2");
- rsDTO.setCreateTime(new Date());
- rsDTO.setUpdateTime(new Date());
- rsDTO.setCoordinateId(coordinateId);
- manageCoordinateDetailMapper.insert(rsDTO);
- j++;
- log.info(j+"");
+ String fly = cruiserDTO.getFlyLat()+"_"+cruiserDTO.getFlyLon();
+ if(!map.containsKey(fly)){
+ ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
+ rsDTO.setLatitude(cruiserDTO.getFlyLat());
+ rsDTO.setLongitude(cruiserDTO.getFlyLon());
+ rsDTO.setState("2");
+ rsDTO.setCreateTime(new Date());
+ rsDTO.setUpdateTime(new Date());
+ rsDTO.setCoordinateId(coordinateId);
+ result.add(rsDTO);
+ }
+ }
+ if(!CollectionUtils.isEmpty(result)){
+ this.saveBatch(result);
}
}
return 200;
--
Gitblit v1.8.0