From 3075910e10bb60fa2775afb4dbad8d5dba488abb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 七月 2022 09:56:36 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 368 insertions(+), 40 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 2a70fe6..6ae4861 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
@@ -1,10 +1,14 @@
package com.sandu.ximon.admin.service;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.config.C3mRedisConfig;
+import com.sandu.ximon.admin.dto.ChargingDto;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3OperationReportInnerFrame;
@@ -12,19 +16,31 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.request.*;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
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.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.LogUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
+import com.sandu.ximon.admin.vo.EquipmentInfomation;
+import com.sandu.ximon.dao.bo.C3ChargingBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
-import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.domain.PoleBinding;
+import com.sandu.ximon.dao.enums.OrderStatus;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* @author ZZQ
@@ -35,7 +51,7 @@
@Slf4j
@AllArgsConstructor
public class C3ChargingService extends BaseServiceImpl<C3mChargingMapper, C3mCharging> {
-
+ private C3mChargingMapper c3mChargingMapper;
private final C3mChargingChargeService c3mChargingChargeService;
private final PoleBindingService bindingService;
private final PoleService poleService;
@@ -46,17 +62,11 @@
* @return 鏄惁鎴愬姛
*/
public boolean updateReportState(String deviceName, String c3Mac, String statusBit, String deviceTemperature) {
- C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getPoleDevicesCode, deviceName));
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
if (one != null) {
- one.setStatusBit(Integer.valueOf(statusBit));
one.setDeviceTemperature(deviceTemperature);
one.setPoleDevicesCode(deviceName);
one.setC3Mac(c3Mac);
-
-// List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, one.getC3Id()));
-// if (list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
-// c3mChargingChargeService.initCharge((one.getC3Id()).intValue());
-// }
return updateById(one);
} else {
return false;
@@ -70,35 +80,94 @@
*/
public boolean saveReporEquipment(String deviceName, String mcuUdid, String c3Mac) {
C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
+ boolean flag;
if (one == null) {
//灏嗚澶囦俊鎭坊鍔犲埌鍏呯數妗╄澶囪〃
C3mCharging c3mCharging = new C3mCharging();
c3mCharging.setMcuUdid(mcuUdid);
c3mCharging.setPoleDevicesCode(deviceName);
c3mCharging.setC3Mac(c3Mac);
- boolean flag = save(c3mCharging);
- //璁剧疆璐圭巼
- C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
- List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
- if (list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
- c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
- }
-
- return flag;
+ flag = save(c3mCharging);
} else {
//灏嗚澶囦俊鎭坊鍔犲埌鍏呯數妗╄澶囪〃
one.setPoleDevicesCode(deviceName);
one.setC3Mac(c3Mac);
- boolean flag = updateById(one);
- //璁剧疆璐圭巼
- C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
- List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
- if (list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
- c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
- }
-
- return flag;
+ flag = updateById(one);
}
+ //璁剧疆璐圭巼
+ C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
+ List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
+ if (list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
+ c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
+ }
+// /**
+// * 娣诲姞缁戝畾鍏崇郴寮�濮�
+// */
+// Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
+// if (pole == null) {
+// Pole pole1 = new Pole();
+// pole1.setDeviceCode(deviceName);
+// pole1.setPoleName(deviceName);
+// pole1.setPoleCode(poleService.generatePoleCode());
+// poleService.save(pole1);
+// }
+//
+// Long poleId = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName)).getId();
+// PoleBindingParam poleBindingParam = new PoleBindingParam();
+// poleBindingParam.setDeviceType(2);
+// poleBindingParam.setDeviceCode(mcuUdid);
+// bindingService.bindPole(poleId, poleBindingParam);
+
+ /**
+ * 娣诲姞缁戝畾鍏崇郴缁撴潫
+ */
+
+ //鍚屾鏃堕棿鎴�
+ String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
+ String s = SetCalendar(c3Mac, 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)));
+ if (!"鎿嶄綔鎴愬姛".equals(s)) {
+ LogUtils.error("鍙戦�佽缃瓹3鏃堕棿鍚屾澶辫触!");
+ return false;
+ }
+
+ /** 璺冲寘鏃堕棿鍚屾
+ * 璁剧疆鏃堕棿瑙勫垯锛氬厖鐢垫椂涓�1鍊嶏紝闈炲厖鐢电姸鎬佷负1.5鍊嶆椂闂�
+ */
+ 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);
+ LogUtils.error("C3绌洪棽蹇冭烦鍖呮椂闂村悓姝ュ搷搴旂粨鏋滐細" + time1);
+ String time2 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true);
+ LogUtils.error("C3鍏呯數鏃跺績璺冲寘鏃堕棿鍚屾鍝嶅簲缁撴灉锛�" + time2);
+
+
+ /**
+ * 鑾峰彇蹇冭烦鍖咃紝鍒ゆ柇鍦ㄧ嚎
+ */
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac);
+ if (aPackage == null) {
+ LogUtils.error("璇诲彇蹇冭烦鍖呬负绌�");
+ return false;
+ }
+ RedisUtils redisUtils = RedisUtils.getBean();
+ redisUtils.set(
+ C3mRedisConstant.C3_STATUS.getCode() + c3Mac,
+ JSON.toJSONString(aPackage),
+ C3mRedisConfig.OUTLINE_TIME
+ );
+
+ /**
+ * finally銆佸悓姝ョ粨鏉�
+ */
+ String end = EndOfTheSynchronization(c3Mac);
+ if (!"鎿嶄綔鎴愬姛".equals(end)) {
+ LogUtils.error("C3鍚屾缁撴潫鍝嶅簲缁撴灉" + end);
+ return false;
+ }
+ return flag;
}
/**
@@ -106,10 +175,137 @@
*
* @return
*/
- public List<C3mCharging> getC3ChargingList(BaseConditionVO baseConditionVO) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return list();
+ public List<C3ChargingBo> getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam) {
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+ if (c3ChargingParam == null) {
+ c3ChargingParam = new C3ChargingParam();
+ }
+
+ //鍏抽敭瀛楀幓闄ょ┖鏍�
+ if (c3ChargingParam.getKeyword() != null) {
+ c3ChargingParam.setKeyword(c3ChargingParam.getKeyword().trim());
+ }
+
+ List<C3ChargingBo> c3ChargingBoList;
+ if (SecurityUtils.getClientId() == null) {
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null);
+ } else {
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId());
+ }
+ for (C3ChargingBo one : c3ChargingBoList) {
+ String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
+ if (s != null) {
+ try {
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ one.setStatusBit((Integer.valueOf(beatDataPackage.getStatusBit())));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ one.setStatusBit(0);
+ }
+
+ }
+ return c3ChargingBoList;
}
+
+ /**
+ * 鑾峰彇鍏呯數妗╄鎯�
+ *
+ * @return
+ */
+ public ChargingDto getChargingInfo(String poleId) {
+ if (poleId == null) {
+ throw new BusinessException("鐏潌ID涓嶈兘涓虹┖锛�");
+ }
+
+ Pole pole = SpringContextHolder.getBean(PoleService.class).
+ getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, poleId));
+ if (pole == null) {
+ throw new BusinessException("鍏呯數妗╃粦瀹氱殑鐏潌涓嶅瓨鍦紒");
+ }
+
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getPoleDevicesCode, pole.getDeviceCode()));
+ ChargingDto chargingDto = new ChargingDto();
+
+ if (one == null) {
+ throw new BusinessException("鍏呯數妗╀俊鎭笉瀛樺湪锛�");
+ }
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Mac());
+ if (beatDataPackage != null) {
+ //鍏呯數妗㊣D
+ chargingDto.setC3Id(one.getC3Id());
+ //C3Mac
+ chargingDto.setC3Mac(one.getC3Mac());
+ //鍦ㄧ嚎鐘舵��
+ chargingDto.setStatusBit(Integer.valueOf(beatDataPackage.getStatusBit()));
+ //鐢靛帇
+ chargingDto.setGridVoltage(beatDataPackage.getGridVoltage());
+ //鐢垫祦
+ chargingDto.setGridCurrent(beatDataPackage.getGridCurrent());
+ //娓╁害
+ chargingDto.setDeviceTemperature(beatDataPackage.getDeviceTemperature());
+ //鐏潌ID
+ chargingDto.setPoleId(pole.getId());
+ }
+
+ return chargingDto;
+ }
+
+ /**
+ * 棣栭〉鐏潌缁戝畾淇℃伅
+ *
+ * @return
+ */
+ public EquipmentInfomation getByC3MacInfo(String udid) {
+ EquipmentInfomation equipmentInfo = new EquipmentInfomation();
+ equipmentInfo.setEquipmentType("C3鍏呯數妗�");
+ if (udid == null || udid.trim().length() == 0) {
+ return equipmentInfo;
+ }
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, udid));
+ if (one != null) {
+ String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
+ if (s != null) {
+ try {
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ switch (beatDataPackage.getStatusBit()) {
+ case "1":
+ equipmentInfo.setEquipmentState("绌洪棽");
+ break;
+ case "2":
+ equipmentInfo.setEquipmentState("鍏呯數涓�");
+ break;
+ case "3":
+ equipmentInfo.setEquipmentState("鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭");
+ break;
+ case "4":
+ equipmentInfo.setEquipmentState("鍏呯數缁撴潫锛岀瓑寰呮湇鍔″櫒纭");
+ break;
+ case "5":
+ equipmentInfo.setEquipmentState("鏈夋晠闅�");
+ break;
+ case "6":
+ equipmentInfo.setEquipmentState("涓庡厖鐢垫々瀵规帴涓�");
+ break;
+ default:
+ equipmentInfo.setEquipmentState("鏈煡");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ equipmentInfo.setEquipmentState("绂荤嚎");
+ }
+ equipmentInfo.setEquipmentCreateTime(one.getUpdateTime());
+ equipmentInfo.setEquipmentMac(one.getMcuUdid());
+ equipmentInfo.setEquipmentName(one.getC3Name());
+ }
+ return equipmentInfo;
+ }
+
/**
* 寮�濮嬪厖鐢�
@@ -130,6 +326,7 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-寮�濮嬪厖鐢�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -151,7 +348,23 @@
*
* @param c3Mac
*/
- public String finishCharging(String c3Mac) {
+ @Transactional(rollbackFor = Exception.class)
+ public String finishCharging(String c3Mac, String openId) {
+ //鏌ヨ
+ 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"));
+
+ if (order == null) {
+ throw new BusinessException("鍏呯數妗╂病鏈夎繘琛屼腑鐨勮鍗�");
+ }
+ if (!openId.equals(order.getOrderId())) {
+ throw new BusinessException("涓嶈兘鎿嶄綔涓嶅睘浜庢偍鐨勮鍗�");
+ }
+
C3FinishChargingReqInnerFrame c3FinishChargingReqInnerFrame =
new C3FinishChargingReqInnerFrame(c3Mac);
@@ -163,11 +376,28 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
-
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-缁撴潫鍏呯數", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
+ //缁撴潫鍏呯數 鏇存敼璁㈠崟鐘舵��
+ C3mOrder lastOrderByC3Mac = SpringContextHolder.getBean(C3mOrderService.class).getLastOrderByC3Mac(c3Mac);
+ if (lastOrderByC3Mac != null) {
+ //璁剧疆璁㈠崟鐘舵�佷负宸插畬鎴�
+ lastOrderByC3Mac.setOrderStatus(OrderStatus.COMPLETE.getStatus());
+
+ BigDecimal actualChargingCapacity = BigDecimal.valueOf(lastOrderByC3Mac.getActualChargingCapacity());
+ BigDecimal actualChargingCapacityHide = BigDecimal.valueOf(lastOrderByC3Mac.getActualChargingCapacityHide());
+ //璁剧疆瀹為檯鍏呯數鐢甸噺
+ lastOrderByC3Mac.setActualChargingCapacity(actualChargingCapacity.add(actualChargingCapacityHide).doubleValue());
+ //璁剧疆璁㈠崟缁撴潫鏃堕棿
+ lastOrderByC3Mac.setStopChargingTimestamp(System.currentTimeMillis());
+ lastOrderByC3Mac.setActualChargingCapacity(0.00);
+ //璁剧疆璁㈠崟鐘舵�佷负鍏呯數缁撴潫
+ lastOrderByC3Mac.setChargingStates(1);
+ SpringContextHolder.getBean(C3mOrderService.class).updateById(lastOrderByC3Mac);
+ }
if (operationReportInnerFrame.isValidate()) {
return operationReportInnerFrame.getState();
} else {
@@ -193,6 +423,38 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鍚屾缁撴潫", a5Frame, commonFrame);
+
+
+ System.out.println(commonFrame + " -----commonFrame");
+
+ A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
+
+ if (operationReportInnerFrame.isValidate()) {
+ return operationReportInnerFrame.getState();
+ } else {
+ throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
+ }
+ }
+
+ /**
+ * 浜岀淮鐮�
+ *
+ * @param c3Mac
+ */
+ public String QrCode(String c3Mac, String qrCodeData) {
+ C3QrCodeReqInnerFrame c3QrCodeReqInnerFrame = new C3QrCodeReqInnerFrame(c3Mac, qrCodeData);
+
+ 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));
+ if (c3mCharging == null) {
+ throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
+ }
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-浜岀淮鐮�", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
@@ -222,6 +484,8 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鐗堟湰鏌ヨ", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
@@ -251,6 +515,7 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鏌ヨ蹇冭烦鍖呴棿闅旀椂闂�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -280,6 +545,8 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鏌ヨ鐢靛帇/鐢垫祦甯告暟", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
@@ -309,6 +576,8 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鏌ヨ鍦板潃", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
@@ -338,6 +607,8 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鏌ヨ鏁呴殰鐮�", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
@@ -367,6 +638,8 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璇诲彇蹇冭烦鍖�", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
@@ -400,6 +673,8 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆蹇冭烦鍖呴棿闅旀椂闂�", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
@@ -431,6 +706,8 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆鐢靛帇/鐢垫祦甯告暟", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
@@ -454,22 +731,36 @@
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) {
+ throw new BusinessException("鏂扮殑鍦板潃淇℃伅宸插瓨鍦紒");
+ }
+
C3SetAddressReqInnerFrame setAddressReqInnerFrame =
new C3SetAddressReqInnerFrame(c3Mac, address);
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setAddressReqInnerFrame);
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);
+
System.out.println(commonFrame + " -----commonFrame");
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));
+ one.setC3Mac(address);
+ updateById(one);
+ }
return operationReportInnerFrame.getState();
} else {
throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
@@ -496,6 +787,7 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆鏃ュ巻", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -527,6 +819,7 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-娓呴櫎鏁呴殰鐮佷笂鎶�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -558,6 +851,7 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鎭㈠鍑哄巶璁剧疆", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -586,7 +880,8 @@
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
-// CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC("32313243305008ff1a06ffff", a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-杞噸鍚�", a5Frame, commonFrame);
+
System.out.println(commonFrame + " -----commonFrame");
@@ -614,7 +909,23 @@
c3mCharging.setC3Name(c3ChargingAddParam.getC3Name());
}
c3mCharging.setC3Mac(c3ChargingAddParam.getC3Mac());
- return save(c3mCharging);
+ /**
+ * 娣诲姞鍏呯數妗� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(c3mCharging.getMcuUdid());
+ String content = "{璁惧code锛�" + c3mCharging.getMcuUdid() + "璁惧鍚�:" + c3mCharging.getC3Name() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞鍏呯數妗�", content);
+ /**
+ * 娣诲姞鍏呯數妗� 鏃ュ織璁板綍缁撴潫
+ */
+
+ return
+
+ save(c3mCharging);
+
}
public boolean updateC3ChargingName(C3ChargingAddParam c3ChargingAddParam) {
@@ -629,6 +940,21 @@
C3mCharging c3mCharging = new C3mCharging();
c3mCharging.setC3Id(c3ChargingAddParam.getC3Id());
c3mCharging.setC3Name(c3ChargingAddParam.getC3Name());
+
+ /**
+ * 淇敼鍏呯數妗� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(c3mCharging.getMcuUdid());
+ String content = "{璁惧code锛�" + c3mCharging.getMcuUdid() + "璁惧鍘熷悕:" + one.getC3Name() + "鏇存敼鍚庣殑璁惧鍚�:" + c3mCharging.getC3Name() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "缂栬緫鍏呯數妗�", content);
+ /**
+ * 淇敼鍏呯數妗� 鏃ュ織璁板綍缁撴潫
+ */
+
+
return updateById(c3mCharging);
}
@@ -637,6 +963,8 @@
if (one == null) {
throw new BusinessException("鏈壘鍒扮粦瀹氬叧绯�");
}
- return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getDeviceCode()));
+ return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, one.getDeviceCode()));
}
+
+
}
--
Gitblit v1.9.3