From 25a0d0f388d38c815ac21bd47c0758a3f3a24df0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 24 八月 2024 09:53:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 156 insertions(+), 12 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 7691758..e7f11c8 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.iotda.enums.ServiceIdMenu;
import com.ruoyi.integration.mongodb.model.*;
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
@@ -26,6 +29,32 @@
private PlatformConfirmationChargingService platformConfirmationChargingService;
@Autowired
private PlatformStartChargingService platformStartChargingService;
+ @Autowired
+ private PlatformStopChargingService platformStopChargingService;
+ @Autowired
+ private ConfirmTransactionRecordService confirmTransactionRecordService;
+ @Autowired
+ private UpdateBalanceService updateBalanceService;
+ @Autowired
+ private SynchronizeOfflineCardService synchronizeOfflineCardService;
+ @Autowired
+ private ClearOfflineCardService clearOfflineCardService;
+ @Autowired
+ private QueryOfflineCardService queryOfflineCardService;
+ @Autowired
+ private WorkingParameterSettingService workingParameterSettingService;
+ @Autowired
+ private TimingSettingService timingSettingService;
+ @Autowired
+ private SetupBillingModelService setupBillingModelService;
+ @Autowired
+ private OpenOrCloseGroundLockService openOrCloseGroundLockService;
+ @Autowired
+ private PlatformRestartService platformRestartService;
+ @Autowired
+ private PlatformRemoteUpdateService platformRemoteUpdateService;
+ @Autowired
+ private MessageConvertUtil messageConvertUtil;
/**
* 登录认证应答
@@ -34,7 +63,7 @@
*/
public String onlineReply(OnlineReply onlineReply){
onlineReplyService.create(onlineReply);
- return getMessageJsonString(onlineReply, ServiceIdConstant.ONLINE_REPLY);
+ return getMessageJsonString(onlineReply, ServiceIdMenu.ONLINE_REPLY.getValue());
}
/**
@@ -44,7 +73,7 @@
*/
public String pong(Pong pong){
pongService.create(pong);
- return getMessageJsonString(pong, ServiceIdConstant.PONG);
+ return getMessageJsonString(pong, ServiceIdMenu.PONG.getValue());
}
/**
@@ -54,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());
}
/**
@@ -64,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());
}
/**
@@ -74,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());
}
/**
@@ -84,7 +113,7 @@
*/
public String endCharge(EndCharge endCharge){
endChargeService.create(endCharge);
- return getMessageJsonString(endCharge, ServiceIdConstant.END_CHARGE);
+ return getMessageJsonString(endCharge, ServiceIdMenu.END_CHARGE.getValue());
}
/**
@@ -94,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());
}
/**
@@ -104,10 +133,126 @@
*/
public String platformConfirmationCharging(PlatformStartCharging platformStartCharging){
platformStartChargingService.create(platformStartCharging);
- return getMessageJsonString(platformStartCharging, ServiceIdConstant.PLATFORM_START_CHARGING);
+ return getMessageJsonString(platformStartCharging, ServiceIdMenu.PLATFORM_START_CHARGING.getValue());
}
+ /**
+ * 运营平台远程停机
+ * @param platformStopCharging 实体对象
+ * @return
+ */
+ public String platformStopCharging(PlatformStopCharging platformStopCharging){
+ platformStopChargingService.create(platformStopCharging);
+ return getMessageJsonString(platformStopCharging, ServiceIdMenu.PLATFORM_STOP_CHARGING.getValue());
+ }
+ /**
+ * 交易记录确认
+ * @param confirmTransactionRecord 实体对象
+ * @return
+ */
+ public String confirmTransactionRecord(ConfirmTransactionRecord confirmTransactionRecord){
+ confirmTransactionRecordService.create(confirmTransactionRecord);
+ return getMessageJsonString(confirmTransactionRecord, ServiceIdMenu.CONFIRM_TRANSACTION_RECORD.getValue());
+ }
+
+ /**
+ * 远程账户余额更新
+ * @param updateBalance 实体对象
+ * @return
+ */
+ public String updateBalance(UpdateBalance updateBalance){
+ updateBalanceService.create(updateBalance);
+ return getMessageJsonString(updateBalance, ServiceIdMenu.UPDATE_BALANCE.getValue());
+ }
+
+ /**
+ * 离线卡数据同步
+ * @param synchronizeOfflineCard 实体对象
+ * @return
+ */
+ public String synchronizeOfflineCard(SynchronizeOfflineCard synchronizeOfflineCard){
+ synchronizeOfflineCardService.create(synchronizeOfflineCard);
+ return getMessageJsonString(synchronizeOfflineCard, ServiceIdMenu.SYNCHRONIZE_OFFLINE_CARD.getValue());
+ }
+
+ /**
+ * 离线卡数据清除
+ * @param clearOfflineCard 实体对象
+ * @return
+ */
+ public String clearOfflineCard(ClearOfflineCard clearOfflineCard){
+ clearOfflineCardService.create(clearOfflineCard);
+ return getMessageJsonString(clearOfflineCard, ServiceIdMenu.CLEAR_OFFLINE_CARD.getValue());
+ }
+
+ /**
+ * 离线卡数据查询
+ * @param queryOfflineCard 实体对象
+ * @return
+ */
+ public String queryOfflineCard(QueryOfflineCard queryOfflineCard){
+ queryOfflineCardService.create(queryOfflineCard);
+ return getMessageJsonString(queryOfflineCard, ServiceIdMenu.QUERY_OFFLINE_CARD.getValue());
+ }
+
+ /**
+ * 充电桩工作参数设置
+ * @param workingParameterSetting 实体对象
+ * @return
+ */
+ public String workingParameterSetting(WorkingParameterSetting workingParameterSetting){
+ workingParameterSettingService.create(workingParameterSetting);
+ return getMessageJsonString(workingParameterSetting, ServiceIdMenu.WORKING_PARAMETER_SETTING.getValue());
+ }
+
+ /**
+ * 对时设置
+ * @param timingSetting 实体对象
+ * @return
+ */
+ public String timingSetting(TimingSetting timingSetting){
+ timingSettingService.create(timingSetting);
+ return getMessageJsonString(timingSetting, ServiceIdMenu.TIMING_SETTING.getValue());
+ }
+
+ /**
+ * 计费模型设置
+ * @param setupBillingModel 实体对象
+ * @return
+ */
+ public String setupBillingModel(SetupBillingModel setupBillingModel){
+ setupBillingModelService.create(setupBillingModel);
+ return getMessageJsonString(setupBillingModel, ServiceIdMenu.SETUP_BILLING_MODEL.getValue());
+ }
+
+ /**
+ * 遥控地锁升锁与降锁命令 （下行）
+ * @param openOrCloseGroundLock 实体对象
+ * @return
+ */
+ public String openOrCloseGroundLock(OpenOrCloseGroundLock openOrCloseGroundLock){
+ openOrCloseGroundLockService.create(openOrCloseGroundLock);
+ return getMessageJsonString(openOrCloseGroundLock, ServiceIdMenu.OPEN_OR_CLOSE_GROUND_LOCK.getValue());
+ }
+ /**
+ * 远程重启
+ * @param platformRestart 实体对象
+ * @return
+ */
+ public String platformRestart(PlatformRestart platformRestart){
+ platformRestartService.create(platformRestart);
+ return getMessageJsonString(platformRestart, ServiceIdMenu.PLATFORM_RESTART.getValue());
+ }
+ /**
+ * 远程更新
+ * @param platformRemoteUpdate 实体对象
+ * @return
+ */
+ public String platformRemoteUpdate(PlatformRemoteUpdate platformRemoteUpdate){
+ platformRemoteUpdateService.create(platformRemoteUpdate);
+ return getMessageJsonString(platformRemoteUpdate, ServiceIdMenu.PLATFORM_REMOTE_UPDATE.getValue());
+ }
/**
* 统一封装消息
@@ -115,10 +260,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