diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index a1e10dd46..4a4f2bb60 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -282,11 +282,12 @@ public class OrderService { RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); String sumChargingTime = realTimeMonitorData.getSumChargingTime(); // xx分钟 - if (StringUtils.isNotBlank(orderVO.getStartTime())) { - // 开始时间不为空, 根据开始充电时间计算充电时长 - sumChargingTime = String.valueOf(DateUtils.minutesSince(orderVO.getStartTime())); + if (StringUtils.equals(orderVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) { + if (StringUtils.isNotBlank(orderVO.getStartTime())) { + // 订单如果是充电中,且开始时间不为空, 根据开始充电时间计算充电时长 + sumChargingTime = String.valueOf(DateUtils.minutesSince(orderVO.getStartTime())); + } } - String chargingTime = "-"; try { // 分钟转成 x时x分 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java index 2764594ad..cea556081 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java @@ -342,7 +342,7 @@ public class UploadRealTimeMonitorHandler extends AbstractYkcHandler { // 异步推送第三方平台告警信息 CompletableFuture.runAsync(() -> { try { - commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus); + commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType()); } catch (Exception e) { log.error("统一推送第三方平台告警信息 error, ", e); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index 2ac7022b6..0dd732358 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -532,7 +532,8 @@ public class CommonService { * @param pileConnectorCode * @param connectorStatus */ - public void commonPushAlarmInfo(String pileConnectorCode, String connectorStatus) { + public void commonPushAlarmInfo(String pileConnectorCode, String connectorStatus, String putGunType) { + String changeConnectorStatus = changeConnectorStatus(connectorStatus, putGunType); // 查询站点信息 PileStationVO stationVO = pileStationInfoService.getStationInfoByPileConnectorCode(pileConnectorCode); String stationId = stationVO.getId(); @@ -543,7 +544,7 @@ public class CommonService { } for (ThirdPartySecretInfoVO relationVO : relationInfoList) { NotificationDTO notificationDTO = new NotificationDTO(); - notificationDTO.setStatus(connectorStatus); + notificationDTO.setStatus(changeConnectorStatus); notificationDTO.setPileConnectorCode(pileConnectorCode); notificationDTO.setStationId(stationId); notificationDTO.setPlatformType(relationVO.getPlatformType()); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java index bbb8f50f5..8ae20846b 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java @@ -158,7 +158,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService { String connectorStatus = dto.getConnectorStatus(); String alertCode = ""; String alertStatus = Constants.ZERO; - if (!StringUtils.equals(connectorStatus, Constants.ONE)) { + if (!StringUtils.equals(connectorStatus, "255")) { // 如果不是故障,则告警状态要改为1-告警恢复 alertStatus = Constants.ONE; }