From 3c99ce947f25a2dcbae14e78276df77978d412ca Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 26 九月 2024 16:03:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 f54d98a..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,13 +142,25 @@
.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
*/
- @PostMapping("/t-accounting-strategy-detail/getDetailListByCode")
+ @GetMapping("/getDetailListByCode")
public R<List<TAccountingStrategyDetail>> getDetailListByCode(@RequestParam("code") String code){
// 查询桩
TChargingPile chargingPile = chargingPileService.getOne(Wrappers.lambdaQuery(TChargingPile.class)
--
Gitblit v1.7.1