From 2d2d9138fbe5c9c43f070be59a2d10f18fbf4c3b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 09:05:06 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DirController.java | 88 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 28 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 bb735e7..43afa3e 100644
--- a/src/main/java/com/lf/server/controller/data/DirController.java
+++ b/src/main/java/com/lf/server/controller/data/DirController.java
@@ -1,18 +1,21 @@
package com.lf.server.controller.data;
-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.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;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -27,15 +30,23 @@
@Autowired
DirService dirService;
+ @Autowired
+ TokenService tokenService;
+
@SysLog()
- @ApiOperation(value = "鎻掑叆鏁版嵁")
+ @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) {
@@ -44,14 +55,19 @@
}
@SysLog()
- @ApiOperation(value = "鎻掑叆澶氭潯鏁版嵁")
+ @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) {
@@ -60,9 +76,9 @@
}
@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 = "/deleteDir")
public ResponseMsg<Integer> deleteDir(int id) {
@@ -76,9 +92,9 @@
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎澶氭潯鏁版嵁")
+ @ApiOperation(value = "鍒犻櫎澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "DirEntity", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "")
+ @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) {
@@ -96,15 +112,20 @@
}
@SysLog()
- @ApiOperation(value = "鏇存柊涓�鏉℃暟鎹�")
+ @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) {
@@ -113,29 +134,33 @@
}
@SysLog()
- @ApiOperation(value = "鏇存柊澶氭潯鏁版嵁")
+ @ApiOperation(value = "鏇存柊澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "DirEntity", value = "涓婚敭ID闆嗗悎", dataType = "DirEntity", paramType = "body", example = "")
+ @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> dirEntity) {
+ public ResponseMsg<Integer> updateDirs(@RequestBody List<DirEntity> list, HttpServletRequest req) {
try {
- int count = dirService.updateDirs(dirEntity);
+ 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) {
@@ -162,10 +187,17 @@
@SysLog()
@ApiOperation(value = "閫掑綊鏌ヨ鏁版嵁")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鐩綍鍚嶇О", dataType = "String", paramType = "query", required = false, example = "涓縿涓滅嚎绠￠亾宸ョ▼鍗楁")
+ })
@GetMapping(value = "/selectDirRecursive")
- public ResponseMsg<List<DirEntity>> selectDirRecursive() {
+ public ResponseMsg<List<DirEntity>> selectDirRecursive(String name) {
try {
- List<DirEntity> list = dirService.selectDirRecursive();
+ 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