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/RoleResController.java | 86 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/RoleResController.java b/src/main/java/com/lf/server/controller/sys/RoleResController.java
index 9d9ae61..1e61bb9 100644
--- a/src/main/java/com/lf/server/controller/sys/RoleResController.java
+++ b/src/main/java/com/lf/server/controller/sys/RoleResController.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.RoleResEntity;
+import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.service.all.PermsService;
import com.lf.server.service.sys.RoleResService;
+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;
/**
@@ -20,10 +24,16 @@
*/
@Api(tags = "杩愮淮绠＄悊\\瑙掕壊璧勬簮")
@RestController
-@RequestMapping("/args")
+@RequestMapping("/roleRes")
public class RoleResController extends BaseController {
@Autowired
RoleResService roleResService;
+
+ @Autowired
+ TokenService tokenService;
+
+ @Autowired
+ PermsService permsService;
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -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,60 +123,75 @@
return success(entity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "娣诲姞鏁版嵁")
+ @ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "RoleResEntity", paramType = "body")
})
@PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insert(@RequestBody RoleResEntity entity) {
+ public ResponseMsg<Integer> insert(@RequestBody RoleResEntity entity, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setCreateUser(ue.getId());
+ }
+
+ permsService.clearPermsCache();
int count = roleResService.insert(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎵归噺娣诲姞")
+ @ApiOperation(value = "鎻掑叆澶氭潯")
@ApiImplicitParams({
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "RoleResEntity", paramType = "body")
})
@PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> inserts(@RequestBody List<RoleResEntity> list) {
+ public ResponseMsg<Integer> inserts(@RequestBody List<RoleResEntity> list, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (RoleResEntity entity : list) {
+ entity.setCreateUser(ue.getId());
+ }
+ }
+
+ permsService.clearPermsCache();
int count = roleResService.inserts(list);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鍒櫎鏁版嵁")
+ @ApiOperation(value = "鍒犻櫎涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/delete")
public ResponseMsg<Integer> delete(int id) {
try {
+ permsService.clearPermsCache();
int count = roleResService.delete(id);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鍒犻櫎澶氭潯")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
})
@@ -177,45 +202,60 @@
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
+ permsService.clearPermsCache();
int count = roleResService.deletes(ids);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "淇敼鏁版嵁")
+ @ApiOperation(value = "鏇存柊涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "RoleResEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> update(@RequestBody RoleResEntity entity) {
+ public ResponseMsg<Integer> update(@RequestBody RoleResEntity entity, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUpdateUser(ue.getId());
+ }
+
+ permsService.clearPermsCache();
int count = roleResService.update(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎵归噺淇敼")
+ @ApiOperation(value = "鏇存柊澶氭潯")
@ApiImplicitParams({
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "RoleResEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/updates", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updates(@RequestBody List<RoleResEntity> list) {
+ public ResponseMsg<Integer> updates(@RequestBody List<RoleResEntity> list, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (RoleResEntity entity : list) {
+ entity.setUpdateUser(ue.getId());
+ }
+ }
+
+ permsService.clearPermsCache();
int count = roleResService.updates(list);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
}
--
Gitblit v1.9.3