全局数量排序

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

@@ -2026,6 +2026,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 +2039,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                         {
                             put("count", countNew + "");
                             put("type", "基础设施");
+                            put("type_index", 3);
                         }
                     });
 
@@ -2073,7 +2075,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
@@ -2272,18 +2287,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>