From 0911582d2f80e7f3162fb6d0b59ee12e23de133b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 17 十月 2024 09:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 132 ++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 60 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 e63b804..cddd92b 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
@@ -262,7 +262,7 @@
//调用华为Iot删除设备
if(StringUtils.isNotEmpty(chargingPile.getIotdDeviceId())){
DeleteDeviceResp deviceResp = iotInterfaceClient.deleteDevice(chargingPile.getIotdDeviceId()).getData();
- if(null != deviceResp && deviceResp.getHttpStatusCode() == 201){
+ if(null != deviceResp && deviceResp.getHttpStatusCode() == 0){
this.removeById(chargingPile);
}
}
@@ -320,7 +320,7 @@
public ChargeMonitoring chargeMonitoring(Integer siteId) {
//获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
- if(null == siteId){
+ if(0 == siteId){
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
@@ -334,12 +334,20 @@
List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
data.addAll(data1);
siteIds = new HashSet<>(data);
+ }else{
+ siteIds = null;
}
}
}else{
siteIds.add(siteId);
}
- List<Site> sites = siteService.listByIds(siteIds);
+ List<Site> sites = null;
+ if(null == siteIds){
+ sites = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
+ siteIds = sites.stream().map(Site::getId).collect(Collectors.toSet());
+ }else{
+ sites = siteService.listByIds(siteIds);
+ }
List<TChargingGun> total = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, siteIds).eq(TChargingGun::getDelFlag, 0));
List<TChargingGun> charging = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, siteIds).eq(TChargingGun::getStatus, 4).eq(TChargingGun::getDelFlag, 0));
BigDecimal ratedPower = total.stream().map(TChargingGun::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -361,9 +369,9 @@
}
List<String> dates = new ArrayList<>();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MMM-dd");
- Calendar calendar = Calendar.getInstance();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for (int i = 6; i >= 0; i--) {
+ Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - i);
dates.add(sdf.format(calendar.getTime()));
}
@@ -382,7 +390,7 @@
if(list.size() == 0){
value2.add(0D);
}else{
- Double datum1 = new BigDecimal(datum).divide(new BigDecimal(list.size()).multiply(v).multiply(new BigDecimal(24))).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ Double datum1 = new BigDecimal(datum).divide(new BigDecimal(list.size()).multiply(v).multiply(new BigDecimal(24)), new MathContext(4, RoundingMode.HALF_EVEN)).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
value2.add(datum1);
}
}
@@ -404,7 +412,7 @@
public ChargingGunCountMonitoring getChargingGunCountMonitoring(Integer siteId) {
//获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
- if(null == siteId){
+ if(0 == siteId){
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
@@ -418,6 +426,9 @@
List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
data.addAll(data1);
siteIds = new HashSet<>(data);
+ }else{
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
+ siteIds = list.stream().map(Site::getId).collect(Collectors.toSet());
}
}
}else{
@@ -452,7 +463,7 @@
public PageInfo<ChargingGunMonitoring> getChargingGunMonitoring(GetChargingGunMonitoring query) {
//获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
- if(null == query.getSiteId()){
+ if(0 == query.getSiteId()){
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
@@ -466,6 +477,9 @@
List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
data.addAll(data1);
siteIds = new HashSet<>(data);
+ }else{
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
+ siteIds = list.stream().map(Site::getId).collect(Collectors.toSet());
}
}
}else{
@@ -489,62 +503,60 @@
Integer id = gunMonitoring.getId();
//根据订单数据查询车牌号
TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
- Long appUserCarId = chargingOrder.getAppUserCarId();
- if(null != appUserCarId){
+ if(null != chargingOrder){
+ Long appUserCarId = chargingOrder.getAppUserCarId();
TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
- }
-
- UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
- gunMonitoring.setChargingRatio(BigDecimal.valueOf(data.getSoc()));
- gunMonitoring.setElectricQuantity(data.getCharging_degree().toString());
- gunMonitoring.setSoc(data.getSoc().toString());
- gunMonitoring.setElectricCurrent(data.getOutput_current().toString());
- gunMonitoring.setVoltage(data.getOutput_voltage().toString());
- switch (data.getHardware_fault()){
- case 1:
- gunMonitoring.setFaultCause("急停按钮动作故障");
- break;
- case 2:
- gunMonitoring.setFaultCause("无可用整流模块");
- break;
- case 3:
- gunMonitoring.setFaultCause("出风口温度过高");
- break;
- case 4:
- gunMonitoring.setFaultCause("交流防雷故障");
- break;
- case 5:
- gunMonitoring.setFaultCause("交直流模块 DC20 通信中断");
- break;
- case 6:
- gunMonitoring.setFaultCause("绝缘检测模块 FC08 通信中断");
- break;
- case 7:
- gunMonitoring.setFaultCause("电度表通信中断");
- break;
- case 8:
- gunMonitoring.setFaultCause("读卡器通信中断");
- break;
- case 9:
- gunMonitoring.setFaultCause("RC10 通信中断");
- break;
- case 10:
- gunMonitoring.setFaultCause("风扇调速板故障");
- break;
- case 11:
- gunMonitoring.setFaultCause("直流熔断器故障");
- break;
- case 12:
- gunMonitoring.setFaultCause("高压接触器故障");
- break;
- case 13:
- gunMonitoring.setFaultCause("门打开");
- break;
+
+ UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
+ gunMonitoring.setChargingRatio(BigDecimal.valueOf(data.getSoc()));
+ gunMonitoring.setElectricQuantity(data.getCharging_degree().toString());
+ gunMonitoring.setSoc(data.getSoc().toString());
+ gunMonitoring.setElectricCurrent(data.getOutput_current().toString());
+ gunMonitoring.setVoltage(data.getOutput_voltage().toString());
+ switch (data.getHardware_fault()){
+ case 1:
+ gunMonitoring.setFaultCause("急停按钮动作故障");
+ break;
+ case 2:
+ gunMonitoring.setFaultCause("无可用整流模块");
+ break;
+ case 3:
+ gunMonitoring.setFaultCause("出风口温度过高");
+ break;
+ case 4:
+ gunMonitoring.setFaultCause("交流防雷故障");
+ break;
+ case 5:
+ gunMonitoring.setFaultCause("交直流模块 DC20 通信中断");
+ break;
+ case 6:
+ gunMonitoring.setFaultCause("绝缘检测模块 FC08 通信中断");
+ break;
+ case 7:
+ gunMonitoring.setFaultCause("电度表通信中断");
+ break;
+ case 8:
+ gunMonitoring.setFaultCause("读卡器通信中断");
+ break;
+ case 9:
+ gunMonitoring.setFaultCause("RC10 通信中断");
+ break;
+ case 10:
+ gunMonitoring.setFaultCause("风扇调速板故障");
+ break;
+ case 11:
+ gunMonitoring.setFaultCause("直流熔断器故障");
+ break;
+ case 12:
+ gunMonitoring.setFaultCause("高压接触器故障");
+ break;
+ case 13:
+ gunMonitoring.setFaultCause("门打开");
+ break;
+ }
}
}
-
-
}
return pageInfo.setRecords(chargingGunMonitoring);
}
--
Gitblit v1.7.1