From 7006932fa6e891d7f92088b9f59fa26c290160a6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 10 十二月 2024 20:29:07 +0800
Subject: [PATCH] 1

---
 se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java |    5 +++--
 se-modules/se-system/src/main/resources/mapper/system/IndexMapper.xml            |   11 ++++++++++-
 docker-compose/mysql/initdb/se_cloud_20240629.sql                                |   20 ++++++++++----------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/docker-compose/mysql/initdb/se_cloud_20240629.sql b/docker-compose/mysql/initdb/se_cloud_20240629.sql
index e5aac1f..5088d74 100644
--- a/docker-compose/mysql/initdb/se_cloud_20240629.sql
+++ b/docker-compose/mysql/initdb/se_cloud_20240629.sql
@@ -274,20 +274,20 @@
 -- insert into sys_menu values('1059', '棰勮浠g爜', '115', '4', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview',           '#', 'admin', sysdate(), '', null, '');
 -- insert into sys_menu values('1060', '鐢熸垚浠g爜', '115', '5', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code',              '#', 'admin', sysdate(), '', null, '');
 -- 棣栭〉
-insert into sys_menu values('1061', 'xx瀹為獙鏉′欢寤鸿',            '0', '1', '#', '', '', '', 1, 0, 'M', '0', '0', 'system:index:sy',   '#', 'admin', sysdate(), '', null, '棣栭〉', 'index');
-insert into sys_menu values('1062', 'xx姒傚康寮�鍙戜笌楠岃瘉骞冲彴',   '1061', '1', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:glkf', '#', 'admin', sysdate(), '', null, '姒傚康寮�鍙戜笌楠岃瘉骞冲彴', 'index');
-insert into sys_menu values('1063', 'xx浣撶郴璁捐涓庤瘎浼板钩鍙�',   '1061', '2', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:txsj', '#', 'admin', sysdate(), '', null, '浣撶郴璁捐涓庤瘎浼板钩鍙�', 'index');
-insert into sys_menu values('1064', 'xx鏂规鎺ㄦ紨涓庡垎鏋愬钩鍙�',   '1061', '3', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:faty', '#', 'admin', sysdate(), '', null, '鏂规鎺ㄦ紨涓庡垎鏋愬钩鍙�', 'index');
-insert into sys_menu values('1065', 'xx鍒涘缓涓巟x杩愮敤鐮旂┒骞冲彴', '1061', '4', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:cxyyy','#', 'admin', sysdate(), '', null, '鍒涘缓涓庤繍鐢ㄧ爺绌跺钩鍙�', 'index');
-insert into sys_menu values('1066', 'xx缁煎悎闆嗘垚鐮旇鍘�',       '1061', '5', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:zhjc', '#', 'admin', sysdate(), '', null, '缁煎悎闆嗘垚鐮旇鍘�', 'index');
+insert into sys_menu values('1061', '浣滄垬瀹為獙鏉′欢寤鸿',            '0', '1', '#', '', '', '', 1, 0, 'M', '0', '0', 'system:index:sy',   '#', 'admin', sysdate(), '', null, '棣栭〉', 'index');
+insert into sys_menu values('1062', '浣滄垬姒傚康寮�鍙戜笌楠岃瘉骞冲彴',   '1061', '1', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:glkf', '#', 'admin', sysdate(), '', null, '姒傚康寮�鍙戜笌楠岃瘉骞冲彴', 'index');
+insert into sys_menu values('1063', '浣滄垬浣撶郴璁捐涓庤瘎浼板钩鍙�',   '1061', '2', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:txsj', '#', 'admin', sysdate(), '', null, '浣撶郴璁捐涓庤瘎浼板钩鍙�', 'index');
+insert into sys_menu values('1064', '浣滄垬鏂规鎺ㄦ紨涓庡垎鏋愬钩鍙�',   '1061', '3', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:faty', '#', 'admin', sysdate(), '', null, '鏂规鎺ㄦ紨涓庡垎鏋愬钩鍙�', 'index');
+insert into sys_menu values('1065', '鎴樻硶鍒涙柊涓庝綔鎴樿繍鐢ㄧ爺绌跺钩鍙�', '1061', '4', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:cxyyy','#', 'admin', sysdate(), '', null, '鍒涘缓涓庤繍鐢ㄧ爺绌跺钩鍙�', 'index');
+insert into sys_menu values('1066', '浣滄垬缁煎悎闆嗘垚鐮旇鍘�',       '1061', '5', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:zhjc', '#', 'admin', sysdate(), '', null, '缁煎悎闆嗘垚鐮旇鍘�', 'index');
 insert into sys_menu values('1067', '鎬佸娍鏄剧ず鍒嗙郴缁�',         '1061', '6', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:tsxs', '#', 'admin', sysdate(), '', null, '鎬佸娍鏄剧ず鍒嗙郴缁�', 'index');
 insert into sys_menu values('1068', '鏁版嵁绠$悊鍒嗙郴缁�',         '1061', '7', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:sjgl', '#', 'admin', sysdate(), '', null, '鏁版嵁绠$悊鍒嗙郴缁�', 'index');
 insert into sys_menu values('1069', '瑁呭搴�',                 '1061', '8', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:zbk',  '#', 'admin', sysdate(), '', null, '瑁呭搴�', 'index');
 insert into sys_menu values('1070', '浠跨湡璧勬簮绠$悊鍒嗙郴缁�',     '1061', '9', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:fzzy', '#', 'admin', sysdate(), '', null, '浠跨湡璧勬簮绠$悊鍒嗙郴缁�', 'index');
-insert into sys_menu values('1071', '宸ュ叿绠�',                 '1061', '10','#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:gjx',  '#', 'admin', sysdate(), '', null, '宸ュ叿绠�', 'index');
-insert into sys_menu values('1072', '鐢ㄦ埛鍙婃潈闄愮鐞�',         '1061', '11','#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:yhgl', '#', 'admin', sysdate(), '', null, '鐢ㄦ埛鍙婃潈闄愮鐞�', 'index');
-insert into sys_menu values('1073', '鐩戞帶鍙婅繍缁寸鐞�',         '1061', '12','#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:ywjk', '#', 'admin', sysdate(), '', null, '鐩戞帶鍙婅繍缁寸鐞�', 'index');
-insert into sys_menu values('1074', 'ISIM Cloud',             '1061', '13','#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:isim', '#', 'admin', sysdate(), '', null, 'ISIM Cloud', 'index');
+insert into sys_menu values('1071', '宸ュ叿绠�',                 '1061', '10','#', '', '', '', 0, 0, 'F', '0', '0', 'system:index:gjx',  '#', 'admin', sysdate(), '', null, '宸ュ叿绠�', 'index');
+insert into sys_menu values('1072', '鐢ㄦ埛鍙婃潈闄愮鐞�',         '1061', '11','#', '', '', '', 0, 0, 'F', '0', '0', 'system:index:yhgl', '#', 'admin', sysdate(), '', null, '鐢ㄦ埛鍙婃潈闄愮鐞�', 'index');
+insert into sys_menu values('1073', '鐩戞帶鍙婅繍缁寸鐞�',         '1061', '12','#', '', '', '', 0, 0, 'F', '0', '0', 'system:index:ywjk', '#', 'admin', sysdate(), '', null, '鐩戞帶鍙婅繍缁寸鐞�', 'index');
+insert into sys_menu values('1074', 'ISIM Cloud',             '1061', '13','#', '', '', '', 0, 0, 'F', '0', '0', 'system:index:isim', '#', 'admin', sysdate(), '', null, 'ISIM Cloud', 'index');
 
 alter table sys_menu add column mark varchar(20) comment '鑿滃崟鏍囪瘑';
 update sys_menu set mark = 'sys' where menu_id < 1070;
diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java b/se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java
index a57250b..cbb4fa7 100644
--- a/se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java
+++ b/se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java
@@ -178,12 +178,13 @@
     }
 
     @GetMapping("/addAccessLog")
-    public AjaxResult addAccessLog(String title, int status) {
+    public AjaxResult addAccessLog(String title, Integer status) {
         long start = System.currentTimeMillis();
+        if (null == status || status < 0) status = 0;
 
         SysOperLog log = new SysOperLog();
         log.setTitle(title);
-        // 0=鍏跺畠,1=鏂板,2=淇敼,3=鍒犻櫎,4=鎺堟潈,5=瀵煎嚭,6=瀵煎叆,7=寮洪��,8=鐢熸垚浠g爜,9=娓呯┖鏁版嵁
+        // 0=鍏跺畠,1=鏂板,2=淇敼,3=鍒犻櫎,4=鎺堟潈,5=瀵煎嚭,6=瀵煎叆,7=寮洪��,8=鐢熸垚浠g爜,9=娓呯┖鏁版嵁,14=鏈巿鏉�
         log.setBusinessType(0);
         // ServletUtils.getRequest().getMethod()
         log.setMethod("com.se.system.controller.IndexController.addAccessLog()");
diff --git a/se-modules/se-system/src/main/resources/mapper/system/IndexMapper.xml b/se-modules/se-system/src/main/resources/mapper/system/IndexMapper.xml
index acecf2a..4185284 100644
--- a/se-modules/se-system/src/main/resources/mapper/system/IndexMapper.xml
+++ b/se-modules/se-system/src/main/resources/mapper/system/IndexMapper.xml
@@ -28,12 +28,21 @@
 		where oper_url = '/index/addAccessLog' and oper_time >= #{createTime};
 	</select>
 
-	<select id="sysVisitList" resultType="java.util.Map">
+	<!--select id="sysVisitList" resultType="java.util.Map">
 		select title, count(*) count
 		from sys_oper_log
 		where oper_time >= #{createTime} and (title like '%骞冲彴' or title like '%鍒嗙郴缁�' or title like '%鐮旇鍘�' or title = '瑁呭搴�')
 		group by title
 		order by count desc
 		limit ${amount};
+	</select-->
+
+	<select id="sysVisitList" resultType="java.util.Map">
+		select menu_name "name",
+			(select count(*) from sys_oper_log b where b.title = a.menu_name and date(oper_time) = date(now())) "tcount",
+			(select count(*) from sys_oper_log b where b.title = a.menu_name and week(oper_time) = week(now())) "wcount"
+		from sys_menu a
+		where a.mark = 'index' and a.menu_type = 'C'
+		order by a.order_num;
 	</select>
 </mapper> 
\ No newline at end of file

--
Gitblit v1.9.3