From 427bee04bfacf44abe5d595e2dad976747d83dba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:48:48 +0800
Subject: [PATCH] 1.8.5
---
src/main/java/com/lf/server/controller/data/DirController.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 92 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DirController.java b/src/main/java/com/lf/server/controller/data/DirController.java
index 349a6da..0bd8e77 100644
--- a/src/main/java/com/lf/server/controller/data/DirController.java
+++ b/src/main/java/com/lf/server/controller/data/DirController.java
@@ -1,10 +1,13 @@
package com.lf.server.controller.data;
-import com.lf.server.controller.BaseController;
+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.data.DictEntity;
import com.lf.server.entity.data.DirEntity;
+import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.DirService;
+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;
/**
@@ -19,21 +23,30 @@
* @author sws
* @date 2022-09-22
*/
-@Api(tags = "鐩綍绠＄悊")
+@Api(tags = "鏁版嵁绠＄悊\\鐩綍绠＄悊")
@RestController
@RequestMapping("/dir")
public class DirController extends BaseController {
@Autowired
DirService dirService;
- @ApiOperation(value = "鎻掑叆鏁版嵁")
+ @Autowired
+ TokenService tokenService;
+
+ @SysLog()
+ @ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "DirEntity", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertDir", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertDir(@RequestBody DirEntity dirEntity) {
+ public ResponseMsg<Integer> insertDir(@RequestBody DirEntity entity, HttpServletRequest req) {
try {
- int count = dirService.insertDir(dirEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setCreateUser(ue.getId());
+ }
+
+ int count = dirService.insertDir(entity);
return success(count);
} catch (Exception ex) {
@@ -41,14 +54,20 @@
}
}
- @ApiOperation(value = "鎻掑叆澶氭潯鏁版嵁")
+ @SysLog()
+ @ApiOperation(value = "鎻掑叆澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "DirEntity", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertDirs", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertDirs(@RequestBody List<DirEntity> dirEntity) {
+ public ResponseMsg<Integer> insertDirs(@RequestBody List<DirEntity> list, HttpServletRequest req) {
try {
- int count = dirService.insertDirs(dirEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ for (DirEntity entity : list) {
+ entity.setCreateUser(ue.getId());
+ }
+
+ int count = dirService.insertDirs(list);
return success(count);
} catch (Exception ex) {
@@ -56,9 +75,10 @@
}
}
- @ApiOperation(value = "鍒犻櫎涓�鏉℃暟鎹�")
+ @SysLog()
+ @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 = "/deleteDir")
public ResponseMsg<Integer> deleteDir(int id) {
@@ -71,9 +91,10 @@
}
}
- @ApiOperation(value = "鍒犻櫎澶氭潯鏁版嵁")
+ @SysLog()
+ @ApiOperation(value = "鍒犻櫎澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "涓婚敭ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2")
+ @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "")
})
@GetMapping(value = "/deleteDirs")
public ResponseMsg<Integer> deleteDirs(@RequestParam List<Integer> ids) {
@@ -90,15 +111,21 @@
}
}
- @ApiOperation(value = "鏇存柊涓�鏉℃暟鎹�")
+ @SysLog()
+ @ApiOperation(value = "鏇存柊涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "dirEntity", value = "涓婚敭ID闆嗗悎", dataType = "DictEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "DictEntity", paramType = "body", example = "")
})
@ResponseBody
@PostMapping(value = "/updateDir", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updateDir(@RequestBody DirEntity dirEntity) {
+ public ResponseMsg<Integer> updateDir(@RequestBody DirEntity entity, HttpServletRequest req) {
try {
- int count = dirService.updateDir(dirEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUpdateUser(ue.getId());
+ }
+
+ int count = dirService.updateDir(entity);
return success(count);
} catch (Exception ex) {
@@ -106,9 +133,34 @@
}
}
+ @SysLog()
+ @ApiOperation(value = "鏇存柊澶氭潯")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "DirEntity", paramType = "body", example = "")
+ })
+ @ResponseBody
+ @PostMapping(value = "/updateDirs", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Integer> updateDirs(@RequestBody List<DirEntity> list, HttpServletRequest req) {
+ try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (DirEntity entity : list) {
+ entity.setUpdateUser(ue.getId());
+ }
+ }
+
+ int count = dirService.updateDirs(list);
+
+ return success(count);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), -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 = "/selectDir")
public ResponseMsg<DirEntity> selectDir(int id) {
@@ -121,7 +173,7 @@
}
}
-
+ @SysLog()
@ApiOperation(value = "鏌ヨ鎵�鏈夋暟鎹�")
@GetMapping(value = "/selectDirAll")
public ResponseMsg<List<DirEntity>> selectDirAll() {
@@ -132,4 +184,23 @@
return fail(ex.getMessage(), null);
}
}
+
+ @SysLog()
+ @ApiOperation(value = "閫掑綊鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鐩綍鍚嶇О", dataType = "String", paramType = "query", required = false, example = "涓縿涓滅嚎绠￠亾宸ョ▼鍗楁")
+ })
+ @GetMapping(value = "/selectDirRecursive")
+ public ResponseMsg<List<DirEntity>> selectDirRecursive(String name) {
+ try {
+ if (StringHelper.isEmpty(name)) {
+ name = "涓縿涓滅嚎绠￠亾宸ョ▼鍗楁";
+ }
+ List<DirEntity> list = dirService.selectDirRecursive(name);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
}
--
Gitblit v1.9.3