From cb9fbcd27a288d0c61d85fa13ff5fc8eb1f4deab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 16:44:56 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/DirController.java |   64 +++++++++++---------------------
 1 files changed, 22 insertions(+), 42 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 4d0fc3e..e755baf 100644
--- a/src/main/java/com/lf/server/controller/data/DirController.java
+++ b/src/main/java/com/lf/server/controller/data/DirController.java
@@ -1,11 +1,10 @@
 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;
@@ -34,9 +33,9 @@
     TokenService tokenService;
 
     @SysLog()
-    @ApiOperation(value = "鎻掑叆鏁版嵁")
+    @ApiOperation(value = "鎻掑叆涓�鏉�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "entity", 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 entity, HttpServletRequest req) {
@@ -46,18 +45,18 @@
                 entity.setCreateUser(ue.getId());
             }
 
-            int count = dirService.insertDir(entity);
+            dirService.insert(entity);
 
-            return success(count);
+            return success(entity.getId());
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "鎻掑叆澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "list", 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> list, HttpServletRequest req) {
@@ -67,18 +66,18 @@
                 entity.setCreateUser(ue.getId());
             }
 
-            int count = dirService.insertDirs(list);
+            int count = dirService.inserts(list);
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
     @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) {
@@ -87,14 +86,14 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
     @SysLog()
     @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) {
@@ -107,14 +106,14 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "鏇存柊涓�鏉�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "entity", 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")
@@ -125,18 +124,18 @@
                 entity.setUpdateUser(ue.getId());
             }
 
-            int count = dirService.updateDir(entity);
+            int count = dirService.update(entity);
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "鏇存柊澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "list", 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")
@@ -149,18 +148,18 @@
                 }
             }
 
-            int count = dirService.updateDirs(list);
+            int count = dirService.updates(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 = "/selectDir")
     public ResponseMsg<DirEntity> selectDir(int id) {
@@ -169,7 +168,7 @@
 
             return success(dirEntity);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -181,26 +180,7 @@
             List<DirEntity> list = dirService.selectDirAll();
             return success(list);
         } catch (Exception ex) {
-            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);
+            return fail(ex, null);
         }
     }
 }

--
Gitblit v1.9.3