From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +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 | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 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 09df514..5fdcac0 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,12 +2,15 @@
import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.integration.iotda.constant.ServiceIdConstant;
-import com.ruoyi.integration.mongodb.model.*;
+import com.ruoyi.integration.api.model.*;
+import com.ruoyi.integration.iotda.enums.ServiceIdMenu;
import com.ruoyi.integration.mongodb.service.*;
-import org.apache.poi.ss.formula.functions.T;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Slf4j
+@Component
public class MessageUtil {
@Autowired
@@ -43,6 +46,8 @@
@Autowired
private TimingSettingService timingSettingService;
@Autowired
+ private TimingSettingReplyService timingSettingReplyService;
+ @Autowired
private SetupBillingModelService setupBillingModelService;
@Autowired
private OpenOrCloseGroundLockService openOrCloseGroundLockService;
@@ -58,7 +63,7 @@
*/
public String onlineReply(OnlineReply onlineReply){
onlineReplyService.create(onlineReply);
- return getMessageJsonString(onlineReply, ServiceIdConstant.ONLINE_REPLY);
+ return getMessageJsonString(onlineReply, ServiceIdMenu.ONLINE_REPLY.getValue());
}
/**
@@ -68,7 +73,7 @@
*/
public String pong(Pong pong){
pongService.create(pong);
- return getMessageJsonString(pong, ServiceIdConstant.PONG);
+ return getMessageJsonString(pong, ServiceIdMenu.PONG.getValue());
}
/**
@@ -78,7 +83,7 @@
*/
public String billingModeVerifyReply(BillingModeVerifyReply billingModeVerifyReply){
billingModeVerifyReplyService.create(billingModeVerifyReply);
- return getMessageJsonString(billingModeVerifyReply, ServiceIdConstant.BILLING_MODE_VERIFY_REPLY);
+ return getMessageJsonString(billingModeVerifyReply, ServiceIdMenu.BILLING_MODE_VERIFY_REPLY.getValue());
}
/**
@@ -88,7 +93,7 @@
*/
public String acquisitionBillingModeReply(AcquisitionBillingModeReply acquisitionBillingModeReply){
acquisitionBillingModeReplyService.create(acquisitionBillingModeReply);
- return getMessageJsonString(acquisitionBillingModeReply, ServiceIdConstant.ACQUISITION_BILLING_MODE_REPLY);
+ return getMessageJsonString(acquisitionBillingModeReply, ServiceIdMenu.ACQUISITION_BILLING_MODE_REPLY.getValue());
}
/**
@@ -98,7 +103,7 @@
*/
public String readRealTimeMonitoringData(ReadRealTimeMonitoringData readRealTimeMonitoringData){
readRealTimeMonitoringDataService.create(readRealTimeMonitoringData);
- return getMessageJsonString(readRealTimeMonitoringData, ServiceIdConstant.READ_REAL_TIME_MONITORING_DATA);
+ return getMessageJsonString(readRealTimeMonitoringData, ServiceIdMenu.READ_REAL_TIME_MONITORING_DATA.getValue());
}
/**
@@ -106,10 +111,10 @@
* @param endCharge 实体对象
* @return
*/
- public String endCharge(EndCharge endCharge){
- endChargeService.create(endCharge);
- return getMessageJsonString(endCharge, ServiceIdConstant.END_CHARGE);
- }
+// public String endCharge(EndCharge endCharge){
+// endChargeService.create(endCharge);
+// return getMessageJsonString(endCharge, ServiceIdMenu.END_CHARGE.getValue());
+// }
/**
* 运营平台确认启动充电
@@ -118,7 +123,7 @@
*/
public String platformConfirmationCharging(PlatformConfirmationCharging platformConfirmationCharging){
platformConfirmationChargingService.create(platformConfirmationCharging);
- return getMessageJsonString(platformConfirmationCharging, ServiceIdConstant.PLATFORM_CONFIRMATION_CHARGING);
+ return getMessageJsonString(platformConfirmationCharging, ServiceIdMenu.PLATFORM_CONFIRMATION_CHARGING.getValue());
}
/**
@@ -126,9 +131,9 @@
* @param platformStartCharging 实体对象
* @return
*/
- public String platformConfirmationCharging(PlatformStartCharging platformStartCharging){
+ public String platformStartCharging(PlatformStartCharging platformStartCharging){
platformStartChargingService.create(platformStartCharging);
- return getMessageJsonString(platformStartCharging, ServiceIdConstant.PLATFORM_START_CHARGING);
+ return getMessageJsonString(platformStartCharging, ServiceIdMenu.PLATFORM_START_CHARGING.getValue());
}
/**
@@ -138,7 +143,7 @@
*/
public String platformStopCharging(PlatformStopCharging platformStopCharging){
platformStopChargingService.create(platformStopCharging);
- return getMessageJsonString(platformStopCharging, ServiceIdConstant.PLATFORM_STOP_CHARGING);
+ return getMessageJsonString(platformStopCharging, ServiceIdMenu.PLATFORM_STOP_CHARGING.getValue());
}
/**
@@ -148,7 +153,7 @@
*/
public String confirmTransactionRecord(ConfirmTransactionRecord confirmTransactionRecord){
confirmTransactionRecordService.create(confirmTransactionRecord);
- return getMessageJsonString(confirmTransactionRecord, ServiceIdConstant.CONFIRM_TRANSACTION_RECORD);
+ return getMessageJsonString(confirmTransactionRecord, ServiceIdMenu.CONFIRM_TRANSACTION_RECORD.getValue());
}
/**
@@ -158,7 +163,7 @@
*/
public String updateBalance(UpdateBalance updateBalance){
updateBalanceService.create(updateBalance);
- return getMessageJsonString(updateBalance, ServiceIdConstant.UPDATE_BALANCE);
+ return getMessageJsonString(updateBalance, ServiceIdMenu.UPDATE_BALANCE.getValue());
}
/**
@@ -168,7 +173,7 @@
*/
public String synchronizeOfflineCard(SynchronizeOfflineCard synchronizeOfflineCard){
synchronizeOfflineCardService.create(synchronizeOfflineCard);
- return getMessageJsonString(synchronizeOfflineCard, ServiceIdConstant.SYNCHRONIZE_OFFLINE_CARD);
+ return getMessageJsonString(synchronizeOfflineCard, ServiceIdMenu.SYNCHRONIZE_OFFLINE_CARD.getValue());
}
/**
@@ -178,7 +183,7 @@
*/
public String clearOfflineCard(ClearOfflineCard clearOfflineCard){
clearOfflineCardService.create(clearOfflineCard);
- return getMessageJsonString(clearOfflineCard, ServiceIdConstant.CLEAR_OFFLINE_CARD);
+ return getMessageJsonString(clearOfflineCard, ServiceIdMenu.CLEAR_OFFLINE_CARD.getValue());
}
/**
@@ -188,7 +193,7 @@
*/
public String queryOfflineCard(QueryOfflineCard queryOfflineCard){
queryOfflineCardService.create(queryOfflineCard);
- return getMessageJsonString(queryOfflineCard, ServiceIdConstant.QUERY_OFFLINE_CARD);
+ return getMessageJsonString(queryOfflineCard, ServiceIdMenu.QUERY_OFFLINE_CARD.getValue());
}
/**
@@ -198,7 +203,7 @@
*/
public String workingParameterSetting(WorkingParameterSetting workingParameterSetting){
workingParameterSettingService.create(workingParameterSetting);
- return getMessageJsonString(workingParameterSetting, ServiceIdConstant.WORKING_PARAMETER_SETTING);
+ return getMessageJsonString(workingParameterSetting, ServiceIdMenu.WORKING_PARAMETER_SETTING.getValue());
}
/**
@@ -208,7 +213,16 @@
*/
public String timingSetting(TimingSetting timingSetting){
timingSettingService.create(timingSetting);
- return getMessageJsonString(timingSetting, ServiceIdConstant.TIMING_SETTING);
+ return getMessageJsonString(timingSetting, ServiceIdMenu.TIMING_SETTING.getValue());
+ }
+ /**
+ * 对时设置应答
+ * @param timingSettingReply 实体对象
+ * @return
+ */
+ public String timingSettingReply(TimingSettingReply timingSettingReply){
+ timingSettingReplyService.create(timingSettingReply);
+ return getMessageJsonString(timingSettingReply, ServiceIdMenu.TIMING_SETTING_REPLY.getValue());
}
/**
@@ -218,7 +232,7 @@
*/
public String setupBillingModel(SetupBillingModel setupBillingModel){
setupBillingModelService.create(setupBillingModel);
- return getMessageJsonString(setupBillingModel, ServiceIdConstant.SETUP_BILLING_MODEL);
+ return getMessageJsonString(setupBillingModel, ServiceIdMenu.SETUP_BILLING_MODEL.getValue());
}
/**
@@ -228,7 +242,7 @@
*/
public String openOrCloseGroundLock(OpenOrCloseGroundLock openOrCloseGroundLock){
openOrCloseGroundLockService.create(openOrCloseGroundLock);
- return getMessageJsonString(openOrCloseGroundLock, ServiceIdConstant.OPEN_OR_CLOSE_GROUND_LOCK);
+ return getMessageJsonString(openOrCloseGroundLock, ServiceIdMenu.OPEN_OR_CLOSE_GROUND_LOCK.getValue());
}
/**
* 远程重启
@@ -237,7 +251,7 @@
*/
public String platformRestart(PlatformRestart platformRestart){
platformRestartService.create(platformRestart);
- return getMessageJsonString(platformRestart, ServiceIdConstant.PLATFORM_RESTART);
+ return getMessageJsonString(platformRestart, ServiceIdMenu.PLATFORM_RESTART.getValue());
}
/**
* 远程更新
@@ -246,7 +260,7 @@
*/
public String platformRemoteUpdate(PlatformRemoteUpdate platformRemoteUpdate){
platformRemoteUpdateService.create(platformRemoteUpdate);
- return getMessageJsonString(platformRemoteUpdate, ServiceIdConstant.PLATFORM_REMOTE_UPDATE);
+ return getMessageJsonString(platformRemoteUpdate, ServiceIdMenu.PLATFORM_REMOTE_UPDATE.getValue());
}
/**
@@ -255,10 +269,9 @@
* @param serviceId 服务ID
* @return
*/
- private String getMessageJsonString(Object object, String serviceId){
+ public String getMessageJsonString(Object object, String serviceId){
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(object));
jsonObject.put("service_id", serviceId);
return jsonObject.toJSONString();
}
-
}
--
Gitblit v1.7.1