From 75ebb56ab456cea188806a8ce685f46d687a9c82 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 13:54:15 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..5f50d55 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,10 +382,10 @@
@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();
--
Gitblit v1.7.1