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

update 苏州市平台

Browse Source
This commit is contained in:
Lemon
2024-09-28 10:17:14 +08:00
parent 18d5aa02b4
commit 949eb10b60
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,11 +282,12 @@ public class OrderService {
RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0);
String sumChargingTime = realTimeMonitorData.getSumChargingTime(); // xx分钟 String sumChargingTime = realTimeMonitorData.getSumChargingTime(); // xx分钟
if (StringUtils.equals(orderVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) {
if (StringUtils.isNotBlank(orderVO.getStartTime())) { if (StringUtils.isNotBlank(orderVO.getStartTime())) {
// 开始时间不为空, 根据开始充电时间计算充电时长 // 订单如果是充电中，且开始时间不为空, 根据开始充电时间计算充电时长
sumChargingTime = String.valueOf(DateUtils.minutesSince(orderVO.getStartTime())); sumChargingTime = String.valueOf(DateUtils.minutesSince(orderVO.getStartTime()));
} }
}
String chargingTime = "-"; String chargingTime = "-";
try { try {
// 分钟转成 x时x分 // 分钟转成 x时x分

2
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java
View File

@@ -342,7 +342,7 @@ public class UploadRealTimeMonitorHandler extends AbstractYkcHandler {
// 异步推送第三方平台告警信息 // 异步推送第三方平台告警信息
CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
try { try {
commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus); commonService.commonPushAlarmInfo(pileConnectorCode, connectorStatus, realTimeMonitorData.getPutGunType());
} catch (Exception e) { } catch (Exception e) {
log.error("统一推送第三方平台告警信息 error, ", e); log.error("统一推送第三方平台告警信息 error, ", e);
} }

5
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java vendored
View File

@@ -532,7 +532,8 @@ public class CommonService {
* @param pileConnectorCode * @param pileConnectorCode
* @param connectorStatus * @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); PileStationVO stationVO = pileStationInfoService.getStationInfoByPileConnectorCode(pileConnectorCode);
String stationId = stationVO.getId(); String stationId = stationVO.getId();
@@ -543,7 +544,7 @@ public class CommonService {
} }
for (ThirdPartySecretInfoVO relationVO : relationInfoList) { for (ThirdPartySecretInfoVO relationVO : relationInfoList) {
NotificationDTO notificationDTO = new NotificationDTO(); NotificationDTO notificationDTO = new NotificationDTO();
notificationDTO.setStatus(connectorStatus); notificationDTO.setStatus(changeConnectorStatus);
notificationDTO.setPileConnectorCode(pileConnectorCode); notificationDTO.setPileConnectorCode(pileConnectorCode);
notificationDTO.setStationId(stationId); notificationDTO.setStationId(stationId);
notificationDTO.setPlatformType(relationVO.getPlatformType()); notificationDTO.setPlatformType(relationVO.getPlatformType());

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java vendored
View File

@@ -158,7 +158,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService {
String connectorStatus = dto.getConnectorStatus(); String connectorStatus = dto.getConnectorStatus();
String alertCode = ""; String alertCode = "";
String alertStatus = Constants.ZERO; String alertStatus = Constants.ZERO;
if (!StringUtils.equals(connectorStatus, Constants.ONE)) { if (!StringUtils.equals(connectorStatus, "255")) {
// 如果不是故障，则告警状态要改为1-告警恢复 // 如果不是故障，则告警状态要改为1-告警恢复
alertStatus = Constants.ONE; alertStatus = Constants.ONE;
} }