From abd77acc13c646cd23d0521a386fe0a1210ffdf7 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 20 四月 2022 15:46:41 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 104 insertions(+), 11 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 977332b..1ee8435 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
@@ -3,8 +3,11 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.C3ChargingService;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -20,11 +23,20 @@
@RequestMapping("/v1/admin/C3Charging")
public class C3ChargingController {
private C3ChargingService c3ChargingService;
+ private PermissionConfig permissionConfig;
- @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) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
+ }
+
+ @PostMapping("/getByC3Mac/{c3Mac}")
+ public ResponseVO<Object> getByC3Mac(String c3Mac) {
+ return ResponseUtil.success(c3ChargingService.getByC3Mac(c3Mac));
}
/**
@@ -61,6 +73,20 @@
@PostMapping("/EndOfTheSynchronization")
public ResponseVO<Object> EndOfTheSynchronization(@RequestBody C3ChargingParam c3ChargingParam) {
String result = c3ChargingService.EndOfTheSynchronization(c3ChargingParam.getC3Mac());
+
+ if ("鎿嶄綔鎴愬姛".equals(result)) {
+ return ResponseUtil.success(result);
+ } else {
+ return ResponseUtil.fail(result);
+ }
+ }
+
+ /**
+ * 浜岀淮鐮�
+ */
+ @PostMapping("/QrCode")
+ public ResponseVO<Object> QrCode(@RequestBody C3ChargingParam c3ChargingParam) {
+ String result = c3ChargingService.QrCode(c3ChargingParam.getC3Mac(), c3ChargingParam.getQrCodeData());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
@@ -143,15 +169,51 @@
return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), false));
}
-// /**
-// * 璁剧疆鐢靛帇/鐢垫祦甯告暟(鍚勪竴瀛楄妭)(榛樿鍊�0xBC64)
-// */
-// @PostMapping("/SetConstant")
-// public ResponseVO<Object> SetConstant(@RequestBody @Validated C3ChargingSetTimeParam c3ChargingSetTimeParam) {
-//
-// return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingSetTimeParam.getC3Mac(), c3ChargingSetTimeParam.getTime(), false));
-// }
+ /**
+ * 璁剧疆鐢靛帇/鐢垫祦甯告暟(鍚勪竴瀛楄妭)(榛樿鍊�0xBC64)
+ */
+ @PostMapping("/SetConstant")
+ public ResponseVO<Object> SetConstant(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+ return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Mac(), c3ChargingParam.getConstant()));
+ }
+
+ /**
+ * 璁剧疆鍦板潃
+ */
+ @PostMapping("/SetAddress")
+ public ResponseVO<Object> SetAddress(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+ return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Mac(), c3ChargingParam.getAddress()));
+ }
+
+ /**
+ * 璁剧疆鏃ュ巻锛堝悓蹇冭烦鍖呬腑鐨�6瀛楄妭鏃ユ湡鏃堕棿锛�
+ */
+ @PostMapping("/SetCalendar")
+ public ResponseVO<Object> SetCalendar(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+ return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Mac()
+ , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay(), c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec()));
+ }
+
+ /**
+ * 鏁呴殰鐮佷笂鎶ユ竻闄�
+ */
+ @PostMapping("/ClearedFaultCode")
+ public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+ return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Mac()));
+ }
+
+ /**
+ * 鎭㈠鍑哄巶鍊�
+ */
+ @PostMapping("/RestoreFactoryValue")
+ public ResponseVO<Object> RestoreFactoryValue(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+ return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Mac()));
+ }
/**
* 杞噸鍚�
@@ -166,4 +228,35 @@
return ResponseUtil.fail(result);
}
}
+
+ /**
+ * 娣诲姞鍏呯數妗╃‖浠惰澶�
+ *
+ * @param c3ChargingAddParam
+ * @return
+ */
+ @PostMapping("/addC3Charging")
+ public ResponseVO<Object> addC3Charging(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
+ boolean flag = c3ChargingService.addC3Charging(c3ChargingAddParam);
+ if (flag) {
+ return ResponseUtil.success("娣诲姞鍏呯數妗╃‖浠惰澶囨垚鍔燂紒");
+ } else {
+ return ResponseUtil.fail("娣诲姞鍏呯數妗╃‖浠惰澶囧け璐ワ紒");
+ }
+ }
+
+ /**
+ * 淇敼鍏呯數妗╃‖浠惰澶囧悕绉�
+ * @param c3ChargingAddParam
+ * @return
+ */
+ @PostMapping("/updateC3ChargingName")
+ public ResponseVO<Object> updateC3ChargingName(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
+ boolean flag = c3ChargingService.updateC3ChargingName(c3ChargingAddParam);
+ if (flag) {
+ return ResponseUtil.success("淇敼鍏呯數妗╃‖浠惰澶囧悕绉版垚鍔燂紒");
+ } else {
+ return ResponseUtil.fail("淇敼鍏呯數妗╃‖浠惰澶囧悕绉板け璐ワ紒");
+ }
+ }
}
--
Gitblit v1.9.3