Merge branch 'dev'

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 `data_source_count` int NULL DEFAULT 0 COMMENT '数据资源数量';
+ALTER TABLE `tb_fuse` ADD COLUMN `component_count` int NULL DEFAULT 0 COMMENT '组件服务数量';

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;
+
+
 }

renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseResourceDTO.java

@@ -19,7 +19,7 @@ public class TbFuseResourceDTO {
     @ApiModelProperty(value = "融合服务id")
     private Long fuseId;
     @ApiModelProperty(value = "资源id")
-    private Long resourceId;
+    private String resourceId;
     @ApiModelProperty(value = "资源挂载顺序")
     private String sequence;
     @ApiModelProperty(value = "资源")

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;
 }

renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java

@@ -27,7 +27,7 @@ public class TbFuseResourceEntity {
     /**
      * 资源id
      */
-    private Long resourceId;
+    private String resourceId;
     /**
      * 顺序
      */

renren-admin/src/main/resources/db/V6.5__fuse_update_col.sql

@@ -0,0 +1 @@
+ALTER TABLE `tb_fuse_resource` MODIFY COLUMN `resource_id` longtext NOT NULL COMMENT '资源id';

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 `data_source_count` int NULL DEFAULT 0 COMMENT '数据资源数量';
+ALTER TABLE `tb_fuse` ADD COLUMN `component_count` int NULL DEFAULT 0 COMMENT '组件服务数量';

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="data_source_count"/>
+        <result property="componentCount" column="component_count"/>
     </resultMap>
 
     <select id="getFuseDTOList" resultMap="fuseDTO">

renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml

@@ -119,6 +119,13 @@
         AND su.dept_id != ''
         AND su.dept_id IS NOT NULL
         GROUP BY tda.attr_value
+
+        UNION
+        SELECT
+            '会议室' AS 'type',
+            COUNT( id ) AS 'amount'
+        FROM
+            t_meetingroom_book tmb
         ) temp2
     </select>
 

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">