From 7f1e17a5f6dde1af93f3c03037c4da7bb4afaaa5 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 25 八月 2022 17:50:19 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java | 22 ----------------------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
index b5771e6..06cf5df 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -384,4 +384,25 @@
}
}
+
+ /**
+ * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴灉鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
+ *
+ * @param dataPackage
+ */
+ public void stopCharingOrder(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
+ //鑾峰彇姝ｅ湪杩涜涓殑璁㈠崟
+ C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
+ .eq(C3mOrder::getC3Mac, dataPackage.getC3Mac()).eq(C3mOrder::getChargingStates, 0)
+ .eq(C3mOrder::getOrderStatus, OrderStatus.PAYED.getStatus()).last("limit 1"));
+ if ("1".equals(dataPackage.getStatusBit()) && c3mOrder != null) {
+ //璁㈠崟鏈粨鏉�,浣嗘槸鍏呯數妗╀负绌洪棽鐘舵��(鍗冲厖鐢垫々鏂數/鏁呴殰鎯呭喌) 缁撴潫璇ヨ鍗�
+ //璁剧疆璁㈠崟涓哄凡瀹屾垚
+ c3mOrder.setOrderStatus(OrderStatus.COMPLETE.getStatus());
+ //璁剧疆鍏呯數鐘舵�佷负宸茬粨鏉�
+ c3mOrder.setChargingStates(1);
+ updateById(c3mOrder);
+ }
+ }
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
index 0a3de51..93f22ee 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
@@ -41,28 +41,6 @@
return result;
}
-// public static String GetWithHeader (String url, String params, CommonHeader header) {
-// CloseableHttpClient client = HttpClients.createDefault();
-// HttpGet get = new HttpGet(url);
-// for(String key: header.keySet()) {
-// get.setHeader(key, header.get(key));
-// }
-// String result = null;
-// try {
-// StringEntity s = new StringEntity(params, UTF8);
-// s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
-// "application/json"));
-// HttpResponse httpResponse = client.execute(get);
-// InputStream inStream = httpResponse.getEntity().getContent();
-//
-// result = streamToString(inStream, UTF8);
-//
-// inStream.close();
-// } catch (Exception e) {
-// return null;
-// }
-// return result;
-// }
public static String GetWithHeader (String url, List<NameValuePair> urlParameters, Map<String, String> header) throws URISyntaxException {
--
Gitblit v1.9.3