From 5162b2ab2226b105b5fe47b8ee444dea7aa9d687 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 16 Mar 2022 22:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.2=E3=80=91=E6=9B=B4=E6=96=B0pgsql?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mapping/SysStatisticsUrlMapper.xml  | 18 ++++++++++++++++++
 .../home/service/impl/HomePageServiceImpl.java |  3 ++-
 .../menu/mapper/mapping/SysMenuMapper.xml      | 18 ++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml
index bf8751ba1..b55c4fc3f 100644
--- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml
+++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml
@@ -36,4 +36,22 @@
         </foreach>,stat_url_id)
     </select>
 
+    <!--根据统计urlId集合获取菜单id集合，pgsql版本-->
+    <select id="getMenuIdsByStatUrlIdList" resultType="java.lang.Long" databaseId="pgsql">
+        select stat_menu_id as statMenuId from sys_statistics_url stat
+        <where>
+            <if test="statUrlIds != null and statUrlIds.size() > 0">
+                stat.stat_url_id in
+                <foreach item="item" collection="statUrlIds" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by case stat_url_id
+        <foreach item="item" collection="statUrlIds" index="index" open="" separator="," close="">
+            when ${item} then ${index}
+        </foreach>
+        end
+    </select>
+
 </mapper>
diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java
index 925068989..38f149721 100644
--- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java
+++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java
@@ -223,8 +223,9 @@ public class HomePageServiceImpl implements HomePageService, HomePageServiceApi
         }
 
         // 查询缓存用户在库中的统计记录
+        List<Long> userIdsLong = userIds.stream().map(Long::valueOf).collect(Collectors.toList());
         List<SysStatisticsCount> sysStatisticsCounts = sysStatisticsCountService.list(
-                Wrappers.lambdaQuery(SysStatisticsCount.class).in(SysStatisticsCount::getUserId, userIds));
+                Wrappers.lambdaQuery(SysStatisticsCount.class).in(SysStatisticsCount::getUserId, userIdsLong));
 
         for (SysStatisticsCount cacheItem : cacheCountList) {
             boolean haveRecord = false;
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml
index 4b9891249..b59606e1c 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml
@@ -36,4 +36,22 @@
         </foreach>,menu_id)
     </select>
 
+    <!--获取一些菜单的统计信息（只返回名称，路径，图标）pgsql版本-->
+    <select id="getMenuStatInfoByMenuIds" resultType="cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu" databaseId="pgsql">
+        select menu_name as menuName, antdv_icon as antdvIcon , antdv_router as antdvRouter from sys_menu menu
+        <where>
+            <if test="menuIds != null and menuIds.size() > 0">
+                menu.menu_id in
+                <foreach item="item" collection="menuIds" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by case menu_id
+        <foreach item="item" collection="menuIds" index="index" open="" separator="," close="">
+            when ${item} then ${index}
+        </foreach>
+        end
+    </select>
+
 </mapper>