yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善notification_equip_charge_status逻辑;重构一番

Browse Source
This commit is contained in:
ZZ 2021-10-29 12:04:07 +08:00
parent 4f8198248b
commit fc5a5ca894
17 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CheckChargeOrderController.java
View File

@ -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<CheckChargeOrderRequestData> commonRequest) throws IOException {

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/ChargeOrderInfoController.java → evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationChargeOrderInfoController.java
View File

@ -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<CDChargeOrderInfo4BonusReq> commonRequest) throws IOException {

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StartChargeResultController.java → evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStartChargeResultController.java
View File

@ -17,7 +17,7 @@ import java.io.IOException;
@Slf4j
@RestController()
public class StartChargeResultController extends CoreDispatcher {
public class NotificationStartChargeResultController {
@Autowired
private XhpcHistoryOrderRepository xhpcHistoryOrderRepository;

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StationStatusController.java → evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStationStatusController.java
View File

@ -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<ConnectorStatusInfo> commonRequest) throws IOException {

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StopChargeResultController.java → evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/NotificationStopChargeResultController.java
View File

@ -17,7 +17,7 @@ import java.io.IOException;
@Slf4j
@RestController()
public class StopChargeResultController extends CoreDispatcher {
public class NotificationStopChargeResultController {
@Autowired
private XhpcHistoryOrderRepository xhpcHistoryOrderRepository;

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipAuthController.java
View File

@ -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;

7
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/EquipChargeStatusController.java → evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java
View File

@ -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("未查询到该订单编号数据");

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationStatusController.java
View File

@ -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")

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/StationsInfoController.java → evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java
View File

@ -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;

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java
View File

@ -24,7 +24,7 @@ import java.util.UUID;
@Slf4j
@RestController()
public class QueryTokenController extends CoreDispatcher {
public class QueryTokenController {
@Autowired
private AuthSecretTokenRepository authSecretTokenRepository;

5
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java
View File

@ -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<XhpcHistoryOrder, String>,
public interface XhpcHistoryOrderRepository extends JpaRepository<XhpcHistoryOrder, Long>,
QueryByExampleExecutor<XhpcHistoryOrder>, JpaSpecificationExecutor<XhpcHistoryOrder> {
List<XhpcHistoryOrder> findByHistoryOrderIdGreaterThanAndStateGreaterThanOrderByHistoryOrderIdAsc(Long hisOrderId, int i);
Optional<XhpcHistoryOrder> findByInternetSerialNumberOrEvcsOrderNo(String startChargeSeq);
}

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java → evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CoreDispatcher.java
View File

@ -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;

1
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java
View File

@ -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;

1
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java
View File

@ -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;

1
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java
View File

@ -1,6 +1,5 @@
package com.xhpc.evcs.notification;
import com.xhpc.evcs.api.CoreDispatcher;
import org.springframework.stereotype.Component;

1
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java
View File

@ -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;

1
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java
View File

@ -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;