From 3e1fc145ecefd1d823423b2e31366a0c1c9a723c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 16 八月 2024 15:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index 87353bc..f6a1de1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@@ -36,10 +38,7 @@
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
@@ -64,6 +63,8 @@
@Resource
private RoleSiteClient roleSiteClient;
@Resource
+ private ParkingLotClient parkingLotClient;
+ @Resource
private TChargingPileService chargingPileService;
@Resource
private TChargingGunService chargingGunService;
@@ -85,7 +86,19 @@
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));
@@ -98,7 +111,11 @@
// 计算距离
Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
siteDetailVO.setDistance(distance.get("WGS84"));
- // TODO 查询绑定车牌提示文案
+ // 查询绑定车牌提示文案
+ TParkingLot parkingLot = parkingLotClient.getLotBySiteId(query.getSiteId()).getData();
+ if(Objects.nonNull(parkingLot)){
+ siteDetailVO.setRemark(parkingLot.getRemark());
+ }
return AjaxResult.success(siteDetailVO);
}
--
Gitblit v1.7.1