Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

zhibing.pu

2024-08-31 f6125b320b78b36c439e85d926cb2b11cd71fc6c

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile


 Conflicts:

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

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

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ParkingLotFallbackFactory.java

@@ -11,6 +11,8 @@
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;

/**
@@ -37,6 +39,11 @@
            public R<TParkingRecord> getRecordById(Long siteId) {
                return R.fail("通过id查询停车场记录：" + throwable.getMessage());
            }

            @Override
            public R<BigDecimal> getRecordAmount(LocalDate sixBefore) {
                return null;
            }
        };
    }
}

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java

@@ -1,5 +1,6 @@
package com.ruoyi.chargingPile.api.factory;

import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.domain.R;
@@ -34,6 +35,11 @@
            public R<List<Site>> getSiteAll() {
                return R.fail("获取所有站点调用失败：" + throwable.getMessage());
            }

            @Override
            public R<List<GetSiteListDTO>> getSiteListByUserId(Long userId) {
                return null;
            }
        };
    }
}

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ParkingLotClient.java

@@ -12,6 +12,8 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;

/**
@@ -30,4 +32,7 @@
    @PostMapping(value = "/t-parking-lot/getRecordById")
    public R<TParkingRecord> getRecordById(@RequestParam("id") Long siteId);

    @PostMapping(value = "/t-parking-lot/getRecordAmount")
    public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore);

}

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java

@@ -1,12 +1,15 @@
package com.ruoyi.chargingPile.api.feignClient;

import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.factory.SiteFallbackFactory;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

@@ -31,4 +34,7 @@
     */
    @PostMapping("/site/getSiteAll")
    R<List<Site>> getSiteAll();

    @GetMapping("/site/getSiteList/byUserId")
    R<List<GetSiteListDTO>> getSiteListByUserId(@RequestParam("userId") Long userId);
}

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java

@@ -39,6 +39,11 @@
    @ApiModelProperty(value = "车牌号")
    @TableField("license_plate")
    private String licensePlate;
    @TableField(exist = false)
    private String name;
    @TableField(exist = false)

    private String uid;
    @ApiModelProperty(value = "订单编号")
    @TableField("code")
    private String code;

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

@@ -9,6 +9,7 @@
import org.springframework.stereotype.Component;

import java.util.List;
import java.util.Set;

/**
 * 充电桩服务降级处理
@@ -35,6 +36,11 @@
            public R<List<UploadRealTimeMonitoringData>> getDataByOrderCode(String code) {
                return R.fail("根据订单编号获取所有监测数据失败：" + throwable.getMessage());
            }

            @Override
            public R<List<UploadRealTimeMonitoringData>> getAll(Set<String> values, Integer page, Integer size) {
                return null;
            }
        };
    }
}

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

@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;
import java.util.Set;

/**
 * @author zhibing.pu
@@ -32,4 +33,7 @@
     */
    @PostMapping("/uploadRealTimeMonitoringData/getDataByOrderCode")
    R<List<UploadRealTimeMonitoringData>> getDataByOrderCode(@RequestParam("code") String code);

    @PostMapping("/uploadRealTimeMonitoringData/getAll")
    R<List<UploadRealTimeMonitoringData>> getAll(@RequestParam("values") Set<String> values, @RequestParam("page") Integer page, @RequestParam("size")Integer size);
}

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

@@ -10,6 +10,7 @@
 */
@Data
public class BaseModel {
    private Date last_time = new Date();
    
    private Date create_time = new Date();
}

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

New file
@@ -0,0 +1,209 @@
package com.ruoyi.integration.api.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;

import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
 * 上传实时监测数据
 **/

@Data
@Document(collection = "upload_real_time_monitoring_data") //指定要对应的文档名（表名）
@Accessors(chain = true)
public class ChargingOrderAndUploadRealTimeMonitoringDataDto extends BaseModel {

    @Id
    private String id;
    private String transaction_serial_number; // 交易流水号
    private String charging_pile_code; // 桩编码
    private String charging_gun_code; // 抢号
    private Integer charging_gun_status; // 状态（0：离线，1：故障，2：空闲，3：充电）
    private Integer homing_status; // 枪是否归位（0：否，1：是，2：未知）
    private Integer insertion_status; // 是否插枪（0：否，1：是）
    private BigDecimal output_voltage; // 输出电压，精确到小数点后一位；待机置零
    private BigDecimal output_current; // 输出电流，精确到小数点后一位；待机置零
    private Integer gun_line_temperature; // 枪线温度，整形，偏移量-50；待机置零
    private String gun_line_code; // 枪线编码，没有置零
    private Integer soc; // SOC待机置零；交流桩置零
    private Integer battery_temperature; // 电池组最高温度，整形，偏移量-50 ºC；待机置零；交流桩置零
    private Integer cumulative_charging_time; // 累计充电时间，单位：min；待机置零
    private Integer time_remaining; // 剩余时间，单位：min；待机置零、交流桩置零
    @ApiModelProperty("充电度数")
    private BigDecimal charging_degree; // 充电度数，精确到小数点后四位；待机置零
    private BigDecimal loss_of_charging_degree; // 计损充电度数，精确到小数点后四位；待机置零，未设置计损比例时等于充电度数
    private BigDecimal paid_amount; // 已充金额，精确到小数点后四位；待机置零（电费+服务费）*计损充电度数

    @ApiModelProperty("时段电价")
    private BigDecimal electrovalence_all;
    @ApiModelProperty("时段服务费单价")
    private BigDecimal service_charge;
    @ApiModelProperty("时段电费")
    private BigDecimal period_electric_price;
    @ApiModelProperty("时段服务费")
    private BigDecimal period_service_price;
    private Integer hardware_fault; // 硬件故障（1：急停按钮动作故障；2：无可用整流模块；3：出风口温度过高；4：交流防雷故障；5：交直流模块 DC20 通信中断；6：绝缘检测模块 FC08 通信中断；7：电度表通信中断；8：读卡器通信中断；9：RC10 通信中断；10：风扇调速板故障；11：直流熔断器故障；12：高压接触器故障；13：门打开）、

    @ApiModelProperty(value = "订单编号")
    @TableField("code")
    private String code;

    @ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
    @TableField("order_type")
    private Integer orderType;
    @ApiModelProperty(value = "0平台1其他")
    @TableField("order_source")
    private Integer orderSource;

    @ApiModelProperty(value = "平台或其他第三分名字")
    @TableField("source_name")
    private String sourceName;
    @ApiModelProperty(value = "手续费")
    @TableField("commission_amount")
    private BigDecimal commissionAmount;
    @ApiModelProperty(value = "分佣")
    @TableField("sharing_amount")
    private BigDecimal sharingAmount;

    @ApiModelProperty(value = "订单分类（1=线上，2=线下）")
    @TableField("order_classification")
    private Integer orderClassification;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "充电车辆 id")
    @TableField("app_user_car_id")
    private Long appUserCarId;

    @ApiModelProperty(value = "站点 id")
    @TableField("site_id")
    private Integer siteId;

    @ApiModelProperty(value = "停车场id")
    @TableField("parking_lot_id")
    private Integer parkingLotId;

    @ApiModelProperty(value = "充电桩id")
    @TableField("charging_pile_id")
    private Integer chargingPileId;

    @ApiModelProperty(value = "充电枪id")
    @TableField("charging_gun_id")
    private Integer chargingGunId;

    @ApiModelProperty(value = "充电总度数")
    @TableField("charging_capacity")
    private BigDecimal chargingCapacity;

    @ApiModelProperty(value = "充电功率")
    @TableField("charging_power")
    private BigDecimal chargingPower;

    @ApiModelProperty(value = "充电开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("start_time")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "充电结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("end_time")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "结束方式（0=异常终止，1=主动终止，2=满电终止，3=费用不足终止）")
    @TableField("end_mode")
    private Integer endMode;

    @ApiModelProperty(value = "充值金额")
    @TableField("recharge_amount")
    private BigDecimal rechargeAmount;

    @ApiModelProperty(value = "充值支付方式（1=微信，2=支付宝）")
    @TableField("recharge_payment_type")
    private Integer rechargePaymentType;

    @ApiModelProperty(value = "充值支付状态（1=待支付，2=已支付）")
    @TableField("recharge_payment_status")
    private Integer rechargePaymentStatus;

    @ApiModelProperty(value = "充值支付第三方流水号")
    @TableField("recharge_serial_number")
    private String rechargeSerialNumber;

    @ApiModelProperty(value = "订单金额(总金额)")
    @TableField("order_amount")
    private BigDecimal orderAmount;

    @ApiModelProperty(value = "优惠券id")
    @TableField("app_coupon_id")
    private Long appCouponId;

    @ApiModelProperty(value = "优惠券抵扣金额")
    @TableField("coupon_discount_amount")
    private BigDecimal couponDiscountAmount;

    @ApiModelProperty(value = "会员折扣")
    @TableField("vip_discount")
    private BigDecimal vipDiscount;

    @ApiModelProperty(value = "会员优惠金额")
    @TableField("vip_discount_amount")
    private BigDecimal vipDiscountAmount;

    @ApiModelProperty(value = "支付金额（实付）")
    @TableField("payment_amount")
    private BigDecimal paymentAmount;

    @ApiModelProperty(value = "退款流水号")
    @TableField("refund_code")
    private String refundCode;

    @ApiModelProperty(value = "退款金额")
    @TableField("refund_amount")
    private BigDecimal refundAmount;

    @ApiModelProperty(value = "累计服务费")
    @TableField("service_charge")
    private BigDecimal serviceCharge;

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

    @ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
    @TableField("refund_status")
    private Integer refundStatus;

    @ApiModelProperty(value = "退款第三方流水号")
    @TableField("refund_serial_number")
    private String refundSerialNumber;

    @ApiModelProperty(value = "退款成功时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("refund_time")
    private LocalDateTime refundTime;


    @ApiModelProperty(value = "支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_time")
    private LocalDateTime payTime;


}



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

@@ -1,5 +1,6 @@
package com.ruoyi.integration.api.model;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.mongodb.core.mapping.Document;
@@ -34,6 +35,14 @@
    private BigDecimal paid_amount; // 已充金额，精确到小数点后四位；待机置零（电费+服务费）*计损充电度数
    private Integer hardware_fault; // 硬件故障（1：急停按钮动作故障；2：无可用整流模块；3：出风口温度过高；4：交流防雷故障；5：交直流模块 DC20 通信中断；6：绝缘检测模块 FC08 通信中断；7：电度表通信中断；8：读卡器通信中断；9：RC10 通信中断；10：风扇调速板故障；11：直流熔断器故障；12：高压接触器故障；13：门打开）

    private BigDecimal electrovalence_all;// @ApiModelProperty("时段电价")

    private BigDecimal service_charge;//@ApiModelProperty("时段服务费单价")

    private BigDecimal period_electric_price;//    @ApiModelProperty("时段电费")

    private BigDecimal period_service_price;//    @ApiModelProperty("时段服务费")


}


 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.query.TChargingCountQuery;
@@ -9,6 +11,8 @@
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

import java.util.List;

/**
 * 充电订单服务降级处理
@@ -37,6 +41,16 @@
            }

            @Override
            public R<List<TChargingOrder>> getList(Integer siteId) {
                return R.fail("根据站点id查询充电订单:" + throwable.getMessage());
            }

            @Override
            public R<List<ChargingOrderGroup>> getBySiteIdAndTime(ChargingPercentProvinceDto chargingPercentProvinceDto) {
                return null;
            }

            @Override
            public R<Integer> getChargingCount(TChargingCountQuery req) {
                return R.fail("根据会员id和有效期查询有效期内享受充电折扣次数:" + throwable.getMessage());
            }

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java

@@ -2,6 +2,8 @@

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.query.TChargingCountQuery;
@@ -11,6 +13,8 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * 充电订单服务
@@ -24,6 +28,16 @@
    @PostMapping(value = "/t-charging-order/detail")
    R<TChargingOrder> orderDetail(@RequestParam("orderId") Long orderId);


    @PostMapping(value = "/t-charging-order/getList")
    R<List<TChargingOrder>> getList(@RequestParam("siteId") Integer siteId);

    @PostMapping(value = "/t-charging-order/getBySiteIdAndTime")
    R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto);




    /**
     * 查询会员在本月有多少次享受了充电折扣
     * @param req

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java

@@ -39,6 +39,19 @@
    @ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
    @TableField("order_type")
    private Integer orderType;
    @ApiModelProperty(value = "0平台1其他")
    @TableField("order_source")
    private Integer orderSource;

    @ApiModelProperty(value = "平台或其他第三分名字")
    @TableField("source_name")
    private String sourceName;
    @ApiModelProperty(value = "手续费")
    @TableField("commission_amount")
    private BigDecimal commissionAmount;
    @ApiModelProperty(value = "分佣")
    @TableField("sharing_amount")
    private BigDecimal sharingAmount;

    @ApiModelProperty(value = "订单分类（1=线上，2=线下）")
    @TableField("order_classification")
@@ -146,6 +159,14 @@
    @TableField("refund_amount")
    private BigDecimal refundAmount;

    @ApiModelProperty(value = "累计服务费")
    @TableField("service_charge")
    private BigDecimal serviceCharge;

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

    @ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
    @TableField("refund_status")
    private Integer refundStatus;

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ChargingOrderGroup.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.common.core.dto;

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

import java.math.BigDecimal;
@Data
public class ChargingOrderGroup {
    @ApiModelProperty("充电量")
    BigDecimal chargingCapacity;
    @ApiModelProperty("站点")
    Integer siteId;
}

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ChargingPercentProvinceDto.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.common.core.dto;

import lombok.Data;

import java.time.LocalDate;
import java.time.LocalDateTime;

@Data
public class ChargingPercentProvinceDto {
    String provinceCode;
    LocalDate date1;
    LocalDate date2;
}

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java

@@ -11,6 +11,9 @@
import com.ruoyi.chargingPile.api.query.SiteQuery;
import com.ruoyi.chargingPile.api.vo.*;
import com.ruoyi.chargingPile.domain.SiteMenu;
import com.ruoyi.chargingPile.dto.ChargingPercentBack;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.GeodesyUtil;
@@ -18,6 +21,8 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.domain.SysUser;
@@ -33,8 +38,11 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @author zhibing.pu
@@ -72,6 +80,9 @@
    @Autowired
    private TAccountingStrategyDetailService accountingStrategyDetailService;

    @Resource
    private ChargingOrderClient chargingOrderClient;


    /**
     * 小程序扫一扫
@@ -105,6 +116,112 @@
        PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
        return AjaxResult.success(list);
    }
    @GetMapping("/getSiteList/byUserId")
    @ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
    public R<List<GetSiteListDTO>> getSiteListByUserId(@RequestParam("userId") Long userId){
        PageInfo<GetSiteListDTO> list = siteService.getSiteList1(userId);
        return R.ok(list.getRecords());
    }



    @GetMapping("/map/getSiteList")
    @ApiOperation(value = "获取站点", tags = {"管理后台-数据分析-电站分析"})
    public R<List<GetSiteListDTO>> getMapSiteList(GetSiteList siteList){
        siteList.setPageCurr(1);
        siteList.setPageCurr(99999);
        PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
        return R.ok(list.getRecords());
    }


    @GetMapping("/map/getPercent")
    @ApiOperation(value = "获取该充电站的利用率", tags = {"管理后台-数据分析-电站分析"})
    public R getPercent(Integer siteId){
        BigDecimal bigDecimal = new BigDecimal("0");
        //获取该站点的总充电度数
        List<TChargingOrder> chargingOrders = chargingOrderClient.getList(siteId).getData();
        for (TChargingOrder chargingOrder : chargingOrders) {
            bigDecimal = bigDecimal.add(chargingOrder.getChargingCapacity());
        }
        //获取该站点的所有充电桩
        List<TChargingPile> chargingPiles = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, siteId).list();
        BigDecimal bigDecimal1 = new BigDecimal("0");
        for (TChargingPile chargingPile : chargingPiles) {
            bigDecimal1 = bigDecimal1.add(chargingPile.getRatedPower());
        }
        BigDecimal multiply = bigDecimal1.multiply(new BigDecimal("24"));

        BigDecimal divide = bigDecimal.divide(multiply, 0, BigDecimal.ROUND_HALF_UP);


        return R.ok(divide);
    }




    @PostMapping("/map/getPercentByprovinceCode")
    @ApiOperation(value = "获取该充电站的利用率", tags = {"管理后台-数据分析-电站分析"})
    public R getPercentByCityCode(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto){

        if (chargingPercentProvinceDto.getDate1()==null){
            LocalDate today = LocalDate.now();
            LocalDate lastMonth = today.minusMonths(1);
            LocalDate firstDayOfLastMonth = lastMonth.withDayOfMonth(1);
            LocalDate lastDayOfLastMonth =lastMonth.withDayOfMonth(lastMonth.lengthOfMonth());
            chargingPercentProvinceDto.setDate1(firstDayOfLastMonth);
            chargingPercentProvinceDto.setDate2(lastDayOfLastMonth);
        }



        GetSiteList siteList = new GetSiteList();
        siteList.setProvinceCode(chargingPercentProvinceDto.getProvinceCode());
        siteList.setPageCurr(1);
        siteList.setPageCurr(9999);
        ChargingPercentBack chargingPercentBack = new ChargingPercentBack();

        //通过省编码获取充电站id
        List<GetSiteListDTO> records = siteService.getSiteList(siteList).getRecords();
        List<Integer> collect = records.stream().map(GetSiteListDTO::getId).collect(Collectors.toList());
        // 通过时间段获取和充电桩id获取各个充电站的充电订单
        List<ChargingOrderGroup> data = chargingOrderClient.getBySiteIdAndTime(chargingPercentProvinceDto).getData();
        // 计算利用率展示
        for (ChargingOrderGroup datum : data) {
            List<TChargingPile> chargingPiles = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, datum.getSiteId()).list();
            BigDecimal bigDecimal1 = new BigDecimal("0");
            for (TChargingPile chargingPile : chargingPiles) {
                bigDecimal1 = bigDecimal1.add(chargingPile.getRatedPower());
            }

            long daysBetween = ChronoUnit.DAYS.between(chargingPercentProvinceDto.getDate1(), chargingPercentProvinceDto.getDate2()) + 1;
            BigDecimal multiply = bigDecimal1.multiply(new BigDecimal("24")).multiply(BigDecimal.valueOf(daysBetween));
            //得到利用率
            BigDecimal divide = datum.getChargingCapacity().divide(multiply, 0, BigDecimal.ROUND_HALF_UP);
            //如果利用率大于等于10
            if (divide.compareTo(BigDecimal.valueOf(10))>=0){
                chargingPercentBack.setCount1(chargingPercentBack.getCount1()+1);
            }

            //如果利用率大于等于5小于10
            if (divide.compareTo(BigDecimal.valueOf(5))>=0 && divide.compareTo(BigDecimal.valueOf(10))<0){
                chargingPercentBack.setCount2(chargingPercentBack.getCount2()+1);
            }
            //如果利用率大于等于1小于5
            if (divide.compareTo(BigDecimal.valueOf(1))>=0 && divide.compareTo(BigDecimal.valueOf(5))<0){
                chargingPercentBack.setCount3(chargingPercentBack.getCount3()+1);
            }
            //如果利用率小于1
            if (divide.compareTo(BigDecimal.valueOf(1))<0){
                chargingPercentBack.setCount4(chargingPercentBack.getCount4()+1);
            }

        }
        return R.ok(chargingPercentBack);
    }


    @GetMapping("/getSiteList1")
    @ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-活动费用统计"})
    public AjaxResult<List<Site>> getSiteList1(){
@@ -162,7 +279,7 @@
        return AjaxResult.success(chargingPileService.getChargingGunList(siteId,type));
    }

    @ApiOperation(value = "获取站点下充电枪数量统计", tags = {"小程序-站点管理-站点详情"})
    @ApiOperation(value = "获取站点下充电枪数量统计", tags = {"小程序-站点管理-站点详情","管理后台-数据分析-电站分析"})
    @GetMapping("/getChargingGunCount")
    public AjaxResult<Map<String,ChargingGunCountVO>> getChargingGunCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId){
        return AjaxResult.success(chargingGunService.getChargingGunCount(siteId));

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java

@@ -26,6 +26,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;

@@ -149,5 +151,10 @@
    public R<TParkingRecord> getRecordById(@RequestParam("id") Long id){
        return R.ok(parkingRecordService.getById(id));
    }
    @PostMapping(value = "/getRecordAmount")
    public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore){
        BigDecimal sum =  parkingRecordService.getSum(sixBefore);
        return R.ok();
    }
}


 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java

@@ -1,8 +1,18 @@
package com.ruoyi.chargingPile.controller;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.chargingPile.api.model.TParkingLot;
import com.ruoyi.chargingPile.api.model.TParkingRecord;
import com.ruoyi.chargingPile.dto.ParkingRecordPageQuery;
import com.ruoyi.chargingPile.service.TParkingLotService;
import com.ruoyi.chargingPile.service.TParkingRecordService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * <p>
@@ -15,6 +25,39 @@
@RestController
@RequestMapping("/t-parking-record")
public class TParkingRecordController {
    @Resource
    private TParkingRecordService parkingRecordService;
    @Resource
    private TParkingLotService parkingLotService;

    @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "列表")
    @PostMapping(value = "/page")
    public R<Page<TParkingRecord>> page(@RequestBody ParkingRecordPageQuery query) {
        Page<TParkingRecord> page = parkingRecordService.lambdaQuery().ge(query.getStart() != null, TParkingRecord::getCreateTime, query.getStart())
                .le(query.getEnd() != null, TParkingRecord::getCreateTime, query.getEnd())
                .like(query.getLicensePlate() != null, TParkingRecord::getLicensePlate, query.getLicensePlate())
                .eq(query.getStatus() != null, TParkingRecord::getStatus, query.getStatus())
                .eq(query.getOutParkingType() != null, TParkingRecord::getOutParkingType, query.getOutParkingType())
                .page(Page.of(query.getPageCurr(), query.getPageSize()));

        for (TParkingRecord record : page.getRecords()) {
            record.setName(parkingLotService.getById(record.getParkingLotId()).getName());
            record.setUid(record.getId().toString());
        }
        return R.ok(page);
    }

    @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "出场")
    @GetMapping(value = "/out")
    public R out(Long id) {
        TParkingRecord byId = parkingRecordService.getById(id);
        byId.setStatus(2);
        parkingRecordService.updateById(byId);
        return R.ok();

    }



}


 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ChargingPercentBack.java

New file
@@ -0,0 +1,14 @@
package com.ruoyi.chargingPile.dto;

import lombok.Data;
import org.apache.poi.hpsf.Decimal;

import java.math.BigDecimal;

@Data
public class ChargingPercentBack {
    private Long count1 = 0L;
    private Long count2= 0L;
    private Long count3= 0L;
    private Long count4= 0L;
}

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/ParkingRecordPageQuery.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.chargingPile.dto;

import com.ruoyi.common.core.web.page.BasePage;
import lombok.Data;

import java.time.LocalDate;
import java.time.LocalDateTime;

@Data
public class ParkingRecordPageQuery extends BasePage {
    LocalDate start;
    LocalDate end;
    String licensePlate;
    Integer status;
    Integer outParkingType;
}

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TParkingRecordMapper.java

@@ -2,6 +2,10 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.chargingPile.api.model.TParkingRecord;
import org.apache.ibatis.annotations.Param;

import java.math.BigDecimal;
import java.time.LocalDate;

/**
 * <p>
@@ -13,4 +17,5 @@
 */
public interface TParkingRecordMapper extends BaseMapper<TParkingRecord> {

    BigDecimal getSum(@Param("sixBefore") LocalDate sixBefore);
}

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java

@@ -28,6 +28,7 @@
     * @return
     */
    PageInfo<GetSiteListDTO> getSiteList(GetSiteList siteList);
    PageInfo<GetSiteListDTO> getSiteList1(Long userId);
    
    
    /**

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TParkingRecordService.java

@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.chargingPile.api.model.TParkingRecord;

import java.math.BigDecimal;
import java.time.LocalDate;

/**
 * <p>
 *  服务类
@@ -13,4 +16,5 @@
 */
public interface TParkingRecordService extends IService<TParkingRecord> {

    BigDecimal getSum(LocalDate sixBefore);
}

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

@@ -109,6 +109,42 @@
    }
    
    
    @Override
    public PageInfo<GetSiteListDTO> getSiteList1(Long userId) {
        GetSiteList siteList = new GetSiteList();
        siteList.setPageCurr(1);
        siteList.setPageSize(9999);
        Set<Integer> ids = null;
        //校验合作商权限
        SysUser sysUser = sysUserClient.getSysUser(userId).getData();
        Integer roleType = sysUser.getRoleType();
        Integer objectId = sysUser.getObjectId();
        //合作商
        if(roleType == 2){
            ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
        }else{
            //非管理员需要根据角色和用户配置查询允许的站点数据
            if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
                List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
                List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
                data.addAll(data1);
                ids = new HashSet<>(data);
            }
        }
        PageInfo<GetSiteListDTO> pageInfo = new PageInfo<>(siteList.getPageCurr(), siteList.getPageSize());
        List<GetSiteListDTO> list = this.baseMapper.getSiteList(pageInfo, siteList, ids);
        for (GetSiteListDTO getSiteListDTO : list) {
            Integer siteId = getSiteListDTO.getId();
            getSiteListDTO.setAuthAccountingStrategy(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.SITE_ACCOUNTING_STRATEGY));
            //平台账号才有此权限
            getSiteListDTO.setAuthPartner(roleType == 1 ? true : false);
            getSiteListDTO.setAuthUpdate(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.SITE_UPDATE));
            getSiteListDTO.setAuthDelete(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.SITE_DELETE));
        }
        return pageInfo.setRecords(list);
    }


    
    
    /**

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

@@ -6,6 +6,9 @@
import com.ruoyi.chargingPile.service.TParkingRecordService;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.time.LocalDate;

/**
 * <p>
 *  服务实现类
@@ -17,4 +20,8 @@
@Service
public class TParkingRecordServiceImpl extends ServiceImpl<TParkingRecordMapper, TParkingRecord> implements TParkingRecordService {

    @Override
    public BigDecimal getSum(LocalDate sixBefore) {
        return this.baseMapper.getSum(sixBefore);
    }
}

 ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml

@@ -23,5 +23,8 @@
    <sql id="Base_Column_List">
        id, app_user_id, license_plate, vehicle_color, charging_order_id, parking_lot_id, in_parking_time, out_parking_time, parking_duration, order_amount, status, out_parking_type, create_time
    </sql>
    <select id="getSum" resultType="java.math.BigDecimal">
        select sum(timeout_amount) from t_parking_record where   in_parking_time >= #{sixBefore}
    </select>

</mapper>

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

@@ -10,6 +10,7 @@

import javax.annotation.Resource;
import java.util.List;
import java.util.Set;

/**
 * <p>
@@ -52,6 +53,14 @@
        return R.ok(list);
    }
    

    @PostMapping(value = "/getAll")
    public R<List<UploadRealTimeMonitoringData>> getAll(@RequestParam("values") Set<String> values,@RequestParam("page") Integer page, @RequestParam("size")Integer size){
        List<UploadRealTimeMonitoringData> list = uploadRealTimeMonitoringDataService.getDataAll(values,page,size);
        return R.ok(list);
    }

    
}



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

@@ -5,6 +5,7 @@
import com.ruoyi.integration.mongodb.base.BaseService;

import java.util.List;
import java.util.Set;

public interface UploadRealTimeMonitoringDataService extends BaseService<UploadRealTimeMonitoringData> {
    
@@ -14,5 +15,6 @@
     * @return
     */
    List<UploadRealTimeMonitoringData> getDataByOrderCode(String code);
    List<UploadRealTimeMonitoringData> getDataAll(Set<String> values, Integer page, Integer size);
    
}

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

@@ -6,6 +6,8 @@
import com.ruoyi.integration.iotda.constant.IotConstant;
import com.ruoyi.integration.mongodb.service.UploadRealTimeMonitoringDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
@@ -13,6 +15,7 @@
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Set;

@Service
public class UploadRealTimeMonitoringDataServiceImpl implements UploadRealTimeMonitoringDataService {
@@ -53,4 +56,21 @@
                , UploadRealTimeMonitoringData.class);
        return uploadRealTimeMonitoringData;
    }

    @Override
    public List<UploadRealTimeMonitoringData> getDataAll(Set<String> values, Integer page, Integer size) {
        Query query = new Query();
        if (!values.isEmpty()){
            query.addCriteria(Criteria.where("transaction_serial_number").in(values));
        }
        // 设置分页
        Pageable pageable = PageRequest.of(page, size);
        query.with(pageable);

        List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData = mongoTemplate.find(
                query.with(Sort.by("create_time"))
                , UploadRealTimeMonitoringData.class);
        return uploadRealTimeMonitoringData;
    }

}

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

@@ -2,6 +2,8 @@
import com.google.common.collect.Lists;

import java.math.BigDecimal;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.LocalDateTime;


@@ -9,6 +11,7 @@
import com.ruoyi.account.api.feignClient.AppUserCarClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
import com.ruoyi.chargingPile.api.feignClient.ParkingLotClient;
@@ -19,11 +22,18 @@
import com.ruoyi.chargingPile.api.model.TParkingRecord;
import com.ruoyi.chargingPile.api.vo.SiteVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.ChargingOrderAndUploadRealTimeMonitoringDataDto;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.ChargingOrderQuery;
@@ -39,6 +49,7 @@
import com.ruoyi.order.dto.OrderEvaluateVo;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.service.*;
import com.ruoyi.order.util.PreviousSixMonths;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import com.ruoyi.payment.api.vo.AliQueryOrder;
@@ -46,6 +57,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import jdk.nashorn.internal.runtime.ListAdapter;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -54,8 +67,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.time.YearMonth;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -87,9 +105,11 @@
    private AliPaymentClient aliPaymentClient;
    @Resource
    private TShoppingOrderService shoppingOrderService;
    @Resource

    @Resource
    private AppUserClient appUserClient;
    

    @Resource
    private TVipOrderService vipOrderService;
@@ -112,6 +132,9 @@
    private AppUserCarClient appUserCarClient;
    @Resource
    private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;




    @ResponseBody
    @PostMapping(value = "/pay/order/list")
@@ -171,11 +194,12 @@
//                    payOrderInfoDto3.setRefundAmount(new BigDecimal("0"));




        }
        return R.ok();

    }

    @ResponseBody
    @GetMapping(value = "/pay/order/refund/detail")
    @ApiOperation(value = "退款信息", tags = {"管理后台-支付订单-订单信息"})
@@ -224,6 +248,7 @@
    }



    @ResponseBody
    @PostMapping(value = "/pay/order/refund/list")
    @ApiOperation(value = "充电信息", tags = {"管理后台-支付订单-退款订单"})
@@ -231,6 +256,9 @@
        return chargingOrderService.getRefundList(chargingRefundDto);

    }





    @ResponseBody
@@ -269,7 +297,6 @@
        orderEvaluateService.addOrderEvaluate(dto);
        return AjaxResult.success();
    }

    /**
     * 查询用户最近一次充电记录使用的车辆
     *
@@ -292,7 +319,6 @@

    /**
     * 查询会员在本月有多少次享受了充电折扣
     *
     * @param req
     * @return
     */
@@ -304,7 +330,6 @@
                .between(TChargingOrder::getStartTime, req.getStartTime(), req.getEndTime())).size();
        return R.ok(size);
    }

    //用户订单数量
    @PostMapping(value = "/useOrderCount")
    public R<Long> useOrderCount(@RequestParam("userId") Long userId) {
@@ -319,9 +344,22 @@
        return R.ok(chargingOrderService.getById(orderId));
    }

    @PostMapping(value = "/getList")
    public R<List<TChargingOrder>> getList(@RequestParam("siteId") Integer siteId) {

        List<TChargingOrder> list = chargingOrderService.lambdaQuery().eq(TChargingOrder::getSiteId, siteId).list();
        return R.ok(list);
    }

    @PostMapping(value = "/getBySiteIdAndTime")
    public R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto) {

        List<ChargingOrderGroup> groups = chargingOrderService.chargingOrderGroup(chargingPercentProvinceDto);
        return R.ok(groups);
    }

    /**
     * 根据充电枪id获取正在进行中的订单
     *
     * @param chargingGunId 充电枪id
     * @return
     */
@@ -331,6 +369,8 @@
                .eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
        return R.ok(one);
    }
    
    


    @ResponseBody
@@ -351,6 +391,7 @@
    }


    
    @ResponseBody
    @GetMapping(value = "/getNoInvoicedOrder")
    @ApiOperation(value = "获取未开票的订单数据", tags = {"小程序-充电发票"})
@@ -358,6 +399,7 @@
        List<MyChargingOrderList> list = chargingOrderService.getNoInvoicedOrder(query);
        return AjaxResult.success(list);
    }
    


    @ResponseBody
@@ -369,7 +411,6 @@

    /**
     * 充电充值支付回调
     *
     * @param request
     */
    @ResponseBody
@@ -445,6 +486,7 @@
    }


    
    @ResponseBody
    @GetMapping(value = "/getChargingDetails/{id}")
    @ApiOperation(value = "获取充电中页面数据", tags = {"小程序-扫一扫"})
@@ -467,6 +509,125 @@
        return chargingOrderService.stopCharging(id);
    }
    
    @ResponseBody
    @GetMapping(value = "/six/charge")
    @ApiOperation(value = "电站收入分析", tags = {"后台-数据分析-平台收入分析"})
    public R<List<SixChargingDto>> charge(Integer siteId) {
        Long userId = SecurityUtils.getUserId();
        //如果没传siteId,获取当前登陆人所有的siteIds
        List<Integer> siteIds = new ArrayList<>();
        if (siteId==null){
            List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
            for (GetSiteListDTO datum : data) {
                siteIds.add(datum.getId());
            }
        }else {
            siteIds.add(siteId);
        }
        LocalDate sixBefore = PreviousSixMonths.get();
        //通过siteIds进行sql查询统计
        List<SixChargingDto> chargingDtos = chargingOrderService.charge(sixBefore, siteIds);

        return R.ok(chargingDtos);

    }

    @ResponseBody
    @GetMapping(value = "/six/circle")
    @ApiOperation(value = "电站收入占比", tags = {"后台-数据分析-平台收入分析"})
    public R<List<SixCircleDto>> circle() {
        Long userId = SecurityUtils.getUserId();
        //获取当前登录的siteIds
        List<Integer> siteIds = new ArrayList<>();
            List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
            for (GetSiteListDTO datum : data) {
                siteIds.add(datum.getId());
            }
        //进行统计groupBySiteId
        LocalDate sixBefore = PreviousSixMonths.get();

        List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore);
        for (SixCircleDto sixCircleDto : sixCircleDtos) {
            Site site = siteClient.getSiteByIds(Arrays.asList(sixCircleDto.getSiteId())).getData().get(0);
            sixCircleDto.setSiteName(site.getName());
        }
        return R.ok(sixCircleDtos);

    }


    @ResponseBody
    @GetMapping(value = "/six/shop")
    @ApiOperation(value = "购物收入", tags = {"后台-数据分析-平台收入分析"})
    public R<List<SixShopDto>> shop(Integer status) {
        //count近6个月的数据
        LocalDate sixBefore = PreviousSixMonths.get();
        List<SixShopDto> sixShopDtos =  shoppingOrderService.sixBefore(sixBefore,status);
        return R.ok(sixShopDtos);
    }

    @ResponseBody
    @GetMapping(value = "/six/vip")
    @ApiOperation(value = "vip收入", tags = {"后台-数据分析-平台收入分析"})
    public R<List<SixVipDto>> vip() {
        //count近6个月的数据
        LocalDate sixBefore = PreviousSixMonths.get();
        List<SixVipDto> vipDtos =  vipOrderService.sixBefore(sixBefore);
        return R.ok(vipDtos);
    }

    @ResponseBody
    @GetMapping(value = "/six/total")
    @ApiOperation(value = "底部数据分类", tags = {"后台-数据分析-平台收入分析"})
    public R<Map<String,BigDecimal>> total() {
        //count近6个月的数据
        LocalDate sixBefore = PreviousSixMonths.get();
        Map<String,BigDecimal>  map = chargingOrderService.countAll(sixBefore);
        BigDecimal data = parkingLotClient.getRecordAmount(sixBefore).getData();
        map.put("parkingAmount",data);
        BigDecimal data1 =   shoppingOrderService.getSumAmount(sixBefore);
        map.put("shopAmount",data1);
        BigDecimal data2 =   vipOrderService.getSumAmout(sixBefore);
        map.put("vipAmount",data2);

    return R.ok(map);
    }

    @Resource
    private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
    @ResponseBody
    @PostMapping(value = "/watch/chargingOrder")
    @ApiOperation(value = "监控订单", tags = {"管理后台-订单管理"})
    public AjaxResult<TCharingOrderVO> watchChargingOrder(@RequestBody ChargingOrderQuery dto) {
        Integer page = dto.getPageCurr();
        Integer pageSize = dto.getPageSize();
        List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
        dto.setUserIds(data);
        dto.setPageCurr(1);
        dto.setPageSize(99999);
        TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
        Map<String,TChargingOrder> map = new HashMap<>();
        //吧list放入map中
        for (ChargingOrderVO record : res.getList().getRecords()) {
            map.put(record.getCode(),record);
        }
        Set<String> strings = map.keySet();


        List<UploadRealTimeMonitoringData> data1 = uploadRealTimeMonitoringDataClient.getAll(strings, page, pageSize).getData();

        List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
        for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data1) {
            ChargingOrderAndUploadRealTimeMonitoringDataDto dataDto = new ChargingOrderAndUploadRealTimeMonitoringDataDto();
            BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
            BeanUtils.copyProperties(map.get(uploadRealTimeMonitoringData.getCharging_pile_code()),dataDto);
            dtos.add(dataDto);
        }


        return AjaxResult.success(res);
    }
    
    
    
    
@@ -479,5 +640,136 @@
        chargingOrderService.chargeMonitoring(query);
    }
    




//    @ResponseBody
//    @PostMapping(value = "/charging/statistics")
//    @ApiOperation(value = "统计", tags = {"管理后台-数据分析-充电运营分析"})
//    public R<TCharingOrderVO> watchChargingOrder(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){
//        List<Integer> siteIds =new ArrayList<>();
//        if (statisticsQueryDto.getSiteId()==null) {
//            Long userId = SecurityUtils.getUserId();
//            //获取当前登录的siteIds
//            List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
//            for (GetSiteListDTO datum : data) {
//                siteIds.add(datum.getId());
//            }
//        }else {
//            siteIds.add(statisticsQueryDto.getSiteId());
//        }
//
//
//        LocalDate start = null;
//        LocalDate end = null;
//        if (statisticsQueryDto.getDayType()==1){
//            start = LocalDate.now();
//
//        }else if (statisticsQueryDto.getDayType()==2){
//            LocalDate today = LocalDate.now();
//
//            // 获取本周一的日期
//            LocalDate mondayThisWeek = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
//
//            System.out.println("本周一是: " + mondayThisWeek);
//        }
//        else if (statisticsQueryDto.getDayType()==3){
//            // 获取当前日期
//            LocalDate today = LocalDate.now();
//
//            // 获取本月1号的日期
//            YearMonth yearMonth = YearMonth.from(today);
//            start = yearMonth.atDay(1);
//
//            System.out.println("本月1号是: " + start);
//        }else if (statisticsQueryDto.getDayType()==4){
//            LocalDate today = LocalDate.now();
//            // 获取当前年份
//            int currentYear = today.getYear();
//            // 获取今年1月1日的日期
//            start = LocalDate.of(currentYear, 1, 1);
//            System.out.println("今年1月1日是: " + start);
//        }else if (statisticsQueryDto.getDayType()==5){
//
//            // 获取今年1月1日的日期
//            start = statisticsQueryDto.getStartTime();
//            end = statisticsQueryDto.getEndTime();
//        }
//        List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getStartTime, start).le(TChargingOrder::getEndTime, end).in(TChargingOrder::getSiteId, siteIds).list();
//        List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
//        //上方饼图
//         List<Map<String,BigDecimal>> maps =   chargingOrderService.getSumByType(chargingOrderIds);
//
//        if (statisticsQueryDto.getDayType()==1){
//            List<Map<String,BigDecimal>> maps1 = chargingOrderService.getDateData(chargingOrderIds);
//
//        }else if (statisticsQueryDto.getDayType()==2){
//            List<Map<String,BigDecimal>> maps1 = chargingOrderService.getWeekData(chargingOrderIds);
//        }else if (statisticsQueryDto.getDayType()==3){
//            List<Map<String,BigDecimal>> maps1 = chargingOrderService.getMonthData(chargingOrderIds);
//        }else  if (statisticsQueryDto.getDayType()==4){
//            List<Map<String,BigDecimal>> maps1 = chargingOrderService.getYearData(chargingOrderIds);
//        }
//
//
//
//
//
//
//    }

    public static void main(String[] args) {
        // 示例数据
        List<TChargingOrder> list = getSampleData();
        System.err.println(list);
        List<Map<String, BigDecimal>> result = processData(list);

        result.forEach(System.out::println);
}


    private static List<TChargingOrder> getSampleData() {
        // 这里可以替换为实际查询逻辑
        List<TChargingOrder> list = new ArrayList<>();
        // 示例数据
        for (int i = 0; i < 24; i++) {
            TChargingOrder order = new TChargingOrder();
            order.setStartTime(LocalDateTime.now().minusHours(23 - i));
            order.setOrderAmount(BigDecimal.valueOf(i + 1));
            list.add(order);
        }
        return list;
    }

    private static List<Map<String, BigDecimal>> processData(List<TChargingOrder> list) {
        Map<LocalDateTime, BigDecimal> hourlySum = new HashMap<>();

        // 按每个小时分组并求和
        for (TChargingOrder order : list) {
            LocalDateTime hour = order.getStartTime().truncatedTo(ChronoUnit.HOURS);
            BigDecimal amount = order.getOrderAmount();
            hourlySum.merge(hour, amount, BigDecimal::add);
        }

        // 创建结果列表
        List<Map<String, BigDecimal>> resultList = new ArrayList<>();
        for (int i = 1; i <= 23; i++) {
            LocalDateTime keyHour = LocalDateTime.now().withHour(i);
            BigDecimal sum = BigDecimal.ZERO;

            // 计算键之后的一小时的数据之和
            for (int j = i + 1; j <= 23; j++) {
                LocalDateTime nextHour = LocalDateTime.now().withHour(j);
                sum = sum.add(hourlySum.getOrDefault(nextHour, BigDecimal.ZERO));
            }

            Map<String, BigDecimal> entry = new HashMap<>();
            entry.put(String.valueOf(i), sum);
            resultList.add(entry);
        }

        return resultList;
    }

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingStatisticsQueryDto.java

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

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

import java.time.LocalDate;

@Data
public class ChargingStatisticsQueryDto {
    @ApiModelProperty("电站id")
    private Integer siteId;
    @ApiModelProperty("1今日2本周3本月4今年5自定义")
    private Integer dayType;
    @ApiModelProperty("开始时间")
    private LocalDate startTime;
    @ApiModelProperty("结束时间")
    private LocalDate endTime;
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/SixChargingDto.java

New file
@@ -0,0 +1,19 @@
package com.ruoyi.order.dto;

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

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;

@Data
public class SixChargingDto {
    private String month;
    @ApiModelProperty("电费")
    private BigDecimal electrovalence;
    @ApiModelProperty("服务费")
    private BigDecimal serviceCharge;


}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/SixCircleDto.java

New file
@@ -0,0 +1,11 @@
package com.ruoyi.order.dto;

import lombok.Data;

import java.math.BigDecimal;
@Data
public class SixCircleDto {
    Integer siteId;
    BigDecimal paymentAmount;
    String siteName;
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/SixMonthTotal.java

New file
@@ -0,0 +1,5 @@
package com.ruoyi.order.dto;

public class SixMonthTotal {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/SixShopDto.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.order.dto;

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

import java.math.BigDecimal;

@Data
public class SixShopDto {
    private String month;
    private Long count;
    private BigDecimal paymentAmount;
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/SixVipDto.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.order.dto;

import lombok.Data;

import java.math.BigDecimal;

@Data
public class SixVipDto {
    private String month;
    private String vipName;
    private Integer vipId;
    private BigDecimal paymentAmount;
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderRefund;
@@ -11,6 +13,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@@ -54,6 +58,24 @@

    List<TChargingOrderRefund> getRefundList(@Param("pageInfo")PageInfo<TChargingOrderRefund> pageInfo,@Param("data")  ChargingRefundDto chargingRefundDto);

    List<ChargingOrderGroup> chargingOrderGroup(@Param("chargingPercentProvinceDto")ChargingPercentProvinceDto chargingPercentProvinceDto);

    List<SixChargingDto> charge(@Param("sixBefore")LocalDate sixBefore,@Param("siteIds") List<Integer> siteIds);

    List<SixCircleDto> circle(@Param("siteIds")List<Integer> siteIds,@Param("sixBefore")LocalDate sixBefore);

    Map<String, BigDecimal> countAll(@Param("sixBefore")LocalDate sixBefore);

    List<Map<String, BigDecimal>> getSumByType(@Param("chargingOrderIds")List<Long> chargingOrderIds);

    List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds);

    List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds);

    List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);

    List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);

    List<ChargingOrderListVO> chargingList(@Param("pageInfo")PageInfo<ChargingOrderListVO> pageInfo, @Param("req")ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);
    List<ChargingOrderListVO> chargingList1( @Param("req")ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TShoppingOrderMapper.java

@@ -6,9 +6,12 @@
import com.ruoyi.order.api.query.ShoppingOrderQuery;
import com.ruoyi.order.api.query.TActivityStatisticsQuery;
import com.ruoyi.order.api.vo.TActivityStatisticslVO;
import com.ruoyi.order.dto.SixShopDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;

/**
@@ -38,4 +41,7 @@

    List<TShoppingOrder> pageList(@Param("pageInfo")PageInfo<TShoppingOrder> pageInfo, @Param("req")ShoppingOrderQuery query, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2);

    List<SixShopDto> sixBefore(@Param("sixBefore")LocalDate sixBefore,@Param("status") Integer status);

    BigDecimal getSumAmount(@Param("sixBefore")LocalDate sixBefore);
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TVipOrderMapper.java

@@ -6,9 +6,12 @@
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.order.api.query.ShoppingOrderQuery;
import com.ruoyi.order.api.query.VipShoppingOrderQuery;
import com.ruoyi.order.dto.SixVipDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;

/**
@@ -25,4 +28,7 @@
    List<TVipOrder> pageList(@Param("pageInfo")PageInfo<TVipOrder> pageInfo, @Param("req") VipShoppingOrderQuery query, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2);


    List<SixVipDto> sixBefore(@Param("sixBefore")LocalDate sixBefore);

    BigDecimal getSumAmout(@Param("sixBefore")LocalDate sixBefore);
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -15,6 +17,8 @@
import com.ruoyi.order.dto.*;
import org.springframework.web.bind.annotation.RequestBody;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@@ -105,6 +109,24 @@

    R<PageInfo<TChargingOrderRefund>> getRefundList(ChargingRefundDto chargingRefundDto);

    List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto);

    List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds);

    List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);

    Map<String, BigDecimal> countAll(LocalDate sixBefore);

    List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds);

    List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds);

    List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds);

    List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);

    List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);

    ChargingOrderTimeVO chargingList(ChargingListQuery dto);
    
    

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java

@@ -8,13 +8,12 @@
import com.ruoyi.order.api.query.TActivityStatisticsQuery;
import com.ruoyi.order.api.vo.TActivityStatisticslVO;
import com.ruoyi.order.api.vo.TActivityVO;
import com.ruoyi.order.dto.GetMyShoppingOrderList;
import com.ruoyi.order.dto.GetNoInvoicedOrder;
import com.ruoyi.order.dto.MyShoppingOrderInfo;
import com.ruoyi.order.dto.MyShoppingOrderList;
import com.ruoyi.order.dto.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@@ -78,4 +77,7 @@

    PageInfo<TShoppingOrder> pageList(ShoppingOrderQuery query);

    List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status);

    BigDecimal getSumAmount(LocalDate sixBefore);
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TVipOrderService.java

@@ -4,6 +4,11 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.order.api.query.VipShoppingOrderQuery;
import com.ruoyi.order.dto.SixVipDto;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;

/**
 * <p>
@@ -16,4 +21,8 @@
public interface TVipOrderService extends IService<TVipOrder> {

    PageInfo<TVipOrder> pageList(VipShoppingOrderQuery query);

    List<SixVipDto> sixBefore(LocalDate sixBefore);

    BigDecimal getSumAmout(LocalDate sixBefore);
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
@@ -19,6 +20,8 @@
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -62,6 +65,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
@@ -109,6 +113,8 @@
    private AliPaymentClient aliPaymentClient;
    

	

    @Resource
    private AppUserVipDetailClient appUserVipDetailClient;
    
@@ -126,6 +132,7 @@
    
    @Resource
    private TOrderEvaluateService orderEvaluateService;

    
    @Resource
    private AccountingStrategyDetailClient accountingStrategyDetailClient;
@@ -695,9 +702,6 @@
        chargingOrder.setEndMode(1);
        this.updateById(chargingOrder);
        //调用硬件停止充电，停止成功后开始计算费用退款
		
		
		
        // todo 待完善
        return AjaxResult.success();
    }
@@ -832,6 +836,52 @@
    }

    @Override
    public List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto) {

        return this.baseMapper.chargingOrderGroup(chargingPercentProvinceDto);
    }

    @Override
    public List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds) {
        return this.baseMapper.charge(sixBefore,siteIds);
    }

    @Override
    public List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore) {
        return this.baseMapper.circle(siteIds,sixBefore);
    }

    @Override
    public Map<String, BigDecimal> countAll(LocalDate sixBefore) {
        return this.baseMapper.countAll(sixBefore);
    }

    @Override
    public List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds) {
        return this.baseMapper.getSumByType(chargingOrderIds);
    }

    @Override
    public List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds) {
        return this.baseMapper.getDateData(chargingOrderIds);
    }

    @Override
    public List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds) {
        return this.baseMapper.getWeekData(chargingOrderIds);
    }

    @Override
    public List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds) {
        return this.baseMapper.getMonthData(chargingOrderIds);
    }

    @Override
    public List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds) {
        return this.baseMapper.getYearData(chargingOrderIds);
    }

    @Override
    public ChargingOrderTimeVO chargingList(ChargingListQuery dto) {
        String startTime1 = null;
        String startTime2 = null;

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

@@ -44,6 +44,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -534,4 +535,16 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status) {
        return this.baseMapper.sixBefore(sixBefore,status);
    }

    @Override
    public BigDecimal getSumAmount(LocalDate sixBefore) {
        return this.baseMapper.getSumAmount(sixBefore);
    }


}

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

@@ -5,6 +5,7 @@
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.order.api.query.VipShoppingOrderQuery;
import com.ruoyi.order.dto.SixVipDto;
import com.ruoyi.order.mapper.TVipOrderMapper;
import com.ruoyi.order.service.TVipOrderService;
import com.ruoyi.other.api.domain.TVip;
@@ -12,6 +13,8 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
import java.time.LocalDate;
import javax.annotation.Resource;
import java.util.List;

@@ -52,4 +55,14 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<SixVipDto> sixBefore(LocalDate sixBefore) {
        return this.baseMapper.sixBefore(sixBefore);
    }

    @Override
    public BigDecimal getSumAmout(LocalDate sixBefore) {
        return this.baseMapper.getSumAmout(sixBefore);
    }
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/PreviousSixMonths.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.util;

import java.time.LocalDate;
import java.time.Period;
import java.time.temporal.TemporalAdjusters;

public class PreviousSixMonths {
    public static LocalDate get() {
        // 获取当前日期
        LocalDate currentDate = LocalDate.now();

        // 计算六个月前的日期
        LocalDate sixMonthsAgo = currentDate.minusMonths(6);

        // 调整为该月的第一天
        LocalDate firstDayOfSixMonthsAgo = sixMonthsAgo.with(TemporalAdjusters.firstDayOfMonth());
        return firstDayOfSixMonthsAgo;

    }
}

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -97,10 +97,10 @@
            and t1.charging_gun_id = #{req.gunId}
        </if>
        <if test="startTime1 != null and startTime1!=''">
            and (t1.start_time between #{startTime1} and #{startTime2})
            and (t1.start_time between #{startTime1} and #{startTime2}
        </if>
        <if test="endTime1 != null and endTime1!=''">
            and (t1.end_time between #{endTime1} and #{endTime2})
            and (t1.end_time between #{endTime1} and #{endTime2}
        </if>
    </select>
    <select id="payOrderQuery" resultType="com.ruoyi.order.dto.PayOrderDto">
@@ -115,10 +115,7 @@
        payment_amount ,
        create_time,
        end_time,
        pay_time,
        refund_status,
        (payment_amount-refund_amount) as final_amount,
        del_flag
                           pay_time
        FROM
        charging_pile_order.t_charging_order UNION ALL
        SELECT
@@ -132,10 +129,7 @@
        payment_amount ,
        create_time,
        receiving_time as end_time,
        pay_time,
        refund_status,
        (payment_amount-refund_amount) as final_amount,
        del_flag
                           pay_time
        FROM
        charging_pile_order.t_shopping_order UNION ALL
        SELECT
@@ -149,10 +143,7 @@
        payment_amount ,
        create_time,
        create_time as end_time,
        pay_time,
        refund_status,
        (payment_amount-refund_amount) as final_amount,
        del_flag
                           pay_time
        FROM
        charging_pile_order.t_vip_order UNION ALL
        SELECT
@@ -166,14 +157,10 @@
        order_amount as payment_amount,
        create_time,
        out_parking_time as end_time,
        out_parking_time as pay_time,
        null as refund_status,
        0 as final_amount,
        0 as del_flag
                           out_parking_time as pay_time
        FROM
        charging_pile_service.t_parking_record ) o
                <where>
                     o.del_flag = 0
                    <if test="data.code != null and data.code != ''">
                        AND o.code LIKE CONCAT('%',#{data.code},'%')
                    </if>
@@ -183,7 +170,9 @@
                    <if test="data.type != null">
                        AND o.type = #{data.type}
                    </if>

                    <if test="data.status != null">
                        AND o.status = #{data.status}
                    </if>
                    <if test="data.createTime1 != null">
                        AND o.create_time &gt;= #{data.createTime1}
                    </if>
@@ -191,7 +180,7 @@
                        AND o.create_time &lt;= #{data.createTime2}
                    </if>
                </where>
        ORDER BY o.create_time desc


    </select>
    <select id="getRefundList" resultType="com.ruoyi.order.api.model.TChargingOrderRefund">
@@ -245,78 +234,189 @@


    </select>
    <select id="chargingList" resultType="com.ruoyi.order.api.vo.ChargingOrderListVO">
        select t1.* from t_charging_order t1
        where 1=1
        <if test="null != req.code and req.code!=''">
            and t1.code  LIKE CONCAT('%',#{req.code},'%')
    <select id="chargingOrderGroup" resultType="com.ruoyi.common.core.dto.ChargingOrderGroup">
        SELECT SUM(charging_capacity) ,site_id
        FROM t_charging_order
        GROUP BY site_id
        <where>
            <if test="chargingPercentProvinceDto.date1 != null">
                AND create_time &gt;= #{chargingPercentProvinceDto.date1}
        </if>
        <if test="null != req.carIds and req.carIds.size()>0" >
            and t1.app_user_car_id in
            <foreach collection="req.carIds" item="item" index="index" separator="," open="(" close=")">
                #{item}
            </foreach>
            <if test="chargingPercentProvinceDto.date2 != null">
                AND create_time &lt;= #{chargingPercentProvinceDto.date2}
        </if>
        <if test="null != req.userIds and req.userIds.size()>0" >
            and t1.app_user_id in
            <foreach collection="req.userIds" item="item" index="index" separator="," open="(" close=")">
                #{item}
            </foreach>
            <if test="chargingPercentProvinceDto.provinceCode != null">
                AND province_code = #{chargingPercentProvinceDto.provinceCode}
        </if>
        <if test="req.orderType != null ">
            and t1.order_type = #{req.orderType}
        </if>
        <if test="req.status != null ">
            and t1.status = #{status}
        </if>
        <if test="req.status != null ">
            and t1.status = #{req.status}
        </if>
        <if test="req.siteId != null ">
            and t1.site_id = #{req.siteId}
        </if>
        <if test="startTime1 != null and startTime1!=''">
            and (t1.start_time between #{startTime1} and #{startTime2})
        </if>
        <if test="endTime1 != null and endTime1!=''">
            and (t1.end_time between #{endTime1} and #{endTime2})
        </if>
        </where>


    </select>
    <select id="chargingList1" resultType="com.ruoyi.order.api.vo.ChargingOrderListVO">
        select t1.* from t_charging_order t1
        where 1=1
        <if test="null != req.code and req.code!=''">
            and t1.code  LIKE CONCAT('%',#{req.code},'%')
    <select id="charge" resultType="com.ruoyi.order.dto.SixChargingDto">
        SELECT
            DATE_FORMAT( subquery.create_time, '%m' ) AS MONTH,
    SUM(electrovalence) AS electrovalence,
    SUM(service_charge) AS service_charge
        FROM
            (
            SELECT
            create_time,
            electrovalence,
            service_charge
            FROM
            t_charging_order
            <where>
                del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status)
                <if test="sixBefore != null">
                    AND create_time &gt;= #{sixBefore}
        </if>
        <if test="null != req.carIds and req.carIds.size()>0" >
            and t1.app_user_car_id in
            <foreach collection="req.carIds" item="item" index="index" separator="," open="(" close=")">
                #{item}
                <if test="siteIds != null and siteIds.size() > 0">
                    AND site_id IN
                    <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
                        #{siteId}
            </foreach>
        </if>
        <if test="null != req.userIds and req.userIds.size()>0" >
            and t1.app_user_id in
            <foreach collection="req.userIds" item="item" index="index" separator="," open="(" close=")">
                #{item}
            </foreach>
        </if>
        <if test="req.orderType != null ">
            and t1.order_type = #{req.orderType}
        </if>
        <if test="req.status != null ">
            and t1.status = #{status}
        </if>
        <if test="req.status != null ">
            and t1.status = #{req.status}
        </if>
        <if test="req.siteId != null ">
            and t1.site_id = #{req.siteId}
        </if>
        <if test="startTime1 != null and startTime1!=''">
            and (t1.start_time between #{startTime1} and #{startTime2})
        </if>
        <if test="endTime1 != null and endTime1!=''">
            and (t1.end_time between #{endTime1} and #{endTime2})
        </if>
            </where>
            ) AS subquery
        GROUP BY
            DATE_FORMAT( subquery.create_time, '%m' )


    </select>
    <select id="circle" resultType="com.ruoyi.order.dto.SixCircleDto">
        SELECT
            site_id as siteId,SUM(payment_amount) as paymentAmount
        FROM
            t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status)
            <if test="siteIds != null and siteIds.size() > 0">
                AND site_id IN
                <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
                    #{siteId}
                </foreach>
            </if>
            <if test="sixBefore != null">
                AND create_time &gt;= #{sixBefore}
            </if>
        </where>
        GROUP BY
            site_id


    </select>
    <select id="countAll" resultType="java.util.Map">
        select sum(electrovalence),sum(service_charge),sum(commission_amount),sum(sharing_amount)
        from t_charging_order
        where create_time &gt;= #{sixBefore} and del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status)
    </select>
    <select id="getSumByType" resultType="java.util.Map">
        SELECT
            type,
            SUM( charging_capacity ) as charging_capacity ,
            SUM( period_service_price ) as period_electric_price,
            SUM(period_electric_price+period_service_price) as total_amount
        FROM
            t_charging_order_accounting_strategy
        <where>
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND charging_order_id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>
        </where>
        GROUP BY
            type
    </select>
    <select id="getDateData" resultType="java.util.Map">
        SELECT
            DATE_FORMAT( create_time, '%Y-%m-%d %H' ) as time,
    SUM(service_charge) as servicecharge,
    SUM(electrovalence) as electrovalence
        FROM
            t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status) and DATE(create_time) = CURDATE()
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>
        </where>
        GROUP BY
            time
        ORDER BY
            time

    </select>
    <select id="getWeekData" resultType="java.util.Map">
        SELECT
        DATE_FORMAT( create_time, '%Y-%m-%d' ) as time,
        SUM(service_charge) as servicecharge,
        SUM(electrovalence) as electrovalence
        FROM
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status) and YEARWEEK(DATE_FORMAT(create_time, '%Y-%m-%d'), 1) = YEARWEEK(NOW(), 1)
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>
        </where>
        GROUP BY
        time
        ORDER BY
        time

    </select>
    <select id="getMonthData" resultType="java.util.Map">
        SELECT
        DATE_FORMAT( create_time, '%Y-%m-%d' ) as time,
        SUM(service_charge) as servicecharge,
        SUM(electrovalence) as electrovalence
        FROM
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status) and MONTH(create_time) = MONTH(NOW())  AND YEAR(create_time) = YEAR(NOW())
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>
        </where>
        GROUP BY
        time
        ORDER BY
        time

    </select>
    <select id="getYearData" resultType="java.util.Map">
        SELECT
        DATE_FORMAT( create_time, '%Y-%m-%d' ) as time,
        SUM(service_charge) as servicecharge,
        SUM(electrovalence) as electrovalence
        FROM
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status) and YEAR(createTime) = YEAR(NOW())
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
                    #{chargingOrderId}
                </foreach>
            </if>
        </where>
        GROUP BY
        time
        ORDER BY
        time


    </select>

</mapper>

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml

@@ -256,4 +256,40 @@
        and t1.payment_status = 2
        AND t1.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
    </select>
    <select id="sixBefore" resultType="com.ruoyi.order.dto.SixShopDto">
        SELECT
            DATE_FORMAT( subquery.create_time, '%m' ) AS MONTH,
    count(1) AS orderNum,
    SUM(payment_amount) AS paymentAmount
        FROM
            (
            SELECT
            create_time,
            payment_amount
            FROM
            t_shopping_order
        <where>
            WHERE del_flag = 0 and payment_status = 2 and ISNULL(refund_status) and status!=4
            <if test="null != sixBefore">
                and DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{sixBefore}, '%Y-%m-%d')
            </if>
            <if test="null != status">
                and status = #{status}
            </if>
        </where>

            ) AS subquery
        GROUP BY
            DATE_FORMAT( subquery.create_time, '%m' );


    </select>
    <select id="getSumAmount" resultType="java.math.BigDecimal">
        select sum(payment_amount)
        from t_shopping_order
        where del_flag = 0 and payment_status = 2 and ISNULL(refund_status) and status!=4
        <if test="null != sixBefore">
            and DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{sixBefore}, '%Y-%m-%d')
        </if>
    </select>
</mapper>

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml

@@ -46,5 +46,46 @@
        </if>
        AND t1.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
    </select>
    <select id="sixBefore" resultType="com.ruoyi.order.dto.SixVipDto">
        SELECT
            DATE_FORMAT(subquery.create_time, '%Y-%m') AS MONTH,
    subquery.vip_id,
    COUNT(1) AS orderNum,
    SUM(subquery.payment_amount) AS paymentAmount
        FROM (
            SELECT
            vip_id,
            create_time,
            payment_amount
            FROM
            t_vip_order
        <where>
            del_flag = 0 AND
            payment_status = 2 AND
            refund_amount IS NULL
            <if test="sixBefore != null">
                AND create_time &gt; #{sixBefore}
            </if>
        </where>
            ) AS subquery
        GROUP BY
            DATE_FORMAT(subquery.create_time, '%Y-%m'),
            subquery.vip_id;


    </select>
    <select id="getSumAmout" resultType="java.math.BigDecimal">
        SELECT
            SUM(payment_amount) AS paymentAmount
        FROM
            t_vip_order
        WHERE
            del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()} AND
            payment_status = 2 AND
            refund_amount IS NULL
            <if test="sixBefore != null">
                AND create_time &gt; #{sixBefore}
            </if>
    </select>

</mapper>