明星电力充电桩
parent: 0fec4a1d | 补丁 | 提交 | ignore whitespace
xuhy
2024-11-01 d0a80136bc66ad8ac24382a133a3b792bd7925f5 
Merge remote-tracking branch 'origin/master'
2个文件已修改
4 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ruoyi-api/ruoyi-api-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports


@@ -6,4 +6,5 @@


com.ruoyi.integration.api.factory.PlatformStopChargingReplyFallbackFactory


com.ruoyi.integration.api.factory.SwitchwayGateFallbackFactory


com.ruoyi.integration.api.factory.IotInterfaceFallbackFactory


com.ruoyi.integration.api.factory.SecurityDetectionFallbackFactory


com.ruoyi.integration.api.factory.SecurityDetectionFallbackFactory


com.ruoyi.integration.api.factory.BmsDemandAndChargerExportationFallbackFactory




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


@@ -289,6 +289,7 @@


            for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : dataList) {


                if(!sdf.format(uploadRealTimeMonitoringData.getCreate_time()).equals(t)){


                    dataLists.add(uploadRealTimeMonitoringData);


                    t = sdf.format(uploadRealTimeMonitoringData.getCreate_time());


                }


            }