From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
index 09c646a..b87e9de 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
@@ -84,25 +84,14 @@
}
- /**
- * 获取当前有效的计费模板
- * @param accountingStrategyId
- * @return
- */
- @PostMapping("/getNowData")
- public R<TAccountingStrategyDetail> getNowData(@RequestParam("accountingStrategyId") Integer accountingStrategyId){
- TAccountingStrategyDetail one = accountingStrategyDetailService.getOne(new LambdaQueryWrapper<TAccountingStrategyDetail>()
- .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategyId)
- .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
- return R.ok(one);
- }
+
/**
* 通过站点id查询当前时段使用的策略明细
* @param siteId
* @return
*/
- @PostMapping("/getDetailBySiteId")
+ @GetMapping("/getDetailBySiteId")
public R<TAccountingStrategyDetail> getDetailBySiteId(@RequestParam("siteId") Integer siteId){
Site site = siteService.getById(siteId);
TAccountingStrategy accountingStrategy = accountingStrategyService.getById(site.getAccountingStrategyId());
@@ -116,8 +105,8 @@
* @param code 设备编号
* @return
*/
- @PostMapping("/getDetailByCode")
- public R<TAccountingStrategyDetail> getDetailByPileId(@RequestParam("code") String code){
+ @GetMapping("/getDetailByCode")
+ public R<TAccountingStrategyDetail> getDetailByCode(@RequestParam("code") String code){
// 查询桩
TChargingPile chargingPile = chargingPileService.getOne(Wrappers.lambdaQuery(TChargingPile.class)
.eq(TChargingPile::getCode,code)
@@ -153,5 +142,38 @@
.last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
return R.ok(dto.getStrategyDetailId().equals(one.getId()));
}
+
+
+ /**
+ * 根据计费策略主表id策略明细
+ * @param id
+ * @return
+ */
+ @GetMapping("/getListByAccountingStrategyId")
+ public R<List<TAccountingStrategyDetail>> getListByAccountingStrategyId(@RequestParam("id") Integer id){
+ List<TAccountingStrategyDetail> list = accountingStrategyDetailService.list(new LambdaQueryWrapper<TAccountingStrategyDetail>().eq(TAccountingStrategyDetail::getAccountingStrategyId, id));
+ return R.ok(list);
+ }
+
+ /**
+ * 通过桩编号查询当前使用的策略明细列表
+ * @param code
+ * @return
+ */
+ @GetMapping("/getDetailListByCode")
+ public R<List<TAccountingStrategyDetail>> getDetailListByCode(@RequestParam("code") String code){
+ // 查询桩
+ TChargingPile chargingPile = chargingPileService.getOne(Wrappers.lambdaQuery(TChargingPile.class)
+ .eq(TChargingPile::getCode,code)
+ .last("LIMIT 1"));
+ if(Objects.isNull(chargingPile)){
+ return R.fail("未查询到该桩设备");
+ }
+ Site site = siteService.getById(chargingPile.getSiteId());
+ TAccountingStrategy accountingStrategy = accountingStrategyService.getById(site.getAccountingStrategyId());
+ List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailService.list(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId()));
+ return R.ok(accountingStrategyDetails);
+ }
}
--
Gitblit v1.7.1