明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-10-28 d6c8f09fd628bd0111de4ee7071844465df9adb1 
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java


@@ -123,8 +123,8 @@


      SiteInfoVO siteInfoVO = new SiteInfoVO();


      TChargingGun chargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getFullNumber, number));


      TChargingPile one = chargingPileService.getById(chargingGun.getChargingPileId());


      Site byId = siteService.getById(one.getSiteId());


      TAccountingStrategy byId1 = accountingStrategyService.getById(byId.getAccountingStrategyId());


      Site byId = siteService.getById(chargingGun.getSiteId());


      TAccountingStrategy byId1 = accountingStrategyService.getById(chargingGun.getAccountingStrategyId());


      List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();


      list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));


      for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {


@@ -132,6 +132,7 @@


         if(DateUtils.string2LocalTime(tAccountingStrategyDetail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0


               && DateUtils.string2LocalTime(tAccountingStrategyDetail.getEndTime() + ("23:59:59".equals(tAccountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){


            siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().setScale(4, BigDecimal.ROUND_HALF_UP));


            siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence().setScale(4, BigDecimal.ROUND_HALF_UP));


         }


      }


      siteInfoVO.setChargingGunId(chargingGun.getId());


@@ -159,6 +160,7 @@


         if(DateUtils.string2LocalTime(tAccountingStrategyDetail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0


               && DateUtils.string2LocalTime(tAccountingStrategyDetail.getEndTime() + ("23:59:59".equals(tAccountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){


            siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().setScale(4, BigDecimal.ROUND_HALF_UP));


            siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence().setScale(4, BigDecimal.ROUND_HALF_UP));


         }


      }


      siteInfoVO.setChargingPileId(one.getId());