From 21775c75545616beec1fdba433f7b45d621e0c95 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 02 十一月 2024 14:19:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
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 bee2a20..dca9c5f 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
@@ -382,18 +382,17 @@
@ApiOperation(value = "计费模型设置",tags = {"硬件接口"})
@PostMapping(value = "/setupBillingModel")
- public R setupBillingModel(@RequestParam("deviceId") String deviceId) {
+ public R setupBillingModel(@RequestParam("deviceId") String deviceId, @RequestParam("json") String json) {
SetupBillingModel setupBillingModel = new SetupBillingModel();
+ List<TAccountingStrategyDetail> accountingStrategyDetails = JSON.parseArray(json, TAccountingStrategyDetail.class);
// 计费模型
- List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailClient.getDetailListByCode(deviceId).getData();
Map<Integer, TAccountingStrategyDetail> strategyPrice = StrategyUtil.getStrategyPrice(accountingStrategyDetails);
// 价格设置
AcquisitionBillingModeReply acquisitionBillingModeReply = new AcquisitionBillingModeReply();
StrategyUtil.setStrategyPrice(strategyPrice,acquisitionBillingModeReply);
// 时段设置
StrategyUtil.setTime(accountingStrategyDetails,acquisitionBillingModeReply);
- TAccountingStrategyDetail accountingStrategyDetail = accountingStrategyDetailClient.getDetailByCode(deviceId).getData();
- acquisitionBillingModeReply.setBilling_model_code(accountingStrategyDetail.getId().toString());
+ acquisitionBillingModeReply.setBilling_model_code(accountingStrategyDetails.get(0).getAccountingStrategyId().toString());
acquisitionBillingModeReply.setCharging_pile_code(deviceId);
acquisitionBillingModeReply.setLoss_ratio(BigDecimal.ZERO);
BeanUtils.copyProperties(acquisitionBillingModeReply,setupBillingModel);
--
Gitblit v1.7.1