Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-08-16 731c3d326b6cc2e08e703f06d06aa453bc52cda3

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

@@ -2,6 +2,7 @@

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;
@@ -16,10 +17,7 @@
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;
@@ -69,7 +67,9 @@
   @Resource
   private TChargingGunService chargingGunService;

	
   @Autowired
   private TParkingLotService parkingLotService;

   
   
   
@@ -86,12 +86,23 @@
   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){
@@ -100,7 +111,8 @@
      Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
      siteDetailVO.setDistance(distance.get("WGS84"));
      // 查询绑定车牌提示文案
      TParkingLot parkingLot = parkingLotClient.getLotBySiteId(query.getSiteId()).getData();
      TParkingLot parkingLot = parkingLotService.getOne(Wrappers.lambdaQuery(TParkingLot.class)
            .eq(TParkingLot::getSiteId, query.getSiteId()));
      if(Objects.nonNull(parkingLot)){
         siteDetailVO.setRemark(parkingLot.getRemark());
      }