Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-24 a435bc86b7a2e069900c708c9ed1ea70716870e0

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-service/ruoyi-account/pom.xml

 ruoyi-api/ruoyi-api-integration/pom.xml

@@ -16,7 +16,11 @@
    </description>

    <dependencies>

        <!--mongodb-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-mongodb</artifactId>
        </dependency>
        <!-- RuoYi Common Core-->
        <dependency>
            <groupId>com.ruoyi</groupId>

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/ChargingPileFallbackFactory.java

File was deleted

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/IntegrationFallbackFactory.java

New file
@@ -0,0 +1,127 @@
package com.ruoyi.integration.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.integration.api.feignClient.IntegrationClient;
import com.ruoyi.integration.api.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

/**
 * 充电桩服务降级处理
 * 
 * @author ruoyi
 */
@Component
public class IntegrationFallbackFactory implements FallbackFactory<IntegrationClient>
{
    private static final Logger log = LoggerFactory.getLogger(IntegrationFallbackFactory.class);

    @Override
    public IntegrationClient create(Throwable throwable) {
        log.error("充电桩调用失败:{}", throwable.getMessage());
        return new IntegrationClient() {

            @Override
            public R<String> onlineReply(OnlineReply onlineReply) {
                return R.fail("登录认证应答调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> pong(Pong pong) {
                return R.fail("心跳包应答调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> billingModeVerifyReply(BillingModeVerifyReply billingModeVerifyReply) {
                return R.fail("计费模型验证请求应答调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> acquisitionBillingModeReply(AcquisitionBillingModeReply acquisitionBillingModeReply) {
                return R.fail("计费模型验证请求应答调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> readRealTimeMonitoringData(ReadRealTimeMonitoringData readRealTimeMonitoringData) {
                return R.fail("读取实时监测数据调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> endCharge(EndCharge endCharge) {
                return R.fail("充电结束调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> platformConfirmationCharging(PlatformConfirmationCharging platformConfirmationCharging) {
                return R.fail("运营平台确认启动充电调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> platformStartCharging(PlatformStartCharging platformStartCharging) {
                return R.fail("运营平台远程控制启机调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> platformStopCharging(PlatformStopCharging platformStopCharging) {
                return R.fail("运营平台远程停机调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> confirmTransactionRecord(ConfirmTransactionRecord confirmTransactionRecord) {
                return R.fail("交易记录确认调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> updateBalance(UpdateBalance updateBalance) {
                return R.fail("远程账户余额更新调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> synchronizeOfflineCard(SynchronizeOfflineCard synchronizeOfflineCard) {
                return R.fail("离线卡数据同步调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> clearOfflineCard(ClearOfflineCard clearOfflineCard) {
                return R.fail("离线卡数据清除调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> queryOfflineCard(QueryOfflineCard queryOfflineCard) {
                return R.fail("离线卡数据查询调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> workingParameterSetting(WorkingParameterSetting workingParameterSetting) {
                return R.fail("充电桩工作参数设置调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> timingSetting(TimingSetting timingSetting) {
                return R.fail("对时设置调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> setupBillingModel(SetupBillingModel setupBillingModel) {
                return R.fail("计费模型设置调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> openOrCloseGroundLock(OpenOrCloseGroundLock openOrCloseGroundLock) {
                return R.fail("遥控地锁升锁与降锁命令 （下行）调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> platformRestart(PlatformRestart platformRestart) {
                return R.fail("远程重启调用失败：" + throwable.getMessage());
            }

            @Override
            public R<String> platformRemoteUpdate(PlatformRemoteUpdate platformRemoteUpdate) {
                return R.fail("远程更新调用失败：" + throwable.getMessage());
            }
        };
    }
}

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/ChargingPileClient.java

File was deleted

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/IntegrationClient.java

New file
@@ -0,0 +1,177 @@
package com.ruoyi.integration.api.feignClient;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.integration.api.factory.IntegrationFallbackFactory;
import com.ruoyi.integration.api.model.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 充电服务
 * @author ruoyi
 */
@FeignClient(contextId = "IntegrationClient", value = ServiceNameConstants.INTEGRATION_SERVICE, fallbackFactory = IntegrationFallbackFactory.class)
public interface IntegrationClient {


    /**
     * 登录认证应答
     * @param onlineReply  实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageonlineReply")
    public R<String> onlineReply(@RequestBody OnlineReply onlineReply);

    /**
     * 心跳包应答
     * @param pong 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessagepong")
    public R<String> pong(@RequestBody Pong pong);

    /**
     * 计费模型验证请求应答
     * @param billingModeVerifyReply 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessagebillingModeVerifyReply")
    public R<String> billingModeVerifyReply(@RequestBody BillingModeVerifyReply billingModeVerifyReply);

    /**
     * 计费模型验证请求应答
     * @param acquisitionBillingModeReply 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageacquisitionBillingModeReply")
    public R<String> acquisitionBillingModeReply(@RequestBody AcquisitionBillingModeReply acquisitionBillingModeReply);

    /**
     * 读取实时监测数据
     * @param readRealTimeMonitoringData 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessagereadRealTimeMonitoringData")
    public R<String> readRealTimeMonitoringData(@RequestBody ReadRealTimeMonitoringData readRealTimeMonitoringData);

    /**
     * 充电结束
     * @param endCharge 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageendCharge")
    public R<String> endCharge(@RequestBody EndCharge endCharge);

    /**
     * 运营平台确认启动充电
     * @param platformConfirmationCharging 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageplatformConfirmationCharging")
    public R<String> platformConfirmationCharging(@RequestBody PlatformConfirmationCharging platformConfirmationCharging);

    /**
     * 运营平台远程控制启机
     * @param platformStartCharging 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageplatformStartCharging")
    public R<String> platformStartCharging(@RequestBody PlatformStartCharging platformStartCharging);

    /**
     * 运营平台远程停机
     * @param platformStopCharging 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageplatformStopCharging")
    public R<String> platformStopCharging(@RequestBody PlatformStopCharging platformStopCharging);

    /**
     * 交易记录确认
     * @param confirmTransactionRecord 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageconfirmTransactionRecord")
    public R<String> confirmTransactionRecord(@RequestBody ConfirmTransactionRecord confirmTransactionRecord);

    /**
     * 远程账户余额更新
     * @param updateBalance 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageupdateBalance")
    public R<String> updateBalance(@RequestBody UpdateBalance updateBalance);

    /**
     * 离线卡数据同步
     * @param synchronizeOfflineCard 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessagesynchronizeOfflineCard")
    public R<String> synchronizeOfflineCard(@RequestBody SynchronizeOfflineCard synchronizeOfflineCard);

    /**
     * 离线卡数据清除
     * @param clearOfflineCard 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageclearOfflineCard")
    public R<String> clearOfflineCard(@RequestBody ClearOfflineCard clearOfflineCard);

    /**
     * 离线卡数据查询
     * @param queryOfflineCard 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessagequeryOfflineCard")
    public R<String> queryOfflineCard(@RequestBody QueryOfflineCard queryOfflineCard);

    /**
     * 充电桩工作参数设置
     * @param workingParameterSetting 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageworkingParameterSetting")
    public R<String> workingParameterSetting(@RequestBody WorkingParameterSetting workingParameterSetting);

    /**
     * 对时设置
     * @param timingSetting 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessagetimingSetting")
    public R<String> timingSetting(@RequestBody TimingSetting timingSetting);

    /**
     * 计费模型设置
     * @param setupBillingModel 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessagesetupBillingModel")
    public R<String> setupBillingModel(@RequestBody SetupBillingModel setupBillingModel);

    /**
     * 遥控地锁升锁与降锁命令 （下行）
     * @param openOrCloseGroundLock 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageopenOrCloseGroundLock")
    public R<String> openOrCloseGroundLock(@RequestBody OpenOrCloseGroundLock openOrCloseGroundLock);
    /**
     * 远程重启
     * @param platformRestart 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageplatformRestart")
    public R<String> platformRestart(@RequestBody PlatformRestart platformRestart);
    /**
     * 远程更新
     * @param platformRemoteUpdate 实体对象
     * @return
     */
    @PostMapping("/sendMessage/sendMessageplatformRemoteUpdate")
    public R<String> platformRemoteUpdate(@RequestBody PlatformRemoteUpdate platformRemoteUpdate);
    
}

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/AcquisitionBillingMode.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/AcquisitionBillingMode.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/AcquisitionBillingModeReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/AcquisitionBillingModeReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BillingModeVerify.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/BillingModeVerify.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BillingModeVerifyReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/BillingModeVerifyReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsAbort.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/BmsAbort.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/BmsDemandAndChargerExportation.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsInformation.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/BmsInformation.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingHandshake.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/ChargingHandshake.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingPileReturnsGroundLockData.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/ChargingPileReturnsGroundLockData.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ChargingPileStartsCharging.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/ChargingPileStartsCharging.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ClearOfflineCard.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/ClearOfflineCard.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ClearOfflineCardReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/ClearOfflineCardReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ConfirmTransactionRecord.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/ConfirmTransactionRecord.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/EndCharge.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/EndCharge.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ErrorMessage.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/ErrorMessage.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/GroundLockRealTimeData.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/GroundLockRealTimeData.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/MotorAbort.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/MotorAbort.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/Online.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/Online.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/OnlineReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/OnlineReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/OpenOrCloseGroundLock.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/OpenOrCloseGroundLock.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ParameterSetting.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/ParameterSetting.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/Ping.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/Ping.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PlatformConfirmationCharging.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/PlatformConfirmationCharging.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PlatformRemoteUpdate.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/PlatformRemoteUpdate.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PlatformRemoteUpdateReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/PlatformRemoteUpdateReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PlatformRestart.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/PlatformRestart.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PlatformRestartReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/PlatformRestartReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PlatformStartCharging.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/PlatformStartCharging.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PlatformStartChargingReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/PlatformStartChargingReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PlatformStopCharging.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/PlatformStopCharging.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PlatformStopChargingReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/PlatformStopChargingReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/Pong.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/Pong.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QueryOfflineCard.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/QueryOfflineCard.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QueryOfflineCardReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/QueryOfflineCardReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/ReadRealTimeMonitoringData.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/ReadRealTimeMonitoringData.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SetupBillingModel.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/SetupBillingModel.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SetupBillingModelReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/SetupBillingModelReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SynchronizeOfflineCard.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/SynchronizeOfflineCard.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SynchronizeOfflineCardReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/SynchronizeOfflineCardReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TimingSetting.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/TimingSetting.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TimingSettingReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/TimingSettingReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/TransactionRecord.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UpdateBalance.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/UpdateBalance.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UpdateBalanceReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/UpdateBalanceReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/UploadRealTimeMonitoringData.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/WorkingParameterSetting.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/WorkingParameterSetting.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/WorkingParameterSettingReply.java

File was renamed from ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/model/WorkingParameterSettingReply.java
@@ -1,4 +1,4 @@
package com.ruoyi.integration.mongodb.model;
package com.ruoyi.integration.api.model;

import lombok.Data;
import lombok.experimental.Accessors;

 ruoyi-api/ruoyi-api-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
com.ruoyi.integration.api.factory.ChargingPileFallbackFactory
com.ruoyi.integration.api.factory.IntegrationFallbackFactory

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/AliPaymentFallbackFactory.java

New file
@@ -0,0 +1,45 @@
package com.ruoyi.payment.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.vo.AliPaymentReq;
import com.ruoyi.payment.api.vo.AliPaymentResp;
import com.ruoyi.payment.api.vo.AliQueryOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;


/**
 * 充电订单服务降级处理
 * 
 * @author ruoyi
 */
@Component
public class AliPaymentFallbackFactory implements FallbackFactory<AliPaymentClient>
{
    private static final Logger log = LoggerFactory.getLogger(AliPaymentFallbackFactory.class);

    @Override
    public AliPaymentClient create(Throwable throwable) {
        log.error("支付宝支付调用失败:{}", throwable.getMessage());
        return new AliPaymentClient() {
    
            @Override
            public R<AliPaymentResp> payment(AliPaymentReq req) {
                throw new RuntimeException("调起支付宝小程序支付失败：" + throwable.getMessage());
            }
    
            @Override
            public R<AliQueryOrder> query(String outTradeNo) {
                throw new RuntimeException("查询支付订单失败：" + throwable.getMessage());
            }
    
            @Override
            public void close(String outTradeNo) {
                throw new RuntimeException("关闭支付订单失败：" + throwable.getMessage());
            }
        };
    }
}

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java

@@ -29,7 +29,7 @@
    
            @Override
            public R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId) {
                return R.fail("查询支付订单信息失败：" + throwable.getMessage());
                throw new RuntimeException("查询支付订单信息失败：" + throwable.getMessage());
            }
    
            @Override
@@ -49,7 +49,7 @@

            @Override
            public void close(String outTradeNo) {

                throw new RuntimeException("关闭支付订单失败：" + throwable.getMessage());
            }
        };
    }

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/AliPaymentClient.java

New file
@@ -0,0 +1,43 @@
package com.ruoyi.payment.api.feignClient;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.payment.api.factory.WxPaymentFallbackFactory;
import com.ruoyi.payment.api.vo.AliPaymentReq;
import com.ruoyi.payment.api.vo.AliPaymentResp;
import com.ruoyi.payment.api.vo.AliQueryOrder;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;

/**
 * @author zhibing.pu
 * @Date 2024/8/24 14:39
 */
@FeignClient(contextId = "AliPaymentClient", value = ServiceNameConstants.PAYMENT_SERVICE, fallbackFactory = WxPaymentFallbackFactory.class)
public interface AliPaymentClient {
	
	
    /**
     * 调起支付宝小程序支付
     * @param req
     * @return
     */
    @PostMapping("/ali/payment")
    R<AliPaymentResp> payment(AliPaymentReq req);
	
	
    /**
     * 查询支付订单
     * @param outTradeNo
     * @return
     */
    @PostMapping("/ali/query")
    R<AliQueryOrder> query(String outTradeNo);
	
    /**
     * 关闭订单
     * @param outTradeNo
     */
    @PostMapping("/ali/close")
    void close(String outTradeNo);
}

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/AliPaymentReq.java

New file
@@ -0,0 +1,51 @@
package com.ruoyi.payment.api.vo;

import lombok.Data;


/**
 * @author zhibing.pu
 * @Date 2024/8/23 16:52
 */
@Data
public class AliPaymentReq {
    /**
     * 业务流水号
     */
    private String outTradeNo;
    /**
     * 支付总金额
     */
    private String totalAmount;
    /**
     * 订单标题
     */
    private String subject;
    /**
     * 支付用户支付宝openid
     */
    private String buyerOpenId;
    /**
     * 订单附加信息
     */
    private String body;
    /**
     * 订单超时时间
     * 订单相对超时时间。从交易创建时间开始计算。
     * 该笔订单允许的最晚付款时间，逾期将关闭交易。取值范围：1m～15d。m-分钟，h-小时，d-天，1c-当天（1c-当天的情况下，无论交易何时创建，都在0点关闭）。 该参数数值不接受小数点， 如 1.5h，可转换为 90m。
     * 当面付场景默认值为3h
     */
    private String timeoutExpress;
    /**
     * 回传参数
     * 如果请求时传递了该参数，支付宝会在异步通知时将该参数原样返回。
     */
    private String passbackParams;
    /**
     * 初始化默认数据
     */
    public AliPaymentReq() {
        //订单超时默认30分钟
        this.timeoutExpress = "30m";
    }
}

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/AliPaymentResp.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.payment.api.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/8/24 15:09
 */
@Data
@ApiModel
public class AliPaymentResp {
    /**
     * 支付单号
     */
    @ApiModelProperty("支付单号")
    private String tradeNo;
    /**
     * 回调通知地址
     */
    @ApiModelProperty("回调通知地址")
    private String notifyUrl;
}

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/AliQueryOrder.java

New file
@@ -0,0 +1,48 @@
package com.ruoyi.payment.api.vo;

import com.fasterxml.jackson.annotation.JsonSetter;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/8/24 12:01
 */
@Data
public class AliQueryOrder {
    /**
     * 支付宝交易号
     */
    @JsonSetter("trade_no")
    private String tradeNo;
    /**
     * 业务流水号
     */
    @JsonSetter("out_trade_no")
    private String outTradeNo;
    /**
     * 交易状态
     * WAIT_BUYER_PAY（交易创建，等待买家付款）、TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、TRADE_SUCCESS（交易支付成功）、TRADE_FINISHED（交易结束，不可退款）
     */
    @JsonSetter("trade_status")
    private String tradeStatus;
    /**
     *  交易订单金额
     */
    @JsonSetter("total_amount")
    private Double totalAmount;
    /**
     * 回传参数
     */
    @JsonSetter("passback_params")
    private String passbackParams;
    /**
     * 订单标题
     */
    @JsonSetter("subject")
    private String subject;
    /**
     * 订单描述
     */
    @JsonSetter("body")
    private String body;
}

 ruoyi-api/ruoyi-api-payment/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
com.ruoyi.payment.api.factory.WxPaymentFallbackFactory
com.ruoyi.payment.api.factory.WxPaymentFallbackFactory
com.ruoyi.payment.api.factory.AliPaymentFallbackFactory

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -22,210 +22,200 @@

/**
 * token验证处理
 * 
 *
 * @author ruoyi
 */
@Component
public class TokenService
{
    @Autowired
    private RedisService redisService;

    protected static final long MILLIS_SECOND = 1000;

    protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;

    private final static long expireTime = CacheConstants.EXPIRATION;
    private final static long expireAppletTime = CacheConstants.EXPIRATION_APPLET;

    private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY;

    private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE;

    /**
     * 创建令牌
     */
    public Map<String, Object> createToken(LoginUser loginUser)
    {
        String token = IdUtils.fastUUID();
        Long userId = loginUser.getSysUser().getUserId();
        String userName = loginUser.getSysUser().getUserName();
        loginUser.setToken(token);
        loginUser.setUserid(userId);
        loginUser.setUsername(userName);
        loginUser.setIpaddr(IpUtils.getIpAddr());
        refreshToken(loginUser);

        // Jwt存储信息
        Map<String, Object> claimsMap = new HashMap<String, Object>();
        claimsMap.put(SecurityConstants.USER_KEY, token);
        claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
        claimsMap.put(SecurityConstants.USER_TYPE, "system");
        claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);

        // 接口返回信息
        Map<String, Object> rspMap = new HashMap<String, Object>();
        rspMap.put("access_token", JwtUtils.createToken(claimsMap));
        rspMap.put("expires_in", expireTime);
        return rspMap;
    }
    /**
     * 创建小程序令牌
     */
    public Map<String, Object> createTokenApplet(LoginUserApplet loginUser) {
        String token = IdUtils.fastUUID();
        Long userId = loginUser.getUserId();
        String name = loginUser.getName();
        loginUser.setToken(token);
        loginUser.setIpaddr(IpUtils.getIpAddr());
        refreshToken1(loginUser);
        // Jwt存储信息
        Map<String, Object> claimsMap = new HashMap<String, Object>();
        claimsMap.put(SecurityConstants.USER_APPLET_KEY, token);
        claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
        claimsMap.put(SecurityConstants.USER_TYPE, "applet");
        claimsMap.put(SecurityConstants.DETAILS_USERNAME, name);
        // 接口返回信息
        Map<String, Object> rspMap = new HashMap<String, Object>();
        rspMap.put("access_token", JwtUtils.createToken(claimsMap));
        rspMap.put("expires_in", expireAppletTime);
        return rspMap;
    }
    public LoginUserApplet getLoginUserApplet() {
        LoginUserApplet loginUserAppletToken = getLoginUserAppletToken(ServletUtils.getRequest());
        if (loginUserAppletToken == null){
            throw new UserAppletException("登录失效，请重新登录！", 401);
        }
        return loginUserAppletToken;
    }
    public LoginUserApplet getLoginUserAppletToken(HttpServletRequest request) {
        // 获取请求携带的令牌
        String token = SecurityUtils.getToken(request);
        return getLoginUserApplet(token);
    }
    /**
     * 小程序 获取用户身份信息
     *
     * @return 用户信息
     */
    public LoginUserApplet getLoginUserApplet(String token) {
        LoginUserApplet user = null;
        try {
            if (StringUtils.isNotEmpty(token)) {
                String userKey = JwtUtils.getUserKeyApplet(token);
                user = redisService.getCacheObject(getTokenKey(userKey));
                return user;
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        return user;
    }
    /**
     * 获取用户身份信息
     *
     * @return 用户信息
     */
    public LoginUser getLoginUser()
    {
        return getLoginUser(ServletUtils.getRequest());
    }

    /**
     * 获取用户身份信息
     *
     * @return 用户信息
     */
    public LoginUser getLoginUser(HttpServletRequest request)
    {
        // 获取请求携带的令牌
        String token = SecurityUtils.getToken(request);
        return getLoginUser(token);
    }

    /**
     * 获取用户身份信息
     *
     * @return 用户信息
     */
    public LoginUser getLoginUser(String token)
    {
        LoginUser user = null;
        try
        {
            if (StringUtils.isNotEmpty(token))
            {
                String userkey = JwtUtils.getUserKey(token);
                user = redisService.getCacheObject(getTokenKey(userkey));
                return user;
            }
        }
        catch (Exception e)
        {
        }
        return user;
    }

    /**
     * 设置用户身份信息
     */
    public void setLoginUser(LoginUser loginUser)
    {
        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
        {
            refreshToken(loginUser);
        }
    }

    /**
     * 删除用户缓存信息
     */
    public void delLoginUser(String token)
    {
        if (StringUtils.isNotEmpty(token))
        {
            String userkey = JwtUtils.getUserKey(token);
            redisService.deleteObject(getTokenKey(userkey));
        }
    }

    /**
     * 验证令牌有效期，相差不足120分钟，自动刷新缓存
     *
     * @param loginUser
     */
    public void verifyToken(LoginUser loginUser)
    {
        long expireTime = loginUser.getExpireTime();
        long currentTime = System.currentTimeMillis();
        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
        {
            refreshToken(loginUser);
        }
    }

    /**
     * 刷新令牌有效期
     *
     * @param loginUser 登录信息
     */
    public void refreshToken(LoginUser loginUser)
    {
        loginUser.setLoginTime(System.currentTimeMillis());
        loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
        // 根据uuid将loginUser缓存
        String userKey = getTokenKey(loginUser.getToken());
        redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
    }
    public void refreshToken1(LoginUserApplet dto) {
        dto.setLoginTime(System.currentTimeMillis());
        dto.setExpireTime(dto.getLoginTime() + expireTime * MILLIS_MINUTE);
        // 根据uuid将loginUser缓存
        String userKey = getTokenKey(dto.getToken());
        redisService.setCacheObject(userKey, dto, expireTime, TimeUnit.MINUTES);
    }
    private String getTokenKey(String token)
    {
        return ACCESS_TOKEN + token;
    }
public class TokenService {
    @Autowired
    private RedisService redisService;
	
    protected static final long MILLIS_SECOND = 1000;
	
    protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
	
    private final static long expireTime = CacheConstants.EXPIRATION;
    private final static long expireAppletTime = CacheConstants.EXPIRATION_APPLET;
	
    private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY;
	
    private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE;
	
    /**
     * 创建令牌
     */
    public Map<String, Object> createToken(LoginUser loginUser) {
        String token = IdUtils.fastUUID();
        Long userId = loginUser.getSysUser().getUserId();
        String userName = loginUser.getSysUser().getUserName();
        loginUser.setToken(token);
        loginUser.setUserid(userId);
        loginUser.setUsername(userName);
        loginUser.setIpaddr(IpUtils.getIpAddr());
        refreshToken(loginUser);
		
        // Jwt存储信息
        Map<String, Object> claimsMap = new HashMap<String, Object>();
        claimsMap.put(SecurityConstants.USER_KEY, token);
        claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
        claimsMap.put(SecurityConstants.USER_TYPE, "system");
        claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
		
        // 接口返回信息
        Map<String, Object> rspMap = new HashMap<String, Object>();
        rspMap.put("access_token", JwtUtils.createToken(claimsMap));
        rspMap.put("expires_in", expireTime);
        return rspMap;
    }
	
    /**
     * 创建小程序令牌
     */
    public Map<String, Object> createTokenApplet(LoginUserApplet loginUser) {
        String token = IdUtils.fastUUID();
        Long userId = loginUser.getUserId();
        String name = loginUser.getName();
        loginUser.setToken(token);
        loginUser.setIpaddr(IpUtils.getIpAddr());
        refreshToken1(loginUser);
        // Jwt存储信息
        Map<String, Object> claimsMap = new HashMap<String, Object>();
        claimsMap.put(SecurityConstants.USER_APPLET_KEY, token);
        claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
        claimsMap.put(SecurityConstants.USER_TYPE, "applet");
        claimsMap.put(SecurityConstants.DETAILS_USERNAME, name);
        // 接口返回信息
        Map<String, Object> rspMap = new HashMap<String, Object>();
        rspMap.put("access_token", JwtUtils.createToken(claimsMap));
        rspMap.put("expires_in", expireAppletTime);
        return rspMap;
    }
	
    public LoginUserApplet getLoginUserApplet() {
        LoginUserApplet loginUserAppletToken = getLoginUserAppletToken(ServletUtils.getRequest());
        if (loginUserAppletToken == null) {
            throw new UserAppletException("登录失效，请重新登录！", 401);
        }
        return loginUserAppletToken;
    }
	
    public LoginUserApplet getLoginUserAppletToken(HttpServletRequest request) {
        // 获取请求携带的令牌
        String token = SecurityUtils.getToken(request);
        return getLoginUserApplet(token);
    }
	
    /**
     * 小程序 获取用户身份信息
     *
     * @return 用户信息
     */
    public LoginUserApplet getLoginUserApplet(String token) {
        LoginUserApplet user = null;
        try {
            if (StringUtils.isNotEmpty(token)) {
                String userKey = JwtUtils.getUserKeyApplet(token);
                user = redisService.getCacheObject(getTokenKey(userKey));
                return user;
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        return user;
    }
	
    /**
     * 获取用户身份信息
     *
     * @return 用户信息
     */
    public LoginUser getLoginUser() {
        return getLoginUser(ServletUtils.getRequest());
    }
	
    /**
     * 获取用户身份信息
     *
     * @return 用户信息
     */
    public LoginUser getLoginUser(HttpServletRequest request) {
        // 获取请求携带的令牌
        String token = SecurityUtils.getToken(request);
        return getLoginUser(token);
    }
	
    /**
     * 获取用户身份信息
     *
     * @return 用户信息
     */
    public LoginUser getLoginUser(String token) {
        LoginUser user = null;
        try {
            if (StringUtils.isNotEmpty(token)) {
                String userkey = JwtUtils.getUserKey(token);
                user = redisService.getCacheObject(getTokenKey(userkey));
                return user;
            }
        } catch (Exception e) {
        }
        return user;
    }
	
    /**
     * 设置用户身份信息
     */
    public void setLoginUser(LoginUser loginUser) {
        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) {
            refreshToken(loginUser);
        }
    }
	
    /**
     * 删除用户缓存信息
     */
    public void delLoginUser(String token) {
        if (StringUtils.isNotEmpty(token)) {
            String userkey = JwtUtils.getUserKey(token);
            redisService.deleteObject(getTokenKey(userkey));
        }
    }
	
    /**
     * 验证令牌有效期，相差不足120分钟，自动刷新缓存
     *
     * @param loginUser
     */
    public void verifyToken(LoginUser loginUser) {
        long expireTime = loginUser.getExpireTime();
        long currentTime = System.currentTimeMillis();
        if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
            refreshToken(loginUser);
        }
    }
	
    /**
     * 刷新令牌有效期
     *
     * @param loginUser 登录信息
     */
    public void refreshToken(LoginUser loginUser) {
        loginUser.setLoginTime(System.currentTimeMillis());
        loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
        // 根据uuid将loginUser缓存
        String userKey = getTokenKey(loginUser.getToken());
        redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
    }
	
    public void refreshToken1(LoginUserApplet dto) {
        dto.setLoginTime(System.currentTimeMillis());
        dto.setExpireTime(dto.getLoginTime() + expireTime * MILLIS_MINUTE);
        // 根据uuid将loginUser缓存
        String userKey = getTokenKey(dto.getToken());
        redisService.setCacheObject(userKey, dto, expireTime, TimeUnit.MINUTES);
    }
	
    private String getTokenKey(String token) {
        return ACCESS_TOKEN + token;
    }
}

 ruoyi-service/ruoyi-account/lib/java-sdk-core-3.2.5.jar

Binary files differ

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java

@@ -93,7 +93,7 @@
            list.add(accountingStrategyDetailNext);
            return list;
        }
        return new ArrayList<>();
        return list;
    }

    @Override
@@ -127,19 +127,16 @@

    @Override
    public Boolean isStrategy24Hour(List<TAccountingStrategyDetail> accountingStrategyDetails) {
        String START_OF_DAY = "00:00:00";
        String END_OF_DAY = "24:00:00";
        List<TAccountingStrategyDetail> sortedDetails = accountingStrategyDetails.stream()
                .sorted(Comparator.comparing(TAccountingStrategyDetail::getStartTime))
                .collect(Collectors.toList());

        boolean isFirstElementValid = sortedDetails.isEmpty() || !START_OF_DAY.equals(sortedDetails.get(0).getStartTime());
        boolean isLastElementValid = sortedDetails.isEmpty() || !END_OF_DAY.equals(sortedDetails.get(sortedDetails.size() - 1).getEndTime());
        boolean isFirstElementValid = sortedDetails.isEmpty() || !sortedDetails.get(0).getStartTime().equals(sortedDetails.get(sortedDetails.size() - 1).getEndTime());

        boolean isTimeContinuous = sortedDetails.stream()
                .skip(1)
                .allMatch(detail -> detail.getStartTime().equals(sortedDetails.get(sortedDetails.indexOf(detail) - 1).getEndTime()));

        return isFirstElementValid || isLastElementValid || !isTimeContinuous;
        return isFirstElementValid || !isTimeContinuous;
    }
}

 ruoyi-service/ruoyi-integration/pom.xml

@@ -15,6 +15,10 @@
    </description>

    <dependencies>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-integration</artifactId>
        </dependency>
        <!-- SpringCloud Alibaba Nacos -->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/ChargingOrderController.java

New file
@@ -0,0 +1,41 @@
package com.ruoyi.integration.controller;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.mongodb.service.UploadRealTimeMonitoringDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@RestController
@RequestMapping("/chargingOrder")
public class ChargingOrderController {
    @Resource
    private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;

    /**
     * 远程调用 通过订单流水号 查询订单详情
     * @param orderId
     * @return
     */
    @PostMapping(value = "/getOrderInfoByCode")
    public R<UploadRealTimeMonitoringData> chargingOrderInfo(String orderId){
        UploadRealTimeMonitoringData byId = uploadRealTimeMonitoringDataService.findById(orderId);
        return R.ok(byId);
    }

}




 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java

New file
@@ -0,0 +1,222 @@
package com.ruoyi.integration.iotda.controller;

import com.ruoyi.integration.api.model.*;
import com.ruoyi.integration.iotda.enums.ServiceIdMenu;
import com.ruoyi.integration.iotda.utils.produce.IotMessageProduce;
import com.ruoyi.integration.iotda.utils.tools.MessageUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Slf4j
@RestController
@RequestMapping("/sendMessage")
public class SendMessageController {

    @Autowired
    private MessageUtil messageUtil;
    @Autowired
    private IotMessageProduce iotMessageProduce;

    /**
     * 登录认证应答
     * @param onlineReply  实体对象
     * @return
     */
    @PostMapping("/onlineReply")
    public String onlineReply(@RequestBody OnlineReply onlineReply){
        return  iotMessageProduce.sendMessage(onlineReply.getCharging_pile_code(), ServiceIdMenu.ONLINE_REPLY.getKey(),messageUtil.onlineReply(onlineReply));
    }

    /**
     * 心跳包应答
     * @param pong 实体对象
     * @return
     */
    @PostMapping("/pong")
    public String pong(@RequestBody Pong pong){
        return  iotMessageProduce.sendMessage(pong.getCharging_pile_code(), ServiceIdMenu.PONG.getKey(),messageUtil.pong(pong));
    }

    /**
     * 计费模型验证请求应答
     * @param billingModeVerifyReply 实体对象
     * @return
     */
    @PostMapping("/billingModeVerifyReply")
    public String billingModeVerifyReply(@RequestBody BillingModeVerifyReply billingModeVerifyReply){
        return  iotMessageProduce.sendMessage(billingModeVerifyReply.getCharging_pile_code(), ServiceIdMenu.BILLING_MODE_VERIFY_REPLY.getKey(),messageUtil.billingModeVerifyReply(billingModeVerifyReply));
    }

    /**
     * 计费模型验证请求应答
     * @param acquisitionBillingModeReply 实体对象
     * @return
     */
    @PostMapping("/acquisitionBillingModeReply")
    public String acquisitionBillingModeReply(@RequestBody AcquisitionBillingModeReply acquisitionBillingModeReply){
        return  iotMessageProduce.sendMessage(acquisitionBillingModeReply.getCharging_pile_code(), ServiceIdMenu.ACQUISITION_BILLING_MODE_REPLY.getKey(),messageUtil.acquisitionBillingModeReply(acquisitionBillingModeReply));
    }

    /**
     * 读取实时监测数据
     * @param readRealTimeMonitoringData 实体对象
     * @return
     */
    @PostMapping("/readRealTimeMonitoringData")
    public String readRealTimeMonitoringData(@RequestBody ReadRealTimeMonitoringData readRealTimeMonitoringData){
        return  iotMessageProduce.sendMessage(readRealTimeMonitoringData.getCharging_pile_code(), ServiceIdMenu.READ_REAL_TIME_MONITORING_DATA.getKey(),messageUtil.readRealTimeMonitoringData(readRealTimeMonitoringData));
    }

    /**
     * 充电结束
     * @param endCharge 实体对象
     * @return
     */
    @PostMapping("/endCharge")
    public String endCharge(@RequestBody EndCharge endCharge){
        return  iotMessageProduce.sendMessage(endCharge.getCharging_pile_code(), ServiceIdMenu.END_CHARGE.getKey(),messageUtil.endCharge(endCharge));
    }

    /**
     * 运营平台确认启动充电
     * @param platformConfirmationCharging 实体对象
     * @return
     */
    @PostMapping("/platformConfirmationCharging")
    public String platformConfirmationCharging(@RequestBody PlatformConfirmationCharging platformConfirmationCharging){
        return  iotMessageProduce.sendMessage(platformConfirmationCharging.getCharging_pile_code(), ServiceIdMenu.PLATFORM_CONFIRMATION_CHARGING.getKey(),messageUtil.platformConfirmationCharging(platformConfirmationCharging));
    }

    /**
     * 运营平台远程控制启机
     * @param platformStartCharging 实体对象
     * @return
     */
    @PostMapping("/platformStartCharging")
    public String platformStartCharging(@RequestBody PlatformStartCharging platformStartCharging){
        return  iotMessageProduce.sendMessage(platformStartCharging.getCharging_pile_code(), ServiceIdMenu.PLATFORM_START_CHARGING.getKey(),messageUtil.platformStartCharging(platformStartCharging));
    }

    /**
     * 运营平台远程停机
     * @param platformStopCharging 实体对象
     * @return
     */
    @PostMapping("/platformStopCharging")
    public String platformStopCharging(@RequestBody PlatformStopCharging platformStopCharging){
        return  iotMessageProduce.sendMessage(platformStopCharging.getCharging_pile_code(), ServiceIdMenu.PLATFORM_STOP_CHARGING.getKey(),messageUtil.platformStopCharging(platformStopCharging));
    }

    /**
     * 交易记录确认
     * @param confirmTransactionRecord 实体对象
     * @return
     */
    @PostMapping("/confirmTransactionRecord")
    public String confirmTransactionRecord(@RequestBody ConfirmTransactionRecord confirmTransactionRecord){
        return  iotMessageProduce.sendMessage(confirmTransactionRecord.getTransaction_serial_number(), ServiceIdMenu.CONFIRM_TRANSACTION_RECORD.getKey(),messageUtil.confirmTransactionRecord(confirmTransactionRecord));
    }

    /**
     * 远程账户余额更新
     * @param updateBalance 实体对象
     * @return
     */
    @PostMapping("/updateBalance")
    public String updateBalance(@RequestBody UpdateBalance updateBalance){
        return  iotMessageProduce.sendMessage(updateBalance.getCharging_pile_code(), ServiceIdMenu.UPDATE_BALANCE.getKey(),messageUtil.updateBalance(updateBalance));
    }

    /**
     * 离线卡数据同步
     * @param synchronizeOfflineCard 实体对象
     * @return
     */
    @PostMapping("/synchronizeOfflineCard")
    public String synchronizeOfflineCard(@RequestBody SynchronizeOfflineCard synchronizeOfflineCard){
        return  iotMessageProduce.sendMessage(synchronizeOfflineCard.getCharging_pile_code(), ServiceIdMenu.SYNCHRONIZE_OFFLINE_CARD.getKey(),messageUtil.synchronizeOfflineCard(synchronizeOfflineCard));
    }

    /**
     * 离线卡数据清除
     * @param clearOfflineCard 实体对象
     * @return
     */
    @PostMapping("/clearOfflineCard")
    public String clearOfflineCard(@RequestBody ClearOfflineCard clearOfflineCard){
        return  iotMessageProduce.sendMessage(clearOfflineCard.getCharging_pile_code(), ServiceIdMenu.CLEAR_OFFLINE_CARD.getKey(),messageUtil.clearOfflineCard(clearOfflineCard));
    }

    /**
     * 离线卡数据查询
     * @param queryOfflineCard 实体对象
     * @return
     */
    @PostMapping("/queryOfflineCard")
    public String queryOfflineCard(@RequestBody QueryOfflineCard queryOfflineCard){
        return iotMessageProduce.sendMessage(queryOfflineCard.getCharging_pile_code(), ServiceIdMenu.QUERY_OFFLINE_CARD.getKey(),messageUtil.queryOfflineCard(queryOfflineCard));
    }

    /**
     * 充电桩工作参数设置
     * @param workingParameterSetting 实体对象
     * @return
     */
    @PostMapping("/workingParameterSetting")
    public String workingParameterSetting(@RequestBody WorkingParameterSetting workingParameterSetting){
        return  iotMessageProduce.sendMessage(workingParameterSetting.getCharging_pile_code(), ServiceIdMenu.WORKING_PARAMETER_SETTING.getKey(),messageUtil.workingParameterSetting(workingParameterSetting));
    }

    /**
     * 对时设置
     * @param timingSetting 实体对象
     * @return
     */
    @PostMapping("/timingSetting")
    public String timingSetting(@RequestBody TimingSetting timingSetting){
        return  iotMessageProduce.sendMessage(timingSetting.getCharging_pile_code(), ServiceIdMenu.TIMING_SETTING.getKey(),messageUtil.timingSetting(timingSetting));
    }

    /**
     * 计费模型设置
     * @param setupBillingModel 实体对象
     * @return
     */
    @PostMapping("/setupBillingModel")
    public String setupBillingModel(@RequestBody SetupBillingModel setupBillingModel){
        return  iotMessageProduce.sendMessage(setupBillingModel.getCharging_pile_code(), ServiceIdMenu.SETUP_BILLING_MODEL.getKey(),messageUtil.setupBillingModel(setupBillingModel));
    }

    /**
     * 遥控地锁升锁与降锁命令 （下行）
     * @param openOrCloseGroundLock 实体对象
     * @return
     */
    @PostMapping("/openOrCloseGroundLock")
    public String openOrCloseGroundLock(@RequestBody OpenOrCloseGroundLock openOrCloseGroundLock){
        return  iotMessageProduce.sendMessage(openOrCloseGroundLock.getCharging_pile_code(), ServiceIdMenu.OPEN_OR_CLOSE_GROUND_LOCK.getKey(),messageUtil.openOrCloseGroundLock(openOrCloseGroundLock));
    }
    /**
     * 远程重启
     * @param platformRestart 实体对象
     * @return
     */
    @PostMapping("/platformRestart")
    public String platformRestart(@RequestBody PlatformRestart platformRestart){
        return  iotMessageProduce.sendMessage(platformRestart.getCharging_pile_code(), ServiceIdMenu.PLATFORM_RESTART.getKey(),messageUtil.platformRestart(platformRestart));
    }
    /**
     * 远程更新
     * @param platformRemoteUpdate 实体对象
     * @return
     */
    @PostMapping("/platformRemoteUpdate")
    public String platformRemoteUpdate(@RequestBody PlatformRemoteUpdate platformRemoteUpdate){
        return  iotMessageProduce.sendMessage(platformRemoteUpdate.getCharging_pile_code(), ServiceIdMenu.PLATFORM_REMOTE_UPDATE.getKey(),messageUtil.platformRemoteUpdate(platformRemoteUpdate));
    }

}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/enums/ServiceIdMenu.java

@@ -9,91 +9,100 @@
    /**
     * 登录认证应答
     */
     ONLINE_REPLY ("online_reply"),
     ONLINE_REPLY ("登录认证应答","online_reply"),
    /**
     * 登录认证应答
     */
     PONG ("pong"),
     PONG ("登录认证应答","pong"),
    /**
     * 计费模型验证请求应答
     */
     BILLING_MODE_VERIFY_REPLY ("billing_mode_verify_reply"),
     BILLING_MODE_VERIFY_REPLY ("计费模型验证请求应答","billing_mode_verify_reply"),
    /**
     * 计费模型请求应答
     */
     ACQUISITION_BILLING_MODE_REPLY ("acquisition_billing_mode_reply"),
     ACQUISITION_BILLING_MODE_REPLY ("计费模型请求应答","acquisition_billing_mode_reply"),
    /**
     * 读取实时监测数据
     */
     READ_REAL_TIME_MONITORING_DATA ("read_real_time_monitoring_data"),
     READ_REAL_TIME_MONITORING_DATA ("读取实时监测数据","read_real_time_monitoring_data"),
    /**
     * 充电结束
     */
     END_CHARGE ("end_charge"),
     END_CHARGE ("充电结束","end_charge"),
    /**
     * 运营平台确认启动充电
     */
     PLATFORM_CONFIRMATION_CHARGING ("platform_confirmation_charging"),
     PLATFORM_CONFIRMATION_CHARGING ("运营平台确认启动充电","platform_confirmation_charging"),
    /**
     * 运营平台远程控制启机
     */
     PLATFORM_START_CHARGING ("platform_start_charging"),
     PLATFORM_START_CHARGING ("运营平台远程控制启机","platform_start_charging"),
    /**
     * 运营平台远程停机
     */
     PLATFORM_STOP_CHARGING ("platform_stop_charging"),
     PLATFORM_STOP_CHARGING ("运营平台远程停机","platform_stop_charging"),
    /**
     * 交易记录确认
     */
     CONFIRM_TRANSACTION_RECORD ("confirm_transaction_record"),
     CONFIRM_TRANSACTION_RECORD ("交易记录确认","confirm_transaction_record"),
    /**
     * 远程账户余额更新
     */
     UPDATE_BALANCE ("update_balance"),
     UPDATE_BALANCE ("远程账户余额更新","update_balance"),
    /**
     * 离线卡数据同步
     */
     SYNCHRONIZE_OFFLINE_CARD ("synchronize_offline_card"),
     SYNCHRONIZE_OFFLINE_CARD ("离线卡数据同步","synchronize_offline_card"),
    /**
     * 离线卡数据清除
     */
     CLEAR_OFFLINE_CARD ("clear_offline_card"),
     CLEAR_OFFLINE_CARD ("离线卡数据清除","clear_offline_card"),
    /**
     * 离线卡数据查询
     */
     QUERY_OFFLINE_CARD ("query_offline_card"),
     QUERY_OFFLINE_CARD ("离线卡数据查询","query_offline_card"),
    /**
     * 充电桩工作参数设置
     */
     WORKING_PARAMETER_SETTING ("working_parameter_setting"),
     WORKING_PARAMETER_SETTING ("充电桩工作参数设置","working_parameter_setting"),
    /**
     * 对时设置
     */
     TIMING_SETTING ("timing_setting"),
     TIMING_SETTING ("对时设置","timing_setting"),
    /**
     * 计费模型设置
     */
     SETUP_BILLING_MODEL ("setup_billing_model"),
     SETUP_BILLING_MODEL ("计费模型设置","setup_billing_model"),
    /**
     * 遥控地锁升锁与降锁命令 （下行）
     */
     OPEN_OR_CLOSE_GROUND_LOCK ("open_or_close_ground_lock"),
     OPEN_OR_CLOSE_GROUND_LOCK ("遥控地锁升锁与降锁命令 （下行）","open_or_close_ground_lock"),
    /**
     * 远程重启
     */
     PLATFORM_RESTART ("platform_restart"),
     PLATFORM_RESTART ("远程重启","platform_restart"),
    /**
     * 远程更新
     */
     PLATFORM_REMOTE_UPDATE ("platform_remote_update"),
     PLATFORM_REMOTE_UPDATE ("远程更新","platform_remote_update"),
    ;
    private String key;
    private String value;


    ServiceIdMenu(String value) {
    ServiceIdMenu(String key,String value) {
        this.value = value;
    }
	

    public String getKey() {
        return key;
    }

    public void setKey(String key) {
        this.key = key;
    }

    public String getValue() {
        return value;
    }

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/api/IotInterfaceUtil.java

@@ -16,6 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RestController;

import java.text.MessageFormat;
import java.util.ArrayList;
@@ -25,7 +26,7 @@
 * iot接口调用工具类
 */
@Slf4j
@Component
@RestController
public class IotInterfaceUtil {

    private static final String dataFormat = "json";
@@ -40,10 +41,6 @@

    private String decodeUrl(String url) {
        return MessageFormat.format(url, iotDAConfig.getProjectId());
    }

    public static void main(String[] args) {

    }

    /**

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/produce/IotMessageProduce.java

@@ -13,12 +13,14 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * iotda消息发送
 */
@Slf4j
@Component
@RestController
public class IotMessageProduce {

    @Autowired
@@ -31,6 +33,7 @@
     * @param message 消息内容
     * @return
     */
    @PostMapping("/sendMessage")
    public String sendMessage(String deviceId,String name,String message){
        CreateMessageRequest request = new CreateMessageRequest();
        request.withDeviceId(deviceId);

 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;
@@ -129,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());
    }

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/AcquisitionBillingModeReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.AcquisitionBillingModeReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.AcquisitionBillingModeReply;

public interface AcquisitionBillingModeReplyService extends BaseService<AcquisitionBillingModeReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/AcquisitionBillingModeService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.AcquisitionBillingMode;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.AcquisitionBillingMode;

public interface AcquisitionBillingModeService extends BaseService<AcquisitionBillingMode> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/BillingModeVerifyReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.BillingModeVerifyReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.BillingModeVerifyReply;
import org.springframework.stereotype.Service;

public interface BillingModeVerifyReplyService extends BaseService<BillingModeVerifyReply> {

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/BillingModeVerifyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.BillingModeVerify;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.BillingModeVerify;

public interface BillingModeVerifyService extends BaseService<BillingModeVerify> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/BmsAbortService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.BmsAbort;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.BmsAbort;

public interface BmsAbortService extends BaseService<BmsAbort> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/BmsDemandAndChargerExportationService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.BmsDemandAndChargerExportation;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.BmsDemandAndChargerExportation;

public interface BmsDemandAndChargerExportationService extends BaseService<BmsDemandAndChargerExportation> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/BmsInformationService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.BmsInformation;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.BmsInformation;

public interface BmsInformationService extends BaseService<BmsInformation> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ChargingHandshakeService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.ChargingHandshake;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.ChargingHandshake;

public interface ChargingHandshakeService extends BaseService<ChargingHandshake> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ChargingPileReturnsGroundLockDataService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.ChargingPileReturnsGroundLockData;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.ChargingPileReturnsGroundLockData;

public interface ChargingPileReturnsGroundLockDataService extends BaseService<ChargingPileReturnsGroundLockData> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ChargingPileStartsChargingService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.ChargingPileStartsCharging;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.ChargingPileStartsCharging;

public interface ChargingPileStartsChargingService extends BaseService<ChargingPileStartsCharging> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ClearOfflineCardReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.ClearOfflineCardReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.ClearOfflineCardReply;

public interface ClearOfflineCardReplyService extends BaseService<ClearOfflineCardReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ClearOfflineCardService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.ClearOfflineCard;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.ClearOfflineCard;

public interface ClearOfflineCardService extends BaseService<ClearOfflineCard> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ConfirmTransactionRecordService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.ConfirmTransactionRecord;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.ConfirmTransactionRecord;

public interface ConfirmTransactionRecordService extends BaseService<ConfirmTransactionRecord> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/EndChargeService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.EndCharge;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.EndCharge;

public interface EndChargeService extends BaseService<EndCharge> {


 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/GroundLockRealTimeDataService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.GroundLockRealTimeData;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.GroundLockRealTimeData;

public interface GroundLockRealTimeDataService extends BaseService<GroundLockRealTimeData> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/MotorAbortService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.MotorAbort;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.MotorAbort;

public interface MotorAbortService extends BaseService<MotorAbort> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/OnlineReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.OnlineReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.OnlineReply;
import org.springframework.stereotype.Service;

/**

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/OnlineService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.Online;
import org.springframework.stereotype.Service;

/**

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/OpenOrCloseGroundLockService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.OpenOrCloseGroundLock;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.OpenOrCloseGroundLock;

public interface OpenOrCloseGroundLockService extends BaseService<OpenOrCloseGroundLock> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ParameterSettingService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.ParameterSetting;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.ParameterSetting;

public interface ParameterSettingService extends BaseService<ParameterSetting> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PingService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.Ping;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.Ping;

public interface PingService extends BaseService<Ping> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PlatformConfirmationChargingService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.PlatformConfirmationCharging;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.PlatformConfirmationCharging;

public interface PlatformConfirmationChargingService extends BaseService<PlatformConfirmationCharging> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PlatformRemoteUpdateReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.PlatformRemoteUpdateReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.PlatformRemoteUpdateReply;

public interface PlatformRemoteUpdateReplyService extends BaseService<PlatformRemoteUpdateReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PlatformRemoteUpdateService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.PlatformRemoteUpdate;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.PlatformRemoteUpdate;

public interface PlatformRemoteUpdateService extends BaseService<PlatformRemoteUpdate> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PlatformRestartReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.PlatformRestartReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.PlatformRestartReply;

public interface PlatformRestartReplyService extends BaseService<PlatformRestartReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PlatformRestartService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.PlatformRestart;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.PlatformRestart;

public interface PlatformRestartService extends BaseService<PlatformRestart> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PlatformStartChargingReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.PlatformStartChargingReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.PlatformStartChargingReply;

public interface PlatformStartChargingReplyService extends BaseService<PlatformStartChargingReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PlatformStartChargingService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.PlatformStartCharging;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.PlatformStartCharging;

public interface PlatformStartChargingService extends BaseService<PlatformStartCharging> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PlatformStopChargingReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.PlatformStopChargingReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.PlatformStopChargingReply;

public interface PlatformStopChargingReplyService extends BaseService<PlatformStopChargingReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PlatformStopChargingService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.PlatformStopCharging;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.PlatformStopCharging;

public interface PlatformStopChargingService extends BaseService<PlatformStopCharging> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/PongService.java

@@ -1,9 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.Pong;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.Pong;
import org.springframework.stereotype.Service;

/**
 * 心跳包应答接口

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/QueryOfflineCardReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.QueryOfflineCardReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.QueryOfflineCardReply;

public interface QueryOfflineCardReplyService extends BaseService<QueryOfflineCardReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/QueryOfflineCardService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.QueryOfflineCard;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.QueryOfflineCard;

public interface QueryOfflineCardService extends BaseService<QueryOfflineCard> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/ReadRealTimeMonitoringDataService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.ReadRealTimeMonitoringData;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.ReadRealTimeMonitoringData;

public interface ReadRealTimeMonitoringDataService extends BaseService<ReadRealTimeMonitoringData> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/SetupBillingModelReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.SetupBillingModelReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.SetupBillingModelReply;

public interface SetupBillingModelReplyService extends BaseService<SetupBillingModelReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/SetupBillingModelService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.SetupBillingModel;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.SetupBillingModel;

public interface SetupBillingModelService extends BaseService<SetupBillingModel> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/SynchronizeOfflineCardReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.SynchronizeOfflineCardReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.SynchronizeOfflineCardReply;

public interface SynchronizeOfflineCardReplyService extends BaseService<SynchronizeOfflineCardReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/SynchronizeOfflineCardService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.SynchronizeOfflineCard;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.SynchronizeOfflineCard;

public interface SynchronizeOfflineCardService extends BaseService<SynchronizeOfflineCard> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/TimingSettingReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.TimingSettingReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.TimingSettingReply;

public interface TimingSettingReplyService extends BaseService<TimingSettingReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/TimingSettingService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.TimingSetting;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.TimingSetting;

public interface TimingSettingService extends BaseService<TimingSetting> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/TransactionRecordService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.TransactionRecord;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.TransactionRecord;

public interface TransactionRecordService extends BaseService<TransactionRecord> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/UpdateBalanceReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.UpdateBalanceReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.UpdateBalanceReply;

public interface UpdateBalanceReplyService extends BaseService<UpdateBalanceReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/UpdateBalanceService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.UpdateBalance;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.UpdateBalance;

public interface UpdateBalanceService extends BaseService<UpdateBalance> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/UploadRealTimeMonitoringDataService.java

@@ -1,7 +1,8 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.UploadRealTimeMonitoringData;

public interface UploadRealTimeMonitoringDataService extends BaseService<UploadRealTimeMonitoringData> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/WorkingParameterSettingReplyService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.WorkingParameterSettingReply;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.WorkingParameterSettingReply;

public interface WorkingParameterSettingReplyService extends BaseService<WorkingParameterSettingReply> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/WorkingParameterSettingService.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service;

import com.ruoyi.integration.api.model.WorkingParameterSetting;
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.integration.mongodb.model.WorkingParameterSetting;

public interface WorkingParameterSettingService extends BaseService<WorkingParameterSetting> {
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/AcquisitionBillingModeReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.api.model.AcquisitionBillingModeReply;
import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.AcquisitionBillingModeReply;
import com.ruoyi.integration.mongodb.service.AcquisitionBillingModeReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/AcquisitionBillingModeServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.api.model.AcquisitionBillingMode;
import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.AcquisitionBillingMode;
import com.ruoyi.integration.mongodb.service.AcquisitionBillingModeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/BillingModeVerifyReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.BillingModeVerifyReply;
import com.ruoyi.integration.api.model.BillingModeVerifyReply;
import com.ruoyi.integration.mongodb.service.BillingModeVerifyReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/BillingModeVerifyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.BillingModeVerify;
import com.ruoyi.integration.api.model.BillingModeVerify;
import com.ruoyi.integration.mongodb.service.BillingModeVerifyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/BmsAbortServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.BmsAbort;
import com.ruoyi.integration.api.model.BmsAbort;
import com.ruoyi.integration.mongodb.service.BmsAbortService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/BmsDemandAndChargerExportationServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.BmsDemandAndChargerExportation;
import com.ruoyi.integration.api.model.BmsDemandAndChargerExportation;
import com.ruoyi.integration.mongodb.service.BmsDemandAndChargerExportationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/BmsInformationServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.BmsInformation;
import com.ruoyi.integration.api.model.BmsInformation;
import com.ruoyi.integration.mongodb.service.BmsInformationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ChargingHandshakeServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.ChargingHandshake;
import com.ruoyi.integration.api.model.ChargingHandshake;
import com.ruoyi.integration.mongodb.service.ChargingHandshakeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ChargingPileReturnsGroundLockDataServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.ChargingPileReturnsGroundLockData;
import com.ruoyi.integration.api.model.ChargingPileReturnsGroundLockData;
import com.ruoyi.integration.mongodb.service.ChargingPileReturnsGroundLockDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ChargingPileStartsChargingServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.ChargingPileStartsCharging;
import com.ruoyi.integration.api.model.ChargingPileStartsCharging;
import com.ruoyi.integration.mongodb.service.ChargingPileStartsChargingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ClearOfflineCardReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.ClearOfflineCardReply;
import com.ruoyi.integration.api.model.ClearOfflineCardReply;
import com.ruoyi.integration.mongodb.service.ClearOfflineCardReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ClearOfflineCardServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.ClearOfflineCard;
import com.ruoyi.integration.api.model.ClearOfflineCard;
import com.ruoyi.integration.mongodb.service.ClearOfflineCardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ConfirmTransactionRecordServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.ConfirmTransactionRecord;
import com.ruoyi.integration.api.model.ConfirmTransactionRecord;
import com.ruoyi.integration.mongodb.service.ConfirmTransactionRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/EndChargeServiceImpl.java

@@ -1,8 +1,8 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.EndCharge;
import com.ruoyi.integration.mongodb.model.Pong;
import com.ruoyi.integration.api.model.EndCharge;
import com.ruoyi.integration.api.model.Pong;
import com.ruoyi.integration.mongodb.service.EndChargeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/GroundLockRealTimeDataServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.GroundLockRealTimeData;
import com.ruoyi.integration.api.model.GroundLockRealTimeData;
import com.ruoyi.integration.mongodb.service.GroundLockRealTimeDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/MotorAbortServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.MotorAbort;
import com.ruoyi.integration.api.model.MotorAbort;
import com.ruoyi.integration.mongodb.service.MotorAbortService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/OnlineReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.OnlineReply;
import com.ruoyi.integration.api.model.OnlineReply;
import com.ruoyi.integration.mongodb.service.OnlineReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/OnlineServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.mongodb.service.OnlineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/OpenOrCloseGroundLockServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.OpenOrCloseGroundLock;
import com.ruoyi.integration.api.model.OpenOrCloseGroundLock;
import com.ruoyi.integration.mongodb.service.OpenOrCloseGroundLockService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ParameterSettingServiceImpl.java

@@ -2,7 +2,7 @@


import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.ParameterSetting;
import com.ruoyi.integration.api.model.ParameterSetting;
import com.ruoyi.integration.mongodb.service.ParameterSettingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PingServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.Ping;
import com.ruoyi.integration.api.model.Ping;
import com.ruoyi.integration.mongodb.service.PingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PlatformConfirmationChargingServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.PlatformConfirmationCharging;
import com.ruoyi.integration.api.model.PlatformConfirmationCharging;
import com.ruoyi.integration.mongodb.service.PlatformConfirmationChargingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PlatformRemoteUpdateReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.PlatformRemoteUpdateReply;
import com.ruoyi.integration.api.model.PlatformRemoteUpdateReply;
import com.ruoyi.integration.mongodb.service.PlatformRemoteUpdateReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PlatformRemoteUpdateServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.PlatformRemoteUpdate;
import com.ruoyi.integration.api.model.PlatformRemoteUpdate;
import com.ruoyi.integration.mongodb.service.PlatformRemoteUpdateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PlatformRestartReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.PlatformRestartReply;
import com.ruoyi.integration.api.model.PlatformRestartReply;
import com.ruoyi.integration.mongodb.service.PlatformRestartReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PlatformRestartServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.PlatformRestart;
import com.ruoyi.integration.api.model.PlatformRestart;
import com.ruoyi.integration.mongodb.service.PlatformRestartService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PlatformStartChargingReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.PlatformStartChargingReply;
import com.ruoyi.integration.api.model.PlatformStartChargingReply;
import com.ruoyi.integration.mongodb.service.PlatformStartChargingReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PlatformStartChargingServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.PlatformStartCharging;
import com.ruoyi.integration.api.model.PlatformStartCharging;
import com.ruoyi.integration.mongodb.service.PlatformStartChargingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PlatformStopChargingReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.PlatformStopChargingReply;
import com.ruoyi.integration.api.model.PlatformStopChargingReply;
import com.ruoyi.integration.mongodb.service.PlatformStopChargingReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PlatformStopChargingServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.PlatformStopCharging;
import com.ruoyi.integration.api.model.PlatformStopCharging;
import com.ruoyi.integration.mongodb.service.PlatformStopChargingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/PongServiceImpl.java

@@ -1,8 +1,8 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.Pong;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.Pong;
import com.ruoyi.integration.mongodb.service.OnlineService;
import com.ruoyi.integration.mongodb.service.PongService;
import org.springframework.beans.factory.annotation.Autowired;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/QueryOfflineCardReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.QueryOfflineCardReply;
import com.ruoyi.integration.api.model.QueryOfflineCardReply;
import com.ruoyi.integration.mongodb.service.QueryOfflineCardReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/QueryOfflineCardServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.QueryOfflineCard;
import com.ruoyi.integration.api.model.QueryOfflineCard;
import com.ruoyi.integration.mongodb.service.QueryOfflineCardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/ReadRealTimeMonitoringDataServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.ReadRealTimeMonitoringData;
import com.ruoyi.integration.api.model.ReadRealTimeMonitoringData;
import com.ruoyi.integration.mongodb.service.ReadRealTimeMonitoringDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/SetupBillingModelReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.SetupBillingModelReply;
import com.ruoyi.integration.api.model.SetupBillingModelReply;
import com.ruoyi.integration.mongodb.service.SetupBillingModelReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/SetupBillingModelServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.SetupBillingModel;
import com.ruoyi.integration.api.model.SetupBillingModel;
import com.ruoyi.integration.mongodb.service.SetupBillingModelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/SynchronizeOfflineCardReplyServiceImpl.java

@@ -1,8 +1,8 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.SetupBillingModel;
import com.ruoyi.integration.mongodb.model.SynchronizeOfflineCardReply;
import com.ruoyi.integration.api.model.SetupBillingModel;
import com.ruoyi.integration.api.model.SynchronizeOfflineCardReply;
import com.ruoyi.integration.mongodb.service.SynchronizeOfflineCardReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/SynchronizeOfflineCardServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.SynchronizeOfflineCard;
import com.ruoyi.integration.api.model.SynchronizeOfflineCard;
import com.ruoyi.integration.mongodb.service.SynchronizeOfflineCardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/TimingSettingReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.TimingSettingReply;
import com.ruoyi.integration.api.model.TimingSettingReply;
import com.ruoyi.integration.mongodb.service.TimingSettingReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/TimingSettingServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.TimingSetting;
import com.ruoyi.integration.api.model.TimingSetting;
import com.ruoyi.integration.mongodb.service.TimingSettingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/TransactionRecordServiceImpl.java

@@ -1,8 +1,8 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.TimingSetting;
import com.ruoyi.integration.mongodb.model.TransactionRecord;
import com.ruoyi.integration.api.model.TimingSetting;
import com.ruoyi.integration.api.model.TransactionRecord;
import com.ruoyi.integration.mongodb.service.TransactionRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UpdateBalanceReplyServiceImpl.java

@@ -1,8 +1,8 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.TransactionRecord;
import com.ruoyi.integration.mongodb.model.UpdateBalanceReply;
import com.ruoyi.integration.api.model.TransactionRecord;
import com.ruoyi.integration.api.model.UpdateBalanceReply;
import com.ruoyi.integration.mongodb.service.UpdateBalanceReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UpdateBalanceServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.UpdateBalance;
import com.ruoyi.integration.api.model.UpdateBalance;
import com.ruoyi.integration.mongodb.service.UpdateBalanceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java

@@ -1,7 +1,8 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.mongodb.service.UploadRealTimeMonitoringDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -25,8 +26,10 @@
        return mongoTemplate.findById(id, UploadRealTimeMonitoringData.class);
    }


    @Override
    public List<UploadRealTimeMonitoringData> findAll() {
        return mongoTemplate.findAll(UploadRealTimeMonitoringData.class);
    }

}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/WorkingParameterSettingReplyServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.WorkingParameterSettingReply;
import com.ruoyi.integration.api.model.WorkingParameterSettingReply;
import com.ruoyi.integration.mongodb.service.WorkingParameterSettingReplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/WorkingParameterSettingServiceImpl.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.mongodb.service.impl;

import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.model.WorkingParameterSetting;
import com.ruoyi.integration.api.model.WorkingParameterSetting;
import com.ruoyi.integration.mongodb.service.WorkingParameterSettingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/AcquisitionBillingModeMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.AcquisitionBillingMode;
import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.api.model.AcquisitionBillingMode;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.mongodb.service.AcquisitionBillingModeService;
import com.ruoyi.integration.rocket.model.AcquisitionBillingModeMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/BillingModeVerifyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.AcquisitionBillingMode;
import com.ruoyi.integration.mongodb.model.BillingModeVerify;
import com.ruoyi.integration.api.model.AcquisitionBillingMode;
import com.ruoyi.integration.api.model.BillingModeVerify;
import com.ruoyi.integration.mongodb.service.BillingModeVerifyService;
import com.ruoyi.integration.rocket.model.BillingModeVerifyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/BmsAbortMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.BillingModeVerify;
import com.ruoyi.integration.mongodb.model.BmsAbort;
import com.ruoyi.integration.api.model.BillingModeVerify;
import com.ruoyi.integration.api.model.BmsAbort;
import com.ruoyi.integration.mongodb.service.BmsAbortService;
import com.ruoyi.integration.rocket.model.BmsAbortMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/BmsDemandAndChargerExportationMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.BmsAbort;
import com.ruoyi.integration.mongodb.model.BmsDemandAndChargerExportation;
import com.ruoyi.integration.api.model.BmsAbort;
import com.ruoyi.integration.api.model.BmsDemandAndChargerExportation;
import com.ruoyi.integration.mongodb.service.BmsDemandAndChargerExportationService;
import com.ruoyi.integration.rocket.model.BmsDemandAndChargerExportationMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/BmsInformationMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.BmsDemandAndChargerExportation;
import com.ruoyi.integration.mongodb.model.BmsInformation;
import com.ruoyi.integration.api.model.BmsDemandAndChargerExportation;
import com.ruoyi.integration.api.model.BmsInformation;
import com.ruoyi.integration.mongodb.service.BmsInformationService;
import com.ruoyi.integration.rocket.model.BmsInformationMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/ChargingHandshakeMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.BmsInformation;
import com.ruoyi.integration.mongodb.model.ChargingHandshake;
import com.ruoyi.integration.api.model.BmsInformation;
import com.ruoyi.integration.api.model.ChargingHandshake;
import com.ruoyi.integration.mongodb.service.ChargingHandshakeService;
import com.ruoyi.integration.rocket.model.ChargingHandshakeMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/ChargingPileReturnsGroundLockDataMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.ChargingHandshake;
import com.ruoyi.integration.mongodb.model.ChargingPileReturnsGroundLockData;
import com.ruoyi.integration.api.model.ChargingHandshake;
import com.ruoyi.integration.api.model.ChargingPileReturnsGroundLockData;
import com.ruoyi.integration.mongodb.service.ChargingPileReturnsGroundLockDataService;
import com.ruoyi.integration.rocket.model.ChargingPileReturnsGroundLockDataMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/ChargingPileStartsChargingMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.ChargingPileReturnsGroundLockData;
import com.ruoyi.integration.mongodb.model.ChargingPileStartsCharging;
import com.ruoyi.integration.api.model.ChargingPileReturnsGroundLockData;
import com.ruoyi.integration.api.model.ChargingPileStartsCharging;
import com.ruoyi.integration.mongodb.service.ChargingPileStartsChargingService;
import com.ruoyi.integration.rocket.model.ChargingPileStartsChargingMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/ClearOfflineCardReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.ChargingPileStartsCharging;
import com.ruoyi.integration.mongodb.model.ClearOfflineCardReply;
import com.ruoyi.integration.api.model.ChargingPileStartsCharging;
import com.ruoyi.integration.api.model.ClearOfflineCardReply;
import com.ruoyi.integration.mongodb.service.ClearOfflineCardReplyService;
import com.ruoyi.integration.rocket.model.ClearOfflineCardReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/GroundLockRealTimeDataMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.ClearOfflineCardReply;
import com.ruoyi.integration.mongodb.model.GroundLockRealTimeData;
import com.ruoyi.integration.api.model.ClearOfflineCardReply;
import com.ruoyi.integration.api.model.GroundLockRealTimeData;
import com.ruoyi.integration.mongodb.service.GroundLockRealTimeDataService;
import com.ruoyi.integration.rocket.model.GroundLockRealTimeDataMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/MotorAbortMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.GroundLockRealTimeData;
import com.ruoyi.integration.mongodb.model.MotorAbort;
import com.ruoyi.integration.api.model.GroundLockRealTimeData;
import com.ruoyi.integration.api.model.MotorAbort;
import com.ruoyi.integration.mongodb.service.MotorAbortService;
import com.ruoyi.integration.rocket.model.MotorAbortMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/OnlineMessageListener.java

@@ -1,6 +1,6 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.mongodb.service.OnlineService;
import com.ruoyi.integration.rocket.model.OnlineMessage;
import com.ruoyi.integration.rocket.model.OnlineMessage;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/ParameterSettingMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.ParameterSetting;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.ParameterSetting;
import com.ruoyi.integration.mongodb.service.ParameterSettingService;
import com.ruoyi.integration.rocket.model.ParameterSettingMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/PingMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.Ping;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.Ping;
import com.ruoyi.integration.mongodb.service.OnlineService;
import com.ruoyi.integration.mongodb.service.PingService;
import com.ruoyi.integration.rocket.model.PingMessage;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/PlatformRemoteUpdateReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.PlatformRemoteUpdateReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.PlatformRemoteUpdateReply;
import com.ruoyi.integration.mongodb.service.PlatformRemoteUpdateReplyService;
import com.ruoyi.integration.rocket.model.PlatformRemoteUpdateReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/PlatformRestartReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.PlatformRestartReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.PlatformRestartReply;
import com.ruoyi.integration.mongodb.service.PlatformRestartReplyService;
import com.ruoyi.integration.rocket.model.PlatformRestartReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/PlatformStartChargingReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.PlatformStartChargingReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.PlatformStartChargingReply;
import com.ruoyi.integration.mongodb.service.PlatformStartChargingReplyService;
import com.ruoyi.integration.rocket.model.PlatformStartChargingReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/PlatformStopChargingReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.PlatformStopChargingReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.PlatformStopChargingReply;
import com.ruoyi.integration.mongodb.service.PlatformStopChargingReplyService;
import com.ruoyi.integration.rocket.model.PlatformStopChargingReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/QueryOfflineCardReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.QueryOfflineCardReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.QueryOfflineCardReply;
import com.ruoyi.integration.mongodb.service.QueryOfflineCardReplyService;
import com.ruoyi.integration.rocket.model.QueryOfflineCardReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/SetupBillingModelReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.SetupBillingModelReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.SetupBillingModelReply;
import com.ruoyi.integration.mongodb.service.SetupBillingModelReplyService;
import com.ruoyi.integration.rocket.model.SetupBillingModelReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/SynchronizeOfflineCardReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.SynchronizeOfflineCardReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.SynchronizeOfflineCardReply;
import com.ruoyi.integration.mongodb.service.SynchronizeOfflineCardReplyService;
import com.ruoyi.integration.rocket.model.SynchronizeOfflineCardReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/TimingSettingReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.TimingSettingReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.TimingSettingReply;
import com.ruoyi.integration.mongodb.service.TimingSettingReplyService;
import com.ruoyi.integration.rocket.model.TimingSettingReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/TransactionRecordMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.TransactionRecord;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.TransactionRecord;
import com.ruoyi.integration.mongodb.service.TransactionRecordService;
import com.ruoyi.integration.rocket.model.TransactionRecordMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/UpdateBalanceReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.UpdateBalanceReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.UpdateBalanceReply;
import com.ruoyi.integration.mongodb.service.UpdateBalanceReplyService;
import com.ruoyi.integration.rocket.model.UpdateBalanceReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/UploadRealTimeMonitoringDataMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.mongodb.service.UploadRealTimeMonitoringDataService;
import com.ruoyi.integration.rocket.model.UploadRealTimeMonitoringDataMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/WorkingParameterSettingReplyMessageListener.java

@@ -1,7 +1,7 @@
package com.ruoyi.integration.rocket.listener;

import com.ruoyi.integration.mongodb.model.Online;
import com.ruoyi.integration.mongodb.model.WorkingParameterSettingReply;
import com.ruoyi.integration.api.model.Online;
import com.ruoyi.integration.api.model.WorkingParameterSettingReply;
import com.ruoyi.integration.mongodb.service.WorkingParameterSettingReplyService;
import com.ruoyi.integration.rocket.model.WorkingParameterSettingReplyMessage;
import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;

 ruoyi-service/ruoyi-order/pom.xml

@@ -22,6 +22,10 @@
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-integration</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-account</artifactId>
        </dependency>
        <!-- ruoyi-modules-chargingPile-api -->

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -25,7 +25,9 @@
import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TOrderEvaluateService;
import com.ruoyi.order.service.TOrderEvaluateTagService;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import com.ruoyi.payment.api.vo.AliQueryOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -36,6 +38,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
import java.util.List;
@@ -65,8 +68,17 @@
    
    @Resource
    private RedisService redisService;
    
    @Resource
    private AliPaymentClient aliPaymentClient;
    
    @Autowired
    private AppUserClient appUserClient;

    
    
    
    
    
    @ResponseBody
    @PostMapping(value = "/chargingOrder")
@@ -77,7 +89,13 @@
        TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
        return AjaxResult.success(res);
    }
    @ResponseBody
    @PostMapping(value = "/chargingOrderInfo")
    @ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})
    public AjaxResult<TCharingOrderVO> chargingOrderInfo(String orderId){

        return AjaxResult.success();
    }

    @ResponseBody
    @PostMapping(value = "/addEvaluate")
@@ -205,20 +223,23 @@
    
    /**
     * 支付宝支付成功后的回调
     * @param request
     */
    @ResponseBody
    @PostMapping(value = "/chargingOrderALICallback")
    public void chargingOrderALICallback(HttpServletRequest request){
        Map<String, Object> data = wxPaymentClient.payNotify(request).getData();
        if(null != data){
            String out_trade_no = data.get("out_trade_no").toString();
            String transaction_id = data.get("transaction_id").toString();
            String attach = data.get("attach").toString();
    public void chargingOrderALICallback(@RequestBody AliQueryOrder aliQueryOrder, HttpServletResponse response){
        try {
            String out_trade_no = aliQueryOrder.getOutTradeNo();
            String transaction_id = aliQueryOrder.getTradeNo();
            String attach = aliQueryOrder.getPassbackParams();
            AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
            if(ajaxResult.isSuccess()){
            
                PrintWriter writer = response.getWriter();
                writer.println("success");
                writer.flush();
                writer.close();
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }
    

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -1,7 +1,5 @@
package com.ruoyi.order.service.impl;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,7 +21,6 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import com.ruoyi.order.api.query.ChargingOrderQuery;
@@ -33,11 +30,9 @@
import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
import com.ruoyi.payment.api.vo.PaymentOrder;
import com.ruoyi.payment.api.vo.*;
import io.seata.spring.annotation.GlobalTransactional;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +47,6 @@
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;

/**
 * <p>
@@ -84,6 +78,9 @@
    
    @Resource
    private WxPaymentClient wxPaymentClient;
	
    @Resource
    private AliPaymentClient aliPaymentClient;
    
    @Resource
    private ChargingPileClient chargingPileClient;
@@ -232,7 +229,14 @@
                }
            }
            if(2 == rechargePaymentType){
			
                AliQueryOrder data = aliPaymentClient.query(tChargingOrder.getCode()).getData();
                if(null != data){
                    //支付失败，删除无效的订单
                    String tradeStatus = data.getTradeStatus();
                    if(tradeStatus.equals("TRADE_CLOSED")){
                        this.removeById(tChargingOrder.getId());
                    }
                }
            }
        }
        
@@ -262,7 +266,19 @@
                }
            }
            if(2 == one.getRechargePaymentType()){
			
                AliQueryOrder data = aliPaymentClient.query(one.getCode()).getData();
                if(null != data){
                    String trade_state = data.getTradeStatus();
                    //支付失败，删除无效的订单
                    if(trade_state.equals("TRADE_CLOSED")){
                        this.removeById(one.getId());
                    }
                    if(trade_state.equals("WAIT_BUYER_PAY")){
                        //结束第三方支付，删除订单
                        aliPaymentClient.close(one.getCode());
                        this.removeById(one.getId());
                    }
                }
            }
        }
        
@@ -314,7 +330,17 @@
            return AjaxResult.success(data);
        }
        if(2 == addChargingOrder.getPaymentType()){
		
            AliPaymentReq req = new AliPaymentReq();
            req.setOutTradeNo(chargingOrder.getCode());
            req.setTotalAmount(chargingOrder.getPaymentAmount().toString());
            req.setSubject("充电充值");
            req.setBuyerOpenId(appUser.getAliOpenid());
            req.setBody("充电充值");
            AliPaymentResp data = aliPaymentClient.payment(req).getData();
            if(null != data){
                data.setNotifyUrl(data.getNotifyUrl() + "/t-charging-order/chargingOrderALICallback");
                return AjaxResult.success(data);
            }
        }
        throw new RuntimeException("无效的支付方式");
    }

 ruoyi-service/ruoyi-payment/pom.xml

@@ -128,6 +128,12 @@
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-payment</artifactId>
        </dependency>
    
        <dependency>
            <groupId>com.alipay.sdk</groupId>
            <artifactId>alipay-sdk-java</artifactId>
            <version>4.39.186.ALL</version>
        </dependency>
    </dependencies>

    <build>

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/config/AliProperties.java

New file
@@ -0,0 +1,54 @@
package com.ruoyi.payment.ali.config;


import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

/**
 * @author zhibing.pu
 * @Date 2024/8/23 16:08
 */
@Data
@Component
@ConfigurationProperties(prefix = "payment.ali")
public class AliProperties {
    /**
     * appid
     */
    private String appId;
    /**
     * 加签方式
     */
    private String signType;
    /**
     * 开发者私钥，由开发者自己生成
     */
    private String privateKey;
    /**
     * 支付宝公钥
     */
    private String alipayPublicKey;
    /**
     * 应用公钥证书文件本地路径
     */
    private String appCertPath;
    /**
     * 支付宝公钥证书文件本地路径
     */
    private String alipayPublicCertPath;
    /**
     * 支付宝根证书文件本地路径
     */
    private String rootCertPath;
    /**
     * 回调地址
     */
    private String notifyUrl;
    /**
     * V2接口地址
     */
    private String v2Path = "https://openapi.alipay.com/gateway.do";
	
	
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/config/SignType.java

New file
@@ -0,0 +1,39 @@
package com.ruoyi.payment.ali.config;

/**
 * @author zhibing.pu
 * @Date 2024/8/23 16:22
 */
public enum SignType {
    /**
     * V2版本
     */
    RSA2("RSA2"),
    /**
     * V3版本
     */
    RSA3("RSA2"),
    /**
     * 秘钥
     */
    SECRET_KEY("secret"),
    /**
     * 证书
     */
    CERT("cert");
	
	
    private String type;
	
    public String getType() {
        return type;
    }
	
    public void setType(String type) {
        this.type = type;
    }
	
    SignType(String type) {
        this.type = type;
    }
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java

New file
@@ -0,0 +1,228 @@
package com.ruoyi.payment.ali.v2;

import com.alibaba.fastjson.JSON;
import com.alipay.api.AlipayClient;
import com.alipay.api.AlipayConfig;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.domain.*;
import com.alipay.api.request.*;
import com.alipay.api.response.*;
import com.ruoyi.payment.ali.config.AliProperties;
import com.ruoyi.payment.ali.config.SignType;
import com.ruoyi.payment.ali.v2.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;


/**
 * 支付宝小程序支付
 * @author zhibing.pu
 * @Date 2024/8/23 16:05
 */
@Component
public class AppletPayUtil {
    private static Logger log = LoggerFactory.getLogger(AppletPayUtil.class);
	
    @Resource
    private AliProperties aliProperties;
	
	
    /**
     * 创建统一收单交易
     * @param pojo
     */
    public PaymentResp payment(PaymentReq pojo){
        try {
            // 初始化SDK
            AlipayClient alipayClient = new DefaultAlipayClient(getAlipayConfig());
            // 构造请求参数以调用接口
            AlipayTradeCreateRequest request = new AlipayTradeCreateRequest();
            AlipayTradeCreateModel model = new AlipayTradeCreateModel();
            // 设置商户订单号
            model.setOutTradeNo(pojo.getOutTradeNo());
            // 设置产品码
            model.setProductCode("JSAPI_PAY");
            // 设置小程序支付中
            model.setOpAppId(aliProperties.getAppId());
            // 设置订单总金额
            model.setTotalAmount(pojo.getTotalAmount());
            // 设置订单标题
            model.setSubject(pojo.getSubject());
            // 设置订单附加信息
            model.setBody(pojo.getBody());
            // 设置买家支付宝用户唯一标识
            model.setBuyerOpenId(pojo.getBuyerOpenId());
            //超时相对时间
            model.setTimeoutExpress(pojo.getTimeoutExpress());
            //异步返回参数
            model.setPassbackParams(pojo.getPassbackParams());
            request.setBizModel(model);
			
            AlipayTradeCreateResponse response = alipayClient.execute(request);
            log.info("-----调起支付宝支付-----");
            log.info("请求参数：{}", pojo);
            log.info("返回结果：{}", response.getBody());
            if (response.isSuccess()) {
                return PaymentResp.build(response.getOutTradeNo(), response.getTradeNo());
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return null;
    }
	
	
    /**
     * 查询支付订单
     * @param outTradeNo 业务流水号
     * @return
     */
    public QueryResp query(String outTradeNo){
        try {
            // 初始化SDK
            AlipayClient alipayClient = new DefaultAlipayClient(getAlipayConfig());
            // 构造请求参数以调用接口
            AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
            AlipayTradeQueryModel model = new AlipayTradeQueryModel();
            // 设置订单支付时传入的商户订单号
            model.setOutTradeNo(outTradeNo);
            request.setBizModel(model);
            AlipayTradeQueryResponse response = alipayClient.execute(request);
            log.info("-----查询支付宝支付-----");
            log.info("请求参数：{}", outTradeNo);
            log.info("返回结果：{}", response.getBody());
            if (response.isSuccess()) {
                return JSON.parseObject(response.getBody(), QueryResp.class);
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return null;
    }
	
	
    /**
     * 交易退款
     * @param req
     * @return
     */
    public RefundResp refund(RefundReq req){
        try {
            // 初始化SDK
            AlipayClient alipayClient = new DefaultAlipayClient(getAlipayConfig());
            // 构造请求参数以调用接口
            AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
            AlipayTradeRefundModel model = new AlipayTradeRefundModel();
            // 设置商户订单号
            model.setOutTradeNo(req.getOutTradeNo());
            // 设置退款商户订单号
            model.setOutRequestNo(req.getOutRequestNo());
            // 设置退款金额
            model.setRefundAmount(req.getRefundAmount());
            // 设置退款原因说明
            model.setRefundReason(req.getRefundReason());
            request.setBizModel(model);
            AlipayTradeRefundResponse response = alipayClient.execute(request);
            log.info("-----支付宝退款-----");
            log.info("请求参数：{}", req);
            log.info("返回结果：{}", response.getBody());
            if (response.isSuccess()) {
                return JSON.parseObject(response.getBody(), RefundResp.class);
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return null;
    }
	
    /**
     * 退款查询
     * @param req
     * @return
     */
    public QueryRefundResp queryRefund(QueryRefundReq req){
        try {
            // 初始化SDK
            AlipayClient alipayClient = new DefaultAlipayClient(getAlipayConfig());
            // 构造请求参数以调用接口
            AlipayTradeFastpayRefundQueryRequest request = new AlipayTradeFastpayRefundQueryRequest();
            AlipayTradeFastpayRefundQueryModel model = new AlipayTradeFastpayRefundQueryModel();
            // 设置商户订单号
            model.setOutTradeNo(req.getOutTradeNo());
            model.setOutRequestNo(req.getOutRequestNo());
            request.setBizModel(model);
            AlipayTradeFastpayRefundQueryResponse response = alipayClient.execute(request);
            log.info("-----查询支付宝退款-----");
            log.info("请求参数：{}", req);
            log.info("返回结果：{}", response.getBody());
            if (response.isSuccess()) {
                return JSON.parseObject(response.getBody(), QueryRefundResp.class);
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return null;
    }
	
    /**
     * 支付宝关闭订单
     * @param outTradeNo 业务流水号
     * @return
     */
    public boolean close(String outTradeNo){
        try {
            AlipayClient alipayClient = new DefaultAlipayClient(getAlipayConfig());
            AlipayTradeCloseRequest request = new AlipayTradeCloseRequest();
            AlipayTradeCloseModel model = new AlipayTradeCloseModel();
            model.setOutTradeNo(outTradeNo);
            request.setBizModel(model);
            AlipayTradeCloseResponse response = alipayClient.execute(request);
            log.info("-----关闭支付宝支付订单-----");
            log.info("请求参数：{}", outTradeNo);
            log.info("返回结果：{}", response.getBody());
            if(response.isSuccess()){
                return true;
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return false;
    }
	
	
	
    /**
     * 构建配置数据
     * @return
     */
    private AlipayConfig getAlipayConfig() throws Exception {
        AlipayConfig alipayConfig = new AlipayConfig();
        alipayConfig.setServerUrl(aliProperties.getV2Path());
        alipayConfig.setAppId(aliProperties.getAppId());
        alipayConfig.setFormat("json");
        alipayConfig.setCharset("UTF-8");
        alipayConfig.setSignType(SignType.RSA2.getType());
        //判断加签方式
        String signType = aliProperties.getSignType();
        if(SignType.CERT.getType().equals(signType)){
            alipayConfig.setPrivateKey(aliProperties.getPrivateKey());
            alipayConfig.setAlipayPublicKey(aliProperties.getAlipayPublicKey());
            return alipayConfig;
        }
        if(SignType.SECRET_KEY.getType().equals(signType)){
            alipayConfig.setAppCertPath(aliProperties.getAppCertPath());
            alipayConfig.setAlipayPublicCertPath(aliProperties.getAlipayPublicCertPath());
            alipayConfig.setRootCertPath(aliProperties.getRootCertPath());
            return alipayConfig;
        }
        throw new RuntimeException("构建配置失败");
    }
	
	
	
	
	
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/PaymentReq.java

New file
@@ -0,0 +1,52 @@
package com.ruoyi.payment.ali.v2.model;

import lombok.Data;


/**
 * @author zhibing.pu
 * @Date 2024/8/23 16:52
 */
@Data
public class PaymentReq {
    /**
     * 业务流水号
     */
    private String outTradeNo;
    /**
     * 支付总金额
     */
    private String totalAmount;
    /**
     * 订单标题
     */
    private String subject;
    /**
     * 支付用户支付宝openid
     */
    private String buyerOpenId;
    /**
     * 订单附加信息
     */
    private String body;
    /**
     * 订单超时时间
     * 订单相对超时时间。从交易创建时间开始计算。
     * 该笔订单允许的最晚付款时间，逾期将关闭交易。取值范围：1m～15d。m-分钟，h-小时，d-天，1c-当天（1c-当天的情况下，无论交易何时创建，都在0点关闭）。 该参数数值不接受小数点， 如 1.5h，可转换为 90m。
     * 当面付场景默认值为3h
     */
    private String timeoutExpress;
    /**
     * 回传参数
     * 如果请求时传递了该参数，支付宝会在异步通知时将该参数原样返回。
     */
    private String passbackParams;
	
    /**
     * 初始化默认数据
     */
    public PaymentReq() {
        //订单超时默认30分钟
        this.timeoutExpress = "30m";
    }
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/PaymentResp.java

New file
@@ -0,0 +1,30 @@
package com.ruoyi.payment.ali.v2.model;

import lombok.Data;


/**
 * @author zhibing.pu
 * @Date 2024/8/23 16:52
 */
@Data
public class PaymentResp {
    /**
     * 业务流水号
     */
    private String outTradeNo;
    /**
     * 支付宝交易号
     */
    private String tradeNo;
	
    private PaymentResp(String outTradeNo, String tradeNo) {
        this.outTradeNo = outTradeNo;
        this.tradeNo = tradeNo;
    }
	
    public static PaymentResp build(String outTradeNo, String tradeNo){
        PaymentResp info = new PaymentResp(outTradeNo, tradeNo);
        return info;
    }
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryRefundReq.java

New file
@@ -0,0 +1,19 @@
package com.ruoyi.payment.ali.v2.model;

import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/8/24 14:00
 */
@Data
public class QueryRefundReq {
    /**
     * 支付业务流水号
     */
    private String outTradeNo;
    /**
     * 退款业务流水号
     */
    private String outRequestNo;
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryRefundResp.java

New file
@@ -0,0 +1,43 @@
package com.ruoyi.payment.ali.v2.model;

import com.fasterxml.jackson.annotation.JsonSetter;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/8/24 13:58
 */
@Data
public class QueryRefundResp {
    /**
     * 支付宝交易号
     */
    @JsonSetter("trade_no")
    private String tradeNo;
    /**
     * 支付业务流水号
     */
    @JsonSetter("out_trade_no")
    private String outTradeNo;
    /**
     * 退款业务流水号
     */
    @JsonSetter("out_request_no")
    private String outRequestNo;
    /**
     * 交易金额
     */
    @JsonSetter("total_amount")
    private Double totalAmount;
    /**
     * 本次退款金额
     */
    @JsonSetter("refund_amount")
    private Double refundAmount;
    /**
     * 退款状态
     * REFUND_SUCCESS 退款处理成功； 未返回该字段表示退款请求未收到或者退款失败； 注：如果退款查询发起时间早于退款时间，或者间隔退款发起时间太短，可能出现退款查询时还没处理成功，后面又处理成功的情况，建议商户在退款发起后间隔10秒以上再发起退款查询请求。
     */
    @JsonSetter("refund_status")
    private String refundStatus;
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/QueryResp.java

New file
@@ -0,0 +1,48 @@
package com.ruoyi.payment.ali.v2.model;

import com.fasterxml.jackson.annotation.JsonSetter;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/8/24 12:01
 */
@Data
public class QueryResp {
    /**
     * 支付宝交易号
     */
    @JsonSetter("trade_no")
    private String tradeNo;
    /**
     * 业务流水号
     */
    @JsonSetter("out_trade_no")
    private String outTradeNo;
    /**
     * 交易状态
     * WAIT_BUYER_PAY（交易创建，等待买家付款）、TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、TRADE_SUCCESS（交易支付成功）、TRADE_FINISHED（交易结束，不可退款）
     */
    @JsonSetter("trade_status")
    private String tradeStatus;
    /**
     *  交易订单金额
     */
    @JsonSetter("total_amount")
    private Double totalAmount;
    /**
     * 回传参数
     */
    @JsonSetter("passback_params")
    private String passbackParams;
    /**
     * 订单标题
     */
    @JsonSetter("subject")
    private String subject;
    /**
     * 订单描述
     */
    @JsonSetter("body")
    private String body;
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/RefundReq.java

New file
@@ -0,0 +1,27 @@
package com.ruoyi.payment.ali.v2.model;

import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/8/24 13:47
 */
@Data
public class RefundReq {
    /**
     * 支付业务流水号
     */
    private String outTradeNo;
    /**
     * 退款业务流水号
     */
    private String outRequestNo;
    /**
     * 退款金额
     */
    private String refundAmount;
    /**
     * 退款原因
     */
    private String refundReason;
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/model/RefundResp.java

New file
@@ -0,0 +1,27 @@
package com.ruoyi.payment.ali.v2.model;

import com.fasterxml.jackson.annotation.JsonSetter;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/8/24 13:50
 */
@Data
public class RefundResp {
    /**
     * 支付宝交易号
     */
    @JsonSetter("trade_no")
    private String tradeNo;
    /**
     * 业务流水号
     */
    @JsonSetter("out_trade_no")
    private String outTradeNo;
    /**
     *  退款金额
     */
    @JsonSetter("refund_fee")
    private Double refundFee;
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java

New file
@@ -0,0 +1,86 @@
package com.ruoyi.payment.controller;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.payment.ali.config.AliProperties;
import com.ruoyi.payment.ali.v2.AppletPayUtil;
import com.ruoyi.payment.ali.v2.model.PaymentReq;
import com.ruoyi.payment.ali.v2.model.PaymentResp;
import com.ruoyi.payment.ali.v2.model.QueryResp;
import com.ruoyi.payment.api.vo.AliPaymentReq;
import com.ruoyi.payment.api.vo.AliPaymentResp;
import com.ruoyi.payment.api.vo.AliQueryOrder;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @author zhibing.pu
 * @Date 2024/8/24 14:29
 */
@RestController
@RequestMapping("/ali")
public class AliPayController {
	
    @Resource
    private AppletPayUtil appletPayUtil;
	
    @Resource
    private AliProperties aliProperties;
	
	
    /**
     * 调起支付宝小程序支付
     * @param req
     * @return
     */
    @ResponseBody
    @PostMapping("/payment")
    public R<AliPaymentResp> payment(@RequestBody AliPaymentReq req){
        PaymentReq pojo = new PaymentReq();
        BeanUtils.copyProperties(req, pojo);
        PaymentResp payment = appletPayUtil.payment(pojo);
        if(null != payment){
            AliPaymentResp aliPaymentResp = new AliPaymentResp();
            aliPaymentResp.setTradeNo(payment.getTradeNo());
            aliPaymentResp.setNotifyUrl(aliProperties.getNotifyUrl());
            return R.ok(aliPaymentResp);
        }
        return R.ok();
    }
	
    /**
     * 查询订单
     * @param outTradeNo
     * @return
     */
    @ResponseBody
    @PostMapping("/query")
    public R<AliQueryOrder> query(@RequestParam("outTradeNo") String outTradeNo){
        QueryResp query = appletPayUtil.query(outTradeNo);
        if(null != query){
            AliQueryOrder aliQueryOrder = new AliQueryOrder();
            BeanUtils.copyProperties(query, aliQueryOrder);
            return R.ok(aliQueryOrder);
        }
        return R.ok();
    }
	
    /**
     * 关闭订单
     * @param outTradeNo
     */
    @ResponseBody
    @PostMapping("/close")
    public void close(@RequestParam("outTradeNo") String outTradeNo){
        boolean close = appletPayUtil.close(outTradeNo);
        if(!close){
            throw new RuntimeException("关闭支付宝订单失败");
        }
    }
	
	
	
	
	
}

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java

File was renamed from ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java
@@ -1,4 +1,4 @@
package com.ruoyi.payment.wx.controller;
package com.ruoyi.payment.controller;

import com.fasterxml.jackson.core.type.TypeReference;
import com.ruoyi.common.core.domain.R;

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/config/WxConfig.java

@@ -13,7 +13,6 @@
 *
 * @author lihen
 */
@ConditionalOnProperty(name = "wx.conf.enabled")
@Configuration
public class WxConfig {


 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/model/WeixinProperties.java

@@ -13,8 +13,7 @@
 */
@ToString
@Component
@ConfigurationProperties(prefix = "wx.conf")
@Data
@ConfigurationProperties(prefix = "payment.wx")
public class WeixinProperties {
    /**
     * 默认开启