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/all/FmeItController.java | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/FmeItController.java b/src/main/java/com/lf/server/controller/all/FmeItController.java
index f9c68cb..e661233 100644
--- a/src/main/java/com/lf/server/controller/all/FmeItController.java
+++ b/src/main/java/com/lf/server/controller/all/FmeItController.java
@@ -2,9 +2,11 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.sys.RoleEntity;
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.RoleService;
import com.lf.server.service.sys.TokenService;
import com.lf.server.service.sys.UserService;
@@ -24,7 +26,7 @@
* FME鎺ュ彛鎺у埗鍣�
* @author WWW
*/
-@Api(tags = "杩愮淮绠＄悊\\FME鎺ュ彛璋冪敤")
+@Api(tags = "绯荤粺瀵规帴\\FME")
@RestController
@RequestMapping("/fmeIt")
public class FmeItController extends BaseController {
@@ -36,6 +38,9 @@
@Autowired
TokenService tokenService;
+
+ @Autowired
+ DirService dirService;
@SysLog()
@ApiOperation(value = "鏌ヨ鏄�/鍚︿负绠＄悊鍛�")
@@ -51,7 +56,7 @@
return success("鎴愬姛", rows > 0);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -67,7 +72,7 @@
return success(userEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -87,32 +92,32 @@
return success(userEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ鐢ㄦ埛骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "瀹�"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
- @GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<UserEntity>> selectByPageAndCount(String uname, Integer pageSize, Integer pageIndex) {
+ @GetMapping(value = "/selectByPageForUser")
+ public ResponseMsg<List<UserEntity>> selectByPageForUser(String uname, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = userService.selectCount(uname);
+ int count = userService.selectCount(uname, null);
if (count == 0) {
return success(0, null);
}
- List<UserEntity> rs = userService.selectByPage(uname, pageSize, pageSize * (pageIndex - 1));
+ List<UserEntity> rs = userService.selectByPage(uname, null, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -133,7 +138,7 @@
return success("鎴愬姛", rows > 0);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -153,7 +158,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -173,7 +178,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -193,7 +198,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -209,20 +214,20 @@
return success(roleEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ瑙掕壊骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "Admin"),
@ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
- @GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<RoleEntity>> selectByPageAndCount(String name, Integer depid, Integer pageSize, Integer pageIndex) {
+ @GetMapping(value = "/selectByPageForRole")
+ public ResponseMsg<List<RoleEntity>> selectByPageForRole(String name, Integer depid, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -237,7 +242,49 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鏍圭洰褰�")
+ @GetMapping(value = "/selectDirRoot")
+ public ResponseMsg<List<DirEntity>> selectDirRoot() {
+ try {
+ List<DirEntity> list = dirService.selectDirRoot();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ椤圭洰")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�")
+ })
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<List<DirEntity>> selectProject(String name) {
+ try {
+ List<DirEntity> list = dirService.selectProject(name);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ椤圭洰鐩綍鏍�")
+ @GetMapping(value = "/selectDirsForPrj")
+ public ResponseMsg<List<DirEntity>> selectDirsForPrj() {
+ try {
+ List<DirEntity> list = dirService.selectDirsForPrj();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3