Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -1917,7 +1917,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         CompletableFuture<Void> all = CompletableFuture.allOf(jcss, hkt, sphy);
         all.join();
 
-        return resultMap;
+        return new LinkedHashMap(){{
+            put("视频资源", resultMap.get("视频资源"));
+            put("会客厅", resultMap.get("会客厅"));
+            put("视频会议", resultMap.get("视频会议"));
+        }};
     }
 
     @Override
@@ -1931,7 +1935,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     @Override
     public Object selectCollectResourceList() {
         List<Map> resourceCountList = baseDao.selectCollectResourceList();
-        Map result = new HashMap();
+        Map result = new LinkedHashMap();
         resourceCountList.stream().filter(it -> it.get("type") != null && !it.get("type").equals("")).forEach(it -> result.put(it.get("type"), it.get("count")));
         return result;
     }
@@ -2026,6 +2030,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                         {
                             put("count", null == dataResource ? "0" : dataResource.get("rows") + "");
                             put("type", "数据资源");
+                            put("type_index", 4);
                         }
                     });
                 }, executor);
@@ -2038,6 +2043,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                         {
                             put("count", countNew + "");
                             put("type", "基础设施");
+                            put("type_index", 3);
                         }
                     });
 
@@ -2073,7 +2079,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             };
             resultList.add(nullMap);
         });
-        return resultList;
+        return resultList.stream().sorted(Comparator.comparing(x -> {
+            Map index = (Map) x;
+            int type_index = index.containsKey("type_index") ? (int) index.get("type_index") : Integer.MAX_VALUE;
+            return type_index;
+        }).reversed()).collect(Collectors.toList());
     }
 
     @Override

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -1639,7 +1639,22 @@
     <select id="selectTypeCountByName" resultType="java.util.Map">
         SELECT
         type,
-        count(id) AS "count"
+        count(id) AS "count",
+        (
+        CASE
+        type
+        WHEN '应用资源' THEN
+        1
+        WHEN '组件服务' THEN
+        2
+        WHEN '基础设施' THEN
+        3
+        WHEN '知识库' THEN
+        5
+        WHEN '数据资源' THEN
+        4
+        END
+        ) AS "type_index"
         FROM tb_data_resource
         WHERE 1 = 1
         AND del_flag = 0
@@ -1797,7 +1812,7 @@
         GROUP BY
         sd.id,
         tdr.type
-        <if test="type == null or type == '' or type == '会议室'">
+        <if test="type == null or type == '' or type == '会客厅'">
             UNION
 
             SELECT
@@ -1986,14 +2001,14 @@
             AND SUBSTR(taa.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
         </if>
 
-        <if test="type == null or type == '' or type == '会议室'">
+        <if test="type == null or type == '' or type == '会客厅'">
             UNION ALL
 
             SELECT
             tmb.dept AS 'deptName',
             tm.`name` AS 'resourceName',
             '青岛市大数据发展管理局' AS 'resourceDeptName',
-            '会议室' AS 'type',
+            '会客厅' AS 'type',
             tmb.create_date AS 'createDate',
             CASE tmb.state WHEN 1 THEN '审核中' WHEN 2 THEN '通过' WHEN 3 THEN '不通过' ELSE '审核中' END AS
             'approveStatus',
@@ -2040,9 +2055,11 @@
         FROM tb_data_attr a INNER JOIN mysql.help_topic b ON a.attr_type='应用领域' AND a.del_flag=0 AND b.help_topic_id
         <![CDATA[ < ]]> (length(a.attr_value) - length(REPLACE(a.attr_value, ';', '')) + 1)) tda
         ON tdr.id=tda.data_resource_id
+        LEFT JOIN (select sdd.sort, sdd.dict_label from sys_dict_data sdd left join tb_data_category tdc on sdd.dict_type_id=tdc.link_value
+        where 1=1 and sdd.status=1 and tdc.del_flag=0 and tdc.name='应用领域' and tdc.root_category='应用资源') dict ON dict.dict_label=tda.attr_value
         WHERE 1=1 AND tdr.del_flag=0 AND tdr.type='应用资源'
         GROUP BY tda.attr_value
-        ORDER BY count DESC
+        ORDER BY ANY_VALUE(IFNULL(dict.sort, 9999)) ASC
     </select>
 
     <select id="getPraiseList" resultType="java.util.Map">
@@ -2272,18 +2289,18 @@
 
     <select id="getAppListByDept" resultType="java.util.Map">
         SELECT
-            tdr.id,
+        tdr.id,
-            tdr.NAME,
+        tdr.NAME,
-            tdr.create_date
+        tdr.create_date
         FROM
-            tb_data_resource tdr
+        tb_data_resource tdr
         WHERE
-            1 = 1
+        1 = 1
-            AND tdr.del_flag = 0
+        AND tdr.del_flag = 0
-            AND tdr.dept_id = #{deptId}
+        AND tdr.dept_id = #{deptId}
-            <if test="key != null and key != ''">
+        <if test="key != null and key != ''">
-                AND tdr.name like CONCAT('%', #{key}, '%')
+            AND tdr.name like CONCAT('%', #{key}, '%')
-            </if>
+        </if>
         ORDER BY create_date DESC
     </select>