From 3fffae8d3c61562b2ed3a783f447ebdc31404b5a Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Tue, 18 Jun 2024 11:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=20apiUrl=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/SysApplicationApiEntity.java   | 10 ++++
 .../api/entity/SysApplicationApiEntity.xml    | 46 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
index e0fc5061..bed8eaf7 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
@@ -20,6 +20,8 @@ public class SysApplicationApiEntity extends BaseEntity {
    private String appId;
   /**  api应用名称 */
    private String appName;
+   /** api应用地址 **/
+   private String appUrl;
   /**  目录 */
    private String catalogueId;
   /**  目录名称 */
@@ -291,5 +293,13 @@ public class SysApplicationApiEntity extends BaseEntity {
     public void setReturnSuccessValue(String returnSuccessValue) {
         this.returnSuccessValue = returnSuccessValue;
     }
+
+    public String getAppUrl() {
+        return appUrl;
+    }
+
+    public void setAppUrl(String appUrl) {
+        this.appUrl = appUrl;
+    }
 }
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
index d180eef9..f6596703 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
@@ -10,6 +10,7 @@
         <result property="apiPath" column="api_path" jdbcType="VARCHAR"/>
         <result property="appId" column="app_id" jdbcType="VARCHAR"/>
         <result property="appName" column="app_name" jdbcType="VARCHAR"/>
+        <result property="appUrl" column="app_url" jdbcType="VARCHAR"/>
         <result property="catalogueId" column="catalogue_id" jdbcType="VARCHAR"/>
         <result property="catalogueName" column="catalogue_name" jdbcType="VARCHAR"/>
         <result property="apiName" column="api_name" jdbcType="VARCHAR"/>
@@ -84,6 +85,7 @@
 	a.id,
 	a.api_status,
 	b.name as app_name,
+	b.interfaceAddress as app_url,
 	a.app_id,
 	a.catalogue_id,
 	c.name as catalogue_name,
@@ -702,7 +704,7 @@ where id = #{id}
 <!--        </trim>-->
 <!--        order by a.sorts asc-->
 <!--    </select>-->
-    <select id="queryVoList"  resultType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo"  parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
+    <select id="queryVoList" databaseId="mysql"  resultType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo"  parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
         select
         a.id,
         a.catalogue_id AS catalogueId,
@@ -744,6 +746,48 @@ where id = #{id}
         </trim>
         order by a.sorts asc
     </select>
+    <select id="queryVoList" databaseId="oracle"  resultType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo"  parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
+        select
+        a.id,
+        a.catalogue_id AS catalogueId,
+        (
+        SELECT
+        b.NAME
+        FROM
+        sys_application_api_type b
+        WHERE
+        b.sts = 'Y'
+        AND b.id = a.catalogue_id
+        ) AS catalogueName,
+        a.api_name AS apiName,
+        a.api_code AS apiCode,
+        a.api_path AS apiPath,
+        a.destination_address AS destinationAddress,
+        a.api_remark AS apiRemark,
+        0 AS errorCount,
+        a.api_status AS apiStatus,
+        (
+        SELECT
+        WM_CONCAT( d.tripartite_system_id )
+        FROM
+        sys_application_api_auth_detail d
+        WHERE
+        d.app_id = a.app_id
+        AND d.api_id = a.id
+        and d.sts = 'Y'
+        ) as authDetail
+        FROM
+        sys_application_api a
+        <trim prefix="where" prefixOverrides="and">
+            <if test="appId != null and appId != ''">and a.app_id = #{appId}</if>
+            <if test="catalogueId != null and catalogueId != ''">and a.catalogue_id = #{catalogueId}</if>
+            <if test="nameOrRemark != null and nameOrRemark != ''">and (a.api_name like concat('%',#{nameOrRemark},'%')
+                or a.api_remark like concat('%',#{nameOrRemark},'%') )
+            </if>
+            and a.sts='Y'
+        </trim>
+        order by a.sorts asc
+    </select>
 
     <!-- 查询 采用==查询 -->
     <select id="queryBaseName" resultMap="get-SysApplicationApiEntity-result"