From a18d98e0b3dd8196255a86a442658ff758df24b1 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Sat, 25 Jun 2022 09:24:30 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=A7=E7=BB=AD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=96=B0=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=90=8E=E5=8F=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/CensusControllerV3.java    |  2 +-
 .../renren/modules/resource/dao/ResourceDao.java |  2 +-
 .../resource/service/ResourceService.java        |  2 +-
 .../service/impl/ResourceServiceImpl.java        |  6 +++++-
 .../resources/mapper/resource/ResourceDao.xml    | 16 ++++++++++++++++
 5 files changed, 24 insertions(+), 4 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 eec9ed3c..96d8408f 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
@@ -256,7 +256,7 @@ public class CensusControllerV3 {
             @ApiImplicitParam(name = "resourceType",value = "资源类型(组件服务、应用资源、基础设施、数据资源、知识库)", paramType = "query", dataType = "String")
     })
     public Result<List<Map<String,Object>>> applicationAreaCapabilitySet(@ApiIgnore @RequestParam Map<String, Object> params) {
-        return new Result<List<Map<String,Object>>>().ok(resourceService.applicationAreaCapabilitySet(params));
+        return new Result<List<Map<String,Object>>>().ok(resourceService.applicationAreaCapabilityList(params));
     }
 
 
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
index 7bd1d012..7ce8c305 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
@@ -119,5 +119,5 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
     Integer selectResourceShare(Map params);
    // List<Map<String,Object>> selectDeptList(Map params);
     List<Map<String,Object>> selectResurceCarDetails(Map params);
-    List<Map<String,Object>> applicationAreaCapabilitySet(Map params);
+    List<Map<String,Object>> applicationAreaCapabilityList(Map params);
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java
index 75dc0110..99034ea8 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java
@@ -93,5 +93,5 @@ public interface ResourceService extends CrudService<ResourceEntity, ResourceDTO
     List<Map<String,Object>> resourceDatasDetails(Map<String,Object> params);
     List<Map<String,Object>> resourceKnowledgeDetails(Map<String,Object> params);
     List<Map<String,Object>> assemblerCarDetail(Map<String,Object> params);
-    List<Map<String,Object>> applicationAreaCapabilitySet(Map params);
+    List<Map<String,Object>> applicationAreaCapabilityList(Map params);
 }
\ No newline at end of file
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 7df6b7d3..ade0819e 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
@@ -733,6 +733,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         return resultMap;
     }
 
+    @Override
+    public List<Map<String,Object>> applicationAreaCapabilityList(Map params){
+        return resourceDao.applicationAreaCapabilityList(params);
+    }
     @Override
     public Object selectResourceListByType(String type) {
         return resourceDao.selectByType(type);
@@ -1181,7 +1185,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                 "INNER JOIN tb_data_resource c ON a.resource_id = c.id \n" +
                 "WHERE b.dept_id = ? AND c.type = ?\n" +
                 "ORDER BY a.create_date DESC \n" +
-                "LIMIT ?,?\n", ps);
+                "LIMIT ?,?\n",ps);
 
         return result;
     }
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 95b411cf..87d1ea3a 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -899,6 +899,22 @@
         type
     </select>
     <select id="applicationAreaCapabilitySet" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+            SUBSTRING_INDEX( SUBSTRING_INDEX( tdav.attr_value, ';', b.help_topic_id + 1 ), ';',- 1 ) AS type ,
+            COUNT( tdav.data_resource_id ) AS  total
+        FROM
+            tb_data_attr tdav
+                JOIN mysql.help_topic b ON b.help_topic_id &lt; ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value,
+                                                                                                                ';', '' ) ) + 1 )
+        WHERE
+            1 = 1
+          AND tdav.attr_type = '应用领域'
+          AND tdav.del_flag = 0
+          AND SUBSTRING_INDEX( SUBSTRING_INDEX( tdav.attr_value, ';', b.help_topic_id + 1 ), ';',- 1 ) != ''
+        GROUP BY
+            type
+    </select>
+    <select id="applicationAreaCapabilityList" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT
             SUBSTRING_INDEX( SUBSTRING_INDEX( tdav.attr_value, ';', b.help_topic_id + 1 ), ';',- 1 ) AS type ,
             COUNT( tdav.data_resource_id ) AS  total