From 15434903649434086bee14c8ace4c1661a90db09 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Mon, 17 Oct 2022 11:24:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A8=E9=80=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9Fjpa=E5=AF=B9=E8=B1=A1=E8=BD=AC=E6=8D=A2=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/evcs/jpa/XhpcTerminalRepository.java |  2 +-
 .../main/java/com/xhpc/common/domain/XhpcTerminal.java | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

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 88d22ba6..d63d49d6 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
@@ -33,6 +33,6 @@ public interface XhpcTerminalRepository extends JpaRepository<XhpcTerminal, Inte
     String selectBySql(String serialNumber);
 
 
-    @Query("select t.serialNumber, t.status from XhpcTerminal as t where t.delFlag = 0")
+    @Query(value = "select new XhpcTerminal(t.serialNumber, t.status) from XhpcTerminal as t where t.delFlag = 0")
     List<XhpcTerminal> selectStatusBySql();
 }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java
index dc8cbf03..7ed49f57 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java
@@ -92,6 +92,16 @@ public class XhpcTerminal extends BaseEntity {
     private String prompt;
 
 
+    public XhpcTerminal(String serialNumber, Integer status){
+        this.serialNumber = serialNumber;
+        this.status = status;
+    }
+
+    public XhpcTerminal() {
+
+    }
+
+
     public int getConnectorType() {
 
         return connectorType;