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/DepController.java | 96 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/DepController.java b/src/main/java/com/lf/server/controller/sys/DepController.java
index 8cb2ccf..8e91d80 100644
--- a/src/main/java/com/lf/server/controller/sys/DepController.java
+++ b/src/main/java/com/lf/server/controller/sys/DepController.java
@@ -1,11 +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.DepEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.sys.DepService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -13,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;
/**
@@ -27,42 +30,57 @@
@Autowired
DepService depService;
+ @Autowired
+ TokenService tokenService;
+
@SysLog()
- @ApiOperation(value = "鎻掑叆鏁版嵁")
+ @ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "DepEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.DepEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "DepEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertDep", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertDep(@RequestBody DepEntity depEntity) {
+ public ResponseMsg<Integer> insertDep(@RequestBody DepEntity entity, HttpServletRequest req) {
try {
- int count = depService.insertDep(depEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setCreateUser(ue.getId());
+ }
+
+ int count = depService.insertDep(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎻掑叆澶氭潯鏁版嵁")
+ @ApiOperation(value = "鎻掑叆澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "DepEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.DepEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "DepEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertDes", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertDes(@RequestBody List<DepEntity> depEntity) {
+ public ResponseMsg<Integer> insertDes(@RequestBody List<DepEntity> list, HttpServletRequest req) {
try {
- int count = depService.insertDeps(depEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (DepEntity entity : list) {
+ entity.setCreateUser(ue.getId());
+ }
+ }
+
+ int count = depService.insertDeps(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")
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/deleteDep")
public ResponseMsg<Integer> deleteDep(int id) {
@@ -71,14 +89,14 @@
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")
+ @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/deleteDeps")
public ResponseMsg<Integer> deleteDeps(@RequestParam List<Integer> ids) {
@@ -91,48 +109,60 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鏇存柊涓�鏉℃暟鎹�")
+ @ApiOperation(value = "鏇存柊涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "depEntity", value = "涓婚敭ID闆嗗悎", dataType = "DepEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "DepEntity", paramType = "body", example = "")
})
@ResponseBody
@PostMapping(value = "/updateDep", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updateDep(@RequestBody DepEntity depEntity) {
+ public ResponseMsg<Integer> updateDep(@RequestBody DepEntity entity, HttpServletRequest req) {
try {
- int count = depService.updateDep(depEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUpdateUser(ue.getId());
+ }
+
+ int count = depService.updateDep(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鏇存柊澶氭潯鏁版嵁")
+ @ApiOperation(value = "鏇存柊澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "DepEntity", value = "涓婚敭ID闆嗗悎", dataType = "DepEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "DepEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/updateDeps", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updateDeps(@RequestBody List<DepEntity> depEntity) {
+ public ResponseMsg<Integer> updateDeps(@RequestBody List<DepEntity> list, HttpServletRequest req) {
try {
- int count = depService.updateDeps(depEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (DepEntity entity : list) {
+ entity.setUpdateUser(ue.getId());
+ }
+ }
+
+ int count = depService.updateDeps(list);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
@ApiOperation(value = "鏍规嵁ID鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "涓婚敭ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectDep")
public ResponseMsg<DepEntity> selectDep(int id) {
@@ -140,7 +170,7 @@
DepEntity de = depService.selectDep(id);
return success(de);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -152,26 +182,26 @@
List<DepEntity> list = depService.selectDepAll();
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "閫掑綊鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍗曚綅鍚嶇О", dataType = "String", paramType = "query", required = false, example = "涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�")
+ @ApiImplicitParam(name = "name", value = "鍗曚綅鍚嶇О", dataType = "String", paramType = "query", required = false, example = "涓浗xxx宸ョ▼鏈夐檺鍏徃")
})
@GetMapping(value = "/selectDepRecursive")
public ResponseMsg<List<DepEntity>> selectDepRecursive(String name) {
try {
if (StringHelper.isEmpty(name)) {
- name = "涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�";
+ name = "涓浗xxx宸ョ▼鏈夐檺鍏徃";
}
List<DepEntity> list = depService.selectDepRecursive(name);
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3