From 1213ddfaad5fbc7a51741b4f8612855866327487 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 08 九月 2022 11:52:37 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 82 ++++++++++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 6 -
dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java | 13 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 196 +++++++++++++++++++-------------------
4 files changed, 174 insertions(+), 123 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
index 354806d..5e2f3f0 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
@@ -45,6 +45,19 @@
ADMIN_LIST("绠＄悊鍛樺垪琛�"),
MENU_LIST("鑿滃崟鍒楄〃"),
C3_CHARGING_LIST("鍏呯數妗╁垪琛�"),
+ C3_CHARGING_QUERYVERSION("鏌ヨ鐗堟湰"),
+ C3_CHARGING_QUERYCONSTANT("鏌ヨ甯告暟"),
+ C3_CHARGING_QUERYADDRESS("鏌ヨ鍦板潃"),
+ C3_CHARGING_QUERYFAULTCODE("鏌ヨ鏁呴殰鐮�"),
+ C3_CHARGING_READTHEHEARTBEATPACKAGE("璇诲績璺冲寘"),
+ C3_CHARGING_HEARTBEATPACKETTIME("蹇冭烦鍖呴棿闅旀椂闂�"),
+ C3_CHARGING_SETCONSTANT("璁剧疆甯告暟"),
+ C3_CHARGING_SETADDRESS("璁剧疆鍦板潃"),
+ C3_CHARGING_SETCALENDAR("璁剧疆鏃ュ巻"),
+ C3_CHARGING_CLEAREDFAULTCODE("鏁呴殰鐮佷笂鎶ユ竻闄�"),
+ C3_CHARGING_RESTOREFACTORYVALUE("鎭㈠鍑哄巶鍊�"),
+ C3_CHARGING_RESTARTCHARGING("杞噸鍚�"),
+ C3_CHARGING_UPDATEC3CHARGINGNAME("淇敼鍏呯數妗╃‖浠惰澶囧悕绉�"),
ROLE_MANAGER("瑙掕壊绠＄悊"),
PAY_CONFIG("鏀粯閰嶇疆"),
BANNER("寰俊logo"),
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 10e6ed2..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
@@ -111,6 +111,10 @@
*/
@PostMapping("/QueryVersion")
public ResponseVO<Object> QueryVersion(@RequestBody C3ChargingParam c3ChargingParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYVERSION.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
@@ -121,6 +125,9 @@
*/
@PostMapping("/QueryIntervalTime")
public ResponseVO<Object> QueryIntervalTime(@RequestBody C3ChargingParam c3ChargingParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_HEARTBEATPACKETTIME.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
@@ -131,6 +138,9 @@
*/
@PostMapping("/QueryConstant")
public ResponseVO<Object> QueryConstant(@RequestBody C3ChargingParam c3ChargingParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYCONSTANT.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
@@ -141,6 +151,9 @@
*/
@PostMapping("/QueryAddress")
public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYADDRESS.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -150,6 +163,9 @@
*/
@PostMapping("/QueryFaultCode")
public ResponseVO<Object> QueryFaultCode(@RequestBody C3ChargingParam c3ChargingParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYFAULTCODE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -159,6 +175,9 @@
*/
@PostMapping("/ReadTheHeartbeatPackage")
public ResponseVO<Object> ReadTheHeartbeatPackage(@RequestBody C3ChargingParam c3ChargingParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_READTHEHEARTBEATPACKAGE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Id(), false));
}
@@ -167,7 +186,9 @@
*/
@PostMapping("/SetHeartbeatPacketTimeCharging")
public ResponseVO<Object> SetHeartbeatPacketTimeCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_HEARTBEATPACKETTIME.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), true, false));
}
@@ -176,7 +197,9 @@
*/
@PostMapping("/SetHeartbeatPacketTimeNotCharging")
public ResponseVO<Object> SetHeartbeatPacketTimeNotCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_HEARTBEATPACKETTIME.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), false, false));
}
@@ -185,7 +208,9 @@
*/
@PostMapping("/SetConstant")
public ResponseVO<Object> SetConstant(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_SETCONSTANT.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Id(), c3ChargingParam.getConstant()));
}
@@ -194,7 +219,9 @@
*/
@PostMapping("/SetAddress")
public ResponseVO<Object> SetAddress(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_SETADDRESS.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Id(), c3ChargingParam.getAddress(), false));
}
@@ -203,6 +230,9 @@
*/
@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.getC3Id()
, c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay()
@@ -214,7 +244,9 @@
*/
@PostMapping("/ClearedFaultCode")
public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_CLEAREDFAULTCODE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Id()));
}
@@ -223,7 +255,9 @@
*/
@PostMapping("/RestoreFactoryValue")
public ResponseVO<Object> RestoreFactoryValue(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
-
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_RESTOREFACTORYVALUE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Id()));
}
@@ -232,6 +266,9 @@
*/
@PostMapping("/restartCharging")
public ResponseVO<Object> restartCharging(@RequestBody C3ChargingParam c3ChargingParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_RESTARTCHARGING.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Id());
if ("鎿嶄綔鎴愬姛".equals(result)) {
@@ -241,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("娣诲姞鍏呯數妗╃‖浠惰澶囧け璐ワ紒");
+// }
+// }
/**
* 淇敼鍏呯數妗╃‖浠惰澶囧悕绉�
@@ -265,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("淇敼鍏呯數妗╃‖浠惰澶囧悕绉版垚鍔燂紒");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
index 7b2a3a5..aec136d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -50,111 +50,116 @@
@Override
public void process(String productKey, String deviceName, CommonFrame frame) {
- String functionCode = frame.getPayload().substring(2, 4);
//TODO
- if (frame.getPayload().contains("0000048E") || frame.getPayload().contains("FEA5820018F040001000000000")) {
- if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
- A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶netRequestFrame");
- log.info(netRequestFrame.toString());
+ if (!"32313243305005ffad36ffff".equals(deviceName)) {
+ log.info("涓嶈澶勭悊0000048E涔嬪鐨勫厖鐢垫々锛�");
+ return;
+ }
- if (netRequestFrame.isValidate()) {
- //淇濆瓨鍏呯數妗╃‖浠朵俊鎭�
- SpringContextHolder.getBean(C3ChargingService.class)
- .saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
- }
- } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
- // 缃戦〉鎿嶄綔浜岀淮鐮佽姹�(41)
- A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶codeRequestFrame");
- log.info(codeRequestFrame.toString());
- if (codeRequestFrame.isValidate()) {
- if (deviceName != null) {
- //璁剧疆浜岀淮鐮�
- Pole pole = SpringContextHolder.getBean(PoleService.class).getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
- if (pole != null) {
- String testUrl = "http://www.ximonsmart.com/charge/#/charge/" + pole.getId() + "/" + System.currentTimeMillis();
- SpringContextHolder.getBean(C3ChargingService.class).QrCode(codeRequestFrame.getDestinationAddress(), testUrl);
- }
+ String functionCode = frame.getPayload().substring(2, 4);
+ if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶netRequestFrame");
+ log.info(netRequestFrame.toString());
+
+ if (netRequestFrame.isValidate()) {
+ //淇濆瓨鍏呯數妗╃‖浠朵俊鎭�
+ SpringContextHolder.getBean(C3ChargingService.class)
+ .saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
+ }
+ } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
+ // 缃戦〉鎿嶄綔浜岀淮鐮佽姹�(41)
+ A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶codeRequestFrame");
+ log.info(codeRequestFrame.toString());
+
+ if (codeRequestFrame.isValidate()) {
+ if (deviceName != null) {
+ //璁剧疆浜岀淮鐮�
+ Pole pole = SpringContextHolder.getBean(PoleService.class).getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
+ if (pole != null) {
+ String testUrl = "http://www.ximonsmart.com/charge/#/charge/" + pole.getId() + "/" + System.currentTimeMillis();
+ SpringContextHolder.getBean(C3ChargingService.class).QrCode(codeRequestFrame.getDestinationAddress(), testUrl);
}
}
+ }
- } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
- log.info("蹇冭烦鐩稿簲鈥斺�擟3鍏呯數妗╂暟鎹�" + productKey + " ------- " + deviceName);
- A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶heartbeatReportInnerFrame");
- log.info(heartbeatReportInnerFrame.toString());
+ } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
+ log.info("蹇冭烦鐩稿簲鈥斺�擟3鍏呯數妗╂暟鎹�" + productKey + " ------- " + deviceName);
+ A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload());
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶heartbeatReportInnerFrame");
+ log.info(heartbeatReportInnerFrame.toString());
- if (heartbeatReportInnerFrame.isValidate()) {
- SpringContextHolder.getBean(C3ChargingService.class).updateReportState(deviceName
- , heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
- , heartbeatReportInnerFrame.getHeartBeatDataPackage().getStatusBit()
- , heartbeatReportInnerFrame.getHeartBeatDataPackage().getDeviceTemperature());
- //鏇存柊璁㈠崟鏁版嵁
- SpringContextHolder.getBean(C3mOrderService.class).updateOrderStatusByHeartbeat(heartbeatReportInnerFrame.getHeartBeatDataPackage());
- //瀛樼紦瀛�
- RedisUtils.getBean().set(C3mRedisConstant.C3_STATUS.getCode() + heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
- , heartbeatReportInnerFrame.getHeartBeatDataPackage(), 300L);
+ if (heartbeatReportInnerFrame.isValidate()) {
+ SpringContextHolder.getBean(C3ChargingService.class).updateReportState(deviceName
+ , heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
+ , heartbeatReportInnerFrame.getHeartBeatDataPackage().getStatusBit()
+ , heartbeatReportInnerFrame.getHeartBeatDataPackage().getDeviceTemperature());
+ //鏇存柊璁㈠崟鏁版嵁
+ SpringContextHolder.getBean(C3mOrderService.class).updateOrderStatusByHeartbeat(heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ //瀛樼紦瀛�
+ RedisUtils.getBean().set(C3mRedisConstant.C3_STATUS.getCode() + heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
+ , heartbeatReportInnerFrame.getHeartBeatDataPackage(), 300L);
+ }
+ } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶completeRequestFrame");
+ log.info(completeRequestFrame.toString());
+ // 鍏呯數缁撴潫涓婃姤(43)
+ /**
+ * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
+ */
+ if (completeRequestFrame != null) {
+ C3mCharging one = SpringContextHolder.getBean(C3ChargingService.class).
+ getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, completeRequestFrame.getMcuUdid()).last("limit 1"));
+ if (one == null) {
+ return;
}
- } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
- A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶completeRequestFrame");
- log.info(completeRequestFrame.toString());
- // 鍏呯數缁撴潫涓婃姤(43)
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(one.getC3Id(), true);
+ if (aPackage == null) {
+ LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+ return;
+ }
+ orderService.stopCharingOrder(aPackage);
+ }
+
+
+ } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
+ log.info("蹇冭烦鍝嶅簲鈥斺�斿厖鐢典腑鏂�");
+ A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶stopRequestFrame");
+ log.info(stopRequestFrame.toString());
+ if (stopRequestFrame != null) {
+ C3mCharging one = SpringContextHolder.getBean(C3ChargingService.class).
+ getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, stopRequestFrame.getMcuUdid()).last("limit 1"));
+ if (one == null) {
+ return;
+ }
+
/**
* 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
*/
- if (completeRequestFrame != null) {
- C3mCharging one = SpringContextHolder.getBean(C3ChargingService.class).
- getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, completeRequestFrame.getMcuUdid()).last("limit 1"));
- if (one == null) {
- return;
- }
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(one.getC3Id(), true);
- if (aPackage == null) {
- LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
- return;
- }
- orderService.stopCharingOrder(aPackage);
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(one.getC3Id(), true);
+ if (aPackage == null) {
+ LogUtils.error("{ 鍏呯數妗�(" + stopRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+ return;
}
+ orderService.stopCharingOrder(aPackage);
+ }
+ } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
+ log.info("蹇冭烦鍝嶅簲鈥斺�旀晠闅�");
+ A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶errorCodeRequestFrame");
+ log.info(errorCodeRequestFrame.toString());
- } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
- log.info("蹇冭烦鍝嶅簲鈥斺�斿厖鐢典腑鏂�");
- A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶stopRequestFrame");
- log.info(stopRequestFrame.toString());
- if (stopRequestFrame != null) {
- C3mCharging one = SpringContextHolder.getBean(C3ChargingService.class).
- getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, stopRequestFrame.getMcuUdid()).last("limit 1"));
- if (one == null) {
- return;
- }
-
- /**
- * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
- */
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(one.getC3Id(), true);
- if (aPackage == null) {
- LogUtils.error("{ 鍏呯數妗�(" + stopRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
- return;
- }
- orderService.stopCharingOrder(aPackage);
- }
-
- } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
- log.info("蹇冭烦鍝嶅簲鈥斺�旀晠闅�");
- A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶errorCodeRequestFrame");
- log.info(errorCodeRequestFrame.toString());
-
- /**
- * 淇濆瓨C3鍏呯數妗╂晠闅滄暟鎹�
- */
- if (errorCodeRequestFrame.isValidate() && errorCodeRequestFrame.getErrorMessage() != null) {
- //淇濆瓨鏁呴殰淇℃伅
- SpringContextHolder.getBean(C3mReportErrorService.class).saveReportError(errorCodeRequestFrame);
+ /**
+ * 淇濆瓨C3鍏呯數妗╂晠闅滄暟鎹�
+ */
+ if (errorCodeRequestFrame.isValidate() && errorCodeRequestFrame.getErrorMessage() != null) {
+ //淇濆瓨鏁呴殰淇℃伅
+ SpringContextHolder.getBean(C3mReportErrorService.class).saveReportError(errorCodeRequestFrame);
// //鍏呯數妗╂晠闅滅粨鏉熻鍗�
// A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(errorCodeRequestFrame.getDestinationAddress(), true);
// if (aPackage == null) {
@@ -163,14 +168,11 @@
// }
// orderService.stopCharingOrder(aPackage);
- } else {
- System.out.println("鏁版嵁鏍￠獙寮傚父锛�");
- }
+ } else {
+ System.out.println("鏁版嵁鏍￠獙寮傚父锛�");
}
- } else {
- log.info("涓嶈澶勭悊0000048A涔嬪鐨勫厖鐢垫々锛�");
- return;
}
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index 89ef4ee..85fa3b5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -480,7 +480,6 @@
/**
* 缁撴潫鍏呯數
- *
*/
@Transactional(rollbackFor = Exception.class)
public String finishCharging(Long c3Id, String openId) {
@@ -1064,7 +1063,6 @@
/**
* 杞噸鍚�
- *
*/
public String restartCharging(Long c3Id) {
C3mCharging one = getById(c3Id);
@@ -1122,9 +1120,7 @@
* 娣诲姞鍏呯數妗� 鏃ュ織璁板綍缁撴潫
*/
- return
-
- save(c3mCharging);
+ return save(c3mCharging);
}
--
Gitblit v1.9.3