From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
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 a9df6df..4813ddb 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
@@ -9,7 +9,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -21,13 +20,11 @@
import com.moral.api.entity.DustldDTO;
import com.moral.api.entity.HistorySecondCruiser;
import com.moral.api.entity.SecondCruiserSort;
-import com.moral.api.entity.SysDictData;
import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.ManageCoordinateDetailMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.mapper.SecondCruiserSortMapper;
import com.moral.api.service.HistorySecondCruiserService;
-import com.moral.api.service.SysDictTypeService;
import com.moral.util.DateUtils;
/**
@@ -56,10 +53,11 @@
public void sort(String startTime, String endTime) {
if (ObjectUtils.isEmpty(startTime)&&ObjectUtils.isEmpty(endTime)){
- //������������������������
- startTime = DateUtils.getDateStringOfDay(-1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ //������������������������������
+ startTime = DateUtils.getDateStringOfHour(-2, "yyyy-MM-dd HH:00:00");
+
//������������������
- endTime = DateUtils.getCurDate(DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ endTime = DateUtils.getCurDate("yyyy-MM-dd HH:00:00");
}
List<HistorySecondCruiser> result = historySecondCruiserMapper.getResult(startTime, endTime);
@@ -118,6 +116,7 @@
secondCruiserSort.setValue(rsAvg);
secondCruiserSort.setMac(mac);
secondCruiserSort.setOrganizationId(organizationId);
+ secondCruiserSort.setTime(endTime);
list1.add(secondCruiserSort);
}
}
--
Gitblit v1.8.0