From e25b31c6abf9b26f2b61768ad6039961574b10a1 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 31 十月 2024 09:34:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 85 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 36 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 41f00fb..f7019e4 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -170,19 +170,19 @@
return AjaxResult.error("设备编号已存在");
}
//调用华为Iot创建设备
- AddDevice addDevice = new AddDevice();
- addDevice.setProductId("66da68d21837002b28b34ec0");
- addDevice.setNodeId(chargingPile.getCode());
- addDevice.setDeviceName(chargingPile.getName());
- addDevice.setDescription(chargingPile.getNumber().toString());
- AddDeviceResp deviceResp = iotInterfaceClient.addDevice(addDevice).getData();
- if(null != deviceResp){
- int httpStatusCode = deviceResp.getHttpStatusCode();
- if(httpStatusCode == 201){
- chargingPile.setIotdDeviceId(deviceResp.getDeviceId());
- this.save(chargingPile);
- }
- }
+// AddDevice addDevice = new AddDevice();
+// addDevice.setProductId("66da68d21837002b28b34ec0");
+// addDevice.setNodeId(chargingPile.getCode());
+// addDevice.setDeviceName(chargingPile.getName());
+// addDevice.setDescription(chargingPile.getNumber().toString());
+// AddDeviceResp deviceResp = iotInterfaceClient.addDevice(addDevice).getData();
+// if(null != deviceResp){
+// int httpStatusCode = deviceResp.getHttpStatusCode();
+// if(httpStatusCode == 201){
+// chargingPile.setIotdDeviceId(deviceResp.getDeviceId());
+// }
+// }
+ this.save(chargingPile);
return AjaxResult.success();
}
@@ -266,12 +266,12 @@
for (Integer id : ids) {
TChargingPile chargingPile = this.getById(id);
//调用华为Iot删除设备
- if(StringUtils.isNotEmpty(chargingPile.getIotdDeviceId())){
- DeleteDeviceResp deviceResp = iotInterfaceClient.deleteDevice(chargingPile.getIotdDeviceId()).getData();
- if(null != deviceResp && deviceResp.getHttpStatusCode() == 0){
- this.removeById(chargingPile);
- }
- }
+// if(StringUtils.isNotEmpty(chargingPile.getIotdDeviceId())){
+// DeleteDeviceResp deviceResp = iotInterfaceClient.deleteDevice(chargingPile.getIotdDeviceId()).getData();
+// if(null != deviceResp && deviceResp.getHttpStatusCode() == 0){
+// }
+// }
+ this.removeById(chargingPile);
}
return AjaxResult.success();
}
@@ -586,25 +586,39 @@
*/
@Override
public void updateStatus() {
- List<TChargingPile> list = this.list(new LambdaQueryWrapper<TChargingPile>().eq(TChargingPile::getDelFlag, 0));
- List<TChargingPile> datas = new ArrayList();
- Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_pile_online");
- for (TChargingPile chargingPile : list) {
- Long time = (Long) charging_pile_online.get(chargingPile.getCode());
- if(null != time && System.currentTimeMillis() - time > 60000){
- chargingPile.setStatus(2);
- datas.add(chargingPile);
- }
+ Map<String, Object> charging_gun_online = redisService.getCacheMap("charging_gun_online");
+ Set<String> keySet = charging_gun_online.keySet();
+ List<TChargingGun> list = new ArrayList<>();
+ if(keySet.size() > 0){
+ list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getDelFlag, 0).in(TChargingGun::getFullNumber, keySet));
}
-
- if(datas.size() > 0){
- for (TChargingPile data : datas) {
- TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, data.getId())
- .eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
+ for (TChargingGun chargingGun : list) {
+ Long time = (Long) charging_gun_online.get(chargingGun.getFullNumber());
+ if(null != time && System.currentTimeMillis() - time > 60000){
+ TChargingGun chargingGun1 = new TChargingGun();
+ chargingGun1.setId(chargingGun.getId());
+ chargingGun1.setStatus(1);
+ chargingGunService.updateById(chargingGun1);
+
+ //桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
+ TChargingPile chargingPile = this.getById(chargingGun.getChargingPileId());
+ List<TChargingGun> list1 = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
+ int size = list1.stream().filter(s -> s.getStatus() == 1 || s.getStatus() == 7).collect(Collectors.toList()).size();
+ if(chargingPile.getStatus() == 1 && list1.size() == size){
+ TChargingPile chargingPile1 = new TChargingPile();
+ chargingPile1.setId(chargingGun.getChargingPileId());
+ chargingPile1.setStatus(2);
+ this.updateById(chargingPile1);
+ }
+
+ //添加记录
+ TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingGun.getChargingPileId())
+ .eq(TFaultMessage::getChargingGunId, chargingGun.getId()).eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
if(null == faultMessage){
faultMessage = new TFaultMessage();
- faultMessage.setSiteId(data.getSiteId());
- faultMessage.setChargingPileId(data.getId());
+ faultMessage.setSiteId(chargingGun.getSiteId());
+ faultMessage.setChargingPileId(chargingGun.getChargingPileId());
+ faultMessage.setChargingGunId(chargingGun.getId());
faultMessage.setStatus(1);
faultMessage.setDownTime(LocalDateTime.now());
faultMessage.setCreateTime(LocalDateTime.now());
@@ -613,7 +627,6 @@
faultMessageService.save(faultMessage);
}
}
- this.updateBatchById(datas);
}
}
}
--
Gitblit v1.7.1