From 51e4f233fd0dfc92c2b8619114aea98322506f18 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Apr 2024 08:56:47 +0800
Subject: [PATCH] fix:经纬度录入补充提交
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 60149e4..2d79ff0 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
@@ -11,7 +11,6 @@
import com.moral.api.service.ManageCoordinateDetailService;
import com.moral.api.util.RoadUtils;
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;
@@ -22,7 +21,6 @@
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;
@@ -196,7 +194,7 @@
int coordinateId = Integer.parseInt(params.get("coordinateId").toString());
QueryWrapper<ManageCoordinateDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("coordinate_id",coordinateId);
- String time1 = params.remove("time1").toString();
+ /* String time1 = params.remove("time1").toString();
String time2 = params.remove("time2").toString();
long l = DateUtils.compareDateStrDay(time1, time2);
if (l>0){
@@ -205,15 +203,33 @@
}else {
params.put("time1",time2);
params.put("time2",time1);
- }
+ }*/
int j =0;
List<ManageCoordinateDetail> manageCoordinateDetails = manageCoordinateDetailMapper.selectList(queryWrapper);
- List<CruiserDTO> cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
- cruiserInfo = cruiserInfo.stream().distinct().collect(Collectors.toList());
+// List<CruiserDTO> cruiserInfo = (List<CruiserDTO>) params.get("list");
+ List<HashMap<String, Object>> list = (List<HashMap<String, Object>>) params.get("list");
+ List<CruiserDTO> cruiserInfo = list.stream().distinct()
+ .map(map -> {
+
+ CruiserDTO p = new CruiserDTO();
+ Double flylat = (Double) map.get("flylat");
+ Double flylon = (Double) map.get("flylon");
+ p.setFlyLat(flylat);
+ p.setFlyLon(flylon);
+ return p;
+ })
+ .collect(Collectors.toList());
+
+
+// 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();
Double flyLon = cruiserDTO.getFlyLon();
+ if (ObjectUtils.isEmpty(flyLat) || ObjectUtils.isEmpty(flyLon)){
+ continue;
+ }
ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
rsDTO.setLatitude(flyLat);
rsDTO.setLongitude(flyLon);
--
Gitblit v1.8.0