From c121143d54615f71d0b87a88ab09da7cfd16d9e4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 31 八月 2022 16:14:57 +0800
Subject: [PATCH] 充电桩
---
/dev/null | 41 -----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 118 +++++++++++-----
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/C3SetRateReqInnerFrame.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/util/SupplementUtils.java | 31 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java | 1
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 169 ++++++++++++------------
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java | 3
8 files changed, 197 insertions(+), 170 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 9a94b50..0387ab6 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
@@ -195,7 +195,7 @@
@PostMapping("/SetAddress")
public ResponseVO<Object> SetAddress(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Mac(), c3ChargingParam.getAddress()));
+ return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Mac(), c3ChargingParam.getAddress(), false));
}
/**
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 800126c..5d0f82c 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
@@ -51,98 +51,93 @@
public void process(String productKey, String deviceName, CommonFrame frame) {
String functionCode = frame.getPayload().substring(2, 4);
//TODO
- if (!frame.getPayload().contains("0000048E")) {
- log.info("涓嶈澶勭悊0000048E涔嬪鐨勫厖鐢垫々锛�");
- return;
- }
+ 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 (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 (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);
+ 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);
- }
- } 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(completeRequestFrame.getDestinationAddress(), true);
- if (aPackage == null) {
- LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
- return;
- }
- orderService.stopCharingOrder(aPackage);
+ 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)
+ /**
+ * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
+ */
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress(), 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());
+ } 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());
- /**
- * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
- */
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress(), 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());
+ /**
+ * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
+ */
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress(), 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) {
@@ -151,9 +146,13 @@
// }
// 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/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java
index 84b75c3..75b2988 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java
@@ -5,6 +5,7 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.SupplementUtils;
import lombok.Data;
import lombok.ToString;
@@ -95,7 +96,7 @@
if (hex.length() != 4) {
throw new BusinessException("鏁版嵁閿欒锛岃閲嶆柊璇锋眰锛�");
}
- setAddress(hex);
+ setAddress(SupplementUtils.suppleZero(hex, 8));
}
/**
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/C3SetRateReqInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/C3SetRateReqInnerFrame.java
index e9232ed..9854d50 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/C3SetRateReqInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/C3SetRateReqInnerFrame.java
@@ -4,7 +4,7 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.MQTTConnectTypeEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
-import com.sandu.ximon.admin.utils.SupplementUtils;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.SupplementUtils;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import java.text.DecimalFormat;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/util/SupplementUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/util/SupplementUtils.java
index c3d1412..345b50d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/util/SupplementUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/util/SupplementUtils.java
@@ -8,7 +8,8 @@
/**
* 鎴彇鎸囧畾闀垮害鐨勫瓧绗︿覆锛屼笉瓒充互0濉厖鍓嶉潰
- * @param hex 瀛楃涓�
+ *
+ * @param hex 瀛楃涓�
* @param totalBit 鎴彇闀垮害
* @return 鎴彇鍚庣殑瀛楃涓�
*/
@@ -29,7 +30,29 @@
return hex;
}
- /** 鍗佸叚杩涘埗杞崲鎴愬瓧鑺傛暟缁� */
+ /**
+ * 鍗佽繘鍒惰浆16杩涘埗锛岃ˉ浣�0
+ *
+ * @param index 瀛楃涓�
+ * @param totalBit 鎴彇闀垮害
+ * @return 鎴彇鍚庣殑瀛楃涓�
+ */
+ public static String suppleZero(Integer index, Integer totalBit) {
+ String format = String.format("%02X", index);
+
+ totalBit = totalBit - format.length();
+
+ StringBuilder hexBuilder = new StringBuilder(format);
+ for (int i = 0; i < totalBit; i++) {
+ hexBuilder.insert(0, "0");
+ }
+ format = hexBuilder.toString();
+ return format;
+ }
+
+ /**
+ * 鍗佸叚杩涘埗杞崲鎴愬瓧鑺傛暟缁�
+ */
public static byte[] hexStringToBytes(String hexString) {
if (hexString == null || hexString.equals("")) {
return null;
@@ -45,7 +68,9 @@
return d;
}
- /** char杞琤yte */
+ /**
+ * char杞琤yte
+ */
private static byte charToByte(char c) {
return (byte) "0123456789ABCDEF".indexOf(c);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
index 1da682a..d361a03 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
@@ -36,6 +36,7 @@
public void addAirEquipment(AirEquipmentNongGeng airEquipmentNongGeng) {
AirEquipmentNongGeng one = getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, airEquipmentNongGeng.getMac()));
if (one == null) {
+ //TODO
save(airEquipmentNongGeng);
/**
* 娣诲姞鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍寮�濮�
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"));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/SupplementUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/SupplementUtils.java
deleted file mode 100644
index 2df9b7a..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/SupplementUtils.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.sandu.ximon.admin.utils;
-
-/**
- * 琛ヤ綅
- */
-public class SupplementUtils {
-
-
- public static String suppleZero(String hex,Integer totalBit){
-
- if (hex.length()>totalBit) {
- return hex.substring(0, totalBit);
- } else if (hex.length()==totalBit){
- return hex;
- }
- totalBit = totalBit - hex.length();
-
- for(int i=0;i<totalBit;i++){
- hex = "0" + hex;
- }
- return hex;
- }
-
- public static String suppleZero(Integer hexInt,Integer totalBit){
-
- String hex = hexInt+"";
-
- if (hex.length()>totalBit) {
- return hex.substring(0, totalBit);
- } else if (hex.length()==totalBit){
- return hex;
- }
- totalBit = totalBit - hex.length();
-
- for(int i=0;i<totalBit;i++){
- hex = "0" + hex;
- }
- return hex;
- }
-
-}
\ No newline at end of file
--
Gitblit v1.9.3