From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 4813ddb..4b2e98a 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,11 +53,10 @@
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);
@@ -103,7 +102,7 @@
if (latDouble1==latDouble && lonDouble1==lonDouble){
Double dustld = Objects.nonNull(dust.get("dustld"))?Double.parseDouble(dust.get("dustld").toString()):0d;
doubleArrayList.add(dustld);
- break;
+// break;
}
}
}
@@ -116,7 +115,7 @@
secondCruiserSort.setValue(rsAvg);
secondCruiserSort.setMac(mac);
secondCruiserSort.setOrganizationId(organizationId);
- secondCruiserSort.setTime(endTime);
+ secondCruiserSort.setTime(startTime);
list1.add(secondCruiserSort);
}
}
--
Gitblit v1.8.0