From 653ab219fdf13b30ff4b2c6c298df8f3929b283a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 25 十月 2022 16:25:06 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/PermsController.java | 21 ++++++++--
src/main/java/com/lf/server/entity/all/PermsAuthEntity.java | 10 ++--
src/main/resources/mapper/all/PermsMapper.xml | 10 +++-
data/db_fn.sql | 5 --
src/main/java/com/lf/server/service/all/WebSocketService.java | 2
说明.txt | 17 ++++----
6 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 335da85..56087ae 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -235,11 +235,8 @@
select to_char(optime,'yyyy-mm-dd') as optime,count(*) from lf.sys_login where optime between (select optime - interval '30 day')
and optime group by to_char(optime, 'yyyy-mm-dd') order by to_char(optime, 'yyyy-mm-dd') asc;
-----------------------------------------------------------------------------------------------------
-select * from lf.sys_user;
+select a.*,coalesce(a.native,'') from lf.sys_user a;
select * from lf.sys_menu order by id;
-
-
-
diff --git a/src/main/java/com/lf/server/controller/all/PermsController.java b/src/main/java/com/lf/server/controller/all/PermsController.java
index ee34610..e60525f 100644
--- a/src/main/java/com/lf/server/controller/all/PermsController.java
+++ b/src/main/java/com/lf/server/controller/all/PermsController.java
@@ -37,7 +37,7 @@
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
- return null;
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
}
List<ResAuthEntity> rs = permsService.selectRes(ue.getUid());
@@ -55,7 +55,7 @@
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
- return null;
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
}
List<MenusAuthEntity> rs = permsService.selectMenus(ue.getUid());
@@ -73,7 +73,7 @@
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
- return null;
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
}
List<String> rs = permsService.selectPerms(ue.getUid());
@@ -91,7 +91,7 @@
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
- return null;
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
}
List<PermsAuthEntity> rs = permsService.selectPermsEntity(ue.getUid());
@@ -101,4 +101,17 @@
return fail(ex.getMessage(), null);
}
}
+
+ @SysLog()
+ @ApiOperation(value = "娓呯┖鎵�鏈夋巿鏉冪紦瀛�")
+ @GetMapping(value = "/clearAllCache")
+ public ResponseMsg<Boolean> clearAllCache() {
+ try {
+ permsService.clearAllCache();
+
+ return success(true);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), false);
+ }
+ }
}
diff --git a/src/main/java/com/lf/server/entity/all/PermsAuthEntity.java b/src/main/java/com/lf/server/entity/all/PermsAuthEntity.java
index 8e6a13a..5cbcffa 100644
--- a/src/main/java/com/lf/server/entity/all/PermsAuthEntity.java
+++ b/src/main/java/com/lf/server/entity/all/PermsAuthEntity.java
@@ -9,7 +9,7 @@
public class PermsAuthEntity implements Serializable {
private static final long serialVersionUID = -8948994757253139554L;
- private Integer id;
+ private Integer orderNum;
private String cnName;
@@ -23,12 +23,12 @@
}
- public Integer getId() {
- return id;
+ public Integer getOrderNum() {
+ return orderNum;
}
- public void setId(Integer id) {
- this.id = id;
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
}
public String getCnName() {
diff --git a/src/main/java/com/lf/server/service/all/WebSocketService.java b/src/main/java/com/lf/server/service/all/WebSocketService.java
index 2441f8b..88f792c 100644
--- a/src/main/java/com/lf/server/service/all/WebSocketService.java
+++ b/src/main/java/com/lf/server/service/all/WebSocketService.java
@@ -15,7 +15,7 @@
* WebSocket鏈嶅姟绫�
* @author WWW
*/
-@ServerEndpoint(value = "/ws")
+@ServerEndpoint(value = "/ws/select")
@Component
public class WebSocketService {
@PostConstruct
diff --git a/src/main/resources/mapper/all/PermsMapper.xml b/src/main/resources/mapper/all/PermsMapper.xml
index f540cb0..daa2173 100644
--- a/src/main/resources/mapper/all/PermsMapper.xml
+++ b/src/main/resources/mapper/all/PermsMapper.xml
@@ -6,6 +6,7 @@
inner join lf.sys_role_res c on b.roleid = c.roleid
inner join lf.sys_res d on c.resid = d.id
where a.uid = #{uid}
+ order by d.id
</select>
<select id="selectMenus" resultType="com.lf.server.entity.all.MenusAuthEntity">
@@ -15,25 +16,28 @@
inner join lf.sys_menu_auth d on c.menu_auth_id = d.id
inner join lf.sys_menu e on d.menuid = e.id
where a.uid = #{uid}
+ order by e.order_num
</select>
<select id="selectPerms" resultType="java.lang.String">
- select distinct e.perms || f.tag as "perms"
+ select distinct e.perms || f.tag as perms
from lf.sys_user a inner join lf.sys_role_user b on a.id = b.userid
inner join lf.sys_role_menu_auth c on b.roleid = c.roleid
inner join lf.sys_menu_auth d on c.menu_auth_id = d.id
inner join lf.sys_menu e on d.menuid = e.id
inner join lf.sys_auth f on d.authid = f.id
- where a.uid = #{uid}
+ where a.uid = #{uid} and e.perms is not null
+ order by perms
</select>
<select id="selectPermsEntity" resultType="com.lf.server.entity.all.PermsAuthEntity">
- select distinct f.id,e.cn_name,f.name,e.perms,f.tag
+ select distinct e.order_num,e.cn_name,f.name,e.perms,f.tag
from lf.sys_user a inner join lf.sys_role_user b on a.id = b.userid
inner join lf.sys_role_menu_auth c on b.roleid = c.roleid
inner join lf.sys_menu_auth d on c.menu_auth_id = d.id
inner join lf.sys_menu e on d.menuid = e.id
inner join lf.sys_auth f on d.authid = f.id
where a.uid = #{uid}
+ order by e.order_num
</select>
</mapper>
\ No newline at end of file
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index a179e54..1014e82 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -18,20 +18,21 @@
17.娣诲姞鏁版嵁搴撶洃鎺у姛鑳�(Druid Monitor)
18.璁剧疆涓嬭浇鏂囦欢鐨凪IME绫诲瀷
19.5鍒嗛挓鍐呭瘑鐮侀敊璇�5娆℃嫆缁濈櫥褰�
-20.寮�鍙戣幏鍙栬祫婧愭潈闄愩�佽彍鍗曟潈闄愩�佹搷浣滄潈闄愭帴鍙�
+20.寮�鍙戣幏鍙栬祫婧愭潈闄愩�佽彍鍗曟潈闄愩�佹搷浣滄潈闄愭帴鍙� <
+21.
+22.
+23.
+24.
+25.
-----------------------------------------------
.Redis鏈嶅姟閰嶇疆寮哄瘑鐮�
.娣诲姞鎵归噺淇敼鐢ㄦ埛瀵嗙爜鎺ュ彛
.淇敼鎵�鏈夌殑鎵归噺鏂板銆佸垹闄ゃ�佷慨鏀规帴鍙�
-.寮�鍙戝ぇ鏂囦欢涓婁紶鎺ュ彛
+.寮�鍙戝ぇ鏂囦欢涓婁紶鎺ュ彛锛坈ommons-fileupload锛�
.GDAL璇诲彇shp鍚庡垹闄や笂浼犳枃浠�
-
------------------------------------------------
-1.涓婁紶鏂囦欢锛坈ommons-fileupload锛� *
-2.瀵圭敤鎴枫�佽彍鍗曘�佽鑹层�佽祫婧愯繘琛屾巿鏉�
-3.娣诲姞鏌ヨ瑙掕壊銆佽彍鍗曘�佽祫婧愭潈闄愭帴鍙�
-4.鎺ュ彛搴旂敤鑿滃崟鏉冮檺
+.瀵圭敤鎴枫�佽彍鍗曘�佽鑹层�佽祫婧愯繘琛屾巿鏉�
+.娣诲姞鏌ヨ瑙掕壊銆佽彍鍗曘�佽祫婧愭潈闄愭帴鍙�
----------------------------------------------------------------------------------------------------
java 璋冪敤gdal璇诲彇gdb鏁版嵁锛宭inux涓媕ava璋冪敤gdal锛�
--
Gitblit v1.9.3