From efcbe1681edc72540967f3e1e7c8443a3d6a41f4 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 28 Dec 2022 15:14:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E8=A1=80=E6=BA=90=E5=88=86=E6=9E=90-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E8=B0=83=E6=95=B4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E8=A1=80=E7=BC=98=E5=85=B3=E7=B3=BB=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

返回值修改为数据源和仪表板
---
 .../io/dataease/ext/ExtDataSetTableMapper.xml | 28 ++++++++++---------
 .../io/dataease/ext/ExtDataSourceMapper.xml   | 18 ++++++------
 .../io/dataease/ext/ExtPanelGroupMapper.xml   | 24 ++++------------
 3 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
index 46bbce05dd..205a1b42f2 100644
--- a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
@@ -159,23 +159,25 @@
 
     <select id="queryDatasetRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
         select
-            dt.id,
-            dt.name,
-            dt_auth.auths,
-            'dataset' `type`,
-            pg.id panel_id,
-            pg.name panel_name,
-            pg_auth.auths panel_auths,
-            if(pg.id is not null,'panel',null) pg_type
+            ds.id,
+            ds.name,
+            ds_auth.auths,
+            'link' `type`,
+            pg.id sub_id,
+            pg.name sub_name,
+            pg_auth.auths sub_auths,
+            if(pg.id is not null,'panel',null) sub_type
         from
             dataset_table dt
+        left join
+            datasource ds on dt.data_source_id = ds.id
         left join
         (
             select
-                t_dt.id,group_concat(distinct sad.privilege_type) auths
+                t_ds.id,group_concat(distinct sad.privilege_type) auths
             from
-                dataset_table t_dt
-            left join sys_auth sa on sa.auth_source = t_dt.id
+                datasource t_ds
+            left join sys_auth sa on sa.auth_source = t_ds.id
             left join sys_auth_detail sad on sa.id = sad.auth_id
             where
                 sa.auth_source = #{datasetId,jdbcType=VARCHAR}
@@ -199,7 +201,7 @@
                 )
             )
             group by sa.auth_source
-        ) dt_auth on dt.id = dt_auth.id
+        ) ds_auth on ds.id = ds_auth.id
         left join chart_view cv on cv.table_id = dt.id
         left join panel_group pg on cv.scene_id = pg.id
         left join
@@ -234,7 +236,7 @@
             group by sa.auth_source
         ) pg_auth on pg_auth.id = pg.id
         where dt.id=#{datasetId,jdbcType=VARCHAR}
-        group by id,panel_id
+        group by id,sub_id
         order by id
     </select>
 </mapper>
diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
index 49c1bfe889..2e572d0578 100644
--- a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
@@ -11,10 +11,10 @@
         <result column="name" property="name"/>
         <result column="auths" property="auths"/>
         <collection property="subRelation" ofType="io.dataease.dto.RelationDTO">
-            <id column="panel_id" property="id"/>
-            <result column="panel_name" property="name"/>
-            <result column="panel_auths" property="auths"/>
-            <result column="pg_type" property="type"/>
+            <id column="sub_id" property="id"/>
+            <result column="sub_name" property="name"/>
+            <result column="sub_auths" property="auths"/>
+            <result column="sub_type" property="type"/>
         </collection>
     </resultMap>
 
@@ -167,10 +167,10 @@
             dt.name,
             dt_auth.auths,
             'dataset' `type`,
-            pg.id panel_id,
-            pg.name panel_name,
-            pg_auth.auths panel_auths,
-            if(pg.id is not null,'panel',null) pg_type
+            pg.id sub_id,
+            pg.name sub_name,
+            pg_auth.auths sub_auths,
+            if(pg.id is not null,'panel',null) sub_type
         from
             datasource ds
         join dataset_table dt on dt.data_source_id = ds.id
@@ -239,7 +239,7 @@
             group by sa.auth_source
         ) pg_auth on pg_auth.id = pg.id
         where ds.id=#{datasourceId,jdbcType=VARCHAR}
-        group by id,panel_id
+        group by id,sub_id
         order by id
     </select>
 </mapper>
diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
index 8aebceeb0c..a75137acd1 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
@@ -14,18 +14,6 @@
         <result column="is_default" property="isDefault"/>
     </resultMap>
 
-    <resultMap id="RelationResultMap" type="io.dataease.dto.RelationDTO">
-        <id column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="auths" property="auths"/>
-        <collection property="subRelation" ofType="io.dataease.dto.RelationDTO">
-            <id column="dt_id" property="id"/>
-            <result column="dt_name" property="name"/>
-            <result column="dt_auths" property="auths"/>
-            <result column="dt_type" property="type"/>
-        </collection>
-    </resultMap>
-
     <select id="findOneWithPrivileges" resultMap="BaseResultMapDTO">
         select panel_group.*,
                panel_group.name                                                        as label,
@@ -238,16 +226,16 @@
 
     </delete>
 
-    <select id="queryPanelRelation" resultType="io.dataease.dto.RelationDTO" resultMap="RelationResultMap">
+    <select id="queryPanelRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
         select
             ds.id,
             ds.name,
             ds_auth.auths,
             'link' `type`,
-            dt.id dt_id,
-            dt.name dt_name,
-            dt_auth.auths dt_auths,
-            if(dt.id is not null,'dataset',null) dt_type
+            dt.id sub_id,
+            dt.name sub_name,
+            dt_auth.auths sub_auths,
+            if(dt.id is not null,'dataset',null) sub_type
         from
             panel_group pg
         join
@@ -318,7 +306,7 @@
             group by sa.auth_source
         ) ds_auth on ds_auth.id = ds.id
         where pg.id=#{panelId,jdbcType=VARCHAR}
-        group by id,dt_id
+        group by id,sub_id
         order by id
     </select>