From e173832d755a37891931401f1e8b34681e2c86b1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 24 八月 2024 09:31:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 20 ++++++++++++++++++--
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 5 +++++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index b876d46..0857bc3 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
@@ -51,16 +52,19 @@
public class TChargingPileController {
private final TChargingPileService chargingPileService;
+ private final TChargingGunService chargingGunService;
+
@Autowired
- public TChargingPileController(TChargingPileService chargingPileService) {
+ public TChargingPileController(TChargingPileService chargingPileService, TChargingGunService chargingGunService) {
this.chargingPileService = chargingPileService;
+ this.chargingGunService = chargingGunService;
}
/**
* 查询充电桩列表
*/
- @ApiOperation(tags = {"小程序-充电桩"},value = "查询充电桩列表")
+ @ApiOperation(tags = {"小程序-充电桩"},value = "通过站点id查询充电桩列表")
@PostMapping(value = "/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "siteId", value = "站点id")
@@ -70,6 +74,18 @@
.eq(TChargingPile::getSiteId,siteId)));
}
/**
+ * 查询充电桩列表
+ */
+ @ApiOperation(tags = {"通过充电桩id 查询充电枪列表"},value = "通过充电桩id 查询充电枪列表")
+ @PostMapping(value = "/pileList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "pileId", value = "充电桩id")
+ })
+ public AjaxResult<List<TChargingGun>> pileList(@RequestParam("pileId") Integer pileId) {
+ return AjaxResult.ok(chargingGunService.list(Wrappers.lambdaQuery(TChargingGun.class)
+ .eq(TChargingGun::getChargingPileId,pileId)));
+ }
+ /**
* 管理后台-通过站点id获取充电桩列表 不分页
*/
@ApiOperation(value = "管理后台-通过站点id获取充电桩列表 不分页")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 6f39524..56714c4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.chargingPile.api.vo.SiteVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.redis.service.RedisService;
@@ -64,6 +65,8 @@
@Resource
private RedisService redisService;
+ @Autowired
+ private AppUserClient appUserClient;
@@ -72,6 +75,8 @@
@PostMapping(value = "/chargingOrder")
@ApiOperation(value = "充电桩订单列表", tags = {"管理后台-订单管理"})
public AjaxResult<TCharingOrderVO> chargingOrder(@RequestBody ChargingOrderQuery dto){
+ List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
+ dto.setUserIds(data);
TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
return AjaxResult.success(res);
}
--
Gitblit v1.7.1