From 9d498b380a7047f7f21fcd709cfcec056be5baac Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 29 Jun 2023 14:27:43 +0800
Subject: [PATCH] 走航车添加百日均值接口
---
screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java | 2 ++
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index f909ef0..d004610 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -18,6 +18,7 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.text.ParseException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -111,14 +112,16 @@
return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
}
long etime = System.currentTimeMillis();
- Map<Integer,HistorySecondCruiserResultDTO> map = new HashMap<>();
+ /*List<Map<Integer,HistorySecondCruiserResultDTO>> mapList = new ArrayList<>();
for(int i = 0 ;i<response.size();i++){
+ Map<Integer,HistorySecondCruiserResultDTO> map = new HashMap<>();
map.put(i,response.get(i));
- }
+ mapList.add(map);
+ }*/
//������������������
System.out.printf("���������������%d ������.", (etime - stime));
- return ResultMessage.ok(map);
+ return ResultMessage.ok(response);
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java
index d6c461b..ff85e75 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java
@@ -23,11 +23,13 @@
/**
* ������
*/
+ @JsonProperty(value = "flylat")
private Double flyLat;
/**
* ������
*/
+ @JsonProperty(value = "flylon")
private Double flyLon;
/**
--
Gitblit v1.8.0