From 7e8090deadb78885e146fe667659257e8c57249a Mon Sep 17 00:00:00 2001 From: yoon Date: Sat, 22 Feb 2025 18:08:43 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=EC=B2=B4=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localhost/controller/common/UserController.java | 13 +++++++++++++ .../company/localhost/mapper/NetmemberMapper.java | 2 ++ .../company/localhost/service/NetmemberService.java | 11 +++++++++++ src/main/resources/mapper/netmemberMapper.xml | 9 ++++++++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/company/localhost/controller/common/UserController.java b/src/main/java/io/company/localhost/controller/common/UserController.java index 5dd9790..d3c34ba 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -127,6 +127,19 @@ public class UserController { boolean isDuplicate = netmemberservice.selectCheckId(memberIds); return ApiResponse.ok(!isDuplicate); } + + /** + * 전화번호 중복 체크 + * + * @param memberIds + * @return ApiResponse + * + */ + @GetMapping("/checkPhone") + public ApiResponse selectCheckPhone(@RequestParam String memberTel) { + boolean isDuplicate = netmemberservice.selectCheckPhone(memberTel); + return ApiResponse.ok(!isDuplicate); + } /** * 로그인 여부 체크 diff --git a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java index 4f764b3..cde8283 100644 --- a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java @@ -32,6 +32,8 @@ public interface NetmemberMapper { int selectCheckId(String memberIds); + int selectCheckPhone(String memberTel); + int selectPwReset(MapDto map); String selectPassword(String id); diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java index 350bd92..6be86c2 100644 --- a/src/main/java/io/company/localhost/service/NetmemberService.java +++ b/src/main/java/io/company/localhost/service/NetmemberService.java @@ -85,6 +85,16 @@ public class NetmemberService { public boolean selectCheckId(String memberIds) { return memberMapper.selectCheckId(memberIds) > 0; } + + /** + * 전화번호 중복 체크 + * + * @param memberIds + * @return + */ + public boolean selectCheckPhone(String memberTel) { + return memberMapper.selectCheckPhone(memberTel) > 0; + } /** * 사원 목록 전체 조회 @@ -143,4 +153,5 @@ public class NetmemberService { return memberMapper.updatePassword(map) > 0; } + } diff --git a/src/main/resources/mapper/netmemberMapper.xml b/src/main/resources/mapper/netmemberMapper.xml index 9dff499..7307fcf 100644 --- a/src/main/resources/mapper/netmemberMapper.xml +++ b/src/main/resources/mapper/netmemberMapper.xml @@ -88,12 +88,19 @@ ) - + + + + - SELECT pm.PROJCTSEQ, - pm.MEMBERSEQ, - pm.PROJCTYON, - nm.MEMBERNAM, - nm.MEMBERPRF, - nm.MEMBERCOL as usercolor - FROM promember pm - JOIN netmember nm ON pm.MEMBERSEQ = nm.MEMBERSEQ - WHERE pm.PROJCTSEQ = #{projctSeq} - - + + SELECT pm.PROJCTSEQ, + pm.MEMBERSEQ, + pm.PROJCTYON, + nm.MEMBERNAM, + nm.MEMBERPRF, + nm.MEMBERCOL as usercolor + FROM promember pm + JOIN netmember nm ON pm.MEMBERSEQ = nm.MEMBERSEQ + WHERE pm.PROJCTSEQ = #{projctSeq} + + + From 2c5705088bfbe64f20ab1a66856b179d6751d573 Mon Sep 17 00:00:00 2001 From: yoon Date: Tue, 25 Feb 2025 09:47:06 +0900 Subject: [PATCH 3/7] . --- src/main/java/io/company/localhost/mapper/NetmemberMapper.java | 1 + src/main/java/io/company/localhost/service/NetmemberService.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java index cde8283..c7726da 100644 --- a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java @@ -41,4 +41,5 @@ public interface NetmemberMapper { int updatePassword(MapDto map); List getallUserList(); + } diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java index 6b79f1e..4026538 100644 --- a/src/main/java/io/company/localhost/service/NetmemberService.java +++ b/src/main/java/io/company/localhost/service/NetmemberService.java @@ -159,5 +159,4 @@ public class NetmemberService { return memberMapper.updatePassword(map) > 0; } - } From 68281f08744353bda98d6d7f9038173dd8f0be93 Mon Sep 17 00:00:00 2001 From: yoon Date: Tue, 25 Feb 2025 09:50:29 +0900 Subject: [PATCH 4/7] Merge branch 'main' into yoon --- .../io/company/localhost/controller/common/UserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/company/localhost/controller/common/UserController.java b/src/main/java/io/company/localhost/controller/common/UserController.java index 221b1a6..3d772d4 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -132,7 +132,7 @@ public class UserController { /** * 전화번호 중복 체크 * - * @param memberIds + * @param memberTel * @return ApiResponse * */ From 41372391dee93b133ab724125f6a6d9eb6ccf9f2 Mon Sep 17 00:00:00 2001 From: yoon Date: Tue, 25 Feb 2025 09:50:58 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/company/localhost/service/NetmemberService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java index 4026538..9e6d44c 100644 --- a/src/main/java/io/company/localhost/service/NetmemberService.java +++ b/src/main/java/io/company/localhost/service/NetmemberService.java @@ -95,7 +95,7 @@ public class NetmemberService { /** * 전화번호 중복 체크 * - * @param memberIds + * @param memberTel * @return */ public boolean selectCheckPhone(String memberTel) { From 231b763f7c515ff9a0215433074c553e92774dbb Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Tue, 25 Feb 2025 10:50:29 +0900 Subject: [PATCH 6/7] =?UTF-8?q?blob=20=EA=B3=B5=ED=86=B5=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localhost/service/localbordService.java | 23 ++-------- .../io/company/localhost/utils/BlobUtil.java | 42 +++++++++++++++++++ 2 files changed, 45 insertions(+), 20 deletions(-) create mode 100644 src/main/java/io/company/localhost/utils/BlobUtil.java diff --git a/src/main/java/io/company/localhost/service/localbordService.java b/src/main/java/io/company/localhost/service/localbordService.java index 98b00c8..8e0b1a4 100644 --- a/src/main/java/io/company/localhost/service/localbordService.java +++ b/src/main/java/io/company/localhost/service/localbordService.java @@ -6,6 +6,7 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.UUID; +import io.company.localhost.utils.BlobUtil; import org.springframework.stereotype.Service; @@ -196,24 +197,6 @@ public class localbordService { return boardMapper.selectCountCommentReactions(boardId); } - private String procBlobToString(Object blob) { - try { - if (blob instanceof String) { - return (String) blob; // 이미 문자열이면 그대로 반환 - } else if (blob instanceof java.sql.Blob) { - java.sql.Blob sqlBlob = (java.sql.Blob) blob; - long blobLength = sqlBlob.length(); - byte[] blobBytes = sqlBlob.getBytes(1, (int) blobLength); - return new String(blobBytes, StandardCharsets.UTF_8); // SQL BLOB → 바이트 배열 → 문자열 변환 - } else { - throw new UnsupportedOperationException("Unsupported blob type: " + blob.getClass()); // 지원되지 않는 타입이면 예외 발생 - } - } catch (Exception e) { - throw new RuntimeException("Failed to convert Blob to String: " + e.getMessage(), e); // 변환 실패 시 예외 처리 - } - } - - private String procFirstImageUrl(String jsonContent) { try { // JSON 유효성 검사 @@ -292,7 +275,7 @@ public class localbordService { // Blob 데이터를 문자열로 변환 Object content = boardDetail.get("content"); if (content != null) { - String contentString = procBlobToString(content); // Blob을 문자열로 변환 + String contentString = BlobUtil.procBlobToString(content); // Blob을 문자열로 변환 boardDetail.put("content", contentString); // JSON 변환 가능 } } @@ -309,7 +292,7 @@ public class localbordService { post.put("dislikeCount", reactions.getOrDefault("dislikeCount", 0)); Object content = post.get("content"); - String contentString = procBlobToString(content); + String contentString = BlobUtil.procBlobToString(content); post.put("content", contentString); String firstImageUrl = procFirstImageUrl(contentString); diff --git a/src/main/java/io/company/localhost/utils/BlobUtil.java b/src/main/java/io/company/localhost/utils/BlobUtil.java new file mode 100644 index 0000000..4fea605 --- /dev/null +++ b/src/main/java/io/company/localhost/utils/BlobUtil.java @@ -0,0 +1,42 @@ +/************************************************************ + * + * @packageName : io.company.localhost.utils + * @fileName : BlobUtil.java + * @author : 서지희 + * @date : 25.02.25 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 25.02.25 서지희 최초 생성 + * + *************************************************************/ +package io.company.localhost.utils; + +import java.nio.charset.StandardCharsets; +import java.sql.Blob; + +public class BlobUtil { + + private BlobUtil() { + // 객체 생성 방지 (유틸리티 클래스는 인스턴스를 만들 필요가 없음) + } + + public static String procBlobToString(Object blob) { + try { + if (blob instanceof String) { + return (String) blob; // 이미 문자열이면 그대로 반환 + } else if (blob instanceof Blob) { + Blob sqlBlob = (Blob) blob; + long blobLength = sqlBlob.length(); + byte[] blobBytes = sqlBlob.getBytes(1, (int) blobLength); + return new String(blobBytes, StandardCharsets.UTF_8); // SQL BLOB → 바이트 배열 → 문자열 변환 + } else { + throw new UnsupportedOperationException("Unsupported blob type: " + blob.getClass()); // 지원되지 않는 타입이면 예외 발생 + } + } catch (Exception e) { + throw new RuntimeException("Failed to convert Blob to String: " + e.getMessage(), e); // 변환 실패 시 예외 처리 + } + } +} From 17552d08675d6aba76550b390d2fc354dc4d28c2 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Tue, 25 Feb 2025 13:20:13 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EC=9A=A9=EC=96=B4=EC=A7=91=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20BlobUtil=20=EC=B6=94=E3=85=8F=E3=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/worddictController.java | 2 +- .../localhost/service/worddictyService.java | 21 +++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/worddictController.java b/src/main/java/io/company/localhost/controller/api/worddictController.java index 3748e29..4e72679 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -89,7 +89,7 @@ public class worddictController { } /** * 용어 등록 - 카테고리 등록 - * @param WRDDICCAT 카테고리 코드값 ,WRDDICTTL 용어,WRDDICCON 내용 ,WRDDICRIK 링크 ,CMNCODNAM 추가 등록 카테고리 이름 + * @param WRDDICCAT 카테고리 코드값 ,WRDDICTTL 용어,WRDDICCON 내용 ,WRDDICRIK 링크 ,CMNCODNAM 추가 등록 카테고리 이름 * @return */ @Member diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java index fddf11e..b794b46 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Service; import io.company.localhost.common.dto.MapDto; import io.company.localhost.mapper.commoncodMapper; import io.company.localhost.mapper.worddictyMapper; +import io.company.localhost.utils.BlobUtil; import lombok.RequiredArgsConstructor; @Service @@ -32,9 +33,14 @@ public class worddictyService { private final worddictyMapper worddictymapper; private final commoncodMapper commoncodmapper; - public List getWordList(MapDto map) { List wordList = worddictymapper.getWordList(map); + for (MapDto word : wordList) { + Object content = word.get("WRDDICCON"); + // BlobUtil.procBlobToString으로 content 변환 + String contentString = BlobUtil.procBlobToString(content); + word.put("WRDDICCON", contentString); + } List processedList = new ArrayList<>(); // 데이터 가공 @@ -60,7 +66,6 @@ public class worddictyService { } return processedList; } - public Long insertWord(MapDto map) { if (map.containsKey("CMNCODNAM") && map.get("CMNCODNAM") != null) { @@ -68,28 +73,16 @@ public class worddictyService { } return worddictymapper.insertWord(map); } - public Long updateWord(MapDto map) { return worddictymapper.updateWord(map); } - public MapDto getWordDetail(MapDto map) { return worddictymapper.getWordDetail(map); } - public int getTotal(MapDto map) { return worddictymapper.getTotal(map); } - - public Long updateword(MapDto map) { return worddictymapper.updateword(map); } - - - - - - - }