From c121143d54615f71d0b87a88ab09da7cfd16d9e4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 31 八月 2022 16:14:57 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 118 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 80 insertions(+), 38 deletions(-)
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 e8ab57f..195696c 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
@@ -18,6 +18,7 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.SupplementUtils;
import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -37,6 +38,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author ZZQ
@@ -58,7 +60,7 @@
* @return 鏄惁鎴愬姛
*/
public boolean updateReportState(String deviceName, String c3Mac, String statusBit, String deviceTemperature) {
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (one != null) {
one.setDeviceTemperature(deviceTemperature);
one.setPoleDevicesCode(deviceName);
@@ -76,7 +78,7 @@
*/
@SneakyThrows
public boolean saveReporEquipment(String deviceName, String mcuUdid, String c3Mac) {
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid).last("limit 1"));
boolean flag;
if (one == null) {
//灏嗚澶囦俊鎭坊鍔犲埌鍏呯數妗╄澶囪〃
@@ -92,10 +94,40 @@
flag = updateById(one);
}
+ String newC3Mac = c3Mac;
+ /**
+ * 鍒濆鍖朿3mac鍦板潃寮�濮�
+ */
+ if (c3Mac.equals("00000000")) {
+ System.out.println("鍒濆鍖朿3mac鍦板潃寮�濮�");
+ List<C3mCharging> list = list();
+ //浠巐ist闆嗗悎涓紝鍙栧嚭瀛楁name鐨勫垪琛ㄥ苟鍘婚噸
+ List<String> c3macList = list.stream().map(C3mCharging::getC3Mac).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+ for (int index = 1; true; index++) {
+ newC3Mac = SupplementUtils.suppleZero(index, 8);
+ if (!c3macList.contains(newC3Mac)) {
+ //澶辫触閲嶅彂涓�娆�
+ String s = SetAddress(c3Mac, newC3Mac, true);
+ if (!"鎿嶄綔鎴愬姛".equals(s)) {
+ LogUtils.error("鍒濆鍖栧厖鐢垫々澶辫触!");
+ return false;
+ } else {
+ break;
+ }
+ }
+ }
+ System.out.println("鍒濆鍖朿3mac鍦板潃缁撴潫");
+ }
+
+ /**
+ * 鍒濆鍖朿3mac鍦板潃缁撴潫
+ */
+
+
//鍚屾鏃堕棿鎴�
System.out.println("鍚屾鏃堕棿鎴冲紑濮�");
String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
- String s = SetCalendar(c3Mac, Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
+ String s = SetCalendar(newC3Mac, 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)) {
@@ -108,12 +140,12 @@
//璁剧疆璐圭巼
System.out.println("璁剧疆璐圭巼寮�濮�");
- C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
+ C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid).last("limit 1"));
List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
if (list == null && list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
}
- String rateState = setRate(c3Mac, list, true);
+ String rateState = setRate(newC3Mac, list, true);
System.out.println("璁剧疆璐圭巼缁撴灉锛�" + rateState);
System.out.println("璁剧疆璐圭巼缁撴潫");
@@ -127,9 +159,9 @@
Set<String> keys = RedisUtils.getBean().keys(C3mRedisConstant.C3_STATUS.getCode() + "*");
C3mRedisConfig.reFlushTime(keys.size());
- String time1 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false, true);
+ String time1 = SetHeartbeatPacketTimeCharging(newC3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false, true);
LogUtils.error("C3绌洪棽蹇冭烦鍖呮椂闂村悓姝ュ搷搴旂粨鏋滐細" + time1);
- String time2 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true, true);
+ String time2 = SetHeartbeatPacketTimeCharging(newC3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true, true);
LogUtils.error("C3鍏呯數鏃跺績璺冲寘鏃堕棿鍚屾鍝嶅簲缁撴灉锛�" + time2);
System.out.println("璁剧疆蹇冭烦鍖呴棿闅旀椂闂寸粨鏉�");
@@ -139,14 +171,14 @@
* 鑾峰彇蹇冭烦鍖咃紝鍒ゆ柇鍦ㄧ嚎
*/
System.out.println("鑾峰彇蹇冭烦鍖呭紑濮�");
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac, true);
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(newC3Mac, true);
if (aPackage == null) {
LogUtils.error("璇诲彇蹇冭烦鍖呬负绌�");
return false;
}
RedisUtils redisUtils = RedisUtils.getBean();
redisUtils.set(
- C3mRedisConstant.C3_STATUS.getCode() + c3Mac,
+ C3mRedisConstant.C3_STATUS.getCode() + newC3Mac,
JSON.toJSONString(aPackage),
C3mRedisConfig.OUTLINE_TIME
);
@@ -156,14 +188,14 @@
/**
* 鏄惁鏈夎繘琛屼腑鐨勪釜璁㈠崟
*/
- SpringContextHolder.getBean(C3mOrderService.class).stopCharingOrder( aPackage);
+ SpringContextHolder.getBean(C3mOrderService.class).stopCharingOrder(aPackage);
/**
* finally銆佸悓姝ョ粨鏉�
*/
System.out.println("鍚屾缁撴潫 寮�濮�");
- String end = EndOfTheSynchronization(c3Mac, true);
+ String end = EndOfTheSynchronization(newC3Mac, true);
if (!"鎿嶄綔鎴愬姛".equals(end)) {
LogUtils.error("C3鍚屾缁撴潫鍝嶅簲缁撴灉" + end);
return false;
@@ -323,7 +355,7 @@
throw new BusinessException("鍏呯數妗╃粦瀹氱殑鐏潌涓嶅瓨鍦紒");
}
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getPoleDevicesCode, pole.getDeviceCode()));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getPoleDevicesCode, pole.getDeviceCode()).last("limit 1"));
ChargingDto chargingDto = new ChargingDto();
if (one == null) {
@@ -368,7 +400,7 @@
if (udid == null || udid.trim().length() == 0) {
return equipmentInfo;
}
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, udid));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, udid).last("limit 1"));
if (one != null) {
String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
if (s != null) {
@@ -424,7 +456,7 @@
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3StartChargingReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -474,7 +506,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -522,7 +554,7 @@
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3EndOfTheSynchronizationReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -557,7 +589,7 @@
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QrCodeReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -588,7 +620,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -619,7 +651,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -649,7 +681,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -680,7 +712,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -711,7 +743,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -743,7 +775,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -784,7 +816,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -822,7 +854,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -847,17 +879,17 @@
* @param address
* @return
*/
- public String SetAddress(String c3Mac, String address) {
+ public String SetAddress(String c3Mac, String address, boolean resendFlag) {
if (address == null || address.length() != 8) {
throw new BusinessException("鍦板潃淇℃伅閿欒锛�");
}
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3MAC鍦板潃涓嶅瓨鍦�");
}
- if (getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, address)) != null) {
+ if (getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, address).last("limit 1")) != null) {
throw new BusinessException("鏂扮殑鍦板潃淇℃伅宸插瓨鍦紒");
}
@@ -866,7 +898,12 @@
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setAddressReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ CommonFrame commonFrame;
+ if (resendFlag) {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ }
StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆鍦板潃", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -878,7 +915,7 @@
if (operationReportInnerFrame.isValidate()) {
if ("鎿嶄綔鎴愬姛".equals(operationReportInnerFrame.getState())) {
//淇敼鎴愬姛闇�瑕佹洿鏀规暟鎹簱鏁版嵁
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
one.setC3Mac(address);
updateById(one);
}
@@ -905,7 +942,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -947,7 +984,7 @@
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3SetRateReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -983,7 +1020,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -1015,7 +1052,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -1026,6 +1063,11 @@
A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
if (operationReportInnerFrame.isValidate()) {
+ if ("鎿嶄綔鎴愬姛".equals(operationReportInnerFrame.getState())) {
+ //鎭㈠鍑哄巶璁剧疆鎴愬姛锛岄渶瑕佷慨鏀笴3Mac鍦板潃
+ c3mCharging.setC3Mac("00000000");
+ updateById(c3mCharging);
+ }
return operationReportInnerFrame.getState();
} else {
throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
@@ -1044,7 +1086,7 @@
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));
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
@@ -1064,7 +1106,7 @@
}
public boolean addC3Charging(C3ChargingAddParam c3ChargingAddParam) {
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, c3ChargingAddParam.getMcuUdid()));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, c3ChargingAddParam.getMcuUdid()).last("limit 1"));
if (one != null) {
throw new BusinessException("纭欢璁惧宸插瓨鍦紒");
}
@@ -1098,7 +1140,7 @@
}
public boolean updateC3ChargingName(C3ChargingAddParam c3ChargingAddParam) {
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Id, c3ChargingAddParam.getC3Id()));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Id, c3ChargingAddParam.getC3Id()).last("limit 1"));
if (one == null) {
throw new BusinessException("纭欢璁惧涓嶅瓨鍦紒");
}
@@ -1132,7 +1174,7 @@
if (one == null) {
throw new BusinessException("鏈壘鍒扮粦瀹氬叧绯�");
}
- return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, one.getDeviceCode()));
+ return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, one.getDeviceCode()).last("limit 1"));
}
--
Gitblit v1.9.3