From db5e24f9f54ed5044666f2dbd89a71905f1ed99e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 16 三月 2022 16:03:24 +0800
Subject: [PATCH] 普通用户管理
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 insertions(+), 4 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 ddc0257..8e652d8 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,14 +1,29 @@
package com.sandu.ximon.admin.service;
+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.ximon.admin.manager.iot.amqp.processor.c3ChargingProcessor;
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;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.C3FinishChargingReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.C3RestartChargingReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.C3StartChargingReqInnerFrame;
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.C3ChargingEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.dao.domain.C3mCharging;
+import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @author ZZQ
@@ -16,8 +31,43 @@
* @date 2022/3/4 9:58
*/
@Service
+@Slf4j
@AllArgsConstructor
-public class C3ChargingService {
+public class C3ChargingService extends BaseServiceImpl<C3mChargingMapper, C3mCharging> {
+
+ /**
+ * 淇濆瓨涓婃姤C3鍏呯數璁惧蹇冭烦鏁版嵁
+ *
+ * @return 鏄惁鎴愬姛
+ */
+ public boolean saveReportData(String deviceName, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
+ C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, deviceName));
+
+ if (one == null) {
+ //灏嗚澶囦俊鎭坊鍔犲埌鍏呯數妗╄澶囪〃
+ C3mCharging c3mCharging = new C3mCharging();
+ c3mCharging.setMcuUdid(deviceName);
+ c3mCharging.setC3Mac(heartBeatDataPackage.getC3Mac());
+ c3mCharging.setStatusBit(Integer.valueOf(heartBeatDataPackage.getStatusBit()));
+ c3mCharging.setDeviceTemperature(heartBeatDataPackage.getDeviceTemperature());
+ return save(c3mCharging);
+ } else {
+ one.setStatusBit(Integer.valueOf(heartBeatDataPackage.getStatusBit()));
+ one.setDeviceTemperature(heartBeatDataPackage.getDeviceTemperature());
+ return updateById(one);
+ }
+ }
+
+ /**
+ * 鏌ヨC3鍏呯數妗╄澶囧垪琛�
+ *
+ * @return
+ */
+ public List<C3mCharging> getC3ChargingList(BaseConditionVO baseConditionVO) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ return list();
+ }
+
/**
* 寮�濮嬪厖鐢�
*
@@ -25,7 +75,7 @@
* @param chargingCapacity
* @param chargeAmount
*/
- public void startCharging(String c3Mac, Integer chargingCapacity, Double chargeAmount) {
+ public String startCharging(String c3Mac, Integer chargingCapacity, Double chargeAmount) {
C3StartChargingReqInnerFrame c3StartChargingReqInnerFrame =
new C3StartChargingReqInnerFrame(c3Mac, chargingCapacity, chargeAmount);
@@ -34,6 +84,19 @@
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC("32313243305008ff0a04ffff", a5Frame);
System.out.println(commonFrame + " -----commonFrame");
+
+
+// String functionCode = commonFrame.getPayload().substring(2, 4);
+// if (C3ChargingEnum.StartCharging.getCode().equals(functionCode)) {}
+
+
+ A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
+
+ if (operationReportInnerFrame.isValidate()) {
+ return operationReportInnerFrame.getState();
+ } else {
+ throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
+ }
}
/**
@@ -41,7 +104,7 @@
*
* @param c3Mac
*/
- public void finishCharging(String c3Mac) {
+ public String finishCharging(String c3Mac) {
C3FinishChargingReqInnerFrame c3FinishChargingReqInnerFrame =
new C3FinishChargingReqInnerFrame(c3Mac);
@@ -50,6 +113,14 @@
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC("32313243305008ff0a04ffff", a5Frame);
System.out.println(commonFrame + " -----commonFrame");
+
+ A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
+
+ if (operationReportInnerFrame.isValidate()) {
+ return operationReportInnerFrame.getState();
+ } else {
+ throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
+ }
}
/**
@@ -57,7 +128,7 @@
*
* @param c3Mac
*/
- public void restartCharging(String c3Mac) {
+ public String restartCharging(String c3Mac) {
C3RestartChargingReqInnerFrame c3RestartChargingReqInnerFrame =
new C3RestartChargingReqInnerFrame(c3Mac);
@@ -66,5 +137,13 @@
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC("32313243305008ff0a04ffff", a5Frame);
System.out.println(commonFrame + " -----commonFrame");
+
+ A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
+
+ if (operationReportInnerFrame.isValidate()) {
+ return operationReportInnerFrame.getState();
+ } else {
+ throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
+ }
}
}
--
Gitblit v1.9.3