From 9367b86590a9774cd1e4f5d02d9f394605fe6a7f Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Tue, 10 Sep 2024 16:25:54 +0800
Subject: [PATCH] fix:job尘负荷排名修改提交
---
screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml | 5 ++++-
screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java | 9 ++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml b/screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml
index 9ec731e..0a5526e 100644
--- a/screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml
+++ b/screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml
@@ -13,7 +13,10 @@
<select id="getSort" resultType="com.moral.api.entity.SecondCruiserSort">
select road,avg(value) as "avg",time,mac from second_cruiser_sort
- where mac =#{mac} and time BETWEEN #{startTime} and #{endTime} GROUP BY road ORDER BY avg DESC
+ where mac =#{mac}
+ AND `time` <![CDATA[>]]> #{startTime}
+ AND `time` <![CDATA[<=]]> #{endTime}
+ GROUP BY road ORDER BY avg DESC
</select>
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..4c938a8 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);
@@ -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