From bcc076d63c5c2ff473adb5ac15ea242559086000 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Tue, 08 Sep 2026 17:00:13 +0800
Subject: [PATCH] fix：雷达调整
---
screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
index d86dd47..06e0037 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
@@ -53,36 +53,41 @@
public void sort(String startTime, String endTime) {
if (ObjectUtils.isEmpty(startTime)&&ObjectUtils.isEmpty(endTime)){
- //������������������������������
- startTime = DateUtils.getDateStringOfHour(-2, "yyyy-MM-dd HH:00:00");
-
+ //������������������������
+ startTime = DateUtils.getDateStringOfDay(-1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
//������������������
- endTime = DateUtils.getCurDate("yyyy-MM-dd HH:00:00");
+ endTime = DateUtils.getCurDate(DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
}
List<HistorySecondCruiser> result = historySecondCruiserMapper.getResult(startTime, endTime);
//
ArrayList<SecondCruiserSort> list1 = new ArrayList<>();
if (!ObjectUtils.isEmpty(result)){
+
for (HistorySecondCruiser historySecondCruiser : result) {
String mac = historySecondCruiser.getMac();
Integer organizationId = historySecondCruiser.getOrganizationId();
List<Integer> orgList = organizationMapper.orgIdSpecialDevList(organizationId, mac);
if(CollectionUtils.isEmpty(orgList)){
- return;
+ continue;
}
-
HashMap<String, Object> params = new HashMap<>();
params.put("mac",mac);
params.put("startTime",startTime);
params.put("endTime",endTime);
List<Map<String, Object>> dusts = historySecondCruiserMapper.getDusts(params);
+ if (ObjectUtils.isEmpty(dusts)){
+ continue;
+ }
Map<String, List<DustldDTO>> collect = manageCoordinateDetailMapper.CompareTo(orgList.get(0)).stream().collect(Collectors.groupingBy(o -> o.getName()));
- if (ObjectUtils.isEmpty(dusts) || ObjectUtils.isEmpty(collect)){
- return;
+ if (ObjectUtils.isEmpty(collect)){
+ continue;
}
Set<String> strings = collect.keySet();
+ int i = 1;
for (String string : strings) {
+ log.info("������������>>>>>>>>> "+i+"/"+strings.size()+" >>>>>>>> "+string+" >>>>>>");
+ i++;
SecondCruiserSort secondCruiserSort = new SecondCruiserSort();
ArrayList<Double> doubleArrayList = new ArrayList<>();
List<DustldDTO> dustldDTOS = collect.get(string);
@@ -94,7 +99,9 @@
}
double latDouble1 = Double.parseDouble(flyLat);
double lonDouble1 = Double.parseDouble(flyLon);
- for (Map<String, Object> dust : dusts) {
+ //for (Map<String, Object> dust : dusts) {
+ for( int ii=0;ii<dusts.size();ii++){
+ Map<String, Object> dust = dusts.get(ii);
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);
@@ -103,7 +110,9 @@
if (latDouble1==latDouble && lonDouble1==lonDouble){
Double dustld = Objects.nonNull(dust.get("dustld"))?Double.parseDouble(dust.get("dustld").toString()):0d;
doubleArrayList.add(dustld);
- break;
+// break;
+ dusts.remove(ii);
+ ii--;
}
}
}
@@ -122,8 +131,8 @@
}
}
if (!ObjectUtils.isEmpty(list1)){
-// log.info(list1.size()+"");
secondCruiserSortMapper.insertAll(list1);
+ log.info("������������������>>>>>>>> "+list1.size()+" >>>>>>>>>���");
}
}
--
Gitblit v1.8.0