From 49f98d682437c5d91fa07a72bdc3cb45c0600f82 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 09:57:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 477 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 355 insertions(+), 122 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..8af0146 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
@@ -1,39 +1,39 @@
package com.ruoyi.chargingPile.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.dto.SendMessageDTO;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
-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.*;
import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
import com.ruoyi.chargingPile.api.query.PageChargingPileList;
-import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
-import com.ruoyi.chargingPile.domain.SiteMenu;
+import com.ruoyi.chargingPile.api.domain.SiteMenu;
import com.ruoyi.chargingPile.dto.ChargeMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
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.chargingPile.util.mongodb.service.UploadRealTimeMonitoringDataService;
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.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.integration.api.feignClient.IotInterfaceClient;
-import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
+import com.ruoyi.integration.api.feignClient.*;
+import com.ruoyi.integration.api.model.QrCodeDelivery;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.api.vo.AddDevice;
import com.ruoyi.integration.api.vo.AddDeviceResp;
import com.ruoyi.integration.api.vo.DeleteDeviceResp;
+import com.ruoyi.integration.api.vo.ShowDeviceResp;
import com.ruoyi.order.api.feignClient.ChargingOrderAccountingStrategyClient;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
@@ -43,6 +43,8 @@
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.feignClient.SysUserRoleClient;
import com.ruoyi.system.api.model.SysUserRoleVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -50,9 +52,9 @@
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;
/**
* <p>
@@ -62,11 +64,15 @@
* @author xiaochen
* @since 2024-08-06
*/
+@Slf4j
@Service
public class TChargingPileServiceImpl extends ServiceImpl<TChargingPileMapper, TChargingPile> implements TChargingPileService {
@Resource
private TChargingGunService chargingGunService;
+
+ @Resource
+ private TCECClient tcecClient;
@Resource
private SysUserClient sysUserClient;
@@ -93,7 +99,7 @@
private AppUserCarClient appUserCarClient;
@Resource
- private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
+ private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
@Resource
private SysUserRoleClient sysUserRoleClient;
@@ -101,10 +107,30 @@
@Resource
private IotInterfaceClient iotInterfaceClient;
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ @Resource
+ private TFaultMessageService faultMessageService;
+
+ @Resource
+ private IntegrationClient integrationClient;
+
+ @Resource
+ private TAccountingStrategyDetailService accountingStrategyDetailService;
+
+ @Resource
+ private SendMessageClient sendMessageClient;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private TChargingPileNotificationService chargingPileNotificationService;
+
+ @Resource
+ private AppUserClient appUserClient;
-
-
+
/**
* 获取充电桩列表数据
* @param page
@@ -114,7 +140,7 @@
public PageInfo<PageChargingPileListDTO> pageChargingPileList(PageChargingPileList page) {
Set<Integer> siteIds = null;
//校验合作商权限
- SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
//合作商
@@ -122,7 +148,7 @@
siteIds = partnerService.authSite(objectId, SiteMenu.CHARGING_PILE);
}else{
//非管理员需要根据角色和用户配置查询允许的站点数据
- if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ if(!SecurityUtils.isAdmin(tokenService.getLoginUser().getUserid())){
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();
@@ -160,19 +186,31 @@
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);
+ ShowDeviceResp showDeviceResp = iotInterfaceClient.showDeviceRequest(chargingPile.getCode()).getData();
+ if(null == showDeviceResp){
+ //调用华为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());
+ }else{
+ log.error("华为创建设备失败" + JSON.toJSONString(deviceResp));
+ return AjaxResult.error("华为创建设备失败");
+ }
+ }else{
+ log.error("华为创建设备失败" + JSON.toJSONString(deviceResp));
+ return AjaxResult.error("华为创建设备失败");
}
+ }else{
+ chargingPile.setIotdDeviceId(showDeviceResp.getDeviceId());
}
+ this.save(chargingPile);
return AjaxResult.success();
}
@@ -235,7 +273,61 @@
if(null != one && !one.getId().equals(chargingPile.getId())){
return AjaxResult.error("设备编号已存在");
}
+ TChargingPile tChargingPile = this.getById(chargingPile.getId());
+ //桩号不相同，需要重新绑定设备
+ if(!tChargingPile.getCode().equals(chargingPile.getCode())){
+ ShowDeviceResp showDeviceResp = iotInterfaceClient.showDeviceRequest(tChargingPile.getCode()).getData();
+ if(null != showDeviceResp){
+ DeleteDeviceResp deleteDeviceResp = iotInterfaceClient.deleteDevice(tChargingPile.getCode()).getData();
+ if(null == deleteDeviceResp){
+ return AjaxResult.error("删除设备异常，请查看华为设备管理");
+ }
+ }
+ }
+
+ ShowDeviceResp showDeviceResp = iotInterfaceClient.showDeviceRequest(tChargingPile.getCode()).getData();
+ if(null == showDeviceResp){
+ //调用华为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());
+ }else{
+ log.error("华为创建设备失败" + JSON.toJSONString(deviceResp));
+ return AjaxResult.error("华为创建设备失败");
+ }
+ }else{
+ return AjaxResult.error("华为创建设备失败");
+ }
+ }
this.updateById(chargingPile);
+
+ List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
+ for (TChargingGun chargingGun : list) {
+ TChargingGun chargingGun1 = new TChargingGun();
+ chargingGun1.setId(chargingGun.getId());
+ chargingGun1.setFullNumber(chargingPile.getCode() + chargingGun.getCode());
+ chargingGun1.setSiteId(chargingPile.getSiteId());
+ chargingGunService.updateById(chargingGun1);
+
+ //下发硬件充电二维码
+ String code_prefix = "https://mxcd.zhinenganguan.com?No=";
+ QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
+ qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
+ qrCodeDelivery.setCharging_gun_code(chargingGun.getCode());
+ qrCodeDelivery.setCode_format(1);
+ qrCodeDelivery.setPrefix_length(code_prefix.length());
+ qrCodeDelivery.setCode_prefix(code_prefix);
+ qrCodeDelivery.setQr_code(code_prefix + chargingPile.getCode() + chargingGun.getCode());
+ sendMessageClient.qrCodeDelivery(qrCodeDelivery);
+ }
+ tcecClient.superviseNotificationStationInfo(chargingPile.getSiteId());
return AjaxResult.success();
}
@@ -257,11 +349,17 @@
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);
+ ShowDeviceResp showDeviceResp = iotInterfaceClient.showDeviceRequest(chargingPile.getCode()).getData();
+ if(null != showDeviceResp){
+ DeleteDeviceResp deleteDeviceResp = iotInterfaceClient.deleteDevice(chargingPile.getCode()).getData();
+ if(null == deleteDeviceResp || (deleteDeviceResp.getHttpStatusCode() != 200 && deleteDeviceResp.getHttpStatusCode() != 201 && deleteDeviceResp.getHttpStatusCode() != 204)){
+ return AjaxResult.error("删除设备异常，请查看华为设备管理");
+ }
+ chargingPile.setIotdDeviceId("");
}
+
}
+ this.removeById(chargingPile);
}
return AjaxResult.success();
}
@@ -275,34 +373,65 @@
List<Integer> id = setAccountingStrategy.getId();
List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getChargingPileId, id).eq(TChargingGun::getDelFlag, 0));
for (TChargingGun tChargingGun : list) {
- tChargingGun.setAccountingStrategyId(setAccountingStrategy.getAccountingStrategyId());
+ TChargingGun tChargingGun1 = new TChargingGun();
+ tChargingGun1.setId(tChargingGun.getId());
+ tChargingGun1.setAccountingStrategyId(setAccountingStrategy.getAccountingStrategyId());
+ chargingGunService.updateById(tChargingGun1);
}
- chargingGunService.updateBatchById(list);
+ Integer accountingStrategyId = setAccountingStrategy.getAccountingStrategyId();
+ List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailService.list(new LambdaQueryWrapper<TAccountingStrategyDetail>()
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategyId).orderByAsc(TAccountingStrategyDetail::getStartTime));
+ //下发硬件更新计费模板
+ List<TChargingPile> tChargingPiles = this.listByIds(id);
+ for (TChargingPile chargingPile : tChargingPiles) {
+ integrationClient.setupBillingModel1(chargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
+ }
+
}
@Override
public List<TChargingPileVO> getChargingGunList(Integer siteId,Integer type) {
- List<TChargingPileVO> chargingPileVOS = this.baseMapper.getChargingGunList(siteId);
LambdaQueryWrapper<TChargingGun> wrapper = new LambdaQueryWrapper<>();
if(Objects.nonNull(type)){
wrapper.eq(TChargingGun::getChargeMode, type);
}
wrapper.eq(TChargingGun::getSiteId, siteId);
List<TChargingGun> chargingGuns = chargingGunService.list(wrapper);
- // 查询充电枪信息
- chargingPileVOS.forEach(item -> {
- 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);
+ Set<Integer> collect = chargingGuns.stream().map(TChargingGun::getChargingPileId).collect(Collectors.toSet());
+ List<TChargingPileVO> chargingPileVOS = new ArrayList<>();
+ if(collect.size() > 0){
+ List<TChargingPile> tChargingPiles = this.baseMapper.selectBatchIds(collect);
+ for (TChargingPile tChargingPile : tChargingPiles) {
+ TChargingPileVO vo = new TChargingPileVO();
+ List<TChargingGun> chargingGunList = chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(tChargingPile.getId())).collect(Collectors.toList());
+ for (TChargingGun chargingGun : chargingGunList) {
+ if(chargingGun.getStatus().equals(4)){
+ // 查询正在充电的单子的实时记录
+ TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(chargingGun.getId()).getData();
+ if(Objects.nonNull(chargingOrder)){
+ UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataService.getLastDataById(chargingOrder.getCode());
+ if(null != uploadRealTimeMonitoringData){
+ chargingGun.setSoc(uploadRealTimeMonitoringData.getSoc());
+ }else{
+ chargingGun.setSoc(0);
+ }
+ }else {
+ chargingGun.setSoc(100);
+ }
+ }
+ if(chargingGun.getStatus().equals(5)){
+ chargingGun.setSoc(100);
+ }
}
- if(chargingGun.getStatus().equals(5)){
- chargingGun.setSoc(100);
- }
+ vo.setChargingGunList(chargingGunList);
+ vo.setId(tChargingPile.getId());
+ vo.setCode(tChargingPile.getCode());
+ vo.setName(tChargingPile.getName());
+ vo.setNumber(tChargingPile.getNumber());
+ chargingPileVOS.add(vo);
+
}
- item.setChargingGunList(chargingGunList);
- });
+ }
return chargingPileVOS;
}
@@ -316,26 +445,34 @@
public ChargeMonitoring chargeMonitoring(Integer siteId) {
//获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
- if(null == siteId){
- SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ if(0 == siteId){
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
if(2 == roleType){
- siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ siteIds = partnerService.authSite(objectId, SiteMenu.CHARGING_FACILITY_MONITORING);
}else{
//非管理员需要根据角色和用户配置查询允许的站点数据
- if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ if(!SecurityUtils.isAdmin(tokenService.getLoginUser().getUserid())){
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{
+ 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 +494,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()));
}
@@ -369,16 +506,18 @@
chargeTrend.put("value", value1);
chargeMonitoring.setChargeTrend(chargeTrend);
- //每日利用率=当日充电度数/（总桩数量*桩总功率*24小时）
+ //每日利用率=当日充电度数/（桩总功率*24小时）
List<TChargingPile> list = this.list(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getSiteId, siteIds).eq(TChargingPile::getDelFlag, 0));
BigDecimal v = list.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(4, RoundingMode.HALF_EVEN);
List<Double> data = chargingOrderAccountingStrategyClient.getDailyChargingDegree(6, siteIds).getData();
List<Double> value2 = new ArrayList<>();
+ BigDecimal multiply = v.multiply(new BigDecimal(24));
for (Double datum : data) {
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(multiply, new MathContext(4, RoundingMode.HALF_EVEN))
+ .multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
value2.add(datum1);
}
}
@@ -400,20 +539,23 @@
public ChargingGunCountMonitoring getChargingGunCountMonitoring(Integer siteId) {
//获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
- if(null == siteId){
- SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ if(0 == siteId){
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
if(2 == roleType){
- siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ siteIds = partnerService.authSite(objectId, SiteMenu.CHARGING_FACILITY_MONITORING);
}else{
//非管理员需要根据角色和用户配置查询允许的站点数据
- if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ if(!SecurityUtils.isAdmin(tokenService.getLoginUser().getUserid())){
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{
@@ -427,7 +569,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 +590,24 @@
public PageInfo<ChargingGunMonitoring> getChargingGunMonitoring(GetChargingGunMonitoring query) {
//获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
- if(null == query.getSiteId()){
- SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ if(0 == query.getSiteId()){
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
+ R<Integer> admin = sysUserClient.isAdmin(tokenService.getLoginUser().getUserid());
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
if(2 == roleType){
- siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ siteIds = partnerService.authSite(objectId, SiteMenu.CHARGING_FACILITY_MONITORING);
}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 +616,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());
@@ -481,67 +627,154 @@
if(status == 5 || status == 6){
gunMonitoring.setStatus(3);
}
- if(status == 4){
+ if(status == 4 || status == 7){
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());
+ }else{
+ gunMonitoring.setLicensePlate(chargingOrder.getPlateNum());
+ }
+
+ UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataService.getLastDataById(chargingOrder.getCode());
+ 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;
+ }
}
}
-
-
+ //test
+// if (status==1||status==7){
+// TFaultMessage one = faultMessageService.lambdaQuery().eq(TFaultMessage::getChargingGunId, gunMonitoring.getId()).orderByDesc(TFaultMessage::getCreateTime).last("limit 1").one();
+// if (one!=null) {
+// gunMonitoring.setFaultCause(one.getContent());
+// }
+// }
}
return pageInfo.setRecords(chargingGunMonitoring);
}
+
+
+ /**
+ * 定时任务修改充电桩状态
+ */
+ @Override
+ public void updateStatus() {
+ //查询出redis集合汇总符合条件的数据
+ Set keys = redisTemplate.opsForHash().keys("charging_gun_online");
+ List<String> fullNumbers = new ArrayList<>();
+ keys.forEach(key -> {
+ Long time = (Long) redisTemplate.opsForHash().get("charging_gun_online", key);
+ if(null != time && System.currentTimeMillis() - time > 300000){
+ log.info("设备编号：{} 已离线", key);
+ log.info("间隔时间", System.currentTimeMillis() - time);
+ fullNumbers.add(key.toString());
+ }
+ });
+ if(fullNumbers.size() == 0){
+ return;
+ }
+
+ //处理符合条件的数据，修改设备状态
+ List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getFullNumber, fullNumbers).eq(TChargingGun::getDelFlag, 0));
+ for (TChargingGun chargingGun : list) {
+ TChargingGun chargingGun1 = new TChargingGun();
+ chargingGun1.setId(chargingGun.getId());
+ chargingGun1.setStatus(1);
+ chargingGunService.updateById(chargingGun1);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(chargingGun1.getFullNumber(), chargingGun1.getStatus());
+ }
+ }).start();
+
+ //桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
+ 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);
+
+ // 发送故障短信
+ Site site = siteService.getById(faultMessage.getSiteId());
+ String siteName = site.getName();
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(site.getPhone());
+ sendMessageDTO.setSite(site.getName());
+ sendMessageDTO.setChargeGun(chargingPile.getNumber() + "");
+ sendMessageDTO.setType(3);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
+ if(siteName.length()>10){
+ siteName = siteName.substring(0,10);
+ }
+ chargingPileNotificationService.saveData(4,faultMessage.getSiteId(),faultMessage.getChargingPileId(),site.getPhone(),"检测到"+siteName+"..."+chargingPile.getNumber()+"号桩设备离线，请及时查看处理！");
+ }
+ }
+ }
}
--
Gitblit v1.7.1