From 65ffc54ad3145eaecbbfe687f7557b95514205a6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 31 八月 2022 17:35:35 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 58 ++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java | 8
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 295 ++++++++++++++++++++---------------------
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 43 ++++-
4 files changed, 207 insertions(+), 197 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 0387ab6..10e6ed2 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
@@ -65,10 +65,10 @@
@AnonymousAccess
@PostMapping("/finishCharging")
public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
- if (c3ChargingParam.getC3Mac() == null || c3ChargingParam.getOpenId() == null) {
+ if (c3ChargingParam.getC3Id() == null || c3ChargingParam.getOpenId() == null) {
throw new BusinessException("鍙傛暟閿欒锛�");
}
- String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getOpenId());
+ String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getOpenId());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
@@ -77,19 +77,19 @@
}
}
- /**
- * 鍚屾缁撴潫
- */
- @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);
- }
- }
+// /**
+// * 鍚屾缁撴潫
+// */
+// @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);
+// }
+// }
// /**
// * 浜岀淮鐮�
@@ -111,7 +111,7 @@
*/
@PostMapping("/QueryVersion")
public ResponseVO<Object> QueryVersion(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -121,7 +121,7 @@
*/
@PostMapping("/QueryIntervalTime")
public ResponseVO<Object> QueryIntervalTime(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -131,7 +131,7 @@
*/
@PostMapping("/QueryConstant")
public ResponseVO<Object> QueryConstant(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -141,7 +141,7 @@
*/
@PostMapping("/QueryAddress")
public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -150,7 +150,7 @@
*/
@PostMapping("/QueryFaultCode")
public ResponseVO<Object> QueryFaultCode(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -159,7 +159,7 @@
*/
@PostMapping("/ReadTheHeartbeatPackage")
public ResponseVO<Object> ReadTheHeartbeatPackage(@RequestBody C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Mac(), false));
+ return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Id(), false));
}
/**
@@ -168,7 +168,7 @@
@PostMapping("/SetHeartbeatPacketTimeCharging")
public ResponseVO<Object> SetHeartbeatPacketTimeCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), true, false));
+ return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), true, false));
}
/**
@@ -177,7 +177,7 @@
@PostMapping("/SetHeartbeatPacketTimeNotCharging")
public ResponseVO<Object> SetHeartbeatPacketTimeNotCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), false, false));
+ return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), false, false));
}
/**
@@ -186,7 +186,7 @@
@PostMapping("/SetConstant")
public ResponseVO<Object> SetConstant(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Mac(), c3ChargingParam.getConstant()));
+ return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Id(), c3ChargingParam.getConstant()));
}
/**
@@ -195,7 +195,7 @@
@PostMapping("/SetAddress")
public ResponseVO<Object> SetAddress(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Mac(), c3ChargingParam.getAddress(), false));
+ return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Id(), c3ChargingParam.getAddress(), false));
}
/**
@@ -204,7 +204,7 @@
@PostMapping("/SetCalendar")
public ResponseVO<Object> SetCalendar(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Mac()
+ return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Id()
, c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay()
, c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec(), false));
}
@@ -215,7 +215,7 @@
@PostMapping("/ClearedFaultCode")
public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Mac()));
+ return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Id()));
}
/**
@@ -224,7 +224,7 @@
@PostMapping("/RestoreFactoryValue")
public ResponseVO<Object> RestoreFactoryValue(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Mac()));
+ return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Id()));
}
/**
@@ -232,7 +232,7 @@
*/
@PostMapping("/restartCharging")
public ResponseVO<Object> restartCharging(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Id());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
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 5d0f82c..7b2a3a5 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
@@ -12,6 +12,7 @@
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.OrderStatus;
@@ -104,28 +105,44 @@
/**
* 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
*/
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress(), true);
- if (aPackage == null) {
- LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
- 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);
}
- 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;
+ }
- /**
- * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
- */
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress(), true);
- if (aPackage == null) {
- LogUtils.error("{ 鍏呯數妗�(" + stopRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
- return;
+ /**
+ * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
+ */
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(one.getC3Id(), true);
+ if (aPackage == null) {
+ LogUtils.error("{ 鍏呯數妗�(" + stopRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+ return;
+ }
+ orderService.stopCharingOrder(aPackage);
}
- orderService.stopCharingOrder(aPackage);
+
} else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
log.info("蹇冭烦鍝嶅簲鈥斺�旀晠闅�");
A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java
index 96b217b..8bcba75 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java
@@ -1,5 +1,7 @@
package com.sandu.ximon.admin.param;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
@@ -13,8 +15,10 @@
public class C3ChargingParam {
//C3鍏呯數妗╁湴鍧� 4锛�8char锛�
- @NotEmpty(message = "C3鍏呯數妗╁湴鍧�涓嶈兘涓虹┖")
- private String c3Mac = "";
+ // @NotEmpty(message = "C3鍏呯數妗╁湴鍧�涓嶈兘涓虹┖")
+// private String c3Mac = "";
+ @NotNull(message = "鍏呯數妗㊣D涓嶈兘涓虹┖")
+ private Long c3Id;
//鍏呯數閲�
private Integer chargingCapacity;
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 195696c..89ef4ee 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
@@ -107,7 +107,7 @@
newC3Mac = SupplementUtils.suppleZero(index, 8);
if (!c3macList.contains(newC3Mac)) {
//澶辫触閲嶅彂涓�娆�
- String s = SetAddress(c3Mac, newC3Mac, true);
+ String s = SetAddress(one.getC3Id(), newC3Mac, true);
if (!"鎿嶄綔鎴愬姛".equals(s)) {
LogUtils.error("鍒濆鍖栧厖鐢垫々澶辫触!");
return false;
@@ -127,7 +127,7 @@
//鍚屾鏃堕棿鎴�
System.out.println("鍚屾鏃堕棿鎴冲紑濮�");
String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
- String s = SetCalendar(newC3Mac, Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
+ String s = SetCalendar(one.getC3Id(), Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)), true);
if (!"鎿嶄綔鎴愬姛".equals(s)) {
@@ -159,9 +159,9 @@
Set<String> keys = RedisUtils.getBean().keys(C3mRedisConstant.C3_STATUS.getCode() + "*");
C3mRedisConfig.reFlushTime(keys.size());
- String time1 = SetHeartbeatPacketTimeCharging(newC3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false, true);
+ String time1 = SetHeartbeatPacketTimeCharging(one.getC3Id(), C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false, true);
LogUtils.error("C3绌洪棽蹇冭烦鍖呮椂闂村悓姝ュ搷搴旂粨鏋滐細" + time1);
- String time2 = SetHeartbeatPacketTimeCharging(newC3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true, true);
+ String time2 = SetHeartbeatPacketTimeCharging(one.getC3Id(), C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true, true);
LogUtils.error("C3鍏呯數鏃跺績璺冲寘鏃堕棿鍚屾鍝嶅簲缁撴灉锛�" + time2);
System.out.println("璁剧疆蹇冭烦鍖呴棿闅旀椂闂寸粨鏉�");
@@ -171,7 +171,7 @@
* 鑾峰彇蹇冭烦鍖咃紝鍒ゆ柇鍦ㄧ嚎
*/
System.out.println("鑾峰彇蹇冭烦鍖呭紑濮�");
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(newC3Mac, true);
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(one.getC3Id(), true);
if (aPackage == null) {
LogUtils.error("璇诲彇蹇冭烦鍖呬负绌�");
return false;
@@ -361,7 +361,7 @@
if (one == null) {
throw new BusinessException("鍏呯數妗╀俊鎭笉瀛樺湪锛�");
}
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Mac(), false);
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Id(), false);
if (beatDataPackage != null) {
//鍏呯數妗㊣D
chargingDto.setC3Id(one.getC3Id());
@@ -481,17 +481,21 @@
/**
* 缁撴潫鍏呯數
*
- * @param c3Mac
*/
@Transactional(rollbackFor = Exception.class)
- public String finishCharging(String c3Mac, String openId) {
+ public String finishCharging(Long c3Id, String openId) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
//鏌ヨ
if (openId.isEmpty()) {
throw new BusinessException("openId涓嶈兘涓虹┖");
}
//鏌ヨ璇ュ厖鐢垫々鏈�杩戠殑璁㈠崟
C3mOrder order = SpringContextHolder.getBean(C3mOrderService.class).getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
+ .eq(C3mOrder::getC3Mac, one.getC3Mac()).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
if (order == null) {
throw new BusinessException("鍏呯數妗╂病鏈夎繘琛屼腑鐨勮鍗�");
@@ -501,23 +505,20 @@
}
C3FinishChargingReqInnerFrame c3FinishChargingReqInnerFrame =
- new C3FinishChargingReqInnerFrame(c3Mac);
+ new C3FinishChargingReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3FinishChargingReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-缁撴潫鍏呯數", a5Frame, commonFrame);
+
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-缁撴潫鍏呯數", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
//缁撴潫鍏呯數 鏇存敼璁㈠崟鐘舵��
- C3mOrder lastOrderByC3Mac = SpringContextHolder.getBean(C3mOrderService.class).getLastOrderByC3Mac(c3Mac);
+ C3mOrder lastOrderByC3Mac = SpringContextHolder.getBean(C3mOrderService.class).getLastOrderByC3Mac(one.getC3Mac());
if (lastOrderByC3Mac != null) {
//璁剧疆璁㈠崟鐘舵�佷负宸插畬鎴�
lastOrderByC3Mac.setOrderStatus(OrderStatus.COMPLETE.getStatus());
@@ -610,22 +611,21 @@
/**
* 鏌ヨ鐗堟湰
- *
- * @param c3Mac
*/
- public String QueryVersion(String c3Mac) {
+ public String QueryVersion(Long c3Id) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
C3QueryVersionReqInnerFrame c3QueryVersionReqInnerFrame =
- new C3QueryVersionReqInnerFrame(c3Mac);
+ new C3QueryVersionReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryVersionReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鐗堟湰鏌ヨ", a5Frame, commonFrame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-鐗堟湰鏌ヨ", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -641,22 +641,21 @@
/**
* 鏌ヨ蹇冭烦鍖呴棿闅旀椂闂�
- *
- * @param c3Mac
*/
- public String QueryIntervalTime(String c3Mac) {
+ public String QueryIntervalTime(Long c3Id) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
C3QueryIntervalTimeReqInnerFrame c3QueryIntervalTimeReqInnerFrame =
- new C3QueryIntervalTimeReqInnerFrame(c3Mac);
+ new C3QueryIntervalTimeReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryIntervalTimeReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鏌ヨ蹇冭烦鍖呴棿闅旀椂闂�", a5Frame, commonFrame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-鏌ヨ蹇冭烦鍖呴棿闅旀椂闂�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -671,22 +670,22 @@
/**
* 鏌ヨ鐢靛帇/鐢垫祦甯告暟
- *
- * @param c3Mac
*/
- public String QueryConstant(String c3Mac) {
+ public String QueryConstant(Long c3Id) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
+
C3QueryConstantReqInnerFrame c3QueryConstantReqInnerFrame =
- new C3QueryConstantReqInnerFrame(c3Mac);
+ new C3QueryConstantReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryConstantReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鏌ヨ鐢靛帇/鐢垫祦甯告暟", a5Frame, commonFrame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-鏌ヨ鐢靛帇/鐢垫祦甯告暟", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -702,23 +701,21 @@
/**
* 鏌ヨ鍦板潃
- *
- * @param c3Mac
*/
- public String QueryAddress(String c3Mac) {
+ public String QueryAddress(Long c3Id) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
C3QueryAddressReqInnerFrame c3QueryAddressReqInnerFrame =
- new C3QueryAddressReqInnerFrame(c3Mac);
+ new C3QueryAddressReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryAddressReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鏌ヨ鍦板潃", a5Frame, commonFrame);
-
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-鏌ヨ鍦板潃", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -733,22 +730,21 @@
/**
* 鏌ヨ鏁呴殰鐮�
- *
- * @param c3Mac
*/
- public String QueryFaultCode(String c3Mac) {
+ public String QueryFaultCode(Long c3Id) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
C3QueryFaultCodeReqInnerFrame c3QueryFaultCodeReqInnerFrame =
- new C3QueryFaultCodeReqInnerFrame(c3Mac);
+ new C3QueryFaultCodeReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryFaultCodeReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鏌ヨ鏁呴殰鐮�", a5Frame, commonFrame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-鏌ヨ鏁呴殰鐮�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -765,27 +761,27 @@
/**
* 璇诲績璺冲寘
*
- * @param c3Mac
* @param resendFlag 閲嶅彂鏍囧織
*/
- public A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage ReadTheHeartbeatPackage(String c3Mac, boolean resendFlag) {
+ public A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage ReadTheHeartbeatPackage(Long c3Id, boolean resendFlag) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
C3ReadTheHeartbeatPackageReqInnerFrame readTheHeartbeatPackageReqInnerFrame =
- new C3ReadTheHeartbeatPackageReqInnerFrame(c3Mac);
+ new C3ReadTheHeartbeatPackageReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), readTheHeartbeatPackageReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
CommonFrame commonFrame;
if (resendFlag) {
- commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
} else {
- commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
}
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璇诲彇蹇冭烦鍖�", a5Frame, commonFrame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-璇诲彇蹇冭烦鍖�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -801,32 +797,32 @@
/**
* 璁剧疆蹇冭烦鍖呴棿闅旀椂闂�(绉掞級-鍏呯數鐘舵�佹椂/闈炲厖鐢电姸鎬佹椂
*
- * @param c3Mac
* @param setTime
* @param resndFlag 閲嶅彂鏍囧織
* @return
*/
- public String SetHeartbeatPacketTimeCharging(String c3Mac, int setTime, boolean flag, boolean resndFlag) {
+ public String SetHeartbeatPacketTimeCharging(Long c3Id, int setTime, boolean flag, boolean resndFlag) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
if (setTime <= 0) {
throw new BusinessException("璁剧疆鐨勫績璺冲寘闂撮殧鏃堕棿閿欒锛�");
}
C3SetHeartbeatPacketTimeReqInnerFrame setHeartbeatPacketTimeChargingReqInnerFrame =
- new C3SetHeartbeatPacketTimeReqInnerFrame(c3Mac, setTime, flag);
+ new C3SetHeartbeatPacketTimeReqInnerFrame(one.getC3Mac(), setTime, flag);
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setHeartbeatPacketTimeChargingReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
CommonFrame commonFrame;
if (resndFlag) {
- commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
} else {
- commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
}
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆蹇冭烦鍖呴棿闅旀椂闂�", a5Frame, commonFrame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-璁剧疆蹇冭烦鍖呴棿闅旀椂闂�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -842,24 +838,23 @@
/**
* 璁剧疆鐢靛帇/鐢垫祦甯告暟(鍚勪竴瀛楄妭)(榛樿鍊�0xBC64)
*
- * @param c3Mac
* @param constant
* @return
*/
- public String SetConstant(String c3Mac, String constant) {
+ public String SetConstant(Long c3Id, String constant) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
C3SetConstantReqInnerFrame setConstantReqInnerFrame =
- new C3SetConstantReqInnerFrame(c3Mac, constant);
+ new C3SetConstantReqInnerFrame(one.getC3Mac(), constant);
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setConstantReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆鐢靛帇/鐢垫祦甯告暟", a5Frame, commonFrame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-璁剧疆鐢靛帇/鐢垫祦甯告暟", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -875,18 +870,17 @@
/**
* 璁剧疆鍦板潃
*
- * @param c3Mac
* @param address
* @return
*/
- public String SetAddress(String c3Mac, String address, boolean resendFlag) {
- if (address == null || address.length() != 8) {
- throw new BusinessException("鍦板潃淇℃伅閿欒锛�");
+ public String SetAddress(Long c3Id, String address, boolean resendFlag) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
}
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3MAC鍦板潃涓嶅瓨鍦�");
+ if (address == null || address.length() != 8) {
+ throw new BusinessException("鍦板潃淇℃伅閿欒锛�");
}
if (getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, address).last("limit 1")) != null) {
@@ -894,30 +888,30 @@
}
C3SetAddressReqInnerFrame setAddressReqInnerFrame =
- new C3SetAddressReqInnerFrame(c3Mac, address);
+ new C3SetAddressReqInnerFrame(one.getC3Mac(), address);
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setAddressReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
CommonFrame commonFrame;
if (resendFlag) {
- commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
} else {
- commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
}
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆鍦板潃", a5Frame, commonFrame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-璁剧疆鍦板潃", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
//淇濆瓨鎿嶄綔鏃ュ織
- String content = "鏃3Mac鍦板潃锛�" + c3Mac + "锛涙柊C3Mac鍦板潃锛�" + address;
+ String content = "鏃3Mac鍦板潃锛�" + one.getC3Mac() + "锛涙柊C3Mac鍦板潃锛�" + address;
StoreOperationRecordsUtils.storeOperationData(null, null, "C3甯�-璁剧疆鍦板潃", content);
A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
if (operationReportInnerFrame.isValidate()) {
if ("鎿嶄綔鎴愬姛".equals(operationReportInnerFrame.getState())) {
//淇敼鎴愬姛闇�瑕佹洿鏀规暟鎹簱鏁版嵁
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getC3Mac()).last("limit 1"));
one.setC3Mac(address);
- updateById(one);
+ updateById(c3mCharging);
}
return operationReportInnerFrame.getState();
} else {
@@ -929,32 +923,30 @@
/**
* 璁剧疆鏃ュ巻锛堝悓蹇冭烦鍖呬腑鐨�6瀛楄妭鏃ユ湡鏃堕棿锛�
*
- * @param c3Mac
* @param resendFlag 鏄惁闇�瑕侀噸鍙戞爣蹇�
* @return
*/
- public String SetCalendar(String c3Mac, int year, int month, int day, int hour, int min, int sec, boolean resendFlag) {
-
+ public String SetCalendar(Long c3Id, int year, int month, int day, int hour, int min, int sec, boolean resendFlag) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
C3SetCalendarReqInnerFrame setCalendarReqInnerFrame =
- new C3SetCalendarReqInnerFrame(c3Mac, year, month, day, hour, min, sec);
+ new C3SetCalendarReqInnerFrame(one.getC3Mac(), year, month, day, hour, min, sec);
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setCalendarReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
CommonFrame commonFrame;
if (resendFlag) {
//闇�瑕侀噸鍙�
- commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
} else {
//涓嶉渶瑕侀噸鍙�
- commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
}
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆鏃ュ巻", a5Frame, commonFrame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-璁剧疆鏃ュ巻", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -1008,24 +1000,22 @@
/**
* 鏁呴殰鐮佷笂鎶ユ竻闄�
*
- * @param c3Mac
* @return
*/
- public String ClearedFaultCode(String c3Mac) {
-
+ public String ClearedFaultCode(Long c3Id) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
C3ClearedFaultCodeReqInnerFrame clearedFaultCodeReqInnerFrame =
- new C3ClearedFaultCodeReqInnerFrame(c3Mac);
+ new C3ClearedFaultCodeReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), clearedFaultCodeReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-娓呴櫎鏁呴殰鐮佷笂鎶�", a5Frame, commonFrame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-娓呴櫎鏁呴殰鐮佷笂鎶�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -1040,24 +1030,22 @@
/**
* 鎭㈠鍑哄巶鍊�
*
- * @param c3Mac
* @return
*/
- public String RestoreFactoryValue(String c3Mac) {
-
+ public String RestoreFactoryValue(Long c3Id) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
C3RestoreFactoryValueReqInnerFrame restoreFactoryValueReqInnerFrame =
- new C3RestoreFactoryValueReqInnerFrame(c3Mac);
+ new C3RestoreFactoryValueReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), restoreFactoryValueReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鎭㈠鍑哄巶璁剧疆", a5Frame, commonFrame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-鎭㈠鍑哄巶璁剧疆", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -1065,8 +1053,8 @@
if (operationReportInnerFrame.isValidate()) {
if ("鎿嶄綔鎴愬姛".equals(operationReportInnerFrame.getState())) {
//鎭㈠鍑哄巶璁剧疆鎴愬姛锛岄渶瑕佷慨鏀笴3Mac鍦板潃
- c3mCharging.setC3Mac("00000000");
- updateById(c3mCharging);
+ one.setC3Mac("00000000");
+ updateById(one);
}
return operationReportInnerFrame.getState();
} else {
@@ -1077,21 +1065,22 @@
/**
* 杞噸鍚�
*
- * @param c3Mac
*/
- public String restartCharging(String c3Mac) {
+ public String restartCharging(Long c3Id) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
+
C3RestartChargingReqInnerFrame c3RestartChargingReqInnerFrame =
- new C3RestartChargingReqInnerFrame(c3Mac);
+ new C3RestartChargingReqInnerFrame(one.getC3Mac());
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3RestartChargingReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
- }
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-杞噸鍚�", a5Frame, commonFrame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-杞噸鍚�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
--
Gitblit v1.9.3