From 0350b21561519f5cab9a29645fac67dd906470fd Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 01 四月 2022 17:51:05 +0800
Subject: [PATCH] c3上报具体处理

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
index e2e5750..0fa07b1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
@@ -23,9 +23,9 @@
     private C3ChargingService c3ChargingService;
 
 
-    @GetMapping("/C3ChargingList")
-    public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO) {
-        return ResponseUtil.successPage(c3ChargingService.getC3ChargingList(baseConditionVO));
+    @PostMapping("/C3ChargingList")
+    public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam) {
+        return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
     }
 
     /**
@@ -71,6 +71,20 @@
     }
 
     /**
+     * 浜岀淮鐮�
+     */
+    @PostMapping("/QrCode")
+    public ResponseVO<Object> QrCode(@RequestBody C3ChargingParam c3ChargingParam) {
+        String result = c3ChargingService.QrCode(c3ChargingParam.getC3Mac(), c3ChargingParam.getQrCodeData());
+
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
+    }
+
+    /**
      * 鏌ヨ鐗堟湰
      */
     @PostMapping("/QueryVersion")

--
Gitblit v1.9.3