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

update 统计查询范围

Browse Source
This commit is contained in:
YAS\29473
2025-08-13 16:36:53 +08:00
parent cc23872407
commit f46c7c0292
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java vendored
View File

@@ -230,6 +230,7 @@ public class ThirdPartyBaseController extends BaseController {
} }
// 计算sign // 计算sign
String sign = GBSignUtils.sign(map, signSecret); String sign = GBSignUtils.sign(map, signSecret);
logger.info("sign:{}, dto.getSig():{}", sign, dto.getSig());
return StringUtils.equals(dto.getSig(), sign); return StringUtils.equals(dto.getSig(), sign);
} }

8
jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java
View File

@@ -1208,4 +1208,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return endLocalDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); return endLocalDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
} }
public static String getEndTime(String dateStr) {
DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDate date = LocalDate.parse(dateStr, inputFormatter);
LocalDateTime endTime = date.atTime(23, 59, 59);
DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
return endTime.format(outputFormatter);
}
} }

14
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java vendored
View File

@@ -1116,7 +1116,8 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService {
//时间格式化 //时间格式化
startTime = DateUtils.convertDateToDateTime(startTime); startTime = DateUtils.convertDateToDateTime(startTime);
endTime = DateUtils.convertDateToDateTime(endTime); endTime = DateUtils.getEndTime(endTime);
List<SupStationStatsVO> orderBasicInfos; List<SupStationStatsVO> orderBasicInfos;
try { try {
@@ -1267,14 +1268,13 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService {
SupStationStatsInfo supStationStatsInfo = SupStationStatsInfo.builder() SupStationStatsInfo supStationStatsInfo = SupStationStatsInfo.builder()
.stationId(stationId) .stationId(stationId)
.startTime(startChargeTime) .startTime(dto.getStartTime())
.endTime(endChargeTime) .endTime(dto.getEndTime())
.stationElectricity(stationTotalElectricity.setScale(2, BigDecimal.ROUND_HALF_UP)) .stationElectricity(stationTotalElectricity.setScale(2, BigDecimal.ROUND_HALF_UP))
.stationTotalChargeNum(orderBasicInfos.size()) .stationTotalChargeNum(orderBasicInfos.size())
.stationTotalChargeTime(stationTotalChargeTime) .stationTotalChargeTime(stationTotalChargeTime)
.stationTotalWarningNum(0) .stationTotalWarningNum(0)
.equipmentStatsInfos(equipmentStatsInfoList) .equipmentStatsInfos(equipmentStatsInfoList)
.supEquipmentStatsInfos(equipmentStatsInfoList)
.build(); .build();
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
@@ -1446,8 +1446,8 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService {
SupStationStatsInfo supStationStatsInfo = SupStationStatsInfo.builder() SupStationStatsInfo supStationStatsInfo = SupStationStatsInfo.builder()
.stationId(stationId) .stationId(stationId)
.startTime(startChargeTime) .startTime(DateUtils.convertDateTimeToDate(startChargeTime))
.endTime(endChargeTime) .endTime(DateUtils.convertDateTimeToDate(endChargeTime))
.stationElectricity(stationTotalElectricity.setScale(2, BigDecimal.ROUND_HALF_UP)) .stationElectricity(stationTotalElectricity.setScale(2, BigDecimal.ROUND_HALF_UP))
.stationTotalChargeNum(orderBasicInfos.size()) .stationTotalChargeNum(orderBasicInfos.size())
.stationTotalChargeTime(stationTotalChargeTime) .stationTotalChargeTime(stationTotalChargeTime)
@@ -1684,7 +1684,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService {
equipmentStatsInfo.setEquipmentTotalChargeNum(connectorList.size()); // 改为每个桩的订单数 equipmentStatsInfo.setEquipmentTotalChargeNum(connectorList.size()); // 改为每个桩的订单数
equipmentStatsInfo.setEquipmentTotalWarningNum(0); equipmentStatsInfo.setEquipmentTotalWarningNum(0);
equipmentStatsInfo.setConnectorStatsInfos(connectorList); equipmentStatsInfo.setConnectorStatsInfos(connectorList);
equipmentStatsInfo.setSupconnectorStatsInfos(connectorList); // equipmentStatsInfo.setSupconnectorStatsInfos(connectorList);
resultList.add(equipmentStatsInfo); resultList.add(equipmentStatsInfo);
log.debug("添加桩统计信息: 桩编号={}, 电量={}, 充电时长={}, 枪数量={}", log.debug("添加桩统计信息: 桩编号={}, 电量={}, 充电时长={}, 枪数量={}",

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/vo/StationStatusInfoVO.java vendored
View File

@@ -17,7 +17,7 @@ import java.util.List;
public class StationStatusInfoVO implements Serializable { public class StationStatusInfoVO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@JSONField(name = "StationId") @JSONField(name = "StationID")
private String stationId; private String stationId;
@JSONField(name = "ConnectorStatusInfos") @JSONField(name = "ConnectorStatusInfos")