From 4686da41b376617f6d447b3546c045ce54f032fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 7387fc3..a6a1a4a 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
@@ -169,12 +169,19 @@
List<CruiserDTO> cruiserInfo = new ArrayList<>();
ArrayList<ManageCoordinateDetail> rsList1 = new ArrayList<>();
for(CruiserListDTO c : list){
+ if (ObjectUtils.isEmpty(c.getFlyLon()) || ObjectUtils.isEmpty(c.getFlyLat())) {
+ continue;
+ }
+ double[] doubles = RoadUtils.transformWGS84ToBD09(c.getFlyLon(), c.getFlyLat());
+ if(doubles.length !=2){
+ continue;
+ }
String date = new StringBuilder().append(c.getFlyLon()).append("_").append(c.getFlyLat()).toString();
if(c.getState().equals(0)){
CruiserDTO cruiserDTO = new CruiserDTO();
cruiserDTO.setTime(c.getTime());
- cruiserDTO.setFlyLat(c.getFlyLat());
- cruiserDTO.setFlyLon(c.getFlyLon());
+ cruiserDTO.setFlyLat(doubles[1]);
+ cruiserDTO.setFlyLon(doubles[0]);
cruiserDTO.setData(date);
cruiserDTO.setState("1");
cruiserInfo.add(cruiserDTO);
@@ -182,8 +189,8 @@
ManageCoordinateDetail detail = new ManageCoordinateDetail();
detail.setId(c.getId());
detail.setCoordinateId(c.getCoordinateId());
- detail.setLongitude(c.getFlyLon());
- detail.setLatitude(c.getFlyLat());
+ detail.setLongitude(doubles[0]);
+ detail.setLatitude(doubles[1]);
detail.setState(c.getState().toString());
detail.setCode(date);
rsList1.add(detail);
--
Gitblit v1.8.0