From 2dc7a6b9623b3f04564e16e03c5c1778f0e2c8ee Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Thu, 29 Jun 2023 19:20:33 +0800
Subject: [PATCH] 点位缺失提交
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 6 ++----
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 5 +++++
2 files changed, 7 insertions(+), 4 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 05f2f72..4e852a2 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
@@ -108,12 +108,10 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
List<HistorySecondCruiserResultDTO> response = specialDeviceService.carTrajectoryNewAvg(params);
- if(CollectionUtils.isEmpty(response)){
- return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
- }//������������������
- return ResultMessage.ok(response);
+ //������������������
+ return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 0562f3a..1ab767d 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -590,6 +590,11 @@
if(!list.contains(d)){
list.add(d);
integer++;
+ HistorySecondCruiserResultCountDTO countResultDTO = Objects.isNull(map.get(integer))?new HistorySecondCruiserResultCountDTO():map.get(integer);
+ countResultDTO.setSumNum(d.getNum());
+ countResultDTO.setContNum(1);
+ map.put(integer,countResultDTO);
+ mapTest.put(d.getFlyLon()+"_"+d.getFlyLat(),d.getNum());
}
}
}
--
Gitblit v1.8.0