Merge remote-tracking branch 'origin/master'

xuhy

2025-01-07 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java

@@ -2,7 +2,6 @@

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;
@@ -12,9 +11,8 @@
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;
@@ -24,9 +22,9 @@
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.domain.BasePojo;
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.IntegrationClient;
import com.ruoyi.integration.api.feignClient.IotInterfaceClient;
@@ -37,6 +35,7 @@
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;
@@ -56,7 +55,6 @@
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * <p>
@@ -120,13 +118,15 @@
   @Resource
   private SendMessageClient sendMessageClient;
   @Resource
   private TokenService tokenService;
   @Resource
   private TChargingPileNotificationService chargingPileNotificationService;

   @Resource
   private AppUserClient appUserClient;
   
   
	

   /**
    * 获取充电桩列表数据
    * @param page
@@ -136,7 +136,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();
      //合作商
@@ -144,7 +144,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();
@@ -182,18 +182,23 @@
         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());
//         }
//      }
      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.save(chargingPile);
      return AjaxResult.success();
   }
@@ -257,6 +262,34 @@
      if(null != one && !one.getId().equals(chargingPile.getId())){
         return AjaxResult.error("设备编号已存在");
      }
      TChargingPile tChargingPile = this.getById(chargingPile.getId());
      ShowDeviceResp showDeviceResp = iotInterfaceClient.showDeviceRequest(tChargingPile.getCode()).getData();
      if(null != showDeviceResp){
         DeleteDeviceResp deleteDeviceResp = iotInterfaceClient.deleteDevice(tChargingPile.getCode()).getData();
         if(null == deleteDeviceResp || (deleteDeviceResp.getHttpStatusCode() != 200 && deleteDeviceResp.getHttpStatusCode() != 201 && deleteDeviceResp.getHttpStatusCode() != 204)){
            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());
         }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));
@@ -297,11 +330,17 @@
      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){
//            }
//         }
         if(StringUtils.isNotEmpty(chargingPile.getIotdDeviceId())){
            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();
@@ -375,14 +414,14 @@
      //获取当前登录账户的站点权限数据
      Set<Integer> siteIds = new HashSet<>();
      if(0 == siteId){
         SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
         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();
@@ -467,14 +506,14 @@
      //获取当前登录账户的站点权限数据
      Set<Integer> siteIds = new HashSet<>();
      if(0 == siteId){
         SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
         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();
@@ -518,12 +557,12 @@
      //获取当前登录账户的站点权限数据
      Set<Integer> siteIds = new HashSet<>();
      if(0 == query.getSiteId()){
         SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
         R<Integer> admin = sysUserClient.isAdmin(SecurityUtils.getUserId());
         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(admin.getData()!=1){