gbpark/invyone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[agent-pipeline] pipe-20260328153638-axu2 round-1

Browse Source
This commit is contained in:
DDD1542
2026-03-29 01:52:38 +09:00
parent 8695be1a8d
commit b7f9e51d62
321 changed files with 9701 additions and 9712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend-spring/src/main/java/com/erp/controller/AdminController.java
+44 -44
View File
@@ -27,16 +27,16 @@ public class AdminController {
*/
@GetMapping("/menus")
public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getAdminMenus(
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@RequestAttribute("role") String role,
@RequestAttribute("userId") String userId,
@RequestAttribute("user_id") String userId,
@RequestParam Map<String, Object> params) {
params.put("companyCode", companyCode);
params.put("userType", role);
params.put("userId", userId);
params.putIfAbsent("userLang", "ko");
params.put("isManagementScreen",
params.get("menuType") == null || "true".equals(params.get("includeInactive")));
params.put("company_code", companyCode);
params.put("user_type", role);
params.put("user_id", userId);
params.putIfAbsent("user_lang", "ko");
params.put("is_management_screen",
params.get("menu_type") == null || "true".equals(params.get("include_inactive")));
return ResponseEntity.ok(ApiResponse.success(adminService.getAdminMenuList(params), "관리자 메뉴 목록 조회 성공"));
}
@@ -46,14 +46,14 @@ public class AdminController {
*/
@GetMapping("/user-menus")
public ResponseEntity<ApiResponse<List<Map<String, Object>>>> getUserMenus(
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@RequestAttribute("role") String role,
@RequestAttribute("userId") String userId,
@RequestAttribute("user_id") String userId,
@RequestParam Map<String, Object> params) {
params.put("companyCode", companyCode);
params.put("userType", role);
params.put("userId", userId);
params.putIfAbsent("userLang", "ko");
params.put("company_code", companyCode);
params.put("user_type", role);
params.put("user_id", userId);
params.putIfAbsent("user_lang", "ko");
return ResponseEntity.ok(ApiResponse.success(adminService.getUserMenuList(params), "사용자 메뉴 목록 조회 성공"));
}
@@ -63,11 +63,11 @@ public class AdminController {
*/
@GetMapping("/pop-menus")
public ResponseEntity<ApiResponse<Map<String, Object>>> getPopMenus(
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@RequestAttribute("role") String role) {
Map<String, Object> params = new HashMap<>();
params.put("companyCode", companyCode);
params.put("userType", role);
params.put("company_code", companyCode);
params.put("user_type", role);
return ResponseEntity.ok(ApiResponse.success(adminService.getPopMenuList(params), "POP 메뉴 목록 조회 성공"));
}
@@ -90,9 +90,9 @@ public class AdminController {
*/
@PostMapping("/menus")
public ResponseEntity<ApiResponse<Map<String, Object>>> saveMenu(
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@RequestBody Map<String, Object> body) {
body.put("companyCode", companyCode);
body.put("company_code", companyCode);
return ResponseEntity.ok(ApiResponse.success(adminService.saveMenu(body), "메뉴 등록 성공"));
}
@@ -133,7 +133,7 @@ public class AdminController {
@DeleteMapping("/menus/batch")
public ResponseEntity<ApiResponse<Void>> deleteMenusBatch(@RequestBody Map<String, Object> body) {
@SuppressWarnings("unchecked")
List<String> menuIds = (List<String>) body.get("menuIds");
List<String> menuIds = (List<String>) body.get("menu_ids");
if (menuIds != null) {
menuIds.forEach(adminService::deleteMenu);
}
@@ -148,14 +148,14 @@ public class AdminController {
*/
@GetMapping("/users")
public ResponseEntity<?> getUserList(
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@RequestAttribute("role") String role,
@RequestParam Map<String, Object> params) {
// SUPER_ADMIN이 아닌 경우 자사 필터 적용
if (!"SUPER_ADMIN".equals(role)) {
params.put("companyCode", companyCode);
params.put("company_code", companyCode);
} else {
params.put("companyCode", "*");
params.put("company_code", "*");
}
params.putIfAbsent("page", "1");
params.putIfAbsent("limit", "20");
@@ -199,11 +199,11 @@ public class AdminController {
*/
@GetMapping("/users/{userId}/with-dept")
public ResponseEntity<ApiResponse<Map<String, Object>>> getUserWithDept(
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@PathVariable String userId) {
Map<String, Object> params = new HashMap<>();
params.put("companyCode", companyCode);
params.put("userId", userId);
params.put("company_code", companyCode);
params.put("user_id", userId);
Map<String, Object> result = adminService.getUserWithDept(params);
if (result == null) {
return ResponseEntity.status(404).body(ApiResponse.error("사용자를 찾을 수 없습니다."));
@@ -217,9 +217,9 @@ public class AdminController {
*/
@PostMapping("/users/with-dept")
public ResponseEntity<ApiResponse<Map<String, Object>>> saveUserWithDept(
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@RequestBody Map<String, Object> body) {
body.put("companyCode", companyCode);
body.put("company_code", companyCode);
return ResponseEntity.ok(ApiResponse.success(adminService.saveUserWithDept(body)));
}
@@ -229,9 +229,9 @@ public class AdminController {
*/
@PostMapping("/users")
public ResponseEntity<ApiResponse<Map<String, Object>>> saveUser(
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@RequestBody Map<String, Object> body) {
body.put("companyCode", companyCode);
body.put("company_code", companyCode);
return ResponseEntity.ok(ApiResponse.success(adminService.saveUser(body), "사용자 저장 성공"));
}
@@ -242,10 +242,10 @@ public class AdminController {
@PutMapping("/users/{userId}")
public ResponseEntity<ApiResponse<Map<String, Object>>> updateUser(
@PathVariable String userId,
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@RequestBody Map<String, Object> body) {
body.put("userId", userId);
body.put("companyCode", companyCode);
body.put("user_id", userId);
body.put("company_code", companyCode);
return ResponseEntity.ok(ApiResponse.success(adminService.saveUser(body), "사용자 수정 성공"));
}
@@ -268,7 +268,7 @@ public class AdminController {
*/
@PostMapping("/users/reset-password")
public ResponseEntity<ApiResponse<Void>> resetUserPassword(@RequestBody Map<String, Object> body) {
String userId = (String) body.get("userId");
String userId = (String) body.get("user_id");
adminService.resetUserPassword(userId);
return ResponseEntity.ok(ApiResponse.success(null, "비밀번호 초기화 성공"));
}
@@ -280,10 +280,10 @@ public class AdminController {
@PostMapping("/users/check-duplicate")
public ResponseEntity<ApiResponse<Map<String, Object>>> checkDuplicateUserId(
@RequestBody Map<String, Object> body) {
String userId = (String) body.get("userId");
String userId = (String) body.get("user_id");
Map<String, Object> existing = adminService.getUserInfo(userId);
Map<String, Object> result = new HashMap<>();
result.put("isDuplicate", existing != null);
result.put("is_duplicate", existing != null);
return ResponseEntity.ok(ApiResponse.success(result, "아이디 중복 확인 완료"));
}
@@ -295,9 +295,9 @@ public class AdminController {
*/
@PutMapping("/profile")
public ResponseEntity<ApiResponse<Map<String, Object>>> updateProfile(
@RequestAttribute("userId") String userId,
@RequestAttribute("user_id") String userId,
@RequestBody Map<String, Object> body) {
body.put("userId", userId);
body.put("user_id", userId);
return ResponseEntity.ok(ApiResponse.success(adminService.saveUser(body), "프로필 수정 성공"));
}
@@ -309,23 +309,23 @@ public class AdminController {
*/
@GetMapping("/departments")
public ResponseEntity<?> getDepartmentList(
@RequestAttribute("companyCode") String companyCode,
@RequestAttribute("company_code") String companyCode,
@RequestParam Map<String, Object> params) {
params.put("companyCode", companyCode);
params.put("company_code", companyCode);
Map<String, Object> serviceResult = adminService.getDepartmentList(params);
int total = ((Number) serviceResult.get("total")).intValue();
Map<String, Object> data = new HashMap<>();
data.put("departments", serviceResult.get("departments"));
data.put("flatList", serviceResult.get("flatList"));
data.put("flat_list", serviceResult.get("flat_list"));
Map<String, Object> response = new HashMap<>();
response.put("success", true);
response.put("data", data);
response.put("message", "부서 목록 조회 성공");
response.put("total", total);
response.put("totalCount", total);
response.put("total_count", total);
return ResponseEntity.ok(response);
}
@@ -402,7 +402,7 @@ public class AdminController {
*/
@GetMapping("/user-locale")
public ResponseEntity<ApiResponse<Object>> getUserLocale(
@RequestAttribute("userId") String userId) {
@RequestAttribute("user_id") String userId) {
Map<String, Object> row = adminService.getUserLocale(userId);
Object locale = row.getOrDefault("locale", "KR");
return ResponseEntity.ok(ApiResponse.success(locale, "사용자 로케일 조회 성공"));
@@ -414,7 +414,7 @@ public class AdminController {
*/
@PostMapping("/user-locale")
public ResponseEntity<ApiResponse<Object>> setUserLocale(
@RequestAttribute("userId") String userId,
@RequestAttribute("user_id") String userId,
@RequestBody Map<String, Object> body) {
String locale = (String) body.get("locale");
if (locale == null || locale.isBlank()) {