From fc5a5ca89478e601f7cb735485fff07d3bfe4243 Mon Sep 17 00:00:00 2001 From: ZZ Date: Fri, 29 Oct 2021 12:04:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84notification=5Fequip=5Fcharge?= =?UTF-8?q?=5Fstatus=E9=80=BB=E8=BE=91;=E9=87=8D=E6=9E=84=E4=B8=80?= =?UTF-8?q?=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/evcs/api/CheckChargeOrderController.java | 2 +- ...ler.java => NotificationChargeOrderInfoController.java} | 2 +- ...r.java => NotificationStartChargeResultController.java} | 2 +- ...oller.java => NotificationStationStatusController.java} | 2 +- ...er.java => NotificationStopChargeResultController.java} | 2 +- .../java/com/xhpc/evcs/api/QueryEquipAuthController.java | 2 +- ...ntroller.java => QueryEquipChargeStatusController.java} | 7 ++++--- .../com/xhpc/evcs/api/QueryStationStatusController.java | 2 +- ...nfoController.java => QueryStationsInfoController.java} | 2 +- .../main/java/com/xhpc/evcs/api/QueryTokenController.java | 2 +- .../java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java | 5 ++++- .../xhpc/evcs/{api => notification}/CoreDispatcher.java | 2 +- .../NotificationChargeOrderInfo4BonusTask.java | 1 - .../notification/NotificationEquipChargeStatusTask.java | 1 - .../notification/NotificationStartChargeResultTask.java | 1 - .../evcs/notification/NotificationStationStatusTask.java | 1 - .../notification/NotificationStopChargeResultTask.java | 1 - 17 files changed, 18 insertions(+), 19 deletions(-) rename evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/{ChargeOrderInfoController.java => NotificationChargeOrderInfoController.java} (96%) rename evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/{StartChargeResultController.java => NotificationStartChargeResultController.java} (96%) rename evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/{StationStatusController.java => NotificationStationStatusController.java} (94%) rename evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/{StopChargeResultController.java => NotificationStopChargeResultController.java} (97%) rename evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/{EquipChargeStatusController.java => QueryEquipChargeStatusController.java} (93%) rename evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/{StationsInfoController.java => QueryStationsInfoController.java} (99%) rename evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/{api => notification}/CoreDispatcher.java (99%) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CheckChargeOrderController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CheckChargeOrderController.java index ab722d11..dcbf1802 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CheckChargeOrderController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CheckChargeOrderController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController; import java.io.IOException; @RestController() -public class CheckChargeOrderController extends CoreDispatcher { +public class CheckChargeOrderController { @PostMapping("/v1/check_charge_orders") public CommonResponse notificationChargeOrderInfo(@RequestBody CommonRequest commonRequest) throws IOException { diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/ChargeOrderInfoController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationChargeOrderInfoController.java similarity index 96% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/ChargeOrderInfoController.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationChargeOrderInfoController.java index 00f7ab77..26ca62a9 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/ChargeOrderInfoController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationChargeOrderInfoController.java @@ -12,7 +12,7 @@ import java.io.IOException; @Slf4j @RestController() -public class ChargeOrderInfoController extends CoreDispatcher { +public class NotificationChargeOrderInfoController { @PostMapping("/v1/notification_charge_order_info") public CommonResponse notificationChargeOrderInfo(@RequestBody CommonRequest commonRequest) throws IOException { diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StartChargeResultController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStartChargeResultController.java similarity index 96% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StartChargeResultController.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStartChargeResultController.java index f4c91d42..5e23a806 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StartChargeResultController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStartChargeResultController.java @@ -17,7 +17,7 @@ import java.io.IOException; @Slf4j @RestController() -public class StartChargeResultController extends CoreDispatcher { +public class NotificationStartChargeResultController { @Autowired private XhpcHistoryOrderRepository xhpcHistoryOrderRepository; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StationStatusController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStationStatusController.java similarity index 94% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StationStatusController.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStationStatusController.java index a68af4da..274f8750 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StationStatusController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStationStatusController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController; import java.io.IOException; @RestController() -public class StationStatusController extends CoreDispatcher { +public class NotificationStationStatusController { @PostMapping("/v1/notification_stationStatus") public CommonResponse notificationStationStatus(@RequestBody CommonRequest commonRequest) throws IOException { diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StopChargeResultController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStopChargeResultController.java similarity index 97% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StopChargeResultController.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStopChargeResultController.java index bb56a759..a15616d1 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StopChargeResultController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStopChargeResultController.java @@ -17,7 +17,7 @@ import java.io.IOException; @Slf4j @RestController() -public class StopChargeResultController extends CoreDispatcher { +public class NotificationStopChargeResultController { @Autowired private XhpcHistoryOrderRepository xhpcHistoryOrderRepository; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipAuthController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipAuthController.java index 9bd6ee0b..b678984b 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipAuthController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipAuthController.java @@ -23,7 +23,7 @@ import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; */ @RestController -public class QueryEquipAuthController extends CoreDispatcher { +public class QueryEquipAuthController { @Autowired private XhpcStationInternetBlacklistRepository xhpcStationInternetBlacklistRepo; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/EquipChargeStatusController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java similarity index 93% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/EquipChargeStatusController.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java index 637c584c..1c523136 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/EquipChargeStatusController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java @@ -1,12 +1,12 @@ package com.xhpc.evcs.api; -import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.evcs.dto.*; import com.xhpc.evcs.encryption.EvcsConst; import com.xhpc.evcs.http.ServerInternalException; import com.xhpc.evcs.jpa.XhpcHistoryOrderRepository; import com.xhpc.evcs.utils.DateUtil; import com.xhpc.evcs.utils.JSONUtil; +import com.xhpc.order.domain.XhpcHistoryOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -16,7 +16,7 @@ import java.io.IOException; import java.util.Date; @RestController() -public class EquipChargeStatusController extends CoreDispatcher { +public class QueryEquipChargeStatusController { @Autowired XhpcHistoryOrderRepository xhpcHistoryOrderRepository; @@ -30,7 +30,8 @@ public class EquipChargeStatusController extends CoreDispatcher { String responseBody = ""; String startChargeSeq = chargeInfoRequest.getStartChargeSeq(); // todo 三方对接 到et_order_mapping表查找xh_order_no - XhpcHistoryOrder xhpcHistoryOrder = xhpcHistoryOrderRepository.findById(startChargeSeq).orElse(null); + XhpcHistoryOrder xhpcHistoryOrder = + xhpcHistoryOrderRepository.findByInternetSerialNumberOrEvcsOrderNo(startChargeSeq).orElse(null); ChargeOrderInfo chargeOrderInfo = new ChargeOrderInfo(xhpcHistoryOrder); if (chargeOrderInfo == null) { throw new ServerInternalException("未查询到该订单编号数据"); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationStatusController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationStatusController.java index 5721a68e..b13f079d 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationStatusController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationStatusController.java @@ -13,7 +13,7 @@ import static cn.hutool.core.util.NumberUtil.isInteger; import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; @RestController -public class QueryStationStatusController extends CoreDispatcher { +public class QueryStationStatusController { @PostMapping("/v1/query_station_status") diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StationsInfoController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java similarity index 99% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StationsInfoController.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java index c709b513..1e4dd5d9 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StationsInfoController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java @@ -27,7 +27,7 @@ import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; @Slf4j @RestController -public class StationsInfoController extends CoreDispatcher { +public class QueryStationsInfoController { @Autowired private XhpcChargingPileRepository xhpcChargingPileRepository; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java index 56536994..4d8d9992 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java @@ -24,7 +24,7 @@ import java.util.UUID; @Slf4j @RestController() -public class QueryTokenController extends CoreDispatcher { +public class QueryTokenController { @Autowired private AuthSecretTokenRepository authSecretTokenRepository; 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 bc4416ac..bdbeea98 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 @@ -7,11 +7,14 @@ import org.springframework.data.repository.query.QueryByExampleExecutor; import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Optional; @Repository -public interface XhpcHistoryOrderRepository extends JpaRepository, +public interface XhpcHistoryOrderRepository extends JpaRepository, QueryByExampleExecutor, JpaSpecificationExecutor { List findByHistoryOrderIdGreaterThanAndStateGreaterThanOrderByHistoryOrderIdAsc(Long hisOrderId, int i); + Optional findByInternetSerialNumberOrEvcsOrderNo(String startChargeSeq); + } diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CoreDispatcher.java similarity index 99% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CoreDispatcher.java index dfff51eb..e4f9c5ff 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CoreDispatcher.java @@ -1,4 +1,4 @@ -package com.xhpc.evcs.api; +package com.xhpc.evcs.notification; import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.core.JsonProcessingException; 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 8576be6e..f03dd4da 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 @@ -1,6 +1,5 @@ package com.xhpc.evcs.notification; -import com.xhpc.evcs.api.CoreDispatcher; import com.xhpc.evcs.domain.AuthSecretToken; import com.xhpc.evcs.domain.EtOrderMapping; import com.xhpc.evcs.domain.XhpcChargingStation; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java index 1242e77d..c39afe81 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java @@ -3,7 +3,6 @@ package com.xhpc.evcs.notification; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import com.xhpc.common.data.redis.CacheRateModel; -import com.xhpc.evcs.api.CoreDispatcher; import com.xhpc.evcs.domain.AuthSecretToken; import com.xhpc.evcs.dto.*; import com.xhpc.evcs.jpa.AuthSecretTokenRepository; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java index 73e8226e..3a7056f7 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java @@ -1,6 +1,5 @@ package com.xhpc.evcs.notification; -import com.xhpc.evcs.api.CoreDispatcher; import org.springframework.stereotype.Component; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java index e0e757d8..8aed14e6 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java @@ -1,7 +1,6 @@ package com.xhpc.evcs.notification; import com.xhpc.common.api.dto.ChargingStationDto; -import com.xhpc.evcs.api.CoreDispatcher; import com.xhpc.evcs.domain.AuthSecretToken; import com.xhpc.evcs.dto.*; import com.xhpc.evcs.jpa.AuthSecretTokenRepository; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java index 0b697cba..f9fa6728 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java @@ -2,7 +2,6 @@ package com.xhpc.evcs.notification; import com.fasterxml.jackson.core.JsonProcessingException; import com.xhpc.common.data.redis.CacheOrderData; -import com.xhpc.evcs.api.CoreDispatcher; import com.xhpc.evcs.dto.ChargeResultRequest; import com.xhpc.evcs.dto.CommonRequest; import com.xhpc.evcs.utils.JSONUtil;