From 67df43bc9765422ed79a51a43a66cf903630f5a3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 11 Apr 2024 13:08:13 +0800
Subject: [PATCH] fix:汇总统计导出补充提交
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 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 02df9c3..510670a 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
@@ -22,7 +22,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;
@@ -193,23 +192,44 @@
@Transactional
public Integer batchAll(Map<String, Object> params) {
params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
+ String type = params.get("type").toString();
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 time2 = params.remove("time2").toString();
- long l = DateUtils.compareDateStrDay(time1, time2);
- if (l>0){
- params.put("time1",time1);
- params.put("time2",time2);
- }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<CruiserDTO> cruiserInfo;
+ //������������
+ if (type.equals("1")){
+ List<HashMap<String, Object>> list = (List<HashMap<String, Object>>) params.get("list");
+ 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());
+
+ }else {
+ //���������������
+ String time1 = params.remove("time1").toString();
+ String time2 = params.remove("time2").toString();
+ long l = DateUtils.compareDateStrDay(time1, time2);
+ if (l>0){
+ params.put("time1",time1);
+ params.put("time2",time2);
+ }else {
+ params.put("time1",time2);
+ params.put("time2",time1);
+ }
+ cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
+ cruiserInfo = cruiserInfo.stream().distinct().collect(Collectors.toList());
+ }
if (ObjectUtils.isEmpty(manageCoordinateDetails)){
for (CruiserDTO cruiserDTO : cruiserInfo) {
Double flyLat = cruiserDTO.getFlyLat();
--
Gitblit v1.8.0