From 5cdad407736e44288b91e893e7144d472e684576 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Tue, 25 Oct 2022 17:41:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=83=BD=E5=8A=9B=E5=B9=BF=E5=9C=BA=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=B9=BF=E5=9C=BAbug=E4=BF=AE=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=93=E6=9E=9C=E6=80=BB=E6=95=B0=202.=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95=E5=B9=BF=E5=9C=BA=E5=92=8Cgis=E5=B9=BF=E5=9C=BA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E9=87=8D=E5=86=99=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E5=8C=BA=E5=B8=82=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E8=B5=B6=E5=9B=9E=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResourceController.java        |  7 ++
 .../modules/resource/dao/ResourceDao.java     |  7 ++
 .../resource/service/ResourceService.java     |  2 +
 .../service/impl/ResourceServiceImpl.java     | 20 +++++-
 .../resources/mapper/resource/ResourceDao.xml | 71 +++++++++++++++++++
 5 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
index c3e6e84f..ac0403a3 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
@@ -671,4 +671,11 @@ public class ResourceController {
         return new Result<>().ok(resourceService.getPotentialList());
     }
 
+    @PostMapping("/getSquareList")
+    @ApiOperation("/算法广场获取算法或Gis列表")
+    @LogOperation("/算法广场获取算法或Gis列表")
+    public Result getSquareList(@RequestBody JSONObject jsonObject) {
+        return new Result().ok(resourceService.getSquareList(jsonObject));
+    }
+
 }
\ No newline at end of file
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 770903c0..5eaa24d4 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
@@ -205,4 +205,11 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
     List<Map> getPotentialList(@Param("halfMonthDay") String halfMonthDay, @Param("monthDay") String monthDay);
 
     List<Map> getStarList();
+
+    Integer selectAppListCount(@Param("type") Integer type, @Param("area") String area);
+
+    List<Map> getSquareList(@Param("type") String type, @Param("deptType") Integer deptType, @Param("area") String area,
+                            @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
+    Integer getSquareListCount(@Param("type") String type, @Param("deptType") Integer deptType, @Param("area") String area);
 }
\ 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 bfb902fc..a6caed9b 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
@@ -157,4 +157,6 @@ public interface ResourceService extends CrudService<ResourceEntity, ResourceDTO
     Object getStarList();
 
     Object getPotentialList();
+
+    Object getSquareList(JSONObject jsonObject);
 }
\ 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 582612c1..21b81203 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
@@ -1494,12 +1494,16 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
 
     @Override
     public Object selectAppList(Map params) {
+
         int pageNum = Integer.parseInt(params.get("pageNum").toString());
         Integer type = params.containsKey("type") ? Integer.parseInt(params.get("type").toString()) : null;
         String area = params.containsKey("area") ? params.get("area").toString() : null;
         List<Map> maps = resourceDao.selectAppList((pageNum - 1) * 9, type, area);
         maps.forEach(x -> x.put("pic", resourceDao.selectPicByResId(x.get("id").toString())));
-        return maps;
+        return new HashMap() {{
+            put("appList",maps);
+            put("total", resourceDao.selectAppListCount(type, area));
+        }};
     }
 
     @Override
@@ -2410,4 +2414,18 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         return potentialList;
     }
 
+    @Override
+    public Object getSquareList(JSONObject jsonObject) {
+        Integer deptType = jsonObject.getInteger("deptType");
+        String area = jsonObject.getString("area");
+        String type = jsonObject.getString("type");
+        Integer pageNum = jsonObject.getInteger("pageNum");
+        Integer pageSize = jsonObject.getInteger("pageSize");
+        Integer i = (pageNum - 1) * pageSize;
+        return new HashMap() {{
+            put("list", resourceDao.getSquareList(type, deptType, area, i, pageSize));
+            put("total", resourceDao.getSquareListCount(type, deptType, area));
+        }};
+    }
+
 }
\ 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 d8d1828e..9763fa3c 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -2164,4 +2164,75 @@
 
         ORDER BY fireNum DESC, create_date DESC LIMIT 10
     </select>
+
+    <select id="selectAppListCount" resultType="java.lang.Integer">
+        SELECT IFNULL(COUNT(1), 0)
+        FROM
+        tb_data_resource tdr
+        LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
+        LEFT JOIN sys_region sr ON sd.district = sr.id
+        WHERE
+        1 = 1
+        AND MATCH (tdr.type) AGAINST ( '应用资源' IN BOOLEAN MODE)
+        AND tdr.del_flag = 0
+        <if test=" type != null and type != ''">
+            AND sd.type = #{type}
+        </if>
+        <if test=" area != null and area != ''">
+            AND JSON_EXTRACT( info_list, JSON_UNQUOTE( REPLACE ( JSON_SEARCH( info_list, 'all', '应用领域', NULL, '$[*].attrType' ), 'attrType', 'attrValue' ) ) ) LIKE CONCAT( '%', #{area}, '%' )
+        </if>
+    </select>
+
+    <select id="getSquareList" resultType="java.util.Map">
+        SELECT
+        tdr.id,
+        tdr.`name`,
+        tdr.dept_id,
+        sd.NAME AS "deptName",
+        sd.sort AS "deptSort",
+        sd.type AS "deptType",
+        sr.sort AS "regionSort",
+        IFNULL( tdr.visitor, 0 ) AS visitor
+        FROM
+        tb_data_resource tdr
+        LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
+        LEFT JOIN sys_region sr ON sd.district = sr.id
+        WHERE
+        1 = 1
+        AND MATCH ( tdr.type ) AGAINST ( '组件服务' IN BOOLEAN MODE )
+        AND tdr.del_flag = 0
+        AND tdr.id IN ( SELECT data_resource_id FROM tb_data_attr WHERE attr_type = '组件类型' AND attr_value = #{type} AND del_flag = 0 )
+        <if test = " deptType != null and deptType != ''">
+            AND sd.type = #{deptType}
+        </if>
+        <if test = " area != null and area != ''">
+            AND JSON_EXTRACT( info_list, JSON_UNQUOTE( REPLACE ( JSON_SEARCH( info_list, 'all', '应用领域', NULL, '$[*].attrType' ), 'attrType', 'attrValue' ) ) ) LIKE CONCAT( '%', #{area}, '%')
+        </if>
+        ORDER BY
+        sd.type,
+        sr.sort,
+        sd.sort,
+        tdr.dept_id,
+        tdr.visitor DESC,
+        tdr.id DESC
+        LIMIT ${pageNum}, 9
+    </select>
+
+    <select id="getSquareListCount" resultType="java.lang.Integer">
+        SELECT IFNULL(COUNT(1), 0) FROM tb_data_resource tdr
+        LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
+        LEFT JOIN sys_region sr ON sd.district = sr.id
+        WHERE
+        1 = 1
+        AND MATCH ( tdr.type ) AGAINST ( '组件服务' IN BOOLEAN MODE )
+        AND tdr.del_flag = 0
+        AND tdr.id IN ( SELECT data_resource_id FROM tb_data_attr WHERE attr_type = '组件类型' AND attr_value = #{type} AND del_flag = 0 )
+        <if test = " deptType != null and deptType != ''">
+            AND sd.type = #{deptType}
+        </if>
+        <if test = " area != null and area != ''">
+            AND JSON_EXTRACT( info_list, JSON_UNQUOTE( REPLACE ( JSON_SEARCH( info_list, 'all', '应用领域', NULL, '$[*].attrType' ), 'attrType', 'attrValue' ) ) ) LIKE CONCAT( '%', #{area}, '%')
+        </if>
+    </select>
+
 </mapper>
\ No newline at end of file