From 0e25c569495c69a663ab2e3dc45d8f27332073ff Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 27 六月 2022 11:28:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 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 662877b..e73142c 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,6 +1,8 @@
package com.sandu.ximon.admin.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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;
@@ -23,28 +25,20 @@
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));
- }
-
- @PostMapping("/deleteC3mCharging")
- public ResponseVO<Object> deleteC3mCharging(@PathVariable Integer c3mId) {
- return ResponseUtil.success(chargeService.deleteC3mCharging(c3mId));
}
@@ -58,4 +52,5 @@
return ResponseUtil.success(chargeService.getChargeByPoleId(PoleId));
}
+
}
--
Gitblit v1.9.3