From cfc5a86060b10ee7984eab1e628d8704c3828474 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 10:47:05 +0800
Subject: [PATCH] 修改枪状态
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java | 7 +++++++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/UploadRealTimeMonitoringDataMessageListener.java | 11 +++++++++++
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java | 5 +++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 15 +++++++++++++++
4 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java
index 8e37b68..a070ffd 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java
@@ -49,6 +49,11 @@
return R.fail("根据枪编号获取充电枪失败：" + throwable.getMessage());
}
+ @Override
+ public R<String> updateChargingGunById(TChargingGun chargingGun) {
+ return R.fail("编辑充电枪失败：" + throwable.getMessage());
+ }
+
};
}
}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java
index 89fb452..f27cd5d 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java
@@ -50,5 +50,12 @@
*/
@PostMapping("/t-charging-gun/getChargingGunByCode/{code}")
R<TChargingGun> getChargingGunByCode(@PathVariable("code") String code);
+ /**
+ * 编辑充电枪
+ * @param chargingGun
+ * @return
+ */
+ @PostMapping("/t-charging-gun/updateChargingGunById")
+ R<String> updateChargingGunById(@RequestBody TChargingGun chargingGun);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index 1ab8a01..78c9342 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -223,5 +223,20 @@
.eq(TChargingGun::getCode, code)
.last("LIMIT 1")));
}
+ /**
+ * 根据枪编号获取充电枪
+ * @param code
+ * @return
+ */
+ /**
+ * 编辑充电枪
+ * @param chargingGun
+ * @return
+ */
+ @PostMapping("/updateChargingGunById")
+ public R<String> updateChargingGunById(@RequestBody TChargingGun chargingGun){
+ chargingGunService.updateById(chargingGun)
+ return R.ok();
+ }
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/UploadRealTimeMonitoringDataMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/UploadRealTimeMonitoringDataMessageListener.java
index 2756d20..ce52b46 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/UploadRealTimeMonitoringDataMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/UploadRealTimeMonitoringDataMessageListener.java
@@ -95,14 +95,24 @@
switch (message.getCharging_gun_status()){
case 0:
faultMessage.setStatus(1);
+ chargingGun.setStatus(1);
break;
case 1:
faultMessage.setStatus(2);
+ chargingGun.setStatus(7);
break;
}
faultMessage.setDownTime(LocalDateTime.now());
faultMessageClient.createFaultMessage(faultMessage);
}else {
+ switch (message.getCharging_gun_status()){
+ case 2:
+ chargingGun.setStatus(2);
+ break;
+ case 3:
+ chargingGun.setStatus(4);
+ break;
+ }
// 空闲 充电 查询是否该设备之前存在离线记录或者故障记录
faultMessage = faultMessageClient.getFaultMessageByGunId(chargingGun.getId()).getData();
if(Objects.nonNull(faultMessage)){
@@ -110,6 +120,7 @@
faultMessageClient.updateFaultMessage(faultMessage);
}
}
+ chargingGunClient.updateChargingGunById(chargingGun);
}
}
--
Gitblit v1.7.1