From 4f375235193465aa1f3fd0b2e02b3a2c058c425b Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Thu, 13 Oct 2022 11:02:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=90=84=E7=A7=8D=E8=B5=84=E6=BA=90=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/db/V6.5__tb_fuse_add_col.sql                      | 3 +++
 .../main/java/io/renren/modules/fuse/dto/TbFuseDTO.java  | 9 +++++++++
 .../java/io/renren/modules/fuse/entity/TbFuseEntity.java | 4 ++++
 .../src/main/resources/db/V6.5__tb_fuse_add_col.sql      | 3 +++
 .../src/main/resources/mapper/fuse/TbFuseDao.xml         | 8 +++-----
 .../src/main/resources/mapper/resource/ResourceDao.xml   | 5 +++--
 6 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 config/db/V6.5__tb_fuse_add_col.sql
 create mode 100644 renren-admin/src/main/resources/db/V6.5__tb_fuse_add_col.sql

diff --git a/config/db/V6.5__tb_fuse_add_col.sql b/config/db/V6.5__tb_fuse_add_col.sql
new file mode 100644
index 00000000..20051adc
--- /dev/null
+++ b/config/db/V6.5__tb_fuse_add_col.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `tb_fuse` ADD COLUMN `infrastructure_count` int NULL DEFAULT 0 COMMENT '基础设施数量';
+ALTER TABLE `tb_fuse` ADD COLUMN `dataSource_count` int NULL DEFAULT 0 COMMENT '数据资源数量';
+ALTER TABLE `tb_fuse` ADD COLUMN `component_count` int NULL DEFAULT 0 COMMENT '组件服务数量';
\ No newline at end of file
diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java b/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java
index a228c23a..7ff0b2ec 100644
--- a/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java
+++ b/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java
@@ -51,4 +51,13 @@ public class TbFuseDTO {
     private List<TbFuseResourceDTO> fuseResourceList;
     @ApiModelProperty(value = "融合资源属性")
     private List<TbFuseAttrDTO> fuseAttrList;
+
+    @ApiModelProperty(value = "基础设施数量")
+    private Integer infrastructureCount;
+    @ApiModelProperty(value = "数据资源数量")
+    private Integer dataSourceCount;
+    @ApiModelProperty(value = "组件服务数量")
+    private Integer componentCount;
+
+
 }
diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java
index 346faa6d..26609e37 100644
--- a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java
+++ b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java
@@ -75,4 +75,8 @@ public class TbFuseEntity extends BaseEntity {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateDate;
+
+    private Integer infrastructureCount;
+    private Integer dataSourceCount;
+    private Integer componentCount;
 }
diff --git a/renren-admin/src/main/resources/db/V6.5__tb_fuse_add_col.sql b/renren-admin/src/main/resources/db/V6.5__tb_fuse_add_col.sql
new file mode 100644
index 00000000..20051adc
--- /dev/null
+++ b/renren-admin/src/main/resources/db/V6.5__tb_fuse_add_col.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `tb_fuse` ADD COLUMN `infrastructure_count` int NULL DEFAULT 0 COMMENT '基础设施数量';
+ALTER TABLE `tb_fuse` ADD COLUMN `dataSource_count` int NULL DEFAULT 0 COMMENT '数据资源数量';
+ALTER TABLE `tb_fuse` ADD COLUMN `component_count` int NULL DEFAULT 0 COMMENT '组件服务数量';
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
index 8427eed8..03038efb 100644
--- a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
+++ b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
@@ -9,18 +9,16 @@
         <result property="description" column="description"/>
         <result property="applicationArea" column="application_area"/>
         <result property="deptId" column="dept_id"/>
-        <result property="deptUser" column="dept_user"/>
-        <result property="mobile" column="mobile"/>
         <result property="sceneUrl" column="scene_url"/>
-        <result property="provider" column="provider"/>
-        <result property="providerUser" column="provider_user"/>
-        <result property="providerMobile" column="provider_mobile"/>
         <result property="creator" column="creator"/>
         <result property="createDate" column="create_date"/>
         <result property="updater" column="updater"/>
         <result property="updateDate" column="update_date"/>
         <result property="isCollect" column="isCollect"/>
         <result property="collectCount" column="collectCount"/>
+        <result property="infrastructureCount" column="infrastructure_count"/>
+        <result property="dataSourceCount" column="dataSource_count"/>
+        <result property="componentCount" column="component_count"/>
     </resultMap>
 
     <select id="getFuseDTOList" resultMap="fuseDTO">
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index aed379e5..ceb7e09f 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -722,10 +722,11 @@
     </select>
 
     <select id="selectDeptCount" resultType="java.lang.Integer">
-        SELECT
+       <!-- SELECT
         COUNT( 1 )
         FROM
-        ( SELECT DISTINCT dept_id FROM tb_data_resource WHERE 1 = 1 AND del_flag = 0 AND dept_id IS NOT NULL ) temp
+        ( SELECT DISTINCT dept_id FROM tb_data_resource WHERE 1 = 1 AND del_flag = 0 AND dept_id IS NOT NULL ) temp -->
+        SELECT COUNT(id) FROM sys_dept WHERE name != '访客部门'
     </select>
 
     <select id="selectDeptTypeCount" resultType="java.util.Map">