From 7ad552337e940a3c41be3b335c2b7bf02c01abb1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 16:22:44 +0800
Subject: [PATCH] 修改计费计算方式
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 5 +----
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java | 6 ++----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index 0e418d1..8592ffb 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -342,14 +342,11 @@
byId1.setAccountingStrategyId(byId.getId());
siteService.updateById(byId1);
}
-
//硬件
- List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, byId.getSiteId()).list();
+ List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, byId.getSiteId()).list();
for (TChargingPile tChargingPile : list) {
integrationClient.setupBillingModel1(tChargingPile.getCode());
}
-
-
}
}else {
if (byId.getAuditStatus()==1){
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
index b466190..bee2a20 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
@@ -381,10 +381,8 @@
}
@ApiOperation(value = "计费模型设置",tags = {"硬件接口"})
- @GetMapping(value = "/setupBillingModel")
- public R setupBillingModel() {
- String deviceId = "3401231001200202";
- // TODO 罗 计费模型设置
+ @PostMapping(value = "/setupBillingModel")
+ public R setupBillingModel(@RequestParam("deviceId") String deviceId) {
SetupBillingModel setupBillingModel = new SetupBillingModel();
// 计费模型
List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailClient.getDetailListByCode(deviceId).getData();
--
Gitblit v1.7.1