From 54144c86295957d18801eb5a6b2b97d62fc81934 Mon Sep 17 00:00:00 2001 From: zz Date: Tue, 12 Apr 2022 11:13:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E8=AE=A2=E5=8D=95=E5=86=99=E5=85=A5te?= =?UTF-8?q?nant=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evcs/api/QueryStartChargeController.java | 55 ++++++++++++------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java index 3c79a897..6efbeee1 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java @@ -1,9 +1,11 @@ package com.xhpc.evcs.api; +import cn.hutool.core.collection.CollUtil; import com.xhpc.common.api.PileOrderService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.DateUtils; import com.xhpc.evcs.domain.EtOrderMapping; +import com.xhpc.evcs.domain.XhpcChargingStation; import com.xhpc.evcs.dto.CommonRequest; import com.xhpc.evcs.dto.CommonResponse; import com.xhpc.evcs.dto.StartChargeRequest; @@ -13,6 +15,7 @@ import com.xhpc.evcs.jpa.*; import com.xhpc.evcs.utils.JSONUtil; import com.xhpc.order.domain.XhpcHistoryOrder; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Example; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -39,6 +42,8 @@ public class QueryStartChargeController { private PileOrderService pileOrderService; @Autowired private XhpcInternetUserRepository xhpcInternetUserRepository; + @Autowired + private XhpcChargingStationRepository xhpcChargingStationRepository; @PostMapping(value = "/v1/query_start_charge") public CommonResponse queryStartCharge(@RequestBody CommonRequest commonRequest) throws Exception { @@ -121,27 +126,35 @@ public class QueryStartChargeController { private void emptyHorder(String startChargeSeq, String connectorId, EtOrderMapping etOrderMapping) { - XhpcHistoryOrder emptyHorder = new XhpcHistoryOrder(); - Date now = DateUtils.getNowDate(); - emptyHorder.setStartTime(now); - emptyHorder.setEndTime(now); - emptyHorder.setCreateTime(now); - emptyHorder.setUpdateTime(now); - emptyHorder.setStopReasonEvcs(9); - String sn = genOrder(connectorId); - etOrderMapping.setXhOrderNo(sn); - emptyHorder.setSerialNumber(sn); - emptyHorder.setInternetSerialNumber(startChargeSeq); - String operatorId3rdpty = startChargeSeq.substring(0, 9); - emptyHorder.setOperatorId3rdptyEvcs(operatorId3rdpty); - emptyHorder.setUserId(xhpcInternetUserRepository.queryDbId(operatorId3rdpty)); - emptyHorder.setType(1); - emptyHorder.setSource(1); - emptyHorder.setState(-1); - emptyHorder.setChargingStationId(REDIS.getCacheMapValue("pile:".concat(connectorId.substring(0, 14)), "stationId")); - emptyHorder.setTerminalId(xhpcTerminalRepository.queryDbId(connectorId)); - emptyHorder.setConfirmResult(-1); - xhpcHistoryOrderRepository.save(emptyHorder); + XhpcChargingStation stationExample = new XhpcChargingStation(); + final Long stationId = REDIS.getCacheMapValue("pile:".concat(connectorId.substring(0, 14)), "stationId"); + stationExample.setId(stationId); + Example example = Example.of(stationExample); + XhpcChargingStation xhpcChargingStation = xhpcChargingStationRepository.findOne(example).orElse(null); + if (xhpcChargingStation != null) { + XhpcHistoryOrder emptyHorder = new XhpcHistoryOrder(); + emptyHorder.setTenantId(xhpcChargingStation.getTenantId()); + Date now = DateUtils.getNowDate(); + emptyHorder.setStartTime(now); + emptyHorder.setEndTime(now); + emptyHorder.setCreateTime(now); + emptyHorder.setUpdateTime(now); + emptyHorder.setStopReasonEvcs(9); + String sn = genOrder(connectorId); + etOrderMapping.setXhOrderNo(sn); + emptyHorder.setSerialNumber(sn); + emptyHorder.setInternetSerialNumber(startChargeSeq); + String operatorId3rdpty = startChargeSeq.substring(0, 9); + emptyHorder.setOperatorId3rdptyEvcs(operatorId3rdpty); + emptyHorder.setUserId(xhpcInternetUserRepository.queryDbId(operatorId3rdpty)); + emptyHorder.setType(1); + emptyHorder.setSource(1); + emptyHorder.setState(-1); + emptyHorder.setChargingStationId(stationId); + emptyHorder.setTerminalId(xhpcTerminalRepository.queryDbId(connectorId)); + emptyHorder.setConfirmResult(-1); + xhpcHistoryOrderRepository.save(emptyHorder); + } }