From e75208a8cbd9c40dea90446b39c84e9ee6f040f5 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Fri, 1 Jul 2022 17:29:24 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?-TOP5=E4=BD=BF=E7=94=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/CensusControllerV3.java     | 12 ++++++++----
 .../service/impl/ResourceServiceImpl.java         |  2 +-
 .../resources/mapper/resource/ResourceDao.xml     | 15 +++++++++------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java
index 6d204c1f..e552f0e0 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java
@@ -234,10 +234,14 @@ public class CensusControllerV3 {
             @ApiImplicitParam(name = "resourceType",value = "资源类型(组件服务、应用资源、基础设施、数据资源、知识库)", paramType = "query", dataType = "String")
     })
     public Result<List<Map<String, Object>>> assemblerUseTopInfo(@ApiIgnore @RequestParam Map<String, Object> params){
-        Object[] ps = {params.get("resourceType"),params.get("id"),params.get("id")};
-        List<Map<String, Object>> maps = jdbcTemplate.queryForList("SELECT  b.name,count(a.id) AS useNum FROM tb_data_resource_rel a INNER JOIN tb_data_resource b ON a.reference_id = b.id \n" +
-                "inner join sys_user d on a.creator = d.id\n" +
-                "INNER JOIN sys_dept c ON d.dept_id = c.id WHERE  a.del_flag = 0 AND b.type = ? AND (c.id = ? OR INSTR(c.pids,?)) GROUP BY b.name ORDER BY useNum desc  LIMIT 5", ps);
+        Object[] ps = {params.get("id"),params.get("id"),params.get("resourceType")};
+        List<Map<String, Object>> maps = jdbcTemplate.queryForList("SELECT COUNT(c.id) as useNum,c.name   FROM \n" +
+                "(\n" +
+                "\tSELECT a.id FROM tb_data_resource a INNER JOIN sys_dept b ON a.dept_id = b.id \n" +
+                "\tWHERE a.del_flag = 0 AND a.type='应用资源' AND (b.id = ? OR INSTR(b.pids,?))\n" +
+                ") a \n" +
+                "INNER JOIN tb_data_resource_rel b ON a.id = b.key_id INNER JOIN tb_data_resource c ON b.reference_id = c.id\n" +
+                "WHERE b.del_flag = 0 AND c.type = ? AND c.del_flag = 0 GROUP BY c.name ORDER BY useNum desc limit 5", ps);
 
         return new Result<List<Map<String,Object>>>().ok(maps);
     }
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index 75c11e50..7bef8b8e 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -1424,7 +1424,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             });
         });
 
-        //这里的使用数应该就是调用数，先用这个，等查询调用数的接口开发完了再改，2020/07/01 ytl
+        //本部门的应用关联的组件数量
         CompletableFuture<Void> voidCompletableFuture02 = CompletableFuture.runAsync(() -> {
             maps.forEach(m -> {
                 paraMap.put("id", m.get("deptId"));
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 9325b95a..e516a300 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1295,16 +1295,19 @@
 
     <!-- 根据组件类型查询部门申请组件的数量-->
     <select id="assemblyCarByDept" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT COUNT(distinct(a.resource_id)) as carNum,c.id FROM tb_resource_car a INNER JOIN sys_user b ON a.creator =
-        b.id INNER JOIN sys_dept c ON b.dept_id = c.id INNER JOIN tb_data_resource d on a.resource_id = d.id
-        WHERE a.del_flag = 0 AND c.id =#{id}  AND d.type = #{resourceType} group by c.id
+        SELECT COUNT(a.id) as carNum  FROM tb_resource_car a INNER JOIN sys_user b ON a.user_id = b.id INNER JOIN sys_dept c
+        ON b.dept_id = c.id INNER JOIN tb_data_resource d ON a.resource_id = d.id
+        WHERE a.del_flag = 0 AND (c.id = #{id} OR INSTR(c.pids,#{id})) AND d.type = #{resourceType} AND d.del_flag = 0
     </select>
 
     <!--根据组件类型查询部门使用组件的数量-->
     <select id="assemblyUseByDept" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT COUNT(distinct(a.key_id)) as useNum,c.id FROM tb_data_resource_rel a INNER JOIN sys_user b ON a.creator =
-        b.id INNER JOIN sys_dept c ON b.dept_id = c.id INNER JOIN tb_data_resource d on a.key_id = d.id
-        WHERE a.del_flag = 0 AND d.type = #{resourceType} AND c.id = #{id}  group by c.id
+        SELECT COUNT(DISTINCT(b.reference_id)) AS useNum FROM
+            (
+                SELECT a.id FROM tb_data_resource a INNER JOIN sys_dept b ON a.dept_id = b.id
+                WHERE a.del_flag = 0 AND a.type='应用资源' AND (b.id = #{id} OR INSTR(b.pids,#{id}))
+            ) a
+                INNER JOIN tb_data_resource_rel b ON a.id = b.key_id WHERE b.del_flag = 0
     </select>
 
     <select id="selectCountByDepts" resultType="java.util.Map">