diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java index ed5188a7..de2ecbdb 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java @@ -1,9 +1,14 @@ package com.xhpc.evcs.jpa; import com.xhpc.order.domain.XhpcHistoryOrder; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.PagingAndSortingRepository; +import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.QueryByExampleExecutor; import org.springframework.stereotype.Repository; @@ -11,16 +16,19 @@ import java.util.List; @Repository public interface XhpcHistoryOrderRepository extends JpaRepository, - QueryByExampleExecutor, JpaSpecificationExecutor { + QueryByExampleExecutor, JpaSpecificationExecutor, PagingAndSortingRepository { - List findByHistoryOrderIdGreaterThanAndStateGreaterThanOrderByHistoryOrderIdAsc(Long hisOrderId, int i); + List findTop100ByHistoryOrderIdGreaterThanAndStateGreaterThanOrderByHistoryOrderIdAsc(Long hisOrderId, int i); List findByConfirmResultNotAndOperatorId3rdptyEvcsIsNotNull(int succCode); List findByConfirmResultNotAndSource(int confirmResult, int source); - @Query("select ho from XhpcHistoryOrder ho join EtPushFailedOrder fo on ho.historyOrderId = fo.id where fo" + - ".operatorId3rdpty = ?1") - List findJoinPushFailedOrders(String operatorId3irdpty); + @Query("select ho from XhpcHistoryOrder ho join EtPushFailedOrder fo on ho.historyOrderId = fo.id where fo.operatorId3rdpty = ?1") + List findJoinPushFailedOrders(@Param("operatorId3irdpty")String operatorId3irdpty, Pageable pageable); + default List findTop10JoinPushFailedOrders(String operatorId3irdpty) { + + return findJoinPushFailedOrders(operatorId3irdpty, PageRequest.of(0, 100)); + } } diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java index 6a52fb12..e653c45c 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java @@ -49,24 +49,24 @@ public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher { // maybe对接第三方 if (authSecretTokenOut != null) { final List notYetPushOrder = - xhpcHistoryOrderRepository.findByHistoryOrderIdGreaterThanAndStateGreaterThanOrderByHistoryOrderIdAsc(authSecretTokenOut.getLastPushOrder(), 0); + xhpcHistoryOrderRepository.findTop100ByHistoryOrderIdGreaterThanAndStateGreaterThanOrderByHistoryOrderIdAsc(authSecretTokenOut.getLastPushOrder(), 0); for (XhpcHistoryOrder xhpcHistoryOrder : notYetPushOrder) { List statisticTimeIntervalList = statisticTimeIntervalRepository.findByHistoryOrderId(xhpcHistoryOrder.getHistoryOrderId()); xhpcHistoryOrder.setXhpcStatisticsTimeIntervalList(statisticTimeIntervalList); notify(xhpcHistoryOrder, authSecretTokenOut, false); } - final List pushFailedOrders = - xhpcHistoryOrderRepository.findJoinPushFailedOrders(authSecretTokenOut.getOperatorId3irdpty()); - for (XhpcHistoryOrder xhpcHistoryOrder : pushFailedOrders) { - List statisticTimeIntervalList = - statisticTimeIntervalRepository.findByHistoryOrderId(xhpcHistoryOrder.getHistoryOrderId()); - xhpcHistoryOrder.setXhpcStatisticsTimeIntervalList(statisticTimeIntervalList); - final boolean notify = notify(xhpcHistoryOrder, authSecretTokenOut, true); - if (notify) { - etPushFailedOrderRepository.deleteById(xhpcHistoryOrder.getHistoryOrderId()); - } - } +// final List pushFailedOrders = +// xhpcHistoryOrderRepository.findTop10JoinPushFailedOrders(authSecretTokenOut.getOperatorId3irdpty()); +// for (XhpcHistoryOrder xhpcHistoryOrder : pushFailedOrders) { +// List statisticTimeIntervalList = +// statisticTimeIntervalRepository.findByHistoryOrderId(xhpcHistoryOrder.getHistoryOrderId()); +// xhpcHistoryOrder.setXhpcStatisticsTimeIntervalList(statisticTimeIntervalList); +// final boolean notify = notify(xhpcHistoryOrder, authSecretTokenOut, true); +// if (notify) { +// etPushFailedOrderRepository.deleteById(xhpcHistoryOrder.getHistoryOrderId()); +// } +// } } }