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

无关风月

2025-03-20 9d09e1ed51ef330a378f7d564bacced7bb7e7d13

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

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

@@ -6,6 +6,7 @@
import lombok.Data;

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

@Data
@ApiModel(value = "ChargingOrderQuery充电桩订单查询对象",description = "管理后台充电桩订单查询对象")
@@ -32,5 +33,5 @@
    private Integer orderSource;
    @ApiModelProperty(value = "用户ids 前端忽略")
    private List<Long> userIds;
    private List<Integer> siteIds;
    private Set<Integer> siteIds;
}

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

@@ -1152,9 +1152,12 @@
                    data.addAll(data1);
                }
                ids = new HashSet<>(data);
            }else{
                ids = new HashSet<>();
                ids.add(-1);
            }
        }
        mongoChargingOrderQuery.setSiteIds(ids.stream().collect(Collectors.toList()));
        mongoChargingOrderQuery.setSiteIds(ids);
        mongoChargingOrderQuery.setPageSize(10);
        R<UploadRealTimeMonitoringPageData> all = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery);
        UploadRealTimeMonitoringPageData data1 = all.getData();