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 |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 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 e87bfb0..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,6 +1,6 @@
 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;
@@ -34,9 +34,9 @@
     TokenService tokenService;
 
     @SysLog()
-    @ApiOperation(value = "鎻掑叆鏁版嵁")
+    @ApiOperation(value = "鎻掑叆涓�鏉�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "entity", 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 entity, HttpServletRequest req) {
@@ -50,14 +50,14 @@
 
             return success(count);
         } 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.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> list, HttpServletRequest req) {
@@ -73,14 +73,14 @@
 
             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 = "/deleteDep")
     public ResponseMsg<Integer> deleteDep(int id) {
@@ -89,14 +89,14 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
     @SysLog()
     @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) {
@@ -109,7 +109,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -131,7 +131,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -155,14 +155,14 @@
 
             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) {
@@ -170,7 +170,7 @@
             DepEntity de = depService.selectDep(id);
             return success(de);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -182,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