From acd8bc764569dcd6a89df4186537e210ffafb283 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Sep 2023 15:21:34 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
index 958d520..a552f8d 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
@@ -282,10 +282,10 @@
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
- String time1 = params.get("time1").toString();
+ String time1 = params.get("startTime").toString();
String dateString1 = DateUtils.stringToDateString(time1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN, DateUtils.yyyy_MM_dd_HH_mm_CN);
String rsTime1 = dateString1.substring(5, 14);
- String time2 = params.get("time2").toString();
+ String time2 = params.get("endTime").toString();
String dateString2 = DateUtils.stringToDateString(time2, DateUtils.yyyy_MM_dd_HH_mm_ss_EN, DateUtils.yyyy_MM_dd_HH_mm_CN);
String rsTime2 = dateString2.substring(5, 14);
HashMap<String, Object> rsMap = new HashMap<>();
@@ -305,29 +305,29 @@
for (DustldDTO dustldDTO : dustldDTOS) {
String flyLat = dustldDTO.getFlyLat();
String flyLon = dustldDTO.getFlyLon();
-// if (flyLon==null && flyLat==null){
-// continue;
-// }
+ if (flyLon==null && flyLat==null){
+ continue;
+ }
+ double latDouble1 = Double.parseDouble(flyLat);
+ double lonDouble1 = Double.parseDouble(flyLon);
for (Map<String, Object> dust : dusts) {
String flyLat1 = Objects.nonNull(dust.get("flyLat")) ? dust.get("flyLat").toString() :"0";
String flyLon1 = Objects.nonNull(dust.get("flyLon")) ? dust.get("flyLon").toString() :"0";
+ double latDouble = Double.parseDouble(flyLat1);
+ double lonDouble = Double.parseDouble(flyLon1);
// String flyLon1 = dust.get("flyLon").toString();
- if (flyLat1.equals(flyLat) && flyLon1.equals(flyLon)){
+ if (latDouble1==latDouble && lonDouble1==lonDouble){
Double dustld = Objects.nonNull(dust.get("dustld"))?Double.parseDouble(dust.get("dustld").toString()):0d;
if (dustld>=0 && dustld<40 ){
dustld = dustld + 170;
- }
- if (dustld>=40 && dustld<60 ){
+ }else if (dustld>=40 && dustld<60){
dustld = dustld + 130;
- }
- if (dustld>=60 && dustld<100 ){
+ }else if (dustld>=60 && dustld<100 ){
dustld = dustld + 110;
- }
- if (dustld>=100 && dustld<150 ){
+ }else if (dustld>=100 && dustld<150){
dustld = dustld + 70;
- }
- if (dustld>=150 && dustld<180 ){
+ }else if (dustld>=150 && dustld<180){
dustld = dustld + 30;
}
doubleArrayList.add(dustld);
--
Gitblit v1.8.0