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/C3ChargingController.java | 155 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 102 insertions(+), 53 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 f988623..74c07d7 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
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
@@ -28,11 +29,13 @@
@PostMapping("/C3ChargingList")
- public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam) {
+ public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam
+ , @RequestParam(value = "order", required = false) Integer order
+ , @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.C3_CHARGING_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
+ return ResponseUtil.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam, order, seq));
}
@AnonymousAccess
@@ -44,6 +47,7 @@
// /**
// * 鍏呯數寮�鍚�
// */
+// @AnonymousAccess
// @PostMapping("/startCharging")
// public ResponseVO<Object> startCharging(@RequestBody C3ChargingParam c3ChargingParam) {
// String result = c3ChargingService.startCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getChargingCapacity(), c3ChargingParam.getChargeAmount());
@@ -56,11 +60,15 @@
// }
/**
- * 鍏呯數缁撴潫
+ * 鍏呯數缁撴潫鈥斺�斿皬绋嬪簭鐢ㄦ埛缁撴潫锛屼笉闇�瑕乼oken锛岄渶瑕乷penId
*/
+ @AnonymousAccess
@PostMapping("/finishCharging")
public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac());
+ if (c3ChargingParam.getC3Id() == null || c3ChargingParam.getOpenId() == null) {
+ throw new BusinessException("鍙傛暟閿欒锛�");
+ }
+ String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getOpenId());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
@@ -69,19 +77,19 @@
}
}
- /**
- * 鍚屾缁撴潫
- */
- @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("/EndOfTheSynchronization")
+// public ResponseVO<Object> EndOfTheSynchronization(@RequestBody C3ChargingParam c3ChargingParam) {
+// String result = c3ChargingService.EndOfTheSynchronization(c3ChargingParam.getC3Mac(), false);
+//
+// if ("鎿嶄綔鎴愬姛".equals(result)) {
+// return ResponseUtil.success(result);
+// } else {
+// return ResponseUtil.fail(result);
+// }
+// }
// /**
// * 浜岀淮鐮�
@@ -103,7 +111,11 @@
*/
@PostMapping("/QueryVersion")
public ResponseVO<Object> QueryVersion(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Mac());
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYVERSION.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
+ String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -113,7 +125,10 @@
*/
@PostMapping("/QueryIntervalTime")
public ResponseVO<Object> QueryIntervalTime(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Mac());
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_HEARTBEATPACKETTIME.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -123,7 +138,10 @@
*/
@PostMapping("/QueryConstant")
public ResponseVO<Object> QueryConstant(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Mac());
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYCONSTANT.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -133,7 +151,10 @@
*/
@PostMapping("/QueryAddress")
public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Mac());
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYADDRESS.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -142,7 +163,10 @@
*/
@PostMapping("/QueryFaultCode")
public ResponseVO<Object> QueryFaultCode(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Mac());
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYFAULTCODE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -151,7 +175,10 @@
*/
@PostMapping("/ReadTheHeartbeatPackage")
public ResponseVO<Object> ReadTheHeartbeatPackage(@RequestBody C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Mac()));
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_READTHEHEARTBEATPACKAGE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Id(), false));
}
/**
@@ -159,8 +186,10 @@
*/
@PostMapping("/SetHeartbeatPacketTimeCharging")
public ResponseVO<Object> SetHeartbeatPacketTimeCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
- return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), true));
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_HEARTBEATPACKETTIME.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), true, false));
}
/**
@@ -168,8 +197,10 @@
*/
@PostMapping("/SetHeartbeatPacketTimeNotCharging")
public ResponseVO<Object> SetHeartbeatPacketTimeNotCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
- return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), false));
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_HEARTBEATPACKETTIME.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), false, false));
}
/**
@@ -177,8 +208,10 @@
*/
@PostMapping("/SetConstant")
public ResponseVO<Object> SetConstant(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
- return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Mac(), c3ChargingParam.getConstant()));
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_SETCONSTANT.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Id(), c3ChargingParam.getConstant()));
}
/**
@@ -186,8 +219,10 @@
*/
@PostMapping("/SetAddress")
public ResponseVO<Object> SetAddress(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
- return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Mac(), c3ChargingParam.getAddress()));
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_SETADDRESS.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Id(), c3ChargingParam.getAddress(), false));
}
/**
@@ -195,9 +230,13 @@
*/
@PostMapping("/SetCalendar")
public ResponseVO<Object> SetCalendar(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_SETCALENDAR.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
- return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Mac()
- , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay(), c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec()));
+ return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Id()
+ , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay()
+ , c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec(), false));
}
/**
@@ -205,8 +244,10 @@
*/
@PostMapping("/ClearedFaultCode")
public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
- return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Mac()));
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_CLEAREDFAULTCODE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Id()));
}
/**
@@ -214,8 +255,10 @@
*/
@PostMapping("/RestoreFactoryValue")
public ResponseVO<Object> RestoreFactoryValue(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
- return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Mac()));
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_RESTOREFACTORYVALUE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Id()));
}
/**
@@ -223,7 +266,10 @@
*/
@PostMapping("/restartCharging")
public ResponseVO<Object> restartCharging(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Mac());
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_RESTARTCHARGING.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Id());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
@@ -232,21 +278,21 @@
}
}
- /**
- * 娣诲姞鍏呯數妗╃‖浠惰澶�
- *
- * @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("/addC3Charging")
+// public ResponseVO<Object> addC3Charging(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
+// boolean flag = c3ChargingService.addC3Charging(c3ChargingAddParam);
+// if (flag) {
+// return ResponseUtil.success("娣诲姞鍏呯數妗╃‖浠惰澶囨垚鍔燂紒");
+// } else {
+// return ResponseUtil.fail("娣诲姞鍏呯數妗╃‖浠惰澶囧け璐ワ紒");
+// }
+// }
/**
* 淇敼鍏呯數妗╃‖浠惰澶囧悕绉�
@@ -256,6 +302,9 @@
*/
@PostMapping("/updateC3ChargingName")
public ResponseVO<Object> updateC3ChargingName(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_UPDATEC3CHARGINGNAME.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean flag = c3ChargingService.updateC3ChargingName(c3ChargingAddParam);
if (flag) {
return ResponseUtil.success("淇敼鍏呯數妗╃‖浠惰澶囧悕绉版垚鍔燂紒");
--
Gitblit v1.9.3