diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java index fd1aad5a0..b5d9ae0b4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java @@ -230,6 +230,7 @@ public class ThirdPartyBaseController extends BaseController { } // 计算sign String sign = GBSignUtils.sign(map, signSecret); + logger.info("sign:{}, dto.getSig():{}", sign, dto.getSig()); return StringUtils.equals(dto.getSig(), sign); } diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java index a7fecf48d..4eaec6e3f 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java @@ -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")); } + 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); + } + } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java index e8fa7f4bf..0009918a9 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java @@ -1116,7 +1116,8 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { //时间格式化 startTime = DateUtils.convertDateToDateTime(startTime); - endTime = DateUtils.convertDateToDateTime(endTime); + endTime = DateUtils.getEndTime(endTime); + List orderBasicInfos; try { @@ -1267,14 +1268,13 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { SupStationStatsInfo supStationStatsInfo = SupStationStatsInfo.builder() .stationId(stationId) - .startTime(startChargeTime) - .endTime(endChargeTime) + .startTime(dto.getStartTime()) + .endTime(dto.getEndTime()) .stationElectricity(stationTotalElectricity.setScale(2, BigDecimal.ROUND_HALF_UP)) .stationTotalChargeNum(orderBasicInfos.size()) .stationTotalChargeTime(stationTotalChargeTime) .stationTotalWarningNum(0) .equipmentStatsInfos(equipmentStatsInfoList) - .supEquipmentStatsInfos(equipmentStatsInfoList) .build(); Map map = new LinkedHashMap<>(); @@ -1446,8 +1446,8 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { SupStationStatsInfo supStationStatsInfo = SupStationStatsInfo.builder() .stationId(stationId) - .startTime(startChargeTime) - .endTime(endChargeTime) + .startTime(DateUtils.convertDateTimeToDate(startChargeTime)) + .endTime(DateUtils.convertDateTimeToDate(endChargeTime)) .stationElectricity(stationTotalElectricity.setScale(2, BigDecimal.ROUND_HALF_UP)) .stationTotalChargeNum(orderBasicInfos.size()) .stationTotalChargeTime(stationTotalChargeTime) @@ -1684,7 +1684,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { equipmentStatsInfo.setEquipmentTotalChargeNum(connectorList.size()); // 改为每个桩的订单数 equipmentStatsInfo.setEquipmentTotalWarningNum(0); equipmentStatsInfo.setConnectorStatsInfos(connectorList); - equipmentStatsInfo.setSupconnectorStatsInfos(connectorList); +// equipmentStatsInfo.setSupconnectorStatsInfos(connectorList); resultList.add(equipmentStatsInfo); log.debug("添加桩统计信息: 桩编号={}, 电量={}, 充电时长={}, 枪数量={}", diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/vo/StationStatusInfoVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/vo/StationStatusInfoVO.java index 1b7089d95..b1f330366 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/vo/StationStatusInfoVO.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/vo/StationStatusInfoVO.java @@ -17,7 +17,7 @@ import java.util.List; public class StationStatusInfoVO implements Serializable { private static final long serialVersionUID = 1L; - @JSONField(name = "StationId") + @JSONField(name = "StationID") private String stationId; @JSONField(name = "ConnectorStatusInfos")