From 7bb22a32cf85b16dee6ac6acb6b1e0e241ab89f1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 30 八月 2024 17:04:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 c0352fe..e073766 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
@@ -138,6 +138,11 @@
@PostMapping("/getDetailById")
public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
SiteDetailVO siteDetailVO = siteService.getDetailById(query.getSiteId());
+ // 查询合作商名称
+ Partner partner = partnerService.getById(siteDetailVO.getPartnerId());
+ if(Objects.nonNull(partner)){
+ siteDetailVO.setPartnerName(partner.getName());
+ }
// 计算距离
Map<String, Double> distance = GeodesyUtil.getDistance(query.getLat() + "," + query.getLon(), siteDetailVO.getLat() + "," + siteDetailVO.getLon());
siteDetailVO.setDistance(distance.get("WGS84"));
@@ -153,7 +158,7 @@
@ApiOperation(value = "获取站点下充电桩及充电枪列表", tags = {"小程序-站点管理-站点详情"})
@GetMapping("/getChargingGunList")
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){
+ @RequestParam(value = "type",required = false)@ApiParam(value = "类型 1=超充，2=快充，3=慢充")Integer type){
return AjaxResult.success(chargingPileService.getChargingGunList(siteId,type));
}
--
Gitblit v1.7.1