无关风月
2024-10-24 550b69a3e65dba70e26a5670aa2149d2dc087ee0
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -298,8 +298,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);
@@ -442,7 +448,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();
@@ -488,8 +494,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());
@@ -504,8 +510,8 @@
            TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
            if(null != chargingOrder){
               Long appUserCarId = chargingOrder.getAppUserCarId();
               TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
               if(null != tAppUserCar){
               if(null != appUserCarId){
                  TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
                  gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
               }