From 1f65fd011582ac6587d60475315d2ee6662d9d5b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Sep 2023 09:01:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 5b9b086..b92b0b9 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
@@ -40,7 +40,6 @@
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
import com.moral.util.TokenUtils;
-import com.sun.org.apache.regexp.internal.RE;
@Service
@@ -171,10 +170,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());
@@ -205,7 +209,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);
@@ -216,6 +220,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 +244,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