From ef2d35afa2de4bc28e2c7679752f7cf39b09255a Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Tue, 2 Nov 2021 17:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/mapper/XhpcStatisticsServiceMapper.java    | 12 ++++++------
 .../service/impl/XhpcStatisticsServiceImpl.java      | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java
index a0825df9..43a607b0 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java
@@ -24,7 +24,7 @@ public interface XhpcStatisticsServiceMapper {
      * @param type             1 平台 2 运营商 3流量方
      * @return
      */
-    List<Map<String, Object>> getTimeIntervalPage(@Param("chargingStationIds") List<String> chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type);
+    List<Map<String, Object>> getTimeIntervalPage(@Param("chargingStationIds") List<String> chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId);
 
 
     /**
@@ -37,7 +37,7 @@ public interface XhpcStatisticsServiceMapper {
      * @param type             1 平台 2 运营商 3流量方
      * @return
      */
-    List<Map<String, Object>> getDateIntervalPage(@Param("chargingStationIds") List<String> chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type);
+    List<Map<String, Object>> getDateIntervalPage(@Param("chargingStationIds") List<String> chargingStationIds,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId")Long userId);
 
     /**
      * 电站统计
@@ -50,7 +50,7 @@ public interface XhpcStatisticsServiceMapper {
      * @param type                1 平台 2 运营商 3流量方
      * @return
      */
-    List<Map<String, Object>> getStationIntervalPage(@Param("chargingStationIds") List<String> chargingStationIds,@Param("operatorUserId") List<String> operatorUserId,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type);
+    List<Map<String, Object>> getStationIntervalPage(@Param("chargingStationIds") List<String> chargingStationIds,@Param("operatorUserId") List<String> operatorUserId,@Param("internetUserId") Long internetUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId);
 
     /**
      * 运营商统计
@@ -61,7 +61,7 @@ public interface XhpcStatisticsServiceMapper {
      * @param type                1 平台 2 运营商 3流量方
      * @return
      */
-    List<Map<String, Object>> getOperatorIntervalPage(@Param("operatorUserId") List<String> operatorUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type);
+    List<Map<String, Object>> getOperatorIntervalPage(@Param("operatorUserId") List<String> operatorUserId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId);
 
     /**
      * 流量方统计
@@ -72,7 +72,7 @@ public interface XhpcStatisticsServiceMapper {
      * @param type                1 平台 2 运营商 3流量方
      * @return
      */
-    List<Map<String, Object>> getInternetUserIntervalPage(@Param("internetIds") List<String> internetIds,@Param("internetUserId") Long internetUserId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type);
+    List<Map<String, Object>> getInternetUserIntervalPage(@Param("internetIds") List<String> internetIds,@Param("internetUserId") Long internetUserId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId);
 
 
     /**
@@ -85,7 +85,7 @@ public interface XhpcStatisticsServiceMapper {
      * @param type             1 平台 2 运营商 3流量方
      * @return
      */
-    List<Map<String, Object>> getTerminalIntervalPage(@Param("chargingStationId") String chargingStationId,@Param("terminalId") String terminalId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type);
+    List<Map<String, Object>> getTerminalIntervalPage(@Param("chargingStationId") String chargingStationId,@Param("terminalId") String terminalId,@Param("operatorId") Long operatorId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") Integer type,@Param("userId") Long userId);
 
 
     /**
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
index 702b14d7..e123c969 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
@@ -30,7 +30,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(!"".equals(chargingStationIds) && chargingStationIds !=null){
             chargingStationId= Arrays.asList(chargingStationIds.split(","));
         }
-        List<Map<String, Object>> list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, type);
+        List<Map<String, Object>> list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, type,userId);
         List<Map<String, Object>> page =new ArrayList<>();
         if(list !=null && list.size()>0){
             for (int i = 1; i <=24 ; i++) {
@@ -133,7 +133,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
             chargingStationId= Arrays.asList(chargingStationIds.split(","));
         }
 
-        return xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, type);
+        return xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, type,userId);
     }
 
     @Override
@@ -149,7 +149,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(!"".equals(operatorIds) && operatorIds !=null){
             operatorUserId= Arrays.asList(operatorIds.split(","));
         }
-        return xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,type);
+        return xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,type,userId);
     }
 
     @Override
@@ -161,7 +161,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(!"".equals(operatorIds) && operatorIds !=null){
             operatorUserId= Arrays.asList(operatorIds.split(","));
         }
-        return xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, type);
+        return xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, type,userId);
     }
 
     @Override
@@ -173,7 +173,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(!"".equals(internetUserIds) && internetUserIds !=null){
             internetIds= Arrays.asList(internetUserIds.split(","));
         }
-        return xhpcStatisticsServiceMapper.getInternetUserIntervalPage(internetIds, internetUserId, startTime, endTime, type);
+        return xhpcStatisticsServiceMapper.getInternetUserIntervalPage(internetIds, internetUserId, startTime, endTime, type,userId);
     }
 
     @Override
@@ -181,7 +181,7 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(getJudge(null,operatorId,type)){
             return new ArrayList<>();
         }
-        return xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, type);
+        return xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, type,userId);
     }
 
     @Override