From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/sys/RoleUserController.java | 84 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/RoleUserController.java b/src/main/java/com/lf/server/controller/sys/RoleUserController.java
index 855544b..e438bbc 100644
--- a/src/main/java/com/lf/server/controller/sys/RoleUserController.java
+++ b/src/main/java/com/lf/server/controller/sys/RoleUserController.java
@@ -1,10 +1,13 @@
package com.lf.server.controller.sys;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.sys.RoleUserEntity;
+import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.service.all.PermsService;
import com.lf.server.service.sys.RoleUserService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -12,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -25,6 +29,12 @@
@Autowired
RoleUserService roleUserService;
+ @Autowired
+ TokenService tokenService;
+
+ @Autowired
+ PermsService permsService;
+
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
@@ -37,7 +47,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -59,7 +69,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -84,7 +94,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -97,7 +107,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -113,7 +123,7 @@
return success(entity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -123,13 +133,21 @@
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "RoleUserEntity", paramType = "body")
})
@PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insert(@RequestBody RoleUserEntity entity) {
+ public ResponseMsg<Integer> insert(@RequestBody RoleUserEntity entity, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setCreateUser(ue.getId());
+ }
+
int count = roleUserService.insert(entity);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -139,13 +157,23 @@
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "RoleUserEntity", paramType = "body")
})
@PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> inserts(@RequestBody List<RoleUserEntity> list) {
+ public ResponseMsg<Integer> inserts(@RequestBody List<RoleUserEntity> list, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (RoleUserEntity entity : list) {
+ entity.setCreateUser(ue.getId());
+ }
+ }
+
int count = roleUserService.inserts(list);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -158,10 +186,13 @@
public ResponseMsg<Integer> delete(int id) {
try {
int count = roleUserService.delete(id);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -178,10 +209,13 @@
}
int count = roleUserService.deletes(ids);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -192,13 +226,21 @@
})
@ResponseBody
@PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> update(@RequestBody RoleUserEntity entity) {
+ public ResponseMsg<Integer> update(@RequestBody RoleUserEntity entity, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUpdateUser(ue.getId());
+ }
+
int count = roleUserService.update(entity);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -209,13 +251,23 @@
})
@ResponseBody
@PostMapping(value = "/updates", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updates(@RequestBody List<RoleUserEntity> list) {
+ public ResponseMsg<Integer> updates(@RequestBody List<RoleUserEntity> list, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (RoleUserEntity entity : list) {
+ entity.setUpdateUser(ue.getId());
+ }
+ }
+
int count = roleUserService.updates(list);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
}
--
Gitblit v1.9.3