From cf8b00cb727591d0d2a8d3f11183043f2f79e085 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 27 六月 2022 11:24:01 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java | 21 ++-------------------
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java | 29 +++--------------------------
2 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java
index 18b3bb0..e73142c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mChargingChargeController.java
@@ -25,20 +25,11 @@
private final C3mChargingChargeService chargeService;
-
/**
- * 娣诲姞璐圭巼
- *
- * @param charge
+ * 缂栬緫鍏呯數妗╄垂鐜�
+ * @param chargeEntities
* @return
*/
- // @PostMapping("/addC3mCharging")
- public ResponseVO<Object> addC3mCharging(@RequestBody C3mChargingChargeParam charge) {
-// chargeService.save(charge);
-// chargeService.initCharge(charge);
- return ResponseUtil.success(chargeService.initCharge(charge));
- }
-
@PostMapping("/updateC3mCharging")
public ResponseVO<Object> updateC3mCharging(@RequestBody List<C3mChargingCharge> chargeEntities) {
if (chargeEntities.size() > 5) {
@@ -48,14 +39,6 @@
throw new BusinessException("鏈�灏戦渶瑕佷竴鏉¤垂鐜�");
}
return ResponseUtil.success(chargeService.updateCharge(chargeEntities));
- }
-
- // @PostMapping("/deleteC3mCharging")
- public ResponseVO<Object> deleteC3mCharging(@RequestBody C3mChargingChargeParam charge) {
- boolean remove = chargeService.remove(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, charge.getC3Id())
- .eq(C3mChargingCharge::getHour, charge.getCharge()).eq(C3mChargingCharge::getHour, charge.getHour())
- .eq(C3mChargingCharge::getCharge, charge.getCharge()).eq(C3mChargingCharge::getCharge, charge.getTimestamp()));
- return ResponseUtil.success(remove);
}
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 ce40a71..75a9dbc 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
@@ -116,37 +116,14 @@
if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_LIGHT_DATA.getCode())) {
// 鍗曠伅鏁版嵁涓婃姤澶勭悊
LightDataProcessor.getInstance().process(productKey, deviceName, frame);
- } /*else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_C3_DATA.getCode())) {
+ } else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_C3_DATA.getCode())) {
// C3鍏呯數妗╀笂鎶ュ鐞�
- c3ChargingReportAnalysis(productKey, deviceName, frame); //TODO 姝ｅ紡涓婄嚎鎵撳紑
- } */else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_ATMOSPHERE_DATA.getCode())) {
-// //娴嬭瘯鐢ㄧ殑
-// String s = "{\"connectType\":\"FE\",\"crc32\":\"8685DF1B\",\"functionCode\":\"A5\",\"orderType\":\"84\",\"payload\":\"F0010022FFFF0101010907640000000000000000419D000000360089000000000002019300008CA14C69\",\"payloadLength\":\"002A\",\"validate\":true}";
-// CommonFrame commonFrame1 = JSON.parseObject(s, CommonFrame.class);
+ c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
+ } else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_ATMOSPHERE_DATA.getCode())) {
// 澶ф皵鏁版嵁鎸囦护涓婃姤
AirDataProcessor.getInstance().process(productKey, deviceName, frame);
-// atmosphereAnalysis(productKey, deviceName, frame);
} else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_POLE_MONITOR_DATA.getCode())) {
PoleMonitorDataProcessor.getInstance().process(productKey, deviceName, frame);
}
}
-
- private void c3ChargingReportAnalysis(String productKey, String deviceName, CommonFrame frame) {
- String functionCode = frame.getPayload().substring(2, 4);
- if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
- // 蹇冭烦鍖呬笂鎶�(42) 鑻ヤ簲鍒嗛挓鏃犲績璺冲寘鏁版嵁锛屽垯鍒ゆ柇绂荤嚎
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- }
- }
-
}
--
Gitblit v1.9.3