From 344486861242d260b4750f1314295a59e42c7ec2 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Wed, 25 May 2022 11:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1-=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=9B=BE=E8=B0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/CensusController.java   |  7 ++
 .../modules/resource/dao/ResourceDao.java     |  7 ++
 .../resource/service/ResourceService.java     |  2 +
 .../service/impl/ResourceServiceImpl.java     | 25 ++++---
 .../resources/mapper/resource/ResourceDao.xml | 73 +++++++++++++++++++
 5 files changed, 104 insertions(+), 10 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
index 3ec455a8..777e0330 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
@@ -320,6 +320,13 @@ public class CensusController {
         return new Result().ok(resourceService.applicationAreaCapabilitySet());
     }
 
+    @GetMapping("/selectResourceListByAppArea")
+    @ApiOperation("资源图谱-应用领域-能力集-根据应用领域查能力")
+    @LogOperation("资源图谱-应用领域-能力集-根据应用领域查能力")
+    public Result selectResourceListByAppArea(@RequestParam String appArea) {
+        return new Result().ok(resourceService.selectResourceListByAppArea(appArea));
+    }
+
     @GetMapping("/selectResourceListByType")
     @ApiOperation("资源图谱-能力类型-能力集-根据类型查能力")
     @LogOperation("资源图谱-能力类型-能力集-根据类型查能力")
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 82c3fd5c..2f8174e2 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
@@ -99,4 +99,11 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
     List<Map> selectByType(@Param("type") String s);
 
     List<Map> selectTypeCountList();
+
+    List<String> selectMaxAppArea();
+
+    List<Map> selectByAppArea(@Param("type") String s);
+
+    List<Map> selectAppAreaCountList();
+
 }
\ 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 2d089eb8..343b33dd 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
@@ -72,4 +72,6 @@ public interface ResourceService extends CrudService<ResourceEntity, ResourceDTO
     Object applicationAreaCapabilitySet();
 
     Object selectResourceListByType(String type);
+
+    Object selectResourceListByAppArea(String appArea);
 }
\ 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 5488bd11..902e6d15 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
@@ -513,22 +513,22 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         maxdeptMap.put("resourceList", resourceList);
         maxdeptMap.put("typeName", types.get(0));
         resultMap.put("maxDept", maxdeptMap);
-        List<Map> deptList = resourceDao.selectTypeCountList();
-        resultMap.put("typeList", deptList);
+        List<Map> typeList = resourceDao.selectTypeCountList();
+        resultMap.put("typeList", typeList);
         return resultMap;
     }
 
     @Override
     public Object applicationAreaCapabilitySet() {
         HashMap<String, Object> resultMap = new HashMap<>();
-        //List<String> types = resourceDao.selectMaxAppArea();
-        //List<Map> resourceList = resourceDao.selectByApparea(types.get(0));
-        //HashMap<String, Object> maxdeptMap = new HashMap<>();
-        //maxdeptMap.put("resourceList", resourceList);
-        //maxdeptMap.put("typeName", types.get(0));
-        //resultMap.put("maxDept", maxdeptMap);
-        //List<Map> deptList = resourceDao.selectTypeCountList();
-        //resultMap.put("typeList", deptList);
+        List<String> types = resourceDao.selectMaxAppArea();
+        List<Map> resourceList = resourceDao.selectByAppArea(types.get(0));
+        HashMap<String, Object> maxAppAreaMap = new HashMap<>();
+        maxAppAreaMap.put("resourceList", resourceList);
+        maxAppAreaMap.put("typeName", types.get(0));
+        resultMap.put("maxAppArea", maxAppAreaMap);
+        List<Map> appAreaList = resourceDao.selectAppAreaCountList();
+        resultMap.put("appAreaList", appAreaList);
         return resultMap;
     }
 
@@ -537,4 +537,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         return resourceDao.selectByType(type);
     }
 
+    @Override
+    public Object selectResourceListByAppArea(String appArea) {
+        return resourceDao.selectByAppArea(appArea);
+    }
+
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 56c61407..eb0001f6 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -792,4 +792,77 @@
             total DESC
     </select>
 
+    <select id="selectMaxAppArea" resultType="java.lang.String">
+        SELECT
+        type
+        FROM
+        (
+        SELECT
+        SUBSTRING_INDEX( SUBSTRING_INDEX( tdav.attr_value, ';', b.help_topic_id + 1 ), ';',- 1 ) AS "type",
+        COUNT( tdav.data_resource_id ) AS "count"
+        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
+        ) temp1
+        WHERE
+        temp1.count = (
+        SELECT
+        MAX( count ) AS "total"
+        FROM
+        (
+        SELECT
+        SUBSTRING_INDEX( SUBSTRING_INDEX( tdav.attr_value, ';', b.help_topic_id + 1 ), ';',- 1 ) AS "type",
+        COUNT( tdav.data_resource_id ) AS "count"
+        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
+        ) temp2
+        )
+    </select>
+
+    <select id="selectByAppArea" resultType="java.util.Map">
+        SELECT
+            tdr.id,
+            tdr.name
+        FROM
+            tb_data_resource tdr,
+            tb_data_attr tda
+        WHERE
+            1 = 1
+          AND tdr.del_flag = 0
+          AND tda.del_flag = 0
+          AND tdr.id = tda.data_resource_id
+          AND attr_value LIKE CONCAT('%', #{type}, '%')
+    </select>
+
+    <select id="selectAppAreaCountList" 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>
+
 </mapper>
\ No newline at end of file