修改bug

Pu Zhibing

2024-10-08 7e73e670d70e860bce6c216c23a75d366982c3c2

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

@@ -23,12 +23,17 @@
import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
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.security.utils.SecurityUtils;
import com.ruoyi.integration.api.feignClient.IotInterfaceClient;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
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.order.api.feignClient.ChargingOrderAccountingStrategyClient;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
@@ -36,6 +41,8 @@
import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.feignClient.SysUserRoleClient;
import com.ruoyi.system.api.model.SysUserRoleVo;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -87,6 +94,12 @@
   
   @Resource
   private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;

   @Resource
   private SysUserRoleClient sysUserRoleClient;
	
   @Resource
   private IotInterfaceClient iotInterfaceClient;
   
   
   
@@ -111,7 +124,8 @@
         //非管理员需要根据角色和用户配置查询允许的站点数据
         if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
            List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
            List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).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);
         }
@@ -145,7 +159,20 @@
      if(count > 0){
         return AjaxResult.error("设备编号已存在");
      }
      this.save(chargingPile);
      //调用华为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);
         }
      }
      return AjaxResult.success();
   }
   
@@ -221,14 +248,20 @@
   @Override
   public AjaxResult delChargingPile(Integer[] ids) {
      //检查是否有关联数据
      //接口
      long count = chargingGunService.count(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, Arrays.asList(ids)).eq(TChargingGun::getDelFlag, 0));
      long count = chargingGunService.count(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getChargingPileId, Arrays.asList(ids))
            .eq(TChargingGun::getDelFlag, 0));
      if(count > 0){
         return AjaxResult.error("该充电桩有关联的接口数据，删除失败！");
         return AjaxResult.error("该充电桩已添加接口，不可删除。");
      }
      for (Integer id : ids) {
         TChargingPile chargingPile = this.getById(id);
         this.removeById(chargingPile);
         //调用华为Iot删除设备
         if(StringUtils.isNotEmpty(chargingPile.getIotdDeviceId())){
            DeleteDeviceResp deviceResp = iotInterfaceClient.deleteDevice(chargingPile.getIotdDeviceId()).getData();
            if(null != deviceResp && deviceResp.getHttpStatusCode() == 201){
               this.removeById(chargingPile);
            }
         }
      }
      return AjaxResult.success();
   }
@@ -258,7 +291,17 @@
      List<TChargingGun> chargingGuns = chargingGunService.list(wrapper);
      // 查询充电枪信息
      chargingPileVOS.forEach(item -> {
         item.setChargingGunList(chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(item.getId())).collect(Collectors.toList()));
         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);
            }
            if(chargingGun.getStatus().equals(5)){
               chargingGun.setSoc(100);
            }
         }
         item.setChargingGunList(chargingGunList);
      });
      return chargingPileVOS;
   }
@@ -283,7 +326,8 @@
            //非管理员需要根据角色和用户配置查询允许的站点数据
            if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
               List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
               List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).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);
            }
@@ -344,7 +388,9 @@
      chargeMonitoring.setUtilizationTrend(utilizationTrend);
      return chargeMonitoring;
   }
	



   /**
    * 获取充电枪各种状态汇总
    * @param siteId 站点id
@@ -364,7 +410,8 @@
            //非管理员需要根据角色和用户配置查询允许的站点数据
            if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
               List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
               List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).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);
            }
@@ -411,7 +458,8 @@
            //非管理员需要根据角色和用户配置查询允许的站点数据
            if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
               List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
               List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).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);
            }