From 0af5efbcac903cdc6ba1e7978cb9ac32220e8cde Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 16:05:36 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 265 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 175 insertions(+), 90 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 96f1155..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
@@ -9,6 +9,7 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
import com.ruoyi.chargingPile.api.query.PageChargingPileList;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
@@ -19,15 +20,14 @@
import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
import com.ruoyi.chargingPile.mapper.TChargingPileMapper;
-import com.ruoyi.chargingPile.service.IPartnerService;
-import com.ruoyi.chargingPile.service.ISiteService;
-import com.ruoyi.chargingPile.service.TChargingGunService;
-import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.integration.api.feignClient.IntegrationClient;
import com.ruoyi.integration.api.feignClient.IotInterfaceClient;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
@@ -50,6 +50,7 @@
import java.math.MathContext;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -100,6 +101,15 @@
@Resource
private IotInterfaceClient iotInterfaceClient;
+
+ @Resource
+ private RedisService redisService;
+
+ @Resource
+ private TFaultMessageService faultMessageService;
+
+ @Resource
+ private IntegrationClient integrationClient;
@@ -160,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();
}
@@ -256,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() == 201){
- 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();
}
@@ -278,6 +288,11 @@
tChargingGun.setAccountingStrategyId(setAccountingStrategy.getAccountingStrategyId());
}
chargingGunService.updateBatchById(list);
+ //下发硬件更新计费模板
+ for (TChargingPile chargingPile : this.listByIds(id)) {
+ integrationClient.setupBillingModel1(chargingPile.getCode());
+ }
+
}
@Override
@@ -294,8 +309,14 @@
List<TChargingGun> chargingGunList = chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(item.getId())).collect(Collectors.toList());
for (TChargingGun chargingGun : chargingGunList) {
if(chargingGun.getStatus().equals(4)){
- // TODO 查询正在充电的单子的实时记录
- chargingGun.setSoc(100);
+ // 查询正在充电的单子的实时记录
+ TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(chargingGun.getId()).getData();
+ if(Objects.nonNull(chargingOrder)){
+ UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
+ chargingGun.setSoc(uploadRealTimeMonitoringData.getSoc());
+ }else {
+ chargingGun.setSoc(100);
+ }
}
if(chargingGun.getStatus().equals(5)){
chargingGun.setSoc(100);
@@ -316,7 +337,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();
@@ -330,12 +351,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);
@@ -357,9 +386,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()));
}
@@ -378,7 +407,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);
}
}
@@ -400,7 +429,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();
@@ -414,6 +443,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{
@@ -427,7 +459,7 @@
//充电中
long charging = list.stream().filter(s -> s.getStatus().equals(4)).count();
//离网
- long offline = list.stream().filter(s -> s.getStatus().equals(0)).count();
+ long offline = list.stream().filter(s -> s.getStatus().equals(1)).count();
//故障
long breakdown = list.stream().filter(s -> s.getStatus().equals(7)).count();
ChargingGunCountMonitoring chargingGunCountMonitoring = new ChargingGunCountMonitoring();
@@ -448,20 +480,24 @@
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();
+ R<Integer> admin = sysUserClient.isAdmin(SecurityUtils.getUserId());
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
if(2 == roleType){
siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
}else{
//非管理员需要根据角色和用户配置查询允许的站点数据
- if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ if(admin.getData()!=1){
List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
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{
@@ -470,8 +506,8 @@
if(null != query.getStatus() && 0 < query.getStatus().size()){
if(query.getStatus().contains(3)){
+ query.getStatus().add(5);
query.getStatus().add(6);
- query.getStatus().add(7);
}
}
PageInfo<ChargingGunMonitoring> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
@@ -483,65 +519,114 @@
}
if(status == 4){
Integer id = gunMonitoring.getId();
- //根据订单数据查询车牌号
TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
- Long appUserCarId = chargingOrder.getAppUserCarId();
- if(null != appUserCarId){
- 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;
+ if(null != chargingOrder){
+ Long appUserCarId = chargingOrder.getAppUserCarId();
+ if(null != appUserCarId){
+ 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;
+ }
}
}
-
-
}
return pageInfo.setRecords(chargingGunMonitoring);
}
+
+
+ /**
+ * 定时任务修改充电桩状态
+ */
+ @Override
+ public void updateStatus() {
+ 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));
+ }
+ 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(chargingGun.getSiteId());
+ faultMessage.setChargingPileId(chargingGun.getChargingPileId());
+ faultMessage.setChargingGunId(chargingGun.getId());
+ faultMessage.setStatus(1);
+ faultMessage.setDownTime(LocalDateTime.now());
+ faultMessage.setCreateTime(LocalDateTime.now());
+ faultMessage.setDelFlag(false);
+ faultMessage.setContent("设备离线");
+ faultMessageService.save(faultMessage);
+ }
+ }
+ }
+ }
}
--
Gitblit v1.7.1