From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java |   61 +++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 22 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 18b3bb0..ecc9b05 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,12 +1,12 @@
 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.security.PermissionConfig;
 import com.sandu.ximon.admin.service.C3mChargingChargeService;
 import com.sandu.ximon.dao.domain.C3mChargingCharge;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,23 +24,19 @@
 public class C3mChargingChargeController {
 
     private final C3mChargingChargeService chargeService;
-
+    private final PermissionConfig permissionConfig;
 
     /**
-     * 娣诲姞璐圭巼
+     * 缂栬緫鍏呯數妗╄垂鐜�
      *
-     * @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 (!permissionConfig.check(MenuEnum.CHARGE_UPDATE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         if (chargeEntities.size() > 5) {
             throw new BusinessException("褰撳墠鏈�楂樹粎鏀寔4缁勮垂鐜�");
         }
@@ -50,24 +46,45 @@
         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}")  //鏈悓姝ユ枃妗�
+    /**
+     * 鏍规嵁c3id鑾峰彇鍏呯數妗╄垂鐜�
+     *
+     * @param c3mId
+     * @return
+     */
+    @GetMapping("/getChargeByC3Id/{c3mId}")
     public ResponseVO<Object> getChargeByC3Id(@PathVariable Integer c3mId) {
+        if (!permissionConfig.check(MenuEnum.CHARGE_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(chargeService.getChargeByC3Id(c3mId));
     }
 
-    @GetMapping("/getChargeByPoleId/{PoleId}") //涓烘湭鍚屾鏂囨。
+    /**
+     * 鏍规嵁鐏潌id鑾峰彇璐圭巼
+     *
+     * @param PoleId
+     * @return
+     */
+    @GetMapping("/getChargeByPoleId/{PoleId}")
     public ResponseVO<Object> getChargeByPoleId(@PathVariable Long PoleId) {
+        if (!permissionConfig.check(MenuEnum.CHARGE_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(chargeService.getChargeByPoleId(PoleId));
     }
 
+    /**
+     * 鏍规嵁鍏呯數妗﹎ac鑾峰彇褰撳墠鏃堕棿娈电殑璐圭巼
+     */
+    @GetMapping("/getChargeByMac/{mac}")
+    public ResponseVO<Object> getChargeByMac(@PathVariable Long mac, Integer power) {
+        if (!permissionConfig.check(MenuEnum.CHARGE_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        return ResponseUtil.success(chargeService.getCostByC3id(mac, power));
+    }
+
 
 }

--
Gitblit v1.9.3