From 5e35130d3cd215f1d14301b0f28be746824b467e Mon Sep 17 00:00:00 2001 From: yoon Date: Fri, 24 Jan 2025 10:00:24 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=83=81=EC=84=B8=EC=A3=BC=EC=86=8C,=20?= =?UTF-8?q?=EC=83=9D=EB=85=84=EC=9B=94=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/netmemberMapper.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/mapper/netmemberMapper.xml b/src/main/resources/mapper/netmemberMapper.xml index bdebbb8..abd6805 100644 --- a/src/main/resources/mapper/netmemberMapper.xml +++ b/src/main/resources/mapper/netmemberMapper.xml @@ -43,7 +43,9 @@ MEMBERPWR, MEMBERPOS, MEMBERARR, + MEMBERDTL, MEMBERZIP, + MEMBERBTH, MEMBERTEL, MEMBERRDT, MEMBERCDT, @@ -63,7 +65,9 @@ #{memberPwr}, #{memberPos}, #{memberArr}, + #{memberDtl}, #{memberZip}, + #{memberBth}, #{memberTel}, #{memberRdt}, #{memberCdt}, From a479a60449bcc1a25f77f89bbd98b3738a8dda20 Mon Sep 17 00:00:00 2001 From: yoon Date: Fri, 24 Jan 2025 10:00:41 +0900 Subject: [PATCH 2/6] =?UTF-8?q?file-size=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f683a96..5099504 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -20,8 +20,8 @@ spring: add-mappings: false servlet: multipart: - max-file-size: 10MB - max-request-size: 10MB + max-file-size: 5MB + max-request-size: 5MB mybatis: mapper-locations: classpath:mapper/**/*.xml From ea9870be561ea2b72ab738393b5d84db6c884437 Mon Sep 17 00:00:00 2001 From: yoon Date: Fri, 24 Jan 2025 10:00:53 +0900 Subject: [PATCH 3/6] =?UTF-8?q?file=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/localhost/controller/common/UserController.java | 4 ++-- .../java/io/company/localhost/service/RegisterService.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 7926f89..c5849e3 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -97,8 +97,8 @@ public class UserController { * @throws RuntimeException 파일 업로드 실패 시 */ @PostMapping("/join") - public ApiResponse register(@RequestParam("profile") MultipartFile profile, @ReqMap MapDto map) { - int member = registerService.register(profile, map); + public ApiResponse register(@RequestParam("memberPrf") MultipartFile memberPrf, @ReqMap MapDto map) { + int member = registerService.register(memberPrf, map); return ApiResponse.ok(member); } diff --git a/src/main/java/io/company/localhost/service/RegisterService.java b/src/main/java/io/company/localhost/service/RegisterService.java index abe74f6..12269ee 100644 --- a/src/main/java/io/company/localhost/service/RegisterService.java +++ b/src/main/java/io/company/localhost/service/RegisterService.java @@ -40,9 +40,9 @@ public class RegisterService { * @param map * @return */ - public int register(MultipartFile profile, MapDto map) { + public int register(MultipartFile memberPrf, MapDto map) { // 프로필 이미지 저장, 저장된 경로 가져옴 - String profilePath = fileService.uploadFile(profile, "profiles"); + String profilePath = fileService.uploadFile(memberPrf, "profiles"); map.put("memberPrf", profilePath); // 비밀번호 암호화 및 저장 @@ -53,7 +53,7 @@ public class RegisterService { map.put("memberRol", "ROLE_MEMBER"); map.put("memberPos", 500107); map.put("memberTkn", "Null"); - map.put("memberPrm", "N"); + map.put("memberPrm", "Y"); map.put("memberDel", "N"); map.put("memberLea", "N"); map.put("memberRdt", LocalDateTime.now()); From dac68fc3ebc4e4429c9ae1b7508cdcd3ac2b6809 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Fri, 24 Jan 2025 10:29:41 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/common/UserController.java | 23 +++++++++++++++---- .../localhost/mapper/NetmemberMapper.java | 4 ++++ ...sterService.java => netmemberService.java} | 18 +++++++++++---- src/main/resources/mapper/netmemberMapper.xml | 16 +++++++++---- 4 files changed, 48 insertions(+), 13 deletions(-) rename src/main/java/io/company/localhost/service/{RegisterService.java => netmemberService.java} (85%) 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 c5849e3..23a8e4e 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -22,7 +22,7 @@ import io.company.localhost.common.annotation.ParameterCheck; import io.company.localhost.common.annotation.ReqMap; import io.company.localhost.common.dto.ApiResponse; import io.company.localhost.common.dto.MapDto; -import io.company.localhost.service.RegisterService; +import io.company.localhost.service.netmemberService; import io.company.localhost.service.commoncodService; import io.company.localhost.utils.AuthUtil; import io.company.localhost.utils.SessionListener; @@ -60,7 +60,7 @@ import static org.springframework.security.web.authentication.rememberme.Abstrac public class UserController { private final commoncodService commoncodservice; - private final RegisterService registerService; + private final netmemberService netmemberservice; /** * 사용 가능 색상 조회 @@ -97,8 +97,8 @@ public class UserController { * @throws RuntimeException 파일 업로드 실패 시 */ @PostMapping("/join") - public ApiResponse register(@RequestParam("memberPrf") MultipartFile memberPrf, @ReqMap MapDto map) { - int member = registerService.register(memberPrf, map); + public ApiResponse register(@RequestParam("profile") MultipartFile profile, @ReqMap MapDto map) { + int member = netmemberservice.register(profile, map); return ApiResponse.ok(member); } @@ -111,7 +111,7 @@ public class UserController { */ @GetMapping("/checkId") public ApiResponse selectCheckId(@RequestParam String memberIds) { - boolean isDuplicate = registerService.selectCheckId(memberIds); + boolean isDuplicate = netmemberservice.selectCheckId(memberIds); return ApiResponse.ok(!isDuplicate); } @@ -198,6 +198,19 @@ public class UserController { return ApiResponse.ok(returnMessage); } + /** + * 사원 목록 전체 조회 + * + * + * + */ + @ParameterCheck + @GetMapping("/allUserList") + public ApiResponse> getallUserList() { + List allUserList = netmemberservice.getallUserList(); + return ApiResponse.ok(allUserList); + } + @Guest diff --git a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java index 7366371..fcaf28f 100644 --- a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java @@ -14,6 +14,8 @@ *************************************************************/ package io.company.localhost.mapper; +import java.util.List; + import org.apache.ibatis.annotations.Mapper; import io.company.localhost.common.dto.MapDto; @@ -27,4 +29,6 @@ public interface NetmemberMapper { int insertMember(MapDto map); int selectCheckId(String memberIds); + + List getallUserList(); } diff --git a/src/main/java/io/company/localhost/service/RegisterService.java b/src/main/java/io/company/localhost/service/netmemberService.java similarity index 85% rename from src/main/java/io/company/localhost/service/RegisterService.java rename to src/main/java/io/company/localhost/service/netmemberService.java index 12269ee..a228ca3 100644 --- a/src/main/java/io/company/localhost/service/RegisterService.java +++ b/src/main/java/io/company/localhost/service/netmemberService.java @@ -15,6 +15,7 @@ package io.company.localhost.service; import java.time.LocalDateTime; +import java.util.List; import org.springframework.security.crypto.password.DelegatingPasswordEncoder; import org.springframework.stereotype.Service; @@ -27,7 +28,7 @@ import lombok.RequiredArgsConstructor; @Service @RequiredArgsConstructor -public class RegisterService { +public class netmemberService { private final NetmemberMapper memberMapper; private final commoncodMapper commoncodMapper; private final DelegatingPasswordEncoder passwordEncoder; @@ -40,9 +41,9 @@ public class RegisterService { * @param map * @return */ - public int register(MultipartFile memberPrf, MapDto map) { + public int register(MultipartFile profile, MapDto map) { // 프로필 이미지 저장, 저장된 경로 가져옴 - String profilePath = fileService.uploadFile(memberPrf, "profiles"); + String profilePath = fileService.uploadFile(profile, "profiles"); map.put("memberPrf", profilePath); // 비밀번호 암호화 및 저장 @@ -53,7 +54,7 @@ public class RegisterService { map.put("memberRol", "ROLE_MEMBER"); map.put("memberPos", 500107); map.put("memberTkn", "Null"); - map.put("memberPrm", "Y"); + map.put("memberPrm", "N"); map.put("memberDel", "N"); map.put("memberLea", "N"); map.put("memberRdt", LocalDateTime.now()); @@ -78,5 +79,14 @@ public class RegisterService { public boolean selectCheckId(String memberIds) { return memberMapper.selectCheckId(memberIds) > 0; } + /** + * 사원 목록 전체 조회 + * + * @param + * @return + */ + public List getallUserList() { + return memberMapper.getallUserList(); + } } diff --git a/src/main/resources/mapper/netmemberMapper.xml b/src/main/resources/mapper/netmemberMapper.xml index abd6805..5473067 100644 --- a/src/main/resources/mapper/netmemberMapper.xml +++ b/src/main/resources/mapper/netmemberMapper.xml @@ -43,9 +43,7 @@ MEMBERPWR, MEMBERPOS, MEMBERARR, - MEMBERDTL, MEMBERZIP, - MEMBERBTH, MEMBERTEL, MEMBERRDT, MEMBERCDT, @@ -65,9 +63,7 @@ #{memberPwr}, #{memberPos}, #{memberArr}, - #{memberDtl}, #{memberZip}, - #{memberBth}, #{memberTel}, #{memberRdt}, #{memberCdt}, @@ -85,5 +81,17 @@ FROM netmember WHERE MEMBERIDS = #{memberIds} + + From 4795be774812f9a8d959049e6064e81bfeab429a Mon Sep 17 00:00:00 2001 From: yoon Date: Fri, 24 Jan 2025 10:56:33 +0900 Subject: [PATCH 5/6] =?UTF-8?q?file=20=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/localhost/controller/common/UserController.java | 4 ++-- .../java/io/company/localhost/service/netmemberService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 23a8e4e..8137021 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -97,8 +97,8 @@ public class UserController { * @throws RuntimeException 파일 업로드 실패 시 */ @PostMapping("/join") - public ApiResponse register(@RequestParam("profile") MultipartFile profile, @ReqMap MapDto map) { - int member = netmemberservice.register(profile, map); + public ApiResponse register(@RequestParam("memberPrf") MultipartFile memberPrf, @ReqMap MapDto map) { + int member = netmemberservice.register(memberPrf, map); return ApiResponse.ok(member); } diff --git a/src/main/java/io/company/localhost/service/netmemberService.java b/src/main/java/io/company/localhost/service/netmemberService.java index a228ca3..46e9612 100644 --- a/src/main/java/io/company/localhost/service/netmemberService.java +++ b/src/main/java/io/company/localhost/service/netmemberService.java @@ -41,9 +41,9 @@ public class netmemberService { * @param map * @return */ - public int register(MultipartFile profile, MapDto map) { + public int register(MultipartFile memberPrf, MapDto map) { // 프로필 이미지 저장, 저장된 경로 가져옴 - String profilePath = fileService.uploadFile(profile, "profiles"); + String profilePath = fileService.uploadFile(memberPrf, "profiles"); map.put("memberPrf", profilePath); // 비밀번호 암호화 및 저장 From 897222821364fc72899487b24720f92b4c36ef2a Mon Sep 17 00:00:00 2001 From: yoon Date: Fri, 24 Jan 2025 11:06:34 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/company/localhost/vo/MemberVo.java | 42 ++++++++++--------- src/main/resources/mapper/netmemberMapper.xml | 6 +++ 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/main/java/io/company/localhost/vo/MemberVo.java b/src/main/java/io/company/localhost/vo/MemberVo.java index 1b8449e..f7960eb 100644 --- a/src/main/java/io/company/localhost/vo/MemberVo.java +++ b/src/main/java/io/company/localhost/vo/MemberVo.java @@ -26,25 +26,27 @@ import java.util.Date; @ToString public class MemberVo { private Long id; - private String loginId; // 사용자 아이디 - private String role; // 권한 - private String token; // 토큰 - private String profile; // 프로필사진 - private String name; // 이름 - private String password; // 비밀번호 - private String passwordhint;// 비밀번호힌트 - private String passwordRes; // 비밀번호힌트답변 - private int position; // 직급 - private String address; // 주소 - private String zipcode; // 우편번호 - private String phone; // 전화번호 - private Date regist; // 가입요청일 - private Date isCdt; // 입사일 - private String isUsed; // 허가여부 - private String isDel; // 퇴사여부 - private String isLea; // 휴직여부 - private int color; // 색상 - private int mbit; // MBTI - private Boolean remember; // 로그인 유지 + private String loginId; // 사용자 아이디 + private String role; // 권한 + private String token; // 토큰 + private String profile; // 프로필사진 + private String name; // 이름 + private String password; // 비밀번호 + private String passwordhint; // 비밀번호힌트 + private String passwordRes; // 비밀번호힌트답변 + private int position; // 직급 + private String address; // 주소 + private String addressDetail; // 상세주소 + private String zipcode; // 우편번호 + private Date birth; // 생년월일 + private String phone; // 전화번호 + private Date regist; // 가입요청일 + private Date isCdt; // 입사일 + private String isUsed; // 허가여부 + private String isDel; // 퇴사여부 + private String isLea; // 휴직여부 + private int color; // 색상 + private int mbit; // MBTI + private Boolean remember; // 로그인 유지 } diff --git a/src/main/resources/mapper/netmemberMapper.xml b/src/main/resources/mapper/netmemberMapper.xml index 5473067..1dea72a 100644 --- a/src/main/resources/mapper/netmemberMapper.xml +++ b/src/main/resources/mapper/netmemberMapper.xml @@ -15,7 +15,9 @@ , MEMBERPWR AS passwordRes , MEMBERPOS AS position , MEMBERARR AS address + , MEMBERDTL AS addressDetail , MEMBERZIP AS zipcode + , MEMBERBTH AS birth , MEMBERTEL AS phone , MEMBERRDT AS regist , MEMBERCDT AS isCdt @@ -43,7 +45,9 @@ MEMBERPWR, MEMBERPOS, MEMBERARR, + MEMBERDTL, MEMBERZIP, + MEMBERBTH, MEMBERTEL, MEMBERRDT, MEMBERCDT, @@ -63,7 +67,9 @@ #{memberPwr}, #{memberPos}, #{memberArr}, + #{memberDtl}, #{memberZip}, + #{memberBth}, #{memberTel}, #{memberRdt}, #{memberCdt},