From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +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/tools/MessageUtil.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
index e7f11c8..c7c76bd 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java
@@ -2,8 +2,8 @@
import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.integration.api.model.*;
import com.ruoyi.integration.iotda.enums.ServiceIdMenu;
-import com.ruoyi.integration.mongodb.model.*;
import com.ruoyi.integration.mongodb.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +44,7 @@
@Autowired
private WorkingParameterSettingService workingParameterSettingService;
@Autowired
- private TimingSettingService timingSettingService;
+ private TimingSettingReplyService timingSettingReplyService;
@Autowired
private SetupBillingModelService setupBillingModelService;
@Autowired
@@ -53,8 +53,6 @@
private PlatformRestartService platformRestartService;
@Autowired
private PlatformRemoteUpdateService platformRemoteUpdateService;
- @Autowired
- private MessageConvertUtil messageConvertUtil;
/**
* 登录认证应答
@@ -111,10 +109,10 @@
* @param endCharge 实体对象
* @return
*/
- public String endCharge(EndCharge endCharge){
- endChargeService.create(endCharge);
- return getMessageJsonString(endCharge, ServiceIdMenu.END_CHARGE.getValue());
- }
+// public String endCharge(EndCharge endCharge){
+// endChargeService.create(endCharge);
+// return getMessageJsonString(endCharge, ServiceIdMenu.END_CHARGE.getValue());
+// }
/**
* 运营平台确认启动充电
@@ -131,7 +129,7 @@
* @param platformStartCharging 实体对象
* @return
*/
- public String platformConfirmationCharging(PlatformStartCharging platformStartCharging){
+ public String platformStartCharging(PlatformStartCharging platformStartCharging){
platformStartChargingService.create(platformStartCharging);
return getMessageJsonString(platformStartCharging, ServiceIdMenu.PLATFORM_START_CHARGING.getValue());
}
@@ -207,13 +205,13 @@
}
/**
- * 对时设置
- * @param timingSetting 实体对象
+ * 对时设置应答
+ * @param timingSettingReply 实体对象
* @return
*/
- public String timingSetting(TimingSetting timingSetting){
- timingSettingService.create(timingSetting);
- return getMessageJsonString(timingSetting, ServiceIdMenu.TIMING_SETTING.getValue());
+ public String timingSettingReply(TimingSettingReply timingSettingReply){
+ timingSettingReplyService.create(timingSettingReply);
+ return getMessageJsonString(timingSettingReply, ServiceIdMenu.TIMING_SETTING_REPLY.getValue());
}
/**
--
Gitblit v1.7.1