From d525dce5189f45112c4548e2dff87bc974c960fb Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Wed, 10 May 2023 17:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A3=85=E7=BD=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mappers/TerminalsDao.xml   | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
index fee9f1a..e67b42a 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
@@ -21,6 +21,28 @@
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
+
+    <resultMap id="LineAndGtAndTermMap" type="com.shxy.xymanager_common.entity.Terminals">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="line_id" jdbcType="INTEGER" property="lineid"/>
+        <result column="tower_id" jdbcType="INTEGER" property="towerid"/>
+        <result column="cmdid" jdbcType="VARCHAR" property="cmdid"/>
+        <result column="org_id" jdbcType="SMALLINT" property="orgId"/>
+        <result column="equip_name" jdbcType="VARCHAR" property="equipName"/>
+        <result column="display_name" jdbcType="VARCHAR" property="displayName"/>
+        <result column="model" jdbcType="VARCHAR" property="model"/>
+        <result column="essential_info_version" jdbcType="VARCHAR" property="essentialInfoVersion"/>
+        <result column="has_pan" jdbcType="TINYINT" property="hasPan"/>
+        <result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer"/>
+        <result column="bs_production_date" jdbcType="DATE" property="bsProductionDate"/>
+        <result column="bs_identifier" jdbcType="VARCHAR" property="bsIdentifier"/>
+        <result column="latitude" jdbcType="DOUBLE" property="latitude"/>
+        <result column="longitude" jdbcType="DOUBLE" property="longitude"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+    </resultMap>
+
     <sql id="Base_Column_List">
     id, line_id,tower_id,cmdid, org_id, equip_name, display_name, model, essential_info_version, has_pan,
     bs_manufacturer, bs_production_date, bs_identifier, latitude, longitude, create_time, 
@@ -33,7 +55,12 @@
         from terminals
         where status = #{status}
     </select>
-
+    <select id="selectTermAndLineList" resultMap="LineAndGtAndTermMap">
+        select
+        <include refid="Base_Column_List"/>
+        from terminals
+        where status = #{status}
+    </select>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         select
@@ -51,7 +78,7 @@
         select
         <include refid="Base_Column_List"/>
         from terminals
-        where line_id = #{lineid} and tower_id = #{towerid} and status = #{status}
+        where line_id = #{lineid} and tower_id = #{towerid} and status = #{status} limit 1;
     </select>
     <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.Terminals">
         insert into terminals