From b44ef7f1204059dec93148273bbadf640dd13e4e Mon Sep 17 00:00:00 2001
From: shi <coolbader@163.com>
Date: Thu, 20 Feb 2025 14:46:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(TenantSecretKey):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86id=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9B=B8=E5=85=B3=E6=98=A0=E5=B0=84-=20=E5=9C=A8=20Te?=
 =?UTF-8?q?nantSecretKey=20=E7=B1=BB=E4=B8=AD=E6=B7=BB=E5=8A=A0=20agentId?=
 =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=20-=20=E6=9B=B4=E6=96=B0=20TenantSecretKe?=
 =?UTF-8?q?yMapper.xml=20=E6=96=87=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=20a?=
 =?UTF-8?q?gentId=20=E7=9A=84=E6=98=A0=E5=B0=84=20-=20=E5=9C=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E3=80=81=E6=8F=92=E5=85=A5=E5=92=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E4=B8=AD=E5=8A=A0=E5=85=A5=20agentId=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=9D=A1=E4=BB=B6=E5=92=8C=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ff/common/domain/TenantSecretKey.java    | 5 +++++
 .../main/resources/mapper/common/TenantSecretKeyMapper.xml | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ff-admin/src/main/java/com/ff/common/domain/TenantSecretKey.java b/ff-admin/src/main/java/com/ff/common/domain/TenantSecretKey.java
index 75973de..4f3fbac 100644
--- a/ff-admin/src/main/java/com/ff/common/domain/TenantSecretKey.java
+++ b/ff-admin/src/main/java/com/ff/common/domain/TenantSecretKey.java
@@ -24,6 +24,11 @@ public class TenantSecretKey extends BaseEntity
     /** 主键id */
     private Long id;
 
+    /**
+     * 代理id
+     */
+    private Long agentId;
+
     /** 租户key */
     @Excel(name = "租户key")
     private String tenantKey;
diff --git a/ff-admin/src/main/resources/mapper/common/TenantSecretKeyMapper.xml b/ff-admin/src/main/resources/mapper/common/TenantSecretKeyMapper.xml
index cb18bfe..29f09df 100644
--- a/ff-admin/src/main/resources/mapper/common/TenantSecretKeyMapper.xml
+++ b/ff-admin/src/main/resources/mapper/common/TenantSecretKeyMapper.xml
@@ -6,6 +6,7 @@
 
     <resultMap type="TenantSecretKey" id="TenantSecretKeyResult">
         <result property="id"    column="id"    />
+        <result property="agentId"    column="agent_id"    />
         <result property="tenantKey"    column="tenant_key"    />
         <result property="tenantSn"    column="tenant_sn"    />
         <result property="tenantSecret"    column="tenant_secret"    />
@@ -18,13 +19,14 @@
     </resultMap>
 
     <sql id="selectTenantSecretKeyVo">
-        select id, tenant_key, tenant_sn, tenant_secret, tenant_status, tenant_type, create_by, create_time, update_by, update_time from ff_tenant_secret_key
+        select id,agent_id, tenant_key, tenant_sn, tenant_secret, tenant_status, tenant_type, create_by, create_time, update_by, update_time from ff_tenant_secret_key
     </sql>
 
     <select id="selectTenantSecretKeyList" parameterType="TenantSecretKey" resultMap="TenantSecretKeyResult">
         <include refid="selectTenantSecretKeyVo"/>
         <where>
             <if test="tenantKey != null  and tenantKey != ''"> and tenant_key = #{tenantKey}</if>
+            <if test="agentId != null "> and agent_id = #{agentId}</if>
             <if test="tenantSn != null  and tenantSn != ''"> and tenant_sn = #{tenantSn}</if>
             <if test="tenantSecret != null  and tenantSecret != ''"> and tenant_secret = #{tenantSecret}</if>
             <if test="tenantStatus != null "> and tenant_status = #{tenantStatus}</if>
@@ -46,6 +48,7 @@
         insert into ff_tenant_secret_key
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="tenantKey != null and tenantKey != ''">tenant_key,</if>
+            <if test="agentId != null ">agent_id,</if>
             <if test="tenantSn != null">tenant_sn,</if>
             <if test="tenantSecret != null and tenantSecret != ''">tenant_secret,</if>
             <if test="tenantStatus != null">tenant_status,</if>
@@ -57,6 +60,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantKey != null and tenantKey != ''">#{tenantKey},</if>
+            <if test="agentId != null ">#{agentId},</if>
             <if test="tenantSn != null">#{tenantSn},</if>
             <if test="tenantSecret != null and tenantSecret != ''">#{tenantSecret},</if>
             <if test="tenantStatus != null">#{tenantStatus},</if>
@@ -72,6 +76,7 @@
         update ff_tenant_secret_key
         <trim prefix="SET" suffixOverrides=",">
             <if test="tenantKey != null and tenantKey != ''">tenant_key = #{tenantKey},</if>
+            <if test="agentId != null ">agent_id = #{agentId},</if>
             <if test="tenantSn != null">tenant_sn = #{tenantSn},</if>
             <if test="tenantSecret != null and tenantSecret != ''">tenant_secret = #{tenantSecret},</if>
             <if test="tenantStatus != null">tenant_status = #{tenantStatus},</if>