Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-17 98f1d329436e64a03a1c9f09a3e17fc0223ee28d

Merge remote-tracking branch 'origin/master'

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

@@ -50,8 +50,8 @@
    private Integer orderType; //1=充电订单（小程序），2=充电订单（刷卡））
    private Integer siteId;
    private Integer status; //状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）"
    private Date startTime; //充电开始时间
    private Date endTime; //充电结束时间
    private LocalDateTime startTime; //充电开始时间
    private LocalDateTime endTime; //充电结束时间

}


 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java

@@ -211,6 +211,11 @@
                        uploadRealTimeMonitoringData.setPeriod_charging_degree(uploadRealTimeMonitoringDataMessage.getCharging_degree());
                        uploadRealTimeMonitoringData.setPeriod_service_price(uploadRealTimeMonitoringDataMessage.getCharging_degree().multiply(accountingStrategyDetail.getServiceCharge()).setScale(4, RoundingMode.HALF_UP));
                    }
                    uploadRealTimeMonitoringData.setOrderType(chargingOrder.getOrderType());
                    uploadRealTimeMonitoringData.setSiteId(chargingOrder.getSiteId());
                    uploadRealTimeMonitoringData.setStatus(chargingOrder.getStatus());
                    uploadRealTimeMonitoringData.setStartTime(chargingOrder.getStartTime());
                    uploadRealTimeMonitoringData.setEndTime(chargingOrder.getEndTime());
                    int i = uploadRealTimeMonitoringDataService.create(uploadRealTimeMonitoringData);
                    if(i == 0){
                        log.error("数据存储mongo失败");