From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 448 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 278 insertions(+), 170 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 c01c7b4..d4bcff3 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,17 +18,21 @@
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.redis.DeviceRedisKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.*;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
+import com.sandu.ximon.admin.vo.RedisDeviceStatus;
import com.sandu.ximon.dao.bo.C3ChargingBo;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +40,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author ZZQ
@@ -46,10 +51,11 @@
@Slf4j
@AllArgsConstructor
public class C3ChargingService extends BaseServiceImpl<C3mChargingMapper, C3mCharging> {
- private C3mChargingMapper c3mChargingMapper;
+ private final C3mChargingMapper c3mChargingMapper;
private final C3mChargingChargeService c3mChargingChargeService;
private final PoleBindingService bindingService;
private final PoleService poleService;
+ private final RedisUtils redisUtils;
/**
* 淇濆瓨涓婃姤C3鍏呯數璁惧蹇冭烦鏁版嵁
@@ -57,7 +63,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);
@@ -73,8 +79,9 @@
*
* @return 鏄惁鎴愬姛
*/
+ @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) {
//灏嗚澶囦俊鎭坊鍔犲埌鍏呯數妗╄澶囪〃
@@ -90,28 +97,63 @@
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(one.getC3Id(), 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(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)));
+ Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)), true);
if (!"鎿嶄綔鎴愬姛".equals(s)) {
LogUtils.error("鍙戦�佽缃瓹3鏃堕棿鍚屾澶辫触!");
return false;
}
System.out.println("鍚屾鏃堕棿鎴崇粨鏉�");
+ Thread.sleep(1000);
+
//璁剧疆璐圭巼
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.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
}
- String rateState = setRate(c3Mac, list);
+ String rateState = setRate(newC3Mac, list, true);
System.out.println("璁剧疆璐圭巼缁撴灉锛�" + rateState);
System.out.println("璁剧疆璐圭巼缁撴潫");
+
+ Thread.sleep(1000);
+
/** 璺冲寘鏃堕棿鍚屾
* 璁剧疆鏃堕棿瑙勫垯锛氬厖鐢垫椂涓�1鍊嶏紝闈炲厖鐢电姸鎬佷负1.5鍊嶆椂闂�
@@ -120,35 +162,43 @@
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);
+ String time1 = SetHeartbeatPacketTimeCharging(one.getC3Id(), C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false, true);
LogUtils.error("C3绌洪棽蹇冭烦鍖呮椂闂村悓姝ュ搷搴旂粨鏋滐細" + time1);
- String time2 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true);
+ String time2 = SetHeartbeatPacketTimeCharging(one.getC3Id(), C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true, true);
LogUtils.error("C3鍏呯數鏃跺績璺冲寘鏃堕棿鍚屾鍝嶅簲缁撴灉锛�" + time2);
System.out.println("璁剧疆蹇冭烦鍖呴棿闅旀椂闂寸粨鏉�");
+ Thread.sleep(1000);
/**
* 鑾峰彇蹇冭烦鍖咃紝鍒ゆ柇鍦ㄧ嚎
*/
System.out.println("鑾峰彇蹇冭烦鍖呭紑濮�");
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac);
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(one.getC3Id(), 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
);
System.out.println("鑾峰彇蹇冭烦鍖呯粨鏉�");
+ Thread.sleep(1000);
+
+ /**
+ * 鏄惁鏈夎繘琛屼腑鐨勪釜璁㈠崟
+ */
+ SpringContextHolder.getBean(C3mOrderService.class).stopCharingOrder(aPackage);
+
/**
* finally銆佸悓姝ョ粨鏉�
*/
System.out.println("鍚屾缁撴潫 寮�濮�");
- String end = EndOfTheSynchronization(c3Mac);
+ String end = EndOfTheSynchronization(newC3Mac, true);
if (!"鎿嶄綔鎴愬姛".equals(end)) {
LogUtils.error("C3鍚屾缁撴潫鍝嶅簲缁撴灉" + end);
return false;
@@ -213,6 +263,8 @@
int faultNumber = 0;
//绛夊緟鎺ュ叆鏁伴噺
int waitConnectNumber = 0;
+ //鍏呯數涓暟閲�
+ int chargingNumber = 0;
for (C3ChargingBo one : c3ChargingBoList) {
String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
@@ -227,6 +279,7 @@
break;
//2.鍏呯數涓�
case 2:
+ chargingNumber++;
onlineNumber = onlineNumber + 1;
break;
//3.鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭
@@ -268,6 +321,7 @@
map.put("offlineNumber", offlineNumber);
map.put("faultNumber", faultNumber);
map.put("waitConnectNumber", waitConnectNumber);
+ map.put("chargingNumber", chargingNumber);
return map;
}
@@ -304,13 +358,13 @@
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) {
throw new BusinessException("鍏呯數妗╀俊鎭笉瀛樺湪锛�");
}
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Mac());
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Id(), false);
if (beatDataPackage != null) {
//鍏呯數妗㊣D
chargingDto.setC3Id(one.getC3Id());
@@ -349,7 +403,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) {
@@ -405,7 +459,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涓嶅瓨鍦�");
}
@@ -429,18 +483,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("鍏呯數妗╂病鏈夎繘琛屼腑鐨勮鍗�");
@@ -450,23 +507,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));
- 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());
@@ -494,19 +548,25 @@
* 鍚屾缁撴潫
*
* @param c3Mac
+ * @param resendFlag 閲嶅彂鏍囧織
*/
- public String EndOfTheSynchronization(String c3Mac) {
+ public String EndOfTheSynchronization(String c3Mac, boolean resendFlag) {
C3EndOfTheSynchronizationReqInnerFrame c3EndOfTheSynchronizationReqInnerFrame =
new C3EndOfTheSynchronizationReqInnerFrame(c3Mac);
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涓嶅瓨鍦�");
}
- 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);
@@ -532,7 +592,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涓嶅瓨鍦�");
}
@@ -553,22 +613,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));
- 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");
@@ -584,22 +643,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));
- 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");
@@ -614,22 +672,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));
- 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");
@@ -645,23 +703,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));
- 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");
@@ -676,22 +732,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));
- 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");
@@ -708,21 +763,27 @@
/**
* 璇诲績璺冲寘
*
- * @param c3Mac
+ * @param resendFlag 閲嶅彂鏍囧織
*/
- public A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage ReadTheHeartbeatPackage(String c3Mac) {
+ 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));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
+ CommonFrame commonFrame;
+ if (resendFlag) {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
}
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璇诲彇蹇冭烦鍖�", a5Frame, commonFrame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-璇诲彇蹇冭烦鍖�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -738,26 +799,32 @@
/**
* 璁剧疆蹇冭烦鍖呴棿闅旀椂闂�(绉掞級-鍏呯數鐘舵�佹椂/闈炲厖鐢电姸鎬佹椂
*
- * @param c3Mac
* @param setTime
+ * @param resndFlag 閲嶅彂鏍囧織
* @return
*/
- public String SetHeartbeatPacketTimeCharging(String c3Mac, int setTime, boolean flag) {
+ 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));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
+ CommonFrame commonFrame;
+ if (resndFlag) {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
}
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆蹇冭烦鍖呴棿闅旀椂闂�", a5Frame, commonFrame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-璁剧疆蹇冭烦鍖呴棿闅旀椂闂�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -773,24 +840,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));
- 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");
@@ -806,44 +872,48 @@
/**
* 璁剧疆鍦板潃
*
- * @param c3Mac
* @param address
* @return
*/
- public String SetAddress(String c3Mac, String address) {
+ public String SetAddress(Long c3Id, String address, boolean resendFlag) {
+ C3mCharging one = getById(c3Id);
+ if (one == null) {
+ System.out.println("鍏呯數妗╀笉瀛樺湪锛�");
+ }
+
if (address == null || address.length() != 8) {
throw new BusinessException("鍦板潃淇℃伅閿欒锛�");
}
- C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
- 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("鏂扮殑鍦板潃淇℃伅宸插瓨鍦紒");
}
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 = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆鍦板潃", a5Frame, commonFrame);
+ CommonFrame commonFrame;
+ if (resendFlag) {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
+ }
+ 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));
+ 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 {
@@ -855,24 +925,30 @@
/**
* 璁剧疆鏃ュ巻锛堝悓蹇冭烦鍖呬腑鐨�6瀛楄妭鏃ユ湡鏃堕棿锛�
*
- * @param c3Mac
+ * @param resendFlag 鏄惁闇�瑕侀噸鍙戞爣蹇�
* @return
*/
- public String SetCalendar(String c3Mac, int year, int month, int day, int hour, int min, int sec) {
-
+ 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));
- if (c3mCharging == null) {
- throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
+ CommonFrame commonFrame;
+ if (resendFlag) {
+ //闇�瑕侀噸鍙�
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ //涓嶉渶瑕侀噸鍙�
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
}
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆鏃ュ巻", a5Frame, commonFrame);
+ StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3甯�-璁剧疆鏃ュ巻", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -891,7 +967,7 @@
* @param list
* @return
*/
- public String setRate(String c3Mac, List<C3mChargingCharge> list) {
+ public String setRate(String c3Mac, List<C3mChargingCharge> list, boolean resendFlag) {
if (StringUtil.strIsNullOrEmpty(c3Mac)) {
throw new BusinessException("C3Mac鍦板潃涓嶈兘涓虹┖锛�");
}
@@ -902,11 +978,16 @@
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涓嶅瓨鍦�");
}
- 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");
@@ -921,24 +1002,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));
- 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");
@@ -953,29 +1032,32 @@
/**
* 鎭㈠鍑哄巶鍊�
*
- * @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));
- 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());
if (operationReportInnerFrame.isValidate()) {
+ if ("鎿嶄綔鎴愬姛".equals(operationReportInnerFrame.getState())) {
+ //鎭㈠鍑哄巶璁剧疆鎴愬姛锛岄渶瑕佷慨鏀笴3Mac鍦板潃
+ one.setC3Mac("00000000");
+ updateById(one);
+ }
return operationReportInnerFrame.getState();
} else {
throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
@@ -984,22 +1066,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));
- 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");
@@ -1014,7 +1096,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("纭欢璁惧宸插瓨鍦紒");
}
@@ -1041,14 +1123,12 @@
* 娣诲姞鍏呯數妗� 鏃ュ織璁板綍缁撴潫
*/
- return
-
- save(c3mCharging);
+ return save(c3mCharging);
}
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("纭欢璁惧涓嶅瓨鍦紒");
}
@@ -1082,8 +1162,36 @@
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"));
}
+ /**
+ * 鍚慠edis涓瓨鍏ヨ澶囩姸鎬�
+ */
+// public void setCacheData() {
+// list().forEach(
+// device -> {
+// RedisDeviceStatus deviceStatus = new RedisDeviceStatus();
+// deviceStatus.setDeviceId(device.getC3Id().toString());
+// if (device != null) {
+// A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(device.getC3Id(), false);
+// if (beatDataPackage != null) {
+// //鍦ㄧ嚎鐘舵�� 1.绌洪棽 2.鍏呯數涓� 3.鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭 4.鍏呯數缁撴潫锛岀瓑寰呮湇鍔″櫒纭 5.鏈夋晠闅� 6.涓庡厖鐢垫々瀵规帴涓�
+// if (Integer.valueOf(beatDataPackage.getStatusBit()) == 5) {
+// deviceStatus.setStatus(2);
+// } else {
+// deviceStatus.setStatus(0);
+// }
+//
+// } else {
+// deviceStatus.setStatus(1);
+// }
+// }
+// redisUtils.set(DeviceRedisKey.C3M + device.getC3Id(), JSON.toJSONString(deviceStatus));
+//// redisUtils.delete(DeviceRedisKey.C3M + device.getC3Id());
+// }
+// );
+//
+// }
}
--
Gitblit v1.9.3