From 72046386cf8a85ad7dae79d82485fa60c2c421e6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 05 七月 2022 18:25:12 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 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 42951e1..55e5d72 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,10 +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;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import lombok.AllArgsConstructor;
@@ -25,48 +23,41 @@
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){
+ if (chargeEntities.size() > 5) {
throw new BusinessException("褰撳墠鏈�楂樹粎鏀寔4缁勮垂鐜�");
}
- if(chargeEntities.size()==0){
+ if (chargeEntities.size() == 0) {
throw new BusinessException("鏈�灏戦渶瑕佷竴鏉¤垂鐜�");
}
return ResponseUtil.success(chargeService.updateCharge(chargeEntities));
}
- // @PostMapping("/deleteC3mCharging")
- public ResponseVO<Object> deleteC3mCharging(@RequestBody C3mChargingChargeParam charge) {
- boolean remove = chargeService.remove(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, charge.getC3Id())
- .eq(C3mChargingCharge::getHour, charge.getCharge()).eq(C3mChargingCharge::getHour, charge.getHour())
- .eq(C3mChargingCharge::getCharge, charge.getCharge()).eq(C3mChargingCharge::getCharge, charge.getTimestamp()));
- return ResponseUtil.success(remove);
- }
-
- @GetMapping("/getChargeByC3Id/{c3mId}") //鏈悓姝ユ枃妗�
+ @GetMapping("/getChargeByC3Id/{c3mId}")
public ResponseVO<Object> getChargeByC3Id(@PathVariable Integer c3mId) {
return ResponseUtil.success(chargeService.getChargeByC3Id(c3mId));
}
- @GetMapping("/getChargeByPoleId/{PoleId}") //涓烘湭鍚屾鏂囨。
+ @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