autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

时间工具类新增 将分钟转成 x时x分钟方法，小程序订单列表页充电时长从缓存中取

Browse Source
This commit is contained in:
Lemon
2023-10-11 11:04:14 +08:00
parent fbf2f03058
commit dd77f63f07
5 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -236,18 +236,31 @@ public class OrderService {
for (OrderVO orderVO : pageInfo.getList()) {
orderVO.setPileConnectorCode(orderVO.getPileSn() + orderVO.getConnectorCode());
String chargingTime = "0分钟";
if (orderVO.getStartTime() != null) {
Date startTimeDate = DateUtils.parseDate(orderVO.getStartTime());
Date endTimeDate;
if (orderVO.getEndTime() != null) {
endTimeDate = DateUtils.parseDate(orderVO.getEndTime());
} else {
endTimeDate = new Date();
}
// 计算出两个时间差
chargingTime = DateUtils.getDatePoor(endTimeDate, startTimeDate);
// 从缓存中获取充电时长
List<RealTimeMonitorData> chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderVO.getTransactionCode());
// 默认时间倒序排列，因此只取第一条就可以
if (CollectionUtils.isEmpty(chargingRealTimeData)) {
orderVO.setChargingTime("-");
continue;
}
RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0);
String sumChargingTime = realTimeMonitorData.getSumChargingTime(); // xx分钟
// 分钟转成 x时x分
String chargingTime = DateUtils.convertMinutesToTime(Integer.parseInt(sumChargingTime));
// String chargingTime = "0分钟";
// if (orderVO.getStartTime() != null) {
// Date startTimeDate = DateUtils.parseDate(orderVO.getStartTime());
// Date endTimeDate;
// if (orderVO.getEndTime() != null) {
// endTimeDate = DateUtils.parseDate(orderVO.getEndTime());
// // 计算出两个时间差
// chargingTime = DateUtils.getDatePoor(endTimeDate, startTimeDate);
// } else {
// endTimeDate = new Date();
// }
//
// }
orderVO.setChargingTime(chargingTime);
}