Merge remote-tracking branch 'origin/master'

xuhy

2024-08-17 5a5b01fa9824a42e3eb033088a20e24c32b30dda

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java

@@ -5,17 +5,11 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.feignClient.ParkingLotClient;
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.TParkingLot;
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.query.GetSiteList;
import com.ruoyi.chargingPile.api.query.SiteDetailQuery;
import com.ruoyi.chargingPile.api.query.SiteQuery;
import com.ruoyi.chargingPile.api.vo.ChargingGunCountVO;
import com.ruoyi.chargingPile.api.vo.SiteDetailVO;
import com.ruoyi.chargingPile.api.vo.SiteVO;
import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
import com.ruoyi.chargingPile.api.vo.*;
import com.ruoyi.chargingPile.domain.SiteMenu;
import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
@@ -36,6 +30,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalTime;
import java.util.*;

/**
@@ -69,18 +65,44 @@

   @Autowired
   private TParkingLotService parkingLotService;
   @Autowired
   private TAccountingStrategyService accountingStrategyService;
   @Autowired
   private TAccountingStrategyDetailService accountingStrategyDetailService;


   /**
    * 小程序扫一扫
    * @param number
    * @return
    */
   @PostMapping("/getSiteInfoByNumber")
   @ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"})
   public R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number){
      SiteInfoVO siteInfoVO = new SiteInfoVO();
      TChargingPile one = chargingPileService.lambdaQuery().eq(TChargingPile::getNumber, number).one();
      Site byId = siteService.getById(one.getSiteId());
      TAccountingStrategy byId1 = accountingStrategyService.getById(byId.getAccountingStrategyId());
      List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
      for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
         // 当前时间属于那个阶段 取哪个阶段的电价
         if(LocalTime.now().isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && LocalTime.now().isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){
            siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence());
            siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP));
         }
      }
      siteInfoVO.setName(byId.getName());
      siteInfoVO.setNumber(one.getNumber().toString());
      siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain());
      return R.ok(siteInfoVO);
   }
   
	
	
   @ResponseBody
   @GetMapping("/getSiteList")
   @ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
   public AjaxResult<PageInfo<GetSiteListDTO>> getSiteList(GetSiteList siteList){
      PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
      return AjaxResult.success(list);
   }
   @ResponseBody
   @GetMapping("/getSiteList1")
   @ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-活动费用统计"})
   public AjaxResult<List<Site>> getSiteList1(){
@@ -148,12 +170,12 @@
   }
   
   @ResponseBody
   @DeleteMapping("/delSite/{id}")
   @DeleteMapping("/delSite")
   @ApiOperation(value = "删除站点", tags = {"管理后台-站点管理"})
   @ApiImplicitParams({
         @ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
   })
   public AjaxResult delSite(@PathVariable Integer[] id){
   public AjaxResult delSite(@RequestParam("id") Integer[] id){
      return siteService.delSite(id);
   }