From 0350b21561519f5cab9a29645fac67dd906470fd Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 01 四月 2022 17:51:05 +0800
Subject: [PATCH] c3上报具体处理
---
dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java | 5 +
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 71 ++++++++++++++++-
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3mRedisConstant.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 5 +
ximon-admin/src/main/java/com/sandu/ximon/admin/security/order/OrderQueryTask.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 6 -
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/OrderUtils.java | 17 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java | 129 +++++++++++++++++++++++++++++++
8 files changed, 219 insertions(+), 18 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
index a9d6e11..68ec3c9 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
@@ -4,9 +4,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.sandu.ximon.dao.enums.OrderStatus;
+import com.sandu.ximon.dao.enums.OrderType;
import lombok.Data;
+import org.springframework.core.annotation.OrderUtils;
import java.io.Serializable;
+import java.util.Date;
/**
* C3璁㈠崟琛�
@@ -126,6 +130,5 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
-
}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
index 672f887..4dea897 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
@@ -1,20 +1,39 @@
package com.sandu.ximon.admin.manager.iot.amqp;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
import com.sandu.ximon.admin.manager.iot.amqp.processor.LightDataProcessor;
import com.sandu.ximon.admin.manager.iot.amqp.processor.PoleMonitorDataProcessor;
import com.sandu.ximon.admin.manager.iot.amqp.processor.c3ChargingProcessor;
-import com.sandu.ximon.admin.manager.iot.frame.inner.report.*;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3CommonReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3ErrorCodeReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonReportMessage;
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.enums.C3mRedisConstant;
import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
+import com.sandu.ximon.admin.service.C3ChargingService;
+import com.sandu.ximon.admin.service.C3mOrderService;
+import com.sandu.ximon.admin.service.PoleBindingService;
+import com.sandu.ximon.admin.service.PoleService;
+import com.sandu.ximon.admin.utils.LogUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.vo.C3mOrderVO;
+import com.sandu.ximon.dao.domain.C3mCharging;
+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.enums.OrderType;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import javax.jms.Message;
import javax.jms.MessageListener;
+import java.util.Date;
import java.util.Map;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -26,6 +45,16 @@
*/
@Slf4j
public class AmqpMessageListener implements MessageListener {
+
+ @Autowired
+ private C3ChargingService c3ChargingService;
+ @Autowired
+ private PoleBindingService bindingService;
+ @Autowired
+ private PoleService poleService;
+ @Autowired
+ private C3mOrderService orderService;
+
protected final static ExecutorService EXECUTOR_SERVICE = new ThreadPoolExecutor(
Runtime.getRuntime().availableProcessors(),
@@ -122,25 +151,49 @@
c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
} 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());
} else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
- //蹇冭烦鍖�
+ // 蹇冭烦鍖呬笂鎶�(42) 鑻ヤ簲鍒嗛挓鏃犲績璺冲寘鏁版嵁锛屽垯鍒ゆ柇绂荤嚎
c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
} 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());
+ if (aPackage == null) {
+ LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+ return;
+ }
+ refund(aPackage);
+
} else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
log.info("C3鍏呯數妗╀笂鎶ュ鐞哶stopRequestFrame");
log.info(stopRequestFrame.toString());
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress());
+ if (aPackage == null) {
+ LogUtils.error("{ 鍏呯數妗�(" + stopRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+ return;
+ }
+ refund(aPackage);
+
} else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
log.info("C3鍏呯數妗╀笂鎶ュ鐞哶errorCodeRequestFrame");
log.info(errorCodeRequestFrame.toString());
-
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(errorCodeRequestFrame.getDestinationAddress());
+ if (aPackage == null) {
+ LogUtils.error("{ 鍏呯數妗�(" + errorCodeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+ return;
+ }
+ refund(aPackage);
}
}
@@ -148,5 +201,75 @@
A5AtmosphereHeartbeatReportInnerFrame transformFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
log.info("澶ф皵蹇冭烦涓婃姤");
log.info(transformFrame.toString());
+
+ }
+
+
+ private void refund(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage) {
+// private void refund(A5C3CommonReportInnerFrame completeRequestFrame,String code){
+ /**
+ * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
+ */
+ String c3Mac = aPackage.getC3Mac();
+ // 鑾峰彇蹇冭烦鍖呬腑鐨勫墿浣欓噾棰濆拰宸插厖鐢甸噺锛屼笌缂撳瓨涓鍦ㄨ繘琛岀殑璁㈠崟杩涜瀵规瘮
+ String chargingOrderJson = RedisUtils.getBean().get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3Mac);
+ if (chargingOrderJson.isEmpty() || null == chargingOrderJson) {
+ C3mCharging c3m = c3ChargingService.getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
+ .eq(PoleBinding::getDeviceCode,aPackage.getC3Mac())
+ .eq(PoleBinding::getDeviceType, 2));
+ // 鐢熸垚璁㈠崟锛屽苟鍔犺浇鍒皉edis缂撳瓨锛岃缃秴鏃舵椂闂翠负5鍒嗛挓
+ C3mOrder order = new C3mOrderVO().generateOrder(binding.getPoleId() == null ? 0L : binding.getPoleId()
+ , c3m.getPoleDevicesCode(), c3m.getC3Mac(), OrderType.ERROR, Double.valueOf(aPackage.getRemainingAmount()),
+ Integer.parseInt(new java.text.DecimalFormat("0").format(aPackage.getReservedCapacity()))
+ );
+ order.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity()));
+ order.setOrderStatus(OrderStatus.REFUNDING.getStatus());
+ order.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount()));
+ orderService.save(order);
+ String s = c3ChargingService.finishCharging(c3Mac);
+// if(C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(code)){
+//
+// }
+ //鏄惁闇�瑕佸尯鍒唋og绫诲瀷 寰呭畾
+ LogUtils.error("{ 鍏呯數妗�(" + c3Mac + ")涓嶅瓨鍦ㄦ鍦ㄨ繘琛岀殑璁㈠崟锛岃妫�鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰!缁撴潫璁㈠崟,缁撴灉涓�" + s + "}");
+ } else {
+ C3mOrder c3mOrderEntity = JSON.parseObject(chargingOrderJson, C3mOrder.class);
+ // 璁剧疆宸插厖鐢甸噺锛岃鍗曠姸鎬侊紝閫�娆鹃噾棰濓紝璁㈠崟閫�娆炬椂闂存埑锛岃鍗曢��娆捐鏄庯紝缁撴潫鍏呯數鏃堕棿鎴筹紝
+ c3mOrderEntity.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity()));
+ c3mOrderEntity.setOrderStatus(OrderStatus.REFUNDING.getStatus());
+ c3mOrderEntity.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount()));
+ // 鑾峰彇鍓╀綑閲戦杩涜閫�娆撅紝骞跺啓鍏ュ綋鍓嶆鍦ㄨ繘琛岀殑璁㈠崟
+ boolean b = orderService.orderRefund(c3mOrderEntity.getOutTradeNo(), c3mOrderEntity.getRefundAmount());
+ c3mOrderEntity.setRefundTimestamp(new Date().getTime());
+ if (b) {
+ c3mOrderEntity.setOrderStatus(OrderStatus.REFUND.getStatus());
+ c3mOrderEntity.setRefundMsg("鍏呯數缁撴潫,璁㈠崟閫�娆炬垚鍔�");
+ } else {
+ c3mOrderEntity.setOrderStatus(OrderStatus.REFUND_FAILED.getStatus());
+ c3mOrderEntity.setRefundMsg(
+ "鍏呯數缁撴潫,璁㈠崟閫�娆惧け璐�,璇疯繘琛屾墜鍔ㄩ��娆�(璁㈠崟鍙�(" +
+ c3mOrderEntity.getOutTradeNo() + "),鎬婚噾棰�(" +
+ c3mOrderEntity.getTotalAmount() + ",閫�娆鹃噾棰�(" +
+ aPackage.getRemainingAmount() + "))"
+ );
+ }
+ c3mOrderEntity.setStopChargingTimestamp(new Date().getTime());
+ orderService.updateById(c3mOrderEntity);
+ // 娓呴櫎缂撳瓨涓鍦ㄨ繘琛屼腑鐨勮鍗�
+ b = RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac());
+ if (!b) {
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac());
+ }
+ // 鍙戦�佺粨鏉熻鍗�
+ String s = c3ChargingService.finishCharging(c3Mac);
+ LogUtils.error("{ 鍏呯數妗�(" + c3Mac + ")涓嶅瓨鍦ㄦ鍦ㄨ繘琛岀殑璁㈠崟锛岃妫�鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰!缁撴潫璁㈠崟,缁撴灉涓�" + s + "}");
+ }
+
}
}
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 469963c..903a76c 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
@@ -57,7 +57,10 @@
log.info(netRequestFrame.toString());
if (netRequestFrame.isValidate()) {
- SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
+ boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
+ if(!b){
+ return;
+ }
}
}
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/C3mRedisConstant.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3mRedisConstant.java
similarity index 89%
rename from dao/src/main/java/com/sandu/ximon/dao/enums/C3mRedisConstant.java
rename to ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3mRedisConstant.java
index 39e7a19..697c5ae 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/C3mRedisConstant.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/C3mRedisConstant.java
@@ -1,4 +1,4 @@
-package com.sandu.ximon.dao.enums;
+package com.sandu.ximon.admin.manager.iot.rrpc.enums;
public enum C3mRedisConstant {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/OrderUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/OrderUtils.java
new file mode 100644
index 0000000..fecffd4
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/OrderUtils.java
@@ -0,0 +1,17 @@
+package com.sandu.ximon.admin.pay;
+
+import com.sandu.ximon.admin.utils.DateUtils;
+
+import java.util.Date;
+import java.util.UUID;
+
+public class OrderUtils {
+
+ public static String generateOutTradeNo () {
+ String outTradeNo = DateUtils.orderFormat(new Date());
+ String uuid = UUID.randomUUID().toString().substring(0, 2);
+ outTradeNo = outTradeNo + uuid;
+ return outTradeNo;
+ }
+
+}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/order/OrderQueryTask.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/order/OrderQueryTask.java
index 80d07ca..782675d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/order/OrderQueryTask.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/order/OrderQueryTask.java
@@ -5,7 +5,7 @@
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.domain.C3mOrder;
-import com.sandu.ximon.dao.enums.C3mRedisConstant;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import lombok.Data;
import java.util.Date;
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 1f0e7e9..b176d54 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,11 +1,12 @@
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.ximon.dao.bo.C3ChargingBo;
+import com.sandu.ximon.admin.config.C3mRedisConfig;
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;
@@ -13,16 +14,25 @@
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.dao.domain.*;
+import com.sandu.ximon.admin.utils.LogUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
+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.PoleBinding;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+import java.util.Set;
/**
* @author ZZQ
@@ -68,13 +78,14 @@
*/
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);
+ 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()));
@@ -82,21 +93,64 @@
c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
}
- return flag;
} else {
//灏嗚澶囦俊鎭坊鍔犲埌鍏呯數妗╄澶囪〃
one.setPoleDevicesCode(deviceName);
one.setC3Mac(c3Mac);
- boolean flag = updateById(one);
+ 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;
}
+ //鍚屾鏃堕棿鎴�
+ 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;
}
/**
@@ -688,4 +742,7 @@
}
return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getDeviceCode()));
}
+
+
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
index 5ad1e67..9790b3c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -19,16 +19,14 @@
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.domain.Pole;
-import com.sandu.ximon.dao.enums.C3mRedisConstant;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.util.Date;
-import java.util.List;
/**
* @Author liuhaonan
@@ -56,7 +54,7 @@
return false;
} else {
orderByOutTradeNo.setRefundAmount(refundAmount);
- return c3mOrderRefund(orderByOutTradeNo, "椤甸潰API閫�娆�", userId, username);
+ return c3mOrderRefund(orderByOutTradeNo, "鍏呯數妗╅��娆�", userId, username);
}
--
Gitblit v1.9.3