From 8f736b214514132327f2e13060c6bac2f86a2701 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 21 三月 2023 18:06:07 +0800
Subject: [PATCH] optimize
---
service-common/src/main/java/com/java110/common/charge/factory/kehang/KeHangChargeMachineFactoryAdapt.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/charge/factory/kehang/KeHangChargeMachineFactoryAdapt.java b/service-common/src/main/java/com/java110/common/charge/factory/kehang/KeHangChargeMachineFactoryAdapt.java
index 34164b6..3b8fed0 100644
--- a/service-common/src/main/java/com/java110/common/charge/factory/kehang/KeHangChargeMachineFactoryAdapt.java
+++ b/service-common/src/main/java/com/java110/common/charge/factory/kehang/KeHangChargeMachineFactoryAdapt.java
@@ -30,7 +30,7 @@
body.put("chargeId", orderId);
String paramOut = null;
try {
- paramOut = DingdingChargeUtils.execute("net.equip.charge.slow.ru", body.toJSONString(), HttpMethod.GET);
+ paramOut = KeHangChargeUtils.execute("net.equip.charge.slow.run", body.toJSONString(), HttpMethod.GET);
} catch (Exception e) {
throw new IllegalArgumentException(e.getMessage());
}
@@ -50,7 +50,7 @@
body.put("port", chargeMachinePortDto.getPortCode());
String paramOut = null;
try {
- paramOut = DingdingChargeUtils.execute("net.equip.charge.slow.run.stop", body.toJSONString(), HttpMethod.GET);
+ paramOut = KeHangChargeUtils.execute("net.equip.charge.slow.run.stop", body.toJSONString(), HttpMethod.GET);
} catch (Exception e) {
throw new IllegalArgumentException(e.getMessage());
}
@@ -69,7 +69,7 @@
body.put("equipCd", chargeMachineDto.getMachineCode());
String paramOut = null;
try {
- paramOut = DingdingChargeUtils.execute("net.equip.charge.slow.port.query", body.toJSONString(), HttpMethod.GET);
+ paramOut = KeHangChargeUtils.execute("net.equip.charge.slow.port.query", body.toJSONString(), HttpMethod.GET);
} catch (Exception e) {
throw new IllegalArgumentException(e.getMessage());
}
@@ -100,6 +100,39 @@
}
@Override
+ public void queryChargeMachineState(ChargeMachineDto chargeMachineDto) {
+ JSONObject body = new JSONObject();
+ body.put("equipCd", chargeMachineDto.getMachineCode());
+ String paramOut = null;
+ try {
+ paramOut = KeHangChargeUtils.execute("net.equip.online.query", body.toJSONString(), HttpMethod.GET);
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e.getMessage());
+ }
+
+ JSONObject paramObj = JSONObject.parseObject(paramOut);
+ if (paramObj.getIntValue("code") != 1) {
+ throw new IllegalArgumentException(paramObj.getString("msg"));
+ }
+
+ JSONObject data = paramObj.getJSONObject("data");
+
+ if(data.getBoolean("online")){
+ chargeMachineDto.setState(ChargeMachineDto.STATE_ONLINE);
+ chargeMachineDto.setStateName("鍦ㄧ嚎");
+ return ;
+ }
+
+ chargeMachineDto.setState(ChargeMachineDto.STATE_OFFLINE);
+ chargeMachineDto.setStateName("绂荤嚎");
+ }
+
+ @Override
+ public void workHeartbeat(ChargeMachineDto chargeMachineDto, String bodyParam) {
+
+ }
+
+ @Override
public List<NotifyChargePortDto> getChargeHeartBeatParam(NotifyChargeOrderDto notifyChargeOrderDto) {
return null;
}
--
Gitblit v1.8.0