Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-08 52d18b0c747f12c64c9f9b36acb1b5e25f131e0c

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

@@ -80,6 +80,20 @@
   
   
   /**
    * 安全检测数据
    * @param securityDetection
    */
   void securityDetection(SecurityDetection securityDetection);
	
	
   /**
    * 启动充电应发
    * @param message
    */
   void startChargeSuccessfully(PlatformStartChargingReplyMessage message);
	
	
   /**
    * 充电启动失败后的退款回调处理
    * @param out_refund_no
    * @param refund_id
@@ -166,6 +180,7 @@
   List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);

   List<Map<String, Object>> usersDay();
   List<Map<String, Object>> usersDay1();

   List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);

@@ -200,4 +215,32 @@
   PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);

    SettlementTotalVO settlementTotal(String time);

   List<Map<String, Object>> countBySource(List<Integer> siteIds);

   List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

   List<Map<String, Object>> equipmentUserType2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

   List<Map<String, Object>> equipmentMapbroke1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

   List<Map<String, Object>> equipmentMapbroke2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

   List<Map<String, Object>> equipmentMapOut1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

   List<Map<String, Object>> equipmentMapOut2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

   List<Map<String, Object>> needElec(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);

   List<Map<String, Object>> getHourType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);

   List<Map<String, Object>> getDateType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);

   List<Map<String, Object>> getMonthType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);

   List<Map<String, Object>> getchargingCapacity(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);

   List<Map<String, Object>> countAllUserData();

   List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
}