From c675a4c92b636fc4401d545b1d7bab6996b305f0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 14:02:28 +0800
Subject: [PATCH] feat:补充提交
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 d7c7333..f0c0550 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
@@ -171,10 +171,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());
@@ -216,6 +221,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();
@@ -239,7 +245,10 @@
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 (lonDouble1==flyLon && flyLat==latDouble1 ){
+ if (longitude.equals(flyLon+"") && latitude.equals(flyLat+"")){
cruiserInfo.remove(i);
break;
}
--
Gitblit v1.8.0