修改bug

puzhibing

2024-08-17 3a0a98d3ea6f852eff758413e5e7ec36e1e06404

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

@@ -1,10 +1,14 @@
package com.ruoyi.chargingPile.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.query.GetSiteList;
import com.ruoyi.chargingPile.api.query.SiteDetailQuery;
import com.ruoyi.chargingPile.api.query.SiteQuery;
@@ -13,10 +17,8 @@
import com.ruoyi.chargingPile.api.vo.SiteVO;
import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
import com.ruoyi.chargingPile.domain.SiteMenu;
import com.ruoyi.chargingPile.service.IPartnerService;
import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.GeodesyUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -28,15 +30,13 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Map;
import java.util.*;

/**
 * @author zhibing.pu
@@ -60,31 +60,49 @@
   
   @Resource
   private RoleSiteClient roleSiteClient;
	
	
	
	
	

   @Autowired
   @Resource
   private ParkingLotClient parkingLotClient;
   @Resource
   private TChargingPileService chargingPileService;
   @Autowired
   @Resource
   private TChargingGunService chargingGunService;

   @Autowired
   private TParkingLotService parkingLotService;

	
	
	
   @ResponseBody
   @GetMapping("/getSiteList")
   @ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
   public AjaxResult<PageInfo<GetSiteListDTO>> getSiteList(@RequestBody GetSiteList siteList){
   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(){
      return AjaxResult.success(siteService.list(new QueryWrapper<>()));
   }

   @ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理"})
   @PostMapping("/getSiteListGun")
   @ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-接口信息使用"})
   public AjaxResult<List<Site>> getSiteListGun(){
      return AjaxResult.success(siteService.getSiteListGun());
   }

   @PostMapping("/getSiteListParkLot")
   @ApiOperation(value = "获取站点列表不分页", tags = {"管理后台-停车场绑定"})
   public AjaxResult<List<Site>> getSiteListParkLot(){
      return AjaxResult.success(siteService.getSiteListParkLot());
   }
   @ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理-首页"})
   @PostMapping("/pageList")
   public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
      return AjaxResult.success(siteService.pageList(query));
   }

   @ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
   @PostMapping("/getDetailById")
   public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
@@ -92,19 +110,25 @@
      // 计算距离
      Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
      siteDetailVO.setDistance(distance.get("WGS84"));
      // TODO 查询绑定车牌提示文案
      // 查询绑定车牌提示文案
      TParkingLot parkingLot = parkingLotService.getOne(Wrappers.lambdaQuery(TParkingLot.class)
            .eq(TParkingLot::getSiteId, query.getSiteId()));
      if(Objects.nonNull(parkingLot)){
         siteDetailVO.setRemark(parkingLot.getRemark());
      }
      return AjaxResult.success(siteDetailVO);
   }

   @ApiOperation(value = "获取站点下充电桩及充电枪列表", tags = {"小程序-站点管理-站点详情"})
   @GetMapping("/getChargingGunList")
   public AjaxResult<List<TChargingPileVO>> getChargingGunList(@RequestParam(name = "siteId",value = "站点id")Integer siteId){
      return AjaxResult.success(chargingPileService.getChargingGunList(siteId));
   public AjaxResult<List<TChargingPileVO>> getChargingGunList(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId,
                                                @RequestParam(value = "siteId",required = false)@ApiParam(value = "类型 1=超充，2=快充，3=慢充")Integer type){
      return AjaxResult.success(chargingPileService.getChargingGunList(siteId,type));
   }

   @ApiOperation(value = "获取站点下充电枪数量统计", tags = {"小程序-站点管理-站点详情"})
   @GetMapping("/getChargingGunCount")
   public AjaxResult<Map<String,ChargingGunCountVO>> getChargingGunCount(@RequestParam(name = "siteId",value = "站点id")Integer siteId){
   public AjaxResult<Map<String,ChargingGunCountVO>> getChargingGunCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId){
      return AjaxResult.success(chargingGunService.getChargingGunCount(siteId));
   }

@@ -124,12 +148,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);
   }
   
@@ -149,7 +173,7 @@
   
   @ResponseBody
   @GetMapping("/getAllSiteList")
   @ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息"})
   @ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息", "管理后台-系统用户管理", "管理后台-角色管理", "管理后台-系统通知", "管理后台-充电评价"})
   public AjaxResult<List<Site>> getAllSiteList(){
      //校验当前账户站点权限
      SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
@@ -172,4 +196,17 @@
      List<Site> list = siteService.list(wrapper.orderByDesc(Site::getCreateTime));
      return AjaxResult.success(list);
   }
	
	
   /**
    * 获取站点数据集合
    * @param ids
    * @return
    */
   @ResponseBody
   @PostMapping("/getSiteByIds")
   public R<List<Site>> getSiteByIds(@RequestBody List<Integer> ids){
      List<Site> sites = siteService.listByIds(ids);
      return R.ok(sites);
   }
}