diff --git a/src/main/java/io/company/localhost/controller/api/AdminController.java b/src/main/java/io/company/localhost/controller/api/AdminController.java index 4082f47..e09e0ae 100644 --- a/src/main/java/io/company/localhost/controller/api/AdminController.java +++ b/src/main/java/io/company/localhost/controller/api/AdminController.java @@ -39,24 +39,32 @@ public class AdminController { private final NetmemberService netmemberService; + /** + * 사원 리스트 + * @return 사원 리스트 + */ @Member @ParameterCheck @GetMapping("/users") - public ApiResponse> getAllUsers() { - List response = netmemberService.getallUserList(); + public ApiResponse> selectallUserList() { + List response = netmemberService.selectallUserList(); return ApiResponse.ok(response); } + /** + * 관리자 권한 수정 + * @ReqMap map 요청 파라미터 (MEMBERROL, MEMBERSEQ) + * @return 결과 메시지 + */ + @Member + @ParameterCheck @PutMapping("/role") public ApiResponse updateUserRole(@ReqMap MapDto map) { - // 요청 데이터에서 id와 role 추출 Long id = Long.valueOf(map.get("id").toString()); String role = map.get("role").toString(); - // 역할 변환 - String newRole = role.equalsIgnoreCase("ADMIN") ? "ROLE_ADMIN" : "ROLE_USER"; + String newRole = role.equalsIgnoreCase("ADMIN") ? "ROLE_ADMIN" : "ROLE_MEMBER"; - // 권한 업데이트 서비스 호출 netmemberService.updateUserRole(id, newRole); return ApiResponse.ok("관리자 권한이 변경되었습니다."); diff --git a/src/main/java/io/company/localhost/controller/api/BoardController.java b/src/main/java/io/company/localhost/controller/api/BoardController.java index ffec70a..a01f898 100644 --- a/src/main/java/io/company/localhost/controller/api/BoardController.java +++ b/src/main/java/io/company/localhost/controller/api/BoardController.java @@ -229,7 +229,7 @@ public class BoardController { /** * 댓글 조회 - * @ReqMap map 수정 데이터 (LOCBRDSEQ) + * @ReqMap map 수정 데이터 (LOCBRDSEQ, page) * @return 댓글 */ @Member @@ -245,7 +245,7 @@ public class BoardController { /** * 대댓글 조회 - * @ReqMap map 수정 데이터 (LOCBRDSEQ) + * @ReqMap map 수정 데이터 (LOCCMTPNT) * @return 대댓글 */ @Member @@ -383,7 +383,7 @@ public class BoardController { * @return 카테고리 리스트 */ @GetMapping("/categories") - public ApiResponse> getCategories() { + public ApiResponse> SelectCategories() { List categories = commoncodService.selectCategoryList(); return ApiResponse.ok(categories); } diff --git a/src/main/java/io/company/localhost/service/localbordService.java b/src/main/java/io/company/localhost/service/localbordService.java index c76db7c..2fdead5 100644 --- a/src/main/java/io/company/localhost/service/localbordService.java +++ b/src/main/java/io/company/localhost/service/localbordService.java @@ -229,21 +229,19 @@ public class localbordService { return boardMapper.selectCountCommentReactions(boardId); } - private String procFirstImageUrl(String jsonContent) { + public static String procFirstImageUrl(String jsonContent) { try { - // JSON 유효성 검사 - if (!procIsValidJson(jsonContent)) { - throw new IllegalArgumentException("Invalid JSON content: " + jsonContent); - } - ObjectMapper objectMapper = new ObjectMapper(); JsonNode rootNode = objectMapper.readTree(jsonContent); - // JSON 배열 순회 - for (JsonNode node : rootNode) { - JsonNode insertNode = node.get("insert"); - if (insertNode != null && insertNode.has("image")) { - return insertNode.get("image").asText(); // 첫 번째 이미지 URL 반환 + // "ops" 배열 가져오기 + JsonNode opsNode = rootNode.get("ops"); + if (opsNode != null && opsNode.isArray()) { + for (JsonNode node : opsNode) { + JsonNode insertNode = node.get("insert"); + if (insertNode != null && insertNode.has("image")) { + return insertNode.get("image").asText(); // 첫 번째 이미지 URL 반환 + } } } } catch (Exception e) { diff --git a/src/main/resources/mapper/localbordMapper.xml b/src/main/resources/mapper/localbordMapper.xml index 7683691..0dbff11 100644 --- a/src/main/resources/mapper/localbordMapper.xml +++ b/src/main/resources/mapper/localbordMapper.xml @@ -65,30 +65,6 @@ ) - - - INSERT INTO commonfil ( - CMNBRDSEQ, - CMNFLENAM, - CMNFLEORG, - CMNFLEPAT, - CMNFLEEXT, - CMNFLESIZ, - CMNFLEREG, - CMNFLERDT - ) VALUES - - #{LOCBRDSEQ}, - #{item.saveFileName}, - #{item.originalFileName}, - #{item.filePath}, - #{item.extension}, - #{item.fileSize}, - #{CMNFLEREG}, - NOW() - - - SELECT c.LOCCMTSEQ,c.LOCBRDSEQ,c.LOCCMTPNT,c.LOCCMTRPY, - c.LOCCMTUDT,c.LOCCMTPWD,c.LOCCMTRDT,c.LOCCMTPNT, + c.LOCCMTUDT,c.LOCCMTPWD,c.LOCCMTRDT, m.MEMBERNAM AS author, m.MEMBERSEQ AS authorId FROM localcomt c @@ -177,8 +153,7 @@ c.LOCCMTSEQ,c.LOCBRDSEQ,c.LOCCMTPNT,c.LOCCMTRPY, c.LOCCMTUDT,c.LOCCMTPWD,c.LOCCMTRDT,c.LOCCMTPNT, m.MEMBERNAM AS author, - m.MEMBERSEQ AS authorId, - m.MEMBERPRF as profileImg + m.MEMBERSEQ AS authorId FROM localcomt c LEFT JOIN netmember m ON c.MEMBERSEQ = m.MEMBERSEQ WHERE LOCCMTPNT = #{LOCCMTPNT} and LOCCMTPNT != 1