From 694962918618b6d9531d8ca876a6746e030387f1 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 23 八月 2022 11:38:26 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java
index 4515574..a01c76e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java
@@ -1,8 +1,8 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.param.C3mChargingChargeParam;
import com.sandu.ximon.admin.service.C3mChargingChargeService;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import lombok.AllArgsConstructor;
@@ -23,33 +23,53 @@
private final C3mChargingChargeService chargeService;
-
/**
- * 娣诲姞璐圭巼
- * @param charge
+ * 缂栬緫鍏呯數妗╄垂鐜�
+ *
+ * @param chargeEntities
* @return
*/
- @PostMapping("/addC3mCharging")
- public ResponseVO<Object> addC3mCharging(@RequestBody C3mChargingChargeParam charge) {
-// chargeService.save(charge);
-// chargeService.initCharge(charge);
- return ResponseUtil.success(chargeService.initCharge(charge));
- }
-
@PostMapping("/updateC3mCharging")
public ResponseVO<Object> updateC3mCharging(@RequestBody List<C3mChargingCharge> chargeEntities) {
+ if (chargeEntities.size() > 5) {
+ throw new BusinessException("褰撳墠鏈�楂樹粎鏀寔4缁勮垂鐜�");
+ }
+ if (chargeEntities.size() == 0) {
+ throw new BusinessException("鏈�灏戦渶瑕佷竴鏉¤垂鐜�");
+ }
return ResponseUtil.success(chargeService.updateCharge(chargeEntities));
}
- @GetMapping("/getChargeByC3Id/{c3mId}") //鏈悓姝ユ枃妗�
+ /**
+ * 鏍规嵁c3id鑾峰彇鍏呯數妗╄垂鐜�
+ *
+ * @param c3mId
+ * @return
+ */
+ @GetMapping("/getChargeByC3Id/{c3mId}")
public ResponseVO<Object> getChargeByC3Id(@PathVariable Integer c3mId) {
return ResponseUtil.success(chargeService.getChargeByC3Id(c3mId));
}
- @GetMapping("/getChargeByPoleId/{PoleId}") //涓烘湭鍚屾鏂囨。
+ /**
+ * 鏍规嵁鐏潌id鑾峰彇璐圭巼
+ *
+ * @param PoleId
+ * @return
+ */
+ @GetMapping("/getChargeByPoleId/{PoleId}")
public ResponseVO<Object> getChargeByPoleId(@PathVariable Long PoleId) {
return ResponseUtil.success(chargeService.getChargeByPoleId(PoleId));
}
+ /**
+ * 鏍规嵁鍏呯數妗﹎ac鑾峰彇褰撳墠鏃堕棿娈电殑璐圭巼
+ */
+ @GetMapping("/getChargeByMac/{mac}")
+ public ResponseVO<Object> getChargeByMac(@PathVariable Long mac, Integer power) {
+ return ResponseUtil.success(chargeService.getCostByC3id(mac, power));
+ }
+
+
}
--
Gitblit v1.9.3