Merge remote-tracking branch 'origin/master'

xuhy

2024-08-24 1d3013d7df551314521df23be1901276b24849da

Merge remote-tracking branch 'origin/master'

 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/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-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java

@@ -20,7 +20,7 @@
    @ApiModelProperty(value = "充电终端名称 桩+枪")
    private String terminalName;
    @ApiModelProperty(value = "充电时间 秒")
    private Integer chargingSecond;
    private Long chargingSecond;
    @ApiModelProperty(value = "平台手续费")
    private BigDecimal platFormMoney;
    @ApiModelProperty(value = "三方平台分佣")
@@ -29,8 +29,7 @@
    private String licensePlate;
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "累计充电量")
    private BigDecimal chargingCapacity;

    @ApiModelProperty(value = "累计电费")
    private BigDecimal electrovalence;
    @ApiModelProperty(value = "累计服务费")

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java

@@ -15,7 +15,7 @@
    @ApiModelProperty(value = "总充电量")
    private BigDecimal total;
    @ApiModelProperty(value = "充电时长")
    private BigDecimal time;
    private Long time;
    @ApiModelProperty(value = "收入")
    private BigDecimal income;
    @ApiModelProperty(value = "电费")

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveHtml.java

New file
@@ -0,0 +1,18 @@
package com.ruoyi.other.api.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("广告列表查询DTO")
public class SaveHtml extends BasePage {

    @ApiModelProperty(value = "数据类型（1=积分规则说明，2=会员折扣说明，3=优惠券说明，4=双倍积分说明，5=商城专享价说明，6=会员协议，7=用户协议，8=隐私协议，9=邀请好友说明，10=资质证明，11=开票说明）")
    private Integer type;
    @ApiModelProperty(value = "标题")
    private String info;


}

 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/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,9 @@
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> {
    public R<UploadRealTimeMonitoringData> findByIdR(String id);
}

 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/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,14 @@
        return mongoTemplate.findById(id, UploadRealTimeMonitoringData.class);
    }


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

    @Override
    public R<UploadRealTimeMonitoringData> findByIdR(String id) {
        return R.ok(mongoTemplate.findById(id, UploadRealTimeMonitoringData.class));
    }
}

 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

@@ -67,9 +67,6 @@
    private RedisService redisService;
    @Autowired
    private AppUserClient appUserClient;
    
    
    

    @ResponseBody
    @PostMapping(value = "/chargingOrder")
@@ -80,7 +77,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")

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

@@ -3,6 +3,7 @@
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;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
@@ -38,6 +39,7 @@
import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
import com.ruoyi.payment.api.vo.PaymentOrder;
import io.seata.spring.annotation.GlobalTransactional;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -45,8 +47,10 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;

@@ -90,10 +94,7 @@
    
    @Resource
    private RedisService redisService;
	
	
	
	

    /**
     * 获取小程序充电记录列表数据
     * @param query
@@ -401,6 +402,8 @@
    @Override
    public TCharingOrderVO chargingOrder(ChargingOrderQuery dto) {
        TCharingOrderVO tCharingOrderVO = new TCharingOrderVO();


        String startTime1 = null;
        String startTime2 = null;
        String endTime1 = null;
@@ -425,7 +428,64 @@
        }
        PageInfo<ChargingOrderVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<ChargingOrderVO> list = this.baseMapper.chargingOrder(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);

         BigDecimal total = new BigDecimal("0");
         long time = 0L;
         BigDecimal income = new BigDecimal("0");
         BigDecimal electronicMoney = new BigDecimal("0");
         BigDecimal serviceMoney = new BigDecimal("0");
        for (ChargingOrderVO chargingOrderVO : list) {
            total = total.add(chargingOrderVO.getChargingCapacity());
            // 充电订单 明细记录
            List<TChargingOrderAccountingStrategy> chargingOrderId = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>()
                    .eq("charging_order_id", chargingOrderVO.getId()));
            // 单个订单累计电费
            BigDecimal electronicMoney1 = new BigDecimal("0");
            // 单个订单累计服务费
            BigDecimal serviceMoney1 = new BigDecimal("0");
            LocalDateTime startTime = chargingOrderVO.getStartTime();
            LocalDateTime endTime = chargingOrderVO.getEndTime();
            // 计算时间差 秒 充电时长
            long between = ChronoUnit.SECONDS.between(startTime, endTime);
            chargingOrderVO.setChargingSecond(between);
            time += between;
            // 总收入
            if (chargingOrderVO.getRefundStatus() == 2){
                income = income.add(chargingOrderVO.getPaymentAmount().subtract(chargingOrderVO.getRefundAmount()));
            }else{
                income = income.add(chargingOrderVO.getPaymentAmount());
            }
            for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : chargingOrderId) {
                // 累计电费
                electronicMoney1 = electronicMoney1.add(tChargingOrderAccountingStrategy.getElectrovalence()
                        .multiply(tChargingOrderAccountingStrategy.getChargingCapacity()));
                electronicMoney = electronicMoney.add(electronicMoney1);
                // 累计服务费
                serviceMoney1 = serviceMoney1.add(tChargingOrderAccountingStrategy.getServiceCharge());
                serviceMoney = serviceMoney.add(serviceMoney1);
            }
            chargingOrderVO.setServiceCharge(serviceMoney1);
            chargingOrderVO.setElectrovalence(electronicMoney1);
            // 充电时段数
            int size = chargingOrderId.size();
            chargingOrderVO.setCount(size);
            // 用户手机号
            TAppUser data = appUserClient.getUserById(chargingOrderVO.getAppUserId()).getData();
            if (data!=null){
                // 车牌号
                chargingOrderVO.setPhone(data.getPhone());
                List<Long> longs = new ArrayList<>();
                longs.add(chargingOrderVO.getAppUserCarId());
                List<TAppUserCar> data1 = appUserCarClient.getCarByIds(longs).getData();
                if (!data1.isEmpty()){
                    chargingOrderVO.setLicensePlate(data1.get(0).getLicensePlate());
                }
            }
        }
        tCharingOrderVO.setTotal(total);
        tCharingOrderVO.setTime(time);
        tCharingOrderVO.setIncome(income);
        tCharingOrderVO.setElectronicMoney(electronicMoney);
        tCharingOrderVO.setServiceMoney(serviceMoney);
        pageInfo.setRecords(list);
        tCharingOrderVO.setList(pageInfo);
        return tCharingOrderVO;

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java

@@ -8,6 +8,7 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.domain.THtml;
import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.other.api.dto.SaveHtml;
import com.ruoyi.other.service.THtmlService;
import com.ruoyi.other.service.TIntegralRuleService;
import io.swagger.annotations.ApiImplicitParam;
@@ -41,34 +42,9 @@
        return R.ok(res);
    }
    
    
    
    @PostMapping("/saveSet")
    @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分设置")
    public R saveSet(@RequestBody TIntegralRule dto) {
//        JSONObject jsonObject = JSONObject.parseObject(dto);
//        String chargeCredit = jsonObject.getString("chargeCredit");
//        String credit = jsonObject.getString("credit");
//        String inviteUsersToEarnPoints = jsonObject.getString("inviteUsersToEarnPoints");
//        String addVehiclesEarnsPoints = jsonObject.getString("addVehiclesEarnsPoints");
//        String signInForPoints = jsonObject.getString("signInForPoints");
//        TIntegralRule tIntegralRule = new TIntegralRule();
//        tIntegralRule.setAddVehiclesEarnsPoints(signInForPoints);
//        tIntegralRule.setChargeCredit(chargeCredit);
//        tIntegralRule.setCredit(credit);
//        tIntegralRule.setSignInForPoints(addVehiclesEarnsPoints);
//        tIntegralRule.setInviteUsersToEarnPoints(inviteUsersToEarnPoints);
//        TIntegralRule one = integralRuleService.getOne(null);
//        if (one!=null){
//            one.setAddVehiclesEarnsPoints(signInForPoints);
//            one.setChargeCredit(chargeCredit);
//            one.setCredit(credit);
//            one.setSignInForPoints(addVehiclesEarnsPoints);
//            one.setInviteUsersToEarnPoints(inviteUsersToEarnPoints);
//            integralRuleService.updateById(one);
//        }else{
//            integralRuleService.save(tIntegralRule);
//        }
        TIntegralRule one = integralRuleService.getOne(null);
        if (one!=null){
            dto.setId(one.getId());
@@ -100,32 +76,17 @@



    @GetMapping("/saveInfo")
    @PostMapping("/saveInfo")
    @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分说明")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "info", value = "内容", required = true),
            @ApiImplicitParam(name = "type", value = "type 1=积分规则说明，\" +\n" +
                    "            \"2=会员折扣说明，\" +\n" +
                    "            \"3=优惠券说明，\" +\n" +
                    "            \"4=双倍积分说明，\" +\n" +
                    "            \"5=商城专享价说明，\" +\n" +
                    "            \"6=会员协议，\" +\n" +
                    "            \"7=用户协议，\" +\n" +
                    "            \"8=隐私协议，\" +\n" +
                    "            \"9=邀请好友说明，\" +\n" +
                    "            \"10=资质证明，\" +\n" +
                    "            \"11=开票说明\"", required = true),

    })
    public R saveInfo(String info,Integer type) {
        THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
    public R saveInfo(@RequestBody SaveHtml dto) {
        THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",dto.getType()));
        if (g == null){
            THtml tHtml = new THtml();
            tHtml.setType(type);
            tHtml.setContent(info);
            tHtml.setType(dto.getType());
            tHtml.setContent(dto.getInfo());
            htmlService.save(tHtml);
        }else{
            g.setContent(info);
            g.setContent(dto.getInfo());
            htmlService.updateById(g);
        }
        return R.ok();