From afee8e3df28ab284628f13da7de9a0eac9e9845e Mon Sep 17 00:00:00 2001 From: zz Date: Wed, 8 Dec 2021 00:06:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=9F=A5=E8=AF=A2=E5=92=8C?= =?UTF-8?q?=E8=87=AA=E5=A2=9Eid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/evcs/api/QueryStartChargeController.java | 2 +- .../main/java/com/xhpc/evcs/jpa/XhpcTerminalRepository.java | 2 ++ .../main/java/com/xhpc/order/domain/XhpcHistoryOrder.java | 6 ++---- 3 files changed, 5 insertions(+), 5 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 410c9ae7..24ac3bd2 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 @@ -128,7 +128,7 @@ public class QueryStartChargeController { emptyHorder.setType(1); emptyHorder.setState(2); emptyHorder.setChargingStationId(REDIS.getCacheMapValue("pile:".concat(connectorId.substring(0, 14)), "stationId")); - emptyHorder.setTerminalId(xhpcTerminalRepository.findOneBySerialNumber(connectorId).get().getTerminalId()); + emptyHorder.setTerminalId(xhpcTerminalRepository.queryDbId(connectorId)); xhpcHistoryOrderRepository.save(emptyHorder); } diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcTerminalRepository.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcTerminalRepository.java index 1dfcbecd..2918c6eb 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcTerminalRepository.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcTerminalRepository.java @@ -25,6 +25,8 @@ public interface XhpcTerminalRepository extends JpaRepository findOneBySerialNumber(String serialNumber); + @Query("select t.terminalId from XhpcTerminal as t where t.delFlag = 0 and t.serialNumber = ?1") + Long queryDbId(String serialNumber); @Query("select t.pileSerialNumber from XhpcTerminal as t where t.delFlag = 0 and t.serialNumber = ?1") String selectBySql(String serialNumber); diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java index 1b7da3f9..b4a04159 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java @@ -3,10 +3,7 @@ package com.xhpc.order.domain; import com.xhpc.common.core.web.domain.BaseEntity; import com.xhpc.evcs.domain.XhpcStatisticsTimeInterval; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; @@ -25,6 +22,7 @@ public class XhpcHistoryOrder extends BaseEntity { * 历史订单id */ @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long historyOrderId; /**