diff --git a/src/main/java/kr/xit/fims/biz/ens/adm/web/SendRqstMngController.java b/src/main/java/kr/xit/fims/biz/ens/adm/web/SendRqstMngController.java index e9dc17a8..6fa0e4b5 100644 --- a/src/main/java/kr/xit/fims/biz/ens/adm/web/SendRqstMngController.java +++ b/src/main/java/kr/xit/fims/biz/ens/adm/web/SendRqstMngController.java @@ -93,7 +93,7 @@ public class SendRqstMngController { */ List list = sendRqstMngService.findList(searchVO); - final int totCnt = list.size()>0 ? list.get(0).getTot_cnt() : list.size(); + final int totCnt = list.size()>0 ? list.get(0).getTotCnt() : list.size(); paginationInfo.setTotalRecordCount(totCnt); /** * 반환값 설정 @@ -193,7 +193,7 @@ public class SendRqstMngController { // List list = sendRqstMngService.findViewList(sendRqstMngVO); List list = sendRqstMngService.findViewList(searchVO); - final int totCnt = list.size()>0 ? list.get(0).getTot_cnt() : list.size(); + final int totCnt = list.size()>0 ? list.get(0).getTotCnt() : list.size(); paginationInfo.setTotalRecordCount(totCnt); /** * 반환값 설정 diff --git a/src/main/java/kr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java b/src/main/java/kr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java index 197b5787..37b3d28d 100644 --- a/src/main/java/kr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java +++ b/src/main/java/kr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java @@ -91,7 +91,7 @@ public class StatsBySignTalkByYearController { * 조회 */ List list = statsBySignTalkByYearService.findList(searchVO); - final int totCnt = list.size()>0 ? list.get(0).getTot_cnt() : list.size(); + final int totCnt = list.size()>0 ? list.get(0).getTotCnt() : list.size(); paginationInfo.setTotalRecordCount(totCnt); /** * 반환값 설정 diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/XitEntrprsMberVO.java b/src/main/java/kr/xit/framework/biz/cmm/model/XitEntrprsMberVO.java index f1502a9d..0ad29728 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/model/XitEntrprsMberVO.java +++ b/src/main/java/kr/xit/framework/biz/cmm/model/XitEntrprsMberVO.java @@ -1,6 +1,12 @@ package kr.xit.framework.biz.cmm.model; import kr.xit.framework.core.model.BaseVO; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * @@ -12,6 +18,12 @@ import kr.xit.framework.core.model.BaseVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = false) +@ToString public class XitEntrprsMberVO extends BaseVO { /** @@ -19,176 +31,28 @@ public class XitEntrprsMberVO extends BaseVO { */ private static final long serialVersionUID = -279550027005549283L; - protected String entrprs_mber_id; //기업 회원 id - protected String entrprs_se_code; //기업 구분 코드 + protected String entrprsMberId; //기업 회원 id + protected String entrprsSeCode; //기업 구분 코드 protected String bizrno; //사업자등록번호 protected String jurirno; //법인등록번호 - protected String cmpny_nm; //회사 명 + protected String cmpnyNm; //회사 명 protected String cxfc; //대표이사 protected String zip; //우편번호 protected String adres; //주소 - protected String entrprs_middle_telno; //기업 중간 전화번호 + protected String entrprsMiddleTelno; //기업 중간 전화번호 protected String fxnum; //팩스번호 protected String induty_code; //업종 코드 - protected String applcnt_nm; //신청인 명 - protected String applcnt_ihidnum; //신청인 주민등록번호 - protected String sbscrb_de; //가입 일 - protected String entrprs_mber_sttus; //기업 회원 상태 - protected String entrprs_mber_password; //기업 회원 비밀번호 - protected String entrprs_mber_password_hint; //기업 회원 비밀번호 힌트 - protected String entrprs_mber_password_cnsr; //기업 회원 비밀번호 정답 - protected String group_id; //그룹 id - protected String detail_adres; //상세 주소 - protected String entrprs_end_telno; //기업 끝 전화번호 + protected String applcntNm; //신청인 명 + protected String applcntIhidnum; //신청인 주민등록번호 + protected String sbscrbDe; //가입 일 + protected String entrprsMberSttus; //기업 회원 상태 + protected String entrprsMberPassword; //기업 회원 비밀번호 + protected String entrprsMberPasswordHint; //기업 회원 비밀번호 힌트 + protected String entrprsMberPasswordCnsr; //기업 회원 비밀번호 정답 + protected String groupId; //그룹 id + protected String detailAdres; //상세 주소 + protected String entrprsEndTelno; //기업 끝 전화번호 protected String area_no; //지역 번호 - protected String applcnt_email_adres; //신청자 이메일 주소 - protected String esntl_id; //고유 id - - - - public String getEntrprs_mber_id() { - return entrprs_mber_id; - } - public void setEntrprs_mber_id(String entrprs_mber_id) { - this.entrprs_mber_id = entrprs_mber_id; - } - public String getEntrprs_se_code() { - return entrprs_se_code; - } - public void setEntrprs_se_code(String entrprs_se_code) { - this.entrprs_se_code = entrprs_se_code; - } - public String getBizrno() { - return bizrno; - } - public void setBizrno(String bizrno) { - this.bizrno = bizrno; - } - public String getJurirno() { - return jurirno; - } - public void setJurirno(String jurirno) { - this.jurirno = jurirno; - } - public String getCmpny_nm() { - return cmpny_nm; - } - public void setCmpny_nm(String cmpny_nm) { - this.cmpny_nm = cmpny_nm; - } - public String getCxfc() { - return cxfc; - } - public void setCxfc(String cxfc) { - this.cxfc = cxfc; - } - public String getZip() { - return zip; - } - public void setZip(String zip) { - this.zip = zip; - } - public String getAdres() { - return adres; - } - public void setAdres(String adres) { - this.adres = adres; - } - public String getEntrprs_middle_telno() { - return entrprs_middle_telno; - } - public void setEntrprs_middle_telno(String entrprs_middle_telno) { - this.entrprs_middle_telno = entrprs_middle_telno; - } - public String getFxnum() { - return fxnum; - } - public void setFxnum(String fxnum) { - this.fxnum = fxnum; - } - public String getInduty_code() { - return induty_code; - } - public void setInduty_code(String induty_code) { - this.induty_code = induty_code; - } - public String getApplcnt_nm() { - return applcnt_nm; - } - public void setApplcnt_nm(String applcnt_nm) { - this.applcnt_nm = applcnt_nm; - } - public String getApplcnt_ihidnum() { - return applcnt_ihidnum; - } - public void setApplcnt_ihidnum(String applcnt_ihidnum) { - this.applcnt_ihidnum = applcnt_ihidnum; - } - public String getSbscrb_de() { - return sbscrb_de; - } - public void setSbscrb_de(String sbscrb_de) { - this.sbscrb_de = sbscrb_de; - } - public String getEntrprs_mber_sttus() { - return entrprs_mber_sttus; - } - public void setEntrprs_mber_sttus(String entrprs_mber_sttus) { - this.entrprs_mber_sttus = entrprs_mber_sttus; - } - public String getEntrprs_mber_password() { - return entrprs_mber_password; - } - public void setEntrprs_mber_password(String entrprs_mber_password) { - this.entrprs_mber_password = entrprs_mber_password; - } - public String getEntrprs_mber_password_hint() { - return entrprs_mber_password_hint; - } - public void setEntrprs_mber_password_hint(String entrprs_mber_password_hint) { - this.entrprs_mber_password_hint = entrprs_mber_password_hint; - } - public String getEntrprs_mber_password_cnsr() { - return entrprs_mber_password_cnsr; - } - public void setEntrprs_mber_password_cnsr(String entrprs_mber_password_cnsr) { - this.entrprs_mber_password_cnsr = entrprs_mber_password_cnsr; - } - public String getGroup_id() { - return group_id; - } - public void setGroup_id(String group_id) { - this.group_id = group_id; - } - public String getDetail_adres() { - return detail_adres; - } - public void setDetail_adres(String detail_adres) { - this.detail_adres = detail_adres; - } - public String getEntrprs_end_telno() { - return entrprs_end_telno; - } - public void setEntrprs_end_telno(String entrprs_end_telno) { - this.entrprs_end_telno = entrprs_end_telno; - } - public String getArea_no() { - return area_no; - } - public void setArea_no(String area_no) { - this.area_no = area_no; - } - public String getApplcnt_email_adres() { - return applcnt_email_adres; - } - public void setApplcnt_email_adres(String applcnt_email_adres) { - this.applcnt_email_adres = applcnt_email_adres; - } - public String getEsntl_id() { - return esntl_id; - } - public void setEsntl_id(String esntl_id) { - this.esntl_id = esntl_id; - } - + protected String applcntEmailAdres; //신청자 이메일 주소 + protected String esntlId; //고유 id } diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/XitGnrlMberVO.java b/src/main/java/kr/xit/framework/biz/cmm/model/XitGnrlMberVO.java index 2e44b468..96e49637 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/model/XitGnrlMberVO.java +++ b/src/main/java/kr/xit/framework/biz/cmm/model/XitGnrlMberVO.java @@ -1,6 +1,12 @@ package kr.xit.framework.biz.cmm.model; import kr.xit.framework.core.model.BaseVO; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * @@ -12,6 +18,12 @@ import kr.xit.framework.core.model.BaseVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = false) +@ToString public class XitGnrlMberVO extends BaseVO { /** @@ -19,146 +31,24 @@ public class XitGnrlMberVO extends BaseVO { */ private static final long serialVersionUID = -8432104288694124828L; - protected String mber_id; //회원 id + protected String mberId; //회원 id protected String password; //비밀번호 - protected String password_hint; //비밀번호 힌트 - protected String password_cnsr; //비밀번호 정답 + protected String passwordHint; //비밀번호 힌트 + protected String passwordCnsr; //비밀번호 정답 protected String ihidnum; //주민등록번호 - protected String mber_nm; //회원 명 + protected String mberNm; //회원 명 protected String zip; //우편번호 protected String adres; //주소 - protected String area_no; //지역 번호 - protected String mber_sttus; //회원 상태 - protected String detail_adres; //상세 주소 - protected String end_telno; //끝 전화번호 + protected String areaNo; //지역 번호 + protected String mberSttus; //회원 상태 + protected String detailAdres; //상세 주소 + protected String endTelno; //끝 전화번호 protected String mbtlnum; //이동전화번호 - protected String group_id; //그룹 id - protected String mber_fxnum; //회원 팩스번호 - protected String mber_email_adres; //회원 이메일 주소 - protected String middle_telno; //중간 전화번호 - protected String sbscrb_de; //가입 일자 - protected String sexdstn_code; //성별 코드 - protected String esntl_id; //고유 id - - - public String getMber_id() { - return mber_id; - } - public void setMber_id(String mber_id) { - this.mber_id = mber_id; - } - public String getPassword() { - return password; - } - public void setPassword(String password) { - this.password = password; - } - public String getPassword_hint() { - return password_hint; - } - public void setPassword_hint(String password_hint) { - this.password_hint = password_hint; - } - public String getPassword_cnsr() { - return password_cnsr; - } - public void setPassword_cnsr(String password_cnsr) { - this.password_cnsr = password_cnsr; - } - public String getIhidnum() { - return ihidnum; - } - public void setIhidnum(String ihidnum) { - this.ihidnum = ihidnum; - } - public String getMber_nm() { - return mber_nm; - } - public void setMber_nm(String mber_nm) { - this.mber_nm = mber_nm; - } - public String getZip() { - return zip; - } - public void setZip(String zip) { - this.zip = zip; - } - public String getAdres() { - return adres; - } - public void setAdres(String adres) { - this.adres = adres; - } - public String getArea_no() { - return area_no; - } - public void setArea_no(String area_no) { - this.area_no = area_no; - } - public String getMber_sttus() { - return mber_sttus; - } - public void setMber_sttus(String mber_sttus) { - this.mber_sttus = mber_sttus; - } - public String getDetail_adres() { - return detail_adres; - } - public void setDetail_adres(String detail_adres) { - this.detail_adres = detail_adres; - } - public String getEnd_telno() { - return end_telno; - } - public void setEnd_telno(String end_telno) { - this.end_telno = end_telno; - } - public String getMbtlnum() { - return mbtlnum; - } - public void setMbtlnum(String mbtlnum) { - this.mbtlnum = mbtlnum; - } - public String getGroup_id() { - return group_id; - } - public void setGroup_id(String group_id) { - this.group_id = group_id; - } - public String getMber_fxnum() { - return mber_fxnum; - } - public void setMber_fxnum(String mber_fxnum) { - this.mber_fxnum = mber_fxnum; - } - public String getMber_email_adres() { - return mber_email_adres; - } - public void setMber_email_adres(String mber_email_adres) { - this.mber_email_adres = mber_email_adres; - } - public String getMiddle_telno() { - return middle_telno; - } - public void setMiddle_telno(String middle_telno) { - this.middle_telno = middle_telno; - } - public String getSbscrb_de() { - return sbscrb_de; - } - public void setSbscrb_de(String sbscrb_de) { - this.sbscrb_de = sbscrb_de; - } - public String getSexdstn_code() { - return sexdstn_code; - } - public void setSexdstn_code(String sexdstn_code) { - this.sexdstn_code = sexdstn_code; - } - public String getEsntl_id() { - return esntl_id; - } - public void setEsntl_id(String esntl_id) { - this.esntl_id = esntl_id; - } + protected String groupId; //그룹 id + protected String mberFxnum; //회원 팩스번호 + protected String mberEmailAdres; //회원 이메일 주소 + protected String middleTelno; //중간 전화번호 + protected String sbscrbDe; //가입 일자 + protected String sexdstnCode; //성별 코드 + protected String esntlId; //고유 id } diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/XitUserEtcOptionVO.java b/src/main/java/kr/xit/framework/biz/cmm/model/XitUserEtcOptionVO.java index b7eb8c52..5159a80e 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/model/XitUserEtcOptionVO.java +++ b/src/main/java/kr/xit/framework/biz/cmm/model/XitUserEtcOptionVO.java @@ -1,6 +1,12 @@ package kr.xit.framework.biz.cmm.model; import kr.xit.framework.core.model.BaseVO; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * @@ -12,53 +18,22 @@ import kr.xit.framework.core.model.BaseVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +//@EqualsAndHashCode(callSuper = false) +@ToString public class XitUserEtcOptionVO extends BaseVO { - - - /** * serialVersionUID */ private static final long serialVersionUID = 2424456977596618565L; - protected String user_id; //사용자 id - protected String job_data_author; //업무 데이터 권한 - protected String user_manage_author; //사용자 관리 권한 - protected String elctrnsanctn_use_at; //전자결재 사용 여부(시스템별 필요 시 사용) - protected String job_confm_author_at; //업무 승인 권한(시스템별 필요 시 사용) - - - - public String getUser_id() { - return user_id; - } - public void setUser_id(String user_id) { - this.user_id = user_id; - } - public String getJob_data_author() { - return job_data_author; - } - public void setJob_data_author(String job_data_author) { - this.job_data_author = job_data_author; - } - public String getUser_manage_author() { - return user_manage_author; - } - public void setUser_manage_author(String user_manage_author) { - this.user_manage_author = user_manage_author; - } - public String getElctrnsanctn_use_at() { - return elctrnsanctn_use_at; - } - public void setElctrnsanctn_use_at(String elctrnsanctn_use_at) { - this.elctrnsanctn_use_at = elctrnsanctn_use_at; - } - public String getJob_confm_author_at() { - return job_confm_author_at; - } - public void setJob_confm_author_at(String job_confm_author_at) { - this.job_confm_author_at = job_confm_author_at; - } - + protected String userId; //사용자 id + protected String jobDataAuthor; //업무 데이터 권한 + protected String userManageAuthor; //사용자 관리 권한 + protected String elctrnsanctnUseAt; //전자결재 사용 여부(시스템별 필요 시 사용) + protected String jobConfmAuthorAt; //업무 승인 권한(시스템별 필요 시 사용) } diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/XitUserInfoVO.java b/src/main/java/kr/xit/framework/biz/cmm/model/XitUserInfoVO.java index d6257d9d..1a3ba208 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/model/XitUserInfoVO.java +++ b/src/main/java/kr/xit/framework/biz/cmm/model/XitUserInfoVO.java @@ -1,5 +1,12 @@ package kr.xit.framework.biz.cmm.model; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + /** * * @업무그룹명: 사용자정보VO @@ -10,215 +17,49 @@ package kr.xit.framework.biz.cmm.model; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +//@EqualsAndHashCode(callSuper = false) +@ToString public class XitUserInfoVO extends XitUserEtcOptionVO{ /** * serialVersionUID */ private static final long serialVersionUID = -4545167436366021662L; - // protected String user_id; //사용자 id - protected String orgnzt_id; //조직 id - protected String user_nm; //사용자 명 + protected String orgnztId; //조직 id + protected String userNm; //사용자 명 protected String password; //비밀번호 - protected String empl_no; //사원 번호 + protected String emplNo; //사원 번호 protected String ihidnum; //주민등록번호 - protected String sexdstn_code; //성별 코드 + protected String sexdstnCode; //성별 코드 protected String brthdy; //생일 protected String fxnum; //팩스번호 - protected String house_adres; //주택 주소 - protected String password_hint; //비밀번호 힌트 - protected String password_cnsr; //비밀번호 정답 - protected String house_end_telno; //주택 끝 전화번호 - protected String area_no; //지역 번호 - protected String detail_adres; //상세 주소 + protected String houseAdres; //주택 주소 + protected String passwordHint; //비밀번호 힌트 + protected String passwordCnsr; //비밀번호 정답 + protected String houseEndTelno; //주택 끝 전화번호 + protected String areaNo; //지역 번호 + protected String detailAdres; //상세 주소 protected String zip; //우편번호 - protected String offm_telno; //사무실 전화번호 + protected String offmTelno; //사무실 전화번호 protected String mbtlnum; //이동전화번호 - protected String email_adres; //이메일 주소 - protected String ofcps_nm; //직위 명 - protected String house_middle_telno; //주택 중간 전화번호 - protected String group_id; //그룹 id - protected String pstinst_code; //소속기관 코드 - protected String user_sttus_code; //사용자 상태 코드 - protected String esntl_id; //고유 id - protected String crtfc_dn_value; //인증 dn 값 - protected String sbscrb_de; //가입 일 + protected String emailAdres; //이메일 주소 + protected String ofcpsNm; //직위 명 + protected String houseMiddleTelno; //주택 중간 전화번호 + protected String groupId; //그룹 id + protected String pstinstCode; //소속기관 코드 + protected String userSttusCode; //사용자 상태 코드 + protected String esntlId; //고유 id + protected String crtfcDnValue; //인증 dn 값 + protected String sbscrbDe; //가입 일 /* ********************** * 기타 컬럼 ***********************/ - protected String orgnzt_nm; //조직 id 명 - -// public String getUser_id() { -// return user_id; -// } -// public void setUser_id(String user_id) { -// this.user_id = user_id; -// } - public String getOrgnzt_id() { - return orgnzt_id; - } - public void setOrgnzt_id(String orgnzt_id) { - this.orgnzt_id = orgnzt_id; - } - public String getUser_nm() { - return user_nm; - } - public void setUser_nm(String user_nm) { - this.user_nm = user_nm; - } - public String getPassword() { - return password; - } - public void setPassword(String password) { - this.password = password; - } - public String getEmpl_no() { - return empl_no; - } - public void setEmpl_no(String empl_no) { - this.empl_no = empl_no; - } - public String getIhidnum() { - return ihidnum; - } - public void setIhidnum(String ihidnum) { - this.ihidnum = ihidnum; - } - public String getSexdstn_code() { - return sexdstn_code; - } - public void setSexdstn_code(String sexdstn_code) { - this.sexdstn_code = sexdstn_code; - } - public String getBrthdy() { - return brthdy; - } - public void setBrthdy(String brthdy) { - this.brthdy = brthdy; - } - public String getFxnum() { - return fxnum; - } - public void setFxnum(String fxnum) { - this.fxnum = fxnum; - } - public String getHouse_adres() { - return house_adres; - } - public void setHouse_adres(String house_adres) { - this.house_adres = house_adres; - } - public String getPassword_hint() { - return password_hint; - } - public void setPassword_hint(String password_hint) { - this.password_hint = password_hint; - } - public String getPassword_cnsr() { - return password_cnsr; - } - public void setPassword_cnsr(String password_cnsr) { - this.password_cnsr = password_cnsr; - } - public String getHouse_end_telno() { - return house_end_telno; - } - public void setHouse_end_telno(String house_end_telno) { - this.house_end_telno = house_end_telno; - } - public String getArea_no() { - return area_no; - } - public void setArea_no(String area_no) { - this.area_no = area_no; - } - public String getDetail_adres() { - return detail_adres; - } - public void setDetail_adres(String detail_adres) { - this.detail_adres = detail_adres; - } - public String getZip() { - return zip; - } - public void setZip(String zip) { - this.zip = zip; - } - public String getOffm_telno() { - return offm_telno; - } - public void setOffm_telno(String offm_telno) { - this.offm_telno = offm_telno; - } - public String getMbtlnum() { - return mbtlnum; - } - public void setMbtlnum(String mbtlnum) { - this.mbtlnum = mbtlnum; - } - public String getEmail_adres() { - return email_adres; - } - public void setEmail_adres(String email_adres) { - this.email_adres = email_adres; - } - public String getOfcps_nm() { - return ofcps_nm; - } - public void setOfcps_nm(String ofcps_nm) { - this.ofcps_nm = ofcps_nm; - } - public String getHouse_middle_telno() { - return house_middle_telno; - } - public void setHouse_middle_telno(String house_middle_telno) { - this.house_middle_telno = house_middle_telno; - } - public String getGroup_id() { - return group_id; - } - public void setGroup_id(String group_id) { - this.group_id = group_id; - } - public String getPstinst_code() { - return pstinst_code; - } - public void setPstinst_code(String pstinst_code) { - this.pstinst_code = pstinst_code; - } - public String getUser_sttus_code() { - return user_sttus_code; - } - public void setUser_sttus_code(String user_sttus_code) { - this.user_sttus_code = user_sttus_code; - } - public String getEsntl_id() { - return esntl_id; - } - public void setEsntl_id(String esntl_id) { - this.esntl_id = esntl_id; - } - public String getCrtfc_dn_value() { - return crtfc_dn_value; - } - public void setCrtfc_dn_value(String crtfc_dn_value) { - this.crtfc_dn_value = crtfc_dn_value; - } - public String getSbscrb_de() { - return sbscrb_de; - } - public void setSbscrb_de(String sbscrb_de) { - this.sbscrb_de = sbscrb_de; - } - public String getOrgnzt_nm() { - return orgnzt_nm; - } - public void setOrgnzt_nm(String orgnzt_nm) { - this.orgnzt_nm = orgnzt_nm; - } - - + protected String orgnztNm; //조직 id 명 } diff --git a/src/main/java/kr/xit/framework/biz/cmm/model/XitUserScrtySetupVO.java b/src/main/java/kr/xit/framework/biz/cmm/model/XitUserScrtySetupVO.java index 9265873f..ec66f22f 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/model/XitUserScrtySetupVO.java +++ b/src/main/java/kr/xit/framework/biz/cmm/model/XitUserScrtySetupVO.java @@ -1,6 +1,12 @@ package kr.xit.framework.biz.cmm.model; import kr.xit.framework.core.model.BaseVO; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * @@ -12,32 +18,19 @@ import kr.xit.framework.core.model.BaseVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@ToString public class XitUserScrtySetupVO extends BaseVO { /** * serialVersionUID */ private static final long serialVersionUID = -4431553754531650113L; - protected String scrty_setup_trget_id; //보안 설정 대상 id - protected String mber_ty_code; //회원 유형 코드 - protected String author_code; //권한 코드 - - public String getScrty_setup_trget_id() { - return scrty_setup_trget_id; - } - public void setScrty_setup_trget_id(String scrty_setup_trget_id) { - this.scrty_setup_trget_id = scrty_setup_trget_id; - } - public String getMber_ty_code() { - return mber_ty_code; - } - public void setMber_ty_code(String mber_ty_code) { - this.mber_ty_code = mber_ty_code; - } - public String getAuthor_code() { - return author_code; - } - public void setAuthor_code(String author_code) { - this.author_code = author_code; - } + protected String scrtySetupTrgetId; //보안 설정 대상 id + protected String mberTyCode; //회원 유형 코드 + protected String authorCode; //권한 코드 } diff --git a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java index 41de15b5..b606ad26 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameCrudServiceImpl.java @@ -1936,7 +1936,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getEntrprs_mber_id())) + if(XitCmmnUtil.isEmpty(vo.getEntrprsMberId())) emsg = String.format("(%s)기업회원ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -1967,7 +1967,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getEntrprs_mber_id())) + if(XitCmmnUtil.isEmpty(vo.getEntrprsMberId())) emsg = String.format("(%s)기업회원ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2000,7 +2000,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getEntrprs_mber_id())) + if(XitCmmnUtil.isEmpty(vo.getEntrprsMberId())) emsg = String.format("(%s)기업회원ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2033,7 +2033,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getEntrprs_mber_id())) + if(XitCmmnUtil.isEmpty(vo.getEntrprsMberId())) emsg = String.format("(%s)기업회원ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2429,7 +2429,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getMber_id())) + if(XitCmmnUtil.isEmpty(vo.getMberId())) emsg = String.format("(%s)회원ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2460,7 +2460,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getMber_id())) + if(XitCmmnUtil.isEmpty(vo.getMberId())) emsg = String.format("(%s)회원ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2493,7 +2493,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getMber_id())) + if(XitCmmnUtil.isEmpty(vo.getMberId())) emsg = String.format("(%s)회원ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2526,7 +2526,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getMber_id())) + if(XitCmmnUtil.isEmpty(vo.getMberId())) emsg = String.format("(%s)회원ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -4448,7 +4448,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getUser_id())) + if(XitCmmnUtil.isEmpty(vo.getUserId())) emsg = String.format("(%s)사용자ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -4479,7 +4479,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getUser_id())) + if(XitCmmnUtil.isEmpty(vo.getUserId())) emsg = String.format("(%s)사용자ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -4512,7 +4512,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getUser_id())) + if(XitCmmnUtil.isEmpty(vo.getUserId())) emsg = String.format("(%s)사용자ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -4545,7 +4545,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getUser_id())) + if(XitCmmnUtil.isEmpty(vo.getUserId())) emsg = String.format("(%s)사용자ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -4822,7 +4822,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getUser_id())) + if(XitCmmnUtil.isEmpty(vo.getUserId())) emsg = String.format("(%s)사용자ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -4864,7 +4864,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getUser_id())) + if(XitCmmnUtil.isEmpty(vo.getUserId())) emsg = String.format("(%s)사용자ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -4897,7 +4897,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getUser_id())) + if(XitCmmnUtil.isEmpty(vo.getUserId())) emsg = String.format("(%s)사용자ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -4930,7 +4930,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getUser_id())) + if(XitCmmnUtil.isEmpty(vo.getUserId())) emsg = String.format("(%s)사용자ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -5006,7 +5006,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getScrty_setup_trget_id())) + if(XitCmmnUtil.isEmpty(vo.getScrtySetupTrgetId())) emsg = String.format("(%s)보안설정대상ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -5037,7 +5037,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getScrty_setup_trget_id())) + if(XitCmmnUtil.isEmpty(vo.getScrtySetupTrgetId())) emsg = String.format("(%s)보안설정대상ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -5070,7 +5070,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getScrty_setup_trget_id())) + if(XitCmmnUtil.isEmpty(vo.getScrtySetupTrgetId())) emsg = String.format("(%s)보안설정대상ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -5103,7 +5103,7 @@ public class XitFrameCrudServiceImpl implements XitFrameCrudService{ * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getScrty_setup_trget_id())) + if(XitCmmnUtil.isEmpty(vo.getScrtySetupTrgetId())) emsg = String.format("(%s)보안설정대상ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); diff --git a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java index 4fd9e624..599f4fcc 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/cmm/service/impl/XitFrameUnitServiceImpl.java @@ -54,7 +54,7 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { * 필수값 설정 */ XitUserInfoVO vo = new XitUserInfoVO(); - vo.setEsntl_id(uniqId); + vo.setEsntlId(uniqId); /** * 사용자정보 조회 @@ -86,11 +86,11 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { switch (user_se) { case GNR: // 일반회원 XitGnrlMberVO userGnrVO = new XitGnrlMberVO(); - userGnrVO.setMber_id(id); + userGnrVO.setMberId(id); userGnrVO = xitFrameCrudService.findXitGnrlMber(userGnrVO); // "회원가입승인" 상태인지 확인 - if (XitCmmnUtil.notEmpty(userGnrVO) && "P".equals(userGnrVO.getMber_sttus())) { + if (XitCmmnUtil.notEmpty(userGnrVO) && "P".equals(userGnrVO.getMberSttus())) { // XitLoginVO에 매핑 loginVO = new XitLoginVO(); loginVO.convertToLoginVO(userGnrVO); @@ -99,11 +99,11 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { case ENT: // 기업회원 XitEntrprsMberVO userEntVO = new XitEntrprsMberVO(); - userEntVO.setEntrprs_mber_id(id); + userEntVO.setEntrprsMberId(id); userEntVO = xitFrameCrudService.findXitEntrprsMber(userEntVO); // "회원가입승인" 상태인지 확인 - if (XitCmmnUtil.notEmpty(userEntVO) && "P".equals(userEntVO.getEntrprs_mber_sttus())) { + if (XitCmmnUtil.notEmpty(userEntVO) && "P".equals(userEntVO.getEntrprsMberSttus())) { // XitLoginVO에 매핑 loginVO = new XitLoginVO(); loginVO.convertToLoginVO(userEntVO); @@ -111,17 +111,17 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { break; case USR: // 업무사용자 XitUserInfoVO userUsrVO = new XitUserInfoVO(); - userUsrVO.setUser_id(id); + userUsrVO.setUserId(id); userUsrVO = xitFrameCrudService.findXitUserInfo(userUsrVO); // "회원가입승인" 상태인지 확인 - if (XitCmmnUtil.notEmpty(userUsrVO) && "P".equals(userUsrVO.getUser_sttus_code())) { + if (XitCmmnUtil.notEmpty(userUsrVO) && "P".equals(userUsrVO.getUserSttusCode())) { // XitLoginVO에 매핑 loginVO = new XitLoginVO(); loginVO.convertToLoginVO(userUsrVO); // 조직id명 설정 XitOrgnztInfoVO orgnztInfoVO = new XitOrgnztInfoVO(); - orgnztInfoVO.setOrgnzt_id(userUsrVO.getOrgnzt_id()); + orgnztInfoVO.setOrgnzt_id(userUsrVO.getOrgnztId()); orgnztInfoVO = xitFrameCrudService.findXitOrgnztInfo(orgnztInfoVO); if (XitCmmnUtil.notEmpty(orgnztInfoVO)) loginVO.setOrgnztNm(orgnztInfoVO.getOrgnzt_nm()); @@ -154,24 +154,24 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { switch (user_se) { case GNR: // 일반회원 XitGnrlMberVO userGnrVO = new XitGnrlMberVO(); - userGnrVO.setMber_nm(name); - userGnrVO.setMber_email_adres(email); + userGnrVO.setMberNm(name); + userGnrVO.setMberEmailAdres(email); List listUserGnr = xitFrameCrudService.findXitGnrlMbers(userGnrVO); - id = XitCmmnUtil.isEmpty(listUserGnr) ? null : listUserGnr.get(0).getMber_id(); + id = XitCmmnUtil.isEmpty(listUserGnr) ? null : listUserGnr.get(0).getMberId(); break; case ENT: // 기업회원 XitEntrprsMberVO userEntVO = new XitEntrprsMberVO(); - userEntVO.setCmpny_nm(name); - userEntVO.setApplcnt_email_adres(email); + userEntVO.setCmpnyNm(name); + userEntVO.setApplcntEmailAdres(email); List listEntrprsMber = xitFrameCrudService.findXitEntrprsMbers(userEntVO); - id = XitCmmnUtil.isEmpty(listEntrprsMber) ? null : listEntrprsMber.get(0).getEntrprs_mber_id(); + id = XitCmmnUtil.isEmpty(listEntrprsMber) ? null : listEntrprsMber.get(0).getEntrprsMberId(); break; case USR: // 업무사용자 XitUserInfoVO userUsrVO = new XitUserInfoVO(); - userUsrVO.setUser_nm(name); - userUsrVO.setEmail_adres(email); + userUsrVO.setUserNm(name); + userUsrVO.setEmailAdres(email); List listUserInfo = xitFrameCrudService.findXitUserInfos(userUsrVO); - id = XitCmmnUtil.isEmpty(listUserInfo) ? null : listUserInfo.get(0).getUser_id(); + id = XitCmmnUtil.isEmpty(listUserInfo) ? null : listUserInfo.get(0).getUserId(); break; default: break; @@ -267,19 +267,19 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { switch (user_se) { case GNR: // 일반회원 XitGnrlMberVO userGnrVO = new XitGnrlMberVO(); - userGnrVO.setMber_id(id); + userGnrVO.setMberId(id); userGnrVO.setPassword(password); xitFrameCrudService.modifyXitGnrlMber(userGnrVO); break; case ENT: // 기업회원 XitEntrprsMberVO userEntVO = new XitEntrprsMberVO(); - userEntVO.setEntrprs_mber_id(id); - userEntVO.setEntrprs_mber_password(password); + userEntVO.setEntrprsMberId(id); + userEntVO.setEntrprsMberPassword(password); xitFrameCrudService.modifyXitEntrprsMber(userEntVO); break; case USR: // 업무사용자 XitUserInfoVO userUsrVO = new XitUserInfoVO(); - userUsrVO.setUser_id(id); + userUsrVO.setUserId(id); userUsrVO.setPassword(password); xitFrameCrudService.modifyXitUserInfo(userUsrVO); break; @@ -320,19 +320,19 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { */ // 일반회원 XitGnrlMberVO userGnrVO = new XitGnrlMberVO(); - userGnrVO.setMber_id(id); + userGnrVO.setMberId(id); userGnrVO = xitFrameCrudService.findXitGnrlMber(userGnrVO); if (XitCmmnUtil.notEmpty(userGnrVO)) return 1; // 기업회원 XitEntrprsMberVO userEntVO = new XitEntrprsMberVO(); - userEntVO.setEntrprs_mber_id(id); + userEntVO.setEntrprsMberId(id); userEntVO = xitFrameCrudService.findXitEntrprsMber(userEntVO); if (XitCmmnUtil.notEmpty(userEntVO)) return 1; // 업무사용자 XitUserInfoVO userUsrVO = new XitUserInfoVO(); - userUsrVO.setUser_id(id); + userUsrVO.setUserId(id); userUsrVO = xitFrameCrudService.findXitUserInfo(userUsrVO); if (XitCmmnUtil.notEmpty(userUsrVO)) return 1; @@ -558,9 +558,9 @@ public class XitFrameUnitServiceImpl implements XitFrameUnitService { */ //사용자보안설정 조회 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); - userScrtySetupVO.setScrty_setup_trget_id(uniqId); + userScrtySetupVO.setScrtySetupTrgetId(uniqId); List listUserScrtySetupVO = xitFrameCrudService.findXitUserScrtySetups(userScrtySetupVO); - String userAuthorCode = XitCmmnUtil.isEmpty(listUserScrtySetupVO)?null:listUserScrtySetupVO.get(0).getAuthor_code(); + String userAuthorCode = XitCmmnUtil.isEmpty(listUserScrtySetupVO)?null:listUserScrtySetupVO.get(0).getAuthorCode(); return this.isCheckUserAuthorCodeForCanChange(userAuthorCode, trgetAuthorCode); } diff --git a/src/main/java/kr/xit/framework/biz/cmm/web/XitTestController.java b/src/main/java/kr/xit/framework/biz/cmm/web/XitTestController.java index 52ef13a8..301666bf 100644 --- a/src/main/java/kr/xit/framework/biz/cmm/web/XitTestController.java +++ b/src/main/java/kr/xit/framework/biz/cmm/web/XitTestController.java @@ -222,15 +222,15 @@ public class XitTestController { else { if(XitCmmnUtil.isEmpty(trgetId)) throw new RuntimeException("사용자ID는 필수조건 입니다."); - vo.setUser_id(trgetId); + vo.setUserId(trgetId); listUserInfo = xitFrameCrudService.findXitUserInfos(vo); } for(XitUserInfoVO userInfoVO : listUserInfo) { - String newPassword = XitScrtyUtil.encryptPassword("1", userInfoVO.getUser_id()); + String newPassword = XitScrtyUtil.encryptPassword("1", userInfoVO.getUserId()); vo = new XitUserInfoVO(); - vo.setUser_id(userInfoVO.getUser_id()); + vo.setUserId(userInfoVO.getUserId()); vo.setPassword(newPassword); xitFrameCrudService.modifyXitUserInfo(vo); } diff --git a/src/main/java/kr/xit/framework/biz/login/model/XitLoginVO.java b/src/main/java/kr/xit/framework/biz/login/model/XitLoginVO.java index 2d6dd8be..68e49209 100644 --- a/src/main/java/kr/xit/framework/biz/login/model/XitLoginVO.java +++ b/src/main/java/kr/xit/framework/biz/login/model/XitLoginVO.java @@ -6,7 +6,19 @@ import kr.xit.framework.biz.cmm.model.XitEntrprsMberVO; import kr.xit.framework.biz.cmm.model.XitGnrlMberVO; import kr.xit.framework.biz.cmm.model.XitUserInfoVO; import kr.xit.framework.core.constants.FrameworkConstants.USER_SE; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode +@ToString public class XitLoginVO implements Serializable{ /** @@ -53,230 +65,7 @@ public class XitLoginVO implements Serializable{ private String elctrnsanctnUseAt; /** 업무 승인 권한 여부 */ private String jobConfmAuthorAt; - /** - * id attribute 를 리턴한다. - * @return String - */ - public String getId() { - return id; - } - /** - * id attribute 값을 설정한다. - * @param id String - */ - public void setId(String id) { - this.id = id; - } - /** - * name attribute 를 리턴한다. - * @return String - */ - public String getName() { - return name; - } - /** - * name attribute 값을 설정한다. - * @param name String - */ - public void setName(String name) { - this.name = name; - } - /** - * ihidNum attribute 를 리턴한다. - * @return String - */ - public String getIhidNum() { - return ihidNum; - } - /** - * ihidNum attribute 값을 설정한다. - * @param ihidNum String - */ - public void setIhidNum(String ihidNum) { - this.ihidNum = ihidNum; - } - /** - * email attribute 를 리턴한다. - * @return String - */ - public String getEmail() { - return email; - } - /** - * email attribute 값을 설정한다. - * @param email String - */ - public void setEmail(String email) { - this.email = email; - } - /** - * password attribute 를 리턴한다. - * @return String - */ - public String getPassword() { - return password; - } - /** - * password attribute 값을 설정한다. - * @param password String - */ - public void setPassword(String password) { - this.password = password; - } - /** - * passwordHint attribute 를 리턴한다. - * @return String - */ - public String getPasswordHint() { - return passwordHint; - } - /** - * passwordHint attribute 값을 설정한다. - * @param passwordHint String - */ - public void setPasswordHint(String passwordHint) { - this.passwordHint = passwordHint; - } - /** - * passwordCnsr attribute 를 리턴한다. - * @return String - */ - public String getPasswordCnsr() { - return passwordCnsr; - } - /** - * passwordCnsr attribute 값을 설정한다. - * @param passwordCnsr String - */ - public void setPasswordCnsr(String passwordCnsr) { - this.passwordCnsr = passwordCnsr; - } - /** - * userSe attribute 를 리턴한다. - * @return String - */ - public String getUserSe() { - return userSe; - } - /** - * userSe attribute 값을 설정한다. - * @param userSe String - */ - public void setUserSe(String userSe) { - this.userSe = userSe; - } - /** - * orgnztId attribute 를 리턴한다. - * @return String - */ - public String getOrgnztId() { - return orgnztId; - } - /** - * orgnztId attribute 값을 설정한다. - * @param orgnztId String - */ - public void setOrgnztId(String orgnztId) { - this.orgnztId = orgnztId; - } - /** - * uniqId attribute 를 리턴한다. - * @return String - */ - public String getUniqId() { - return uniqId; - } - /** - * uniqId attribute 값을 설정한다. - * @param uniqId String - */ - public void setUniqId(String uniqId) { - this.uniqId = uniqId; - } - /** - * url attribute 를 리턴한다. - * @return String - */ - public String getUrl() { - return url; - } - /** - * url attribute 값을 설정한다. - * @param url String - */ - public void setUrl(String url) { - this.url = url; - } - /** - * ip attribute 를 리턴한다. - * @return String - */ - public String getIp() { - return ip; - } - /** - * ip attribute 값을 설정한다. - * @param ip String - */ - public void setIp(String ip) { - this.ip = ip; - } - /** - * dn attribute 를 리턴한다. - * @return String - */ - public String getDn() { - return dn; - } - /** - * dn attribute 값을 설정한다. - * @param dn String - */ - public void setDn(String dn) { - this.dn = dn; - } - public String getGroupId() { - return groupId; - } - public void setGroupId(String groupId) { - this.groupId = groupId; - } - /** - * @return the orgnztNm - */ - public String getOrgnztNm() { - return orgnztNm; - } - /** - * @param orgnztNm the orgnztNm to set - */ - public void setOrgnztNm(String orgnztNm) { - this.orgnztNm = orgnztNm; - } - public String getJobDataAuthor() { - return jobDataAuthor; - } - public void setJobDataAuthor(String jobDataAuthor) { - this.jobDataAuthor = jobDataAuthor; - } - public String getUserManageAuthor() { - return userManageAuthor; - } - public void setUserManageAuthor(String userManageAuthor) { - this.userManageAuthor = userManageAuthor; - } - public String getElctrnsanctnUseAt() { - return elctrnsanctnUseAt; - } - public void setElctrnsanctnUseAt(String elctrnsanctnUseAt) { - this.elctrnsanctnUseAt = elctrnsanctnUseAt; - } - public String getJobConfmAuthorAt() { - return jobConfmAuthorAt; - } - public void setJobConfmAuthorAt(String jobConfmAuthorAt) { - this.jobConfmAuthorAt = jobConfmAuthorAt; - } + /** @@ -295,16 +84,16 @@ public class XitLoginVO implements Serializable{ } else if(obj instanceof XitGnrlMberVO) { //일반회원 XitGnrlMberVO vo = (XitGnrlMberVO)obj; - this.id = vo.getMber_id(); - this.name = vo.getMber_nm(); + this.id = vo.getMberId(); + this.name = vo.getMberNm(); this.password = vo.getPassword(); this.ihidNum = vo.getIhidnum(); - this.email = vo.getMber_email_adres(); + this.email = vo.getMberEmailAdres(); this.userSe = USER_SE.GNR.name(); this.orgnztId = "-"; this.orgnztNm = "-"; - this.groupId = vo.getGroup_id(); - this.uniqId = vo.getEsntl_id(); + this.groupId = vo.getGroupId(); + this.uniqId = vo.getEsntlId(); this.jobDataAuthor = "-"; this.userManageAuthor = "-"; this.elctrnsanctnUseAt = "-"; @@ -313,16 +102,16 @@ public class XitLoginVO implements Serializable{ }else if(obj instanceof XitEntrprsMberVO) { //기업회원 XitEntrprsMberVO vo = (XitEntrprsMberVO)obj; - this.id = vo.getEntrprs_mber_id(); - this.name = vo.getCmpny_nm(); - this.password = vo.getEntrprs_mber_password(); + this.id = vo.getEntrprsMberId(); + this.name = vo.getCmpnyNm(); + this.password = vo.getEntrprsMberPassword(); this.ihidNum = vo.getBizrno(); - this.email = vo.getApplcnt_email_adres(); + this.email = vo.getApplcntEmailAdres(); this.userSe = USER_SE.ENT.name(); this.orgnztId = "-"; this.orgnztNm = "-"; - this.groupId = vo.getGroup_id(); - this.uniqId = vo.getEsntl_id(); + this.groupId = vo.getGroupId(); + this.uniqId = vo.getEsntlId(); this.jobDataAuthor = "-"; this.userManageAuthor = "-"; this.elctrnsanctnUseAt = "-"; @@ -331,20 +120,20 @@ public class XitLoginVO implements Serializable{ }else if(obj instanceof XitUserInfoVO) { //업무사용자 XitUserInfoVO vo = (XitUserInfoVO)obj; - this.id = vo.getUser_id(); - this.name = vo.getUser_nm(); + this.id = vo.getUserId(); + this.name = vo.getUserNm(); this.password = vo.getPassword(); this.ihidNum = vo.getIhidnum(); - this.email = vo.getEmail_adres(); + this.email = vo.getEmailAdres(); this.userSe = USER_SE.USR.name(); - this.orgnztId = vo.getOrgnzt_id(); - this.orgnztNm = vo.getOrgnzt_nm(); - this.groupId = vo.getGroup_id(); - this.uniqId = vo.getEsntl_id(); - this.jobDataAuthor = vo.getJob_data_author(); - this.userManageAuthor = vo.getUser_manage_author(); - this.elctrnsanctnUseAt = vo.getElctrnsanctn_use_at(); - this.jobConfmAuthorAt = vo.getJob_confm_author_at(); + this.orgnztId = vo.getOrgnztId(); + this.orgnztNm = vo.getOrgnztNm(); + this.groupId = vo.getGroupId(); + this.uniqId = vo.getEsntlId(); + this.jobDataAuthor = vo.getJobDataAuthor(); + this.userManageAuthor = vo.getUserManageAuthor(); + this.elctrnsanctnUseAt = vo.getElctrnsanctnUseAt(); + this.jobConfmAuthorAt = vo.getJobConfmAuthorAt(); } } diff --git a/src/main/java/kr/xit/framework/biz/main/service/impl/XitMainServiceImpl.java b/src/main/java/kr/xit/framework/biz/main/service/impl/XitMainServiceImpl.java index 6e82d101..bb34cc0c 100644 --- a/src/main/java/kr/xit/framework/biz/main/service/impl/XitMainServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/main/service/impl/XitMainServiceImpl.java @@ -19,7 +19,7 @@ public class XitMainServiceImpl implements XitMainService { @Override public List findMainMenuHeads(String uniqId) { XitMenuManageVO vo = new XitMenuManageVO(); - vo.setTmp_UniqId(uniqId); + vo.setTmpUniqId(uniqId); List result = null; @@ -35,7 +35,7 @@ public class XitMainServiceImpl implements XitMainService { @Override public List findtMainMenuLefts(String uniqId) { XitMenuManageVO vo = new XitMenuManageVO(); - vo.setTmp_UniqId(uniqId); + vo.setTmpUniqId(uniqId); List result = null; try { diff --git a/src/main/java/kr/xit/framework/biz/mng/auth/usr/service/impl/XitAuthUsrMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/auth/usr/service/impl/XitAuthUsrMngServiceImpl.java index 7b9313d6..772bbfd3 100644 --- a/src/main/java/kr/xit/framework/biz/mng/auth/usr/service/impl/XitAuthUsrMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/auth/usr/service/impl/XitAuthUsrMngServiceImpl.java @@ -107,9 +107,9 @@ public class XitAuthUsrMngServiceImpl implements XitAuthUsrMngService { * 필수값 설정 */ XitUserScrtySetupVO userScrtySetupVO = convertToCrudVO(vo); - userScrtySetupVO.setMber_ty_code(null); + userScrtySetupVO.setMberTyCode(null); String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(vo.getGroupId()); - userScrtySetupVO.setAuthor_code(defaultAuthorCode); + userScrtySetupVO.setAuthorCode(defaultAuthorCode); /** * 처리 */ @@ -167,9 +167,9 @@ public class XitAuthUsrMngServiceImpl implements XitAuthUsrMngService { */ private XitUserScrtySetupVO convertToCrudVO(XitAuthUsrMngVO vo) { XitUserScrtySetupVO crudVO = new XitUserScrtySetupVO(); - crudVO.setScrty_setup_trget_id(vo.getUniqId()); //보안 설정 대상 id - crudVO.setMber_ty_code (vo.getMberTyCode()); //회원 유형 코드 - crudVO.setAuthor_code (vo.getAuthorCode()); //권한 코드 + crudVO.setScrtySetupTrgetId(vo.getUniqId()); //보안 설정 대상 id + crudVO.setMberTyCode(vo.getMberTyCode()); //회원 유형 코드 + crudVO.setAuthorCode(vo.getAuthorCode()); //권한 코드 return crudVO; } diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/program/dao/XitProgramMngMapper.java b/src/main/java/kr/xit/framework/biz/mng/menu/program/dao/XitProgramMngMapper.java deleted file mode 100644 index db6d3435..00000000 --- a/src/main/java/kr/xit/framework/biz/mng/menu/program/dao/XitProgramMngMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package kr.xit.framework.biz.mng.menu.program.dao; - -import java.sql.SQLException; -import java.util.List; -import java.util.Map; - -import egovframework.rte.psl.dataaccess.mapper.Mapper; -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngSearchVO; -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngVO; -import org.apache.ibatis.session.RowBounds; - -/** - * - * @업무그룹명: 프로그램관리 Mapper - * @설명: - * @최초작성일: 2020. 3. 26. 오전 10:03:50 - * @최초작성자: 박민규 - * @author (주)엑스아이티 개발팀 - * @since 2002. 2. 2. - * @version 1.0 Copyright(c) XIT All rights reserved. - */ -@Mapper -public interface XitProgramMngMapper { - - /** - * 
메소드 설명: 프로그램관리 목록 조회
- * @param map - * @return List 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - public List findList(Map map, RowBounds rowBounds); - - /** - * 
메소드 설명: 프로그램관리 목록 총건수 조회
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - public int findListTotCnt(XitProgramMngSearchVO searchVO) throws SQLException; - - /** - * 
메소드 설명: 프로그램관리 상세정보 조회
- * @param vo - * @return XitProgramMngVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - public XitProgramMngVO findView(XitProgramMngVO vo) throws SQLException; - - /** - * 
메소드 설명: 프로그램정보 전체데이터 삭제
- * @return - * @throws SQLException int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 27. - */ - public int deleteAllProgrm() throws SQLException; - - /** - * 
메소드 설명: 프로그램변경내역정보 전체데이터 삭제
- * @return - * @throws SQLException int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 27. - */ - public int deleteAllProgrmDtls() throws SQLException; -} diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/program/model/XitProgramMngSearchVO.java b/src/main/java/kr/xit/framework/biz/mng/menu/program/model/XitProgramMngSearchVO.java deleted file mode 100644 index 8d476b0e..00000000 --- a/src/main/java/kr/xit/framework/biz/mng/menu/program/model/XitProgramMngSearchVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package kr.xit.framework.biz.mng.menu.program.model; - -import kr.xit.framework.core.model.XitBaseSearchVO; - -/** - * - * @업무그룹명: 프로그램관리SearchVO - * @설명: - * @최초작성일: 2020. 3. 26. 오후 1:33:08 - * @최초작성자: 박민규 - * @author (주)엑스아이티 개발팀 - * @since 2002. 2. 2. - * @version 1.0 Copyright(c) XIT All rights reserved. - */ -public class XitProgramMngSearchVO extends XitBaseSearchVO{ - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 1L; - -} diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/program/model/XitProgramMngVO.java b/src/main/java/kr/xit/framework/biz/mng/menu/program/model/XitProgramMngVO.java deleted file mode 100644 index aaaad2d7..00000000 --- a/src/main/java/kr/xit/framework/biz/mng/menu/program/model/XitProgramMngVO.java +++ /dev/null @@ -1,103 +0,0 @@ -package kr.xit.framework.biz.mng.menu.program.model; - -import kr.xit.framework.core.model.BaseVO; - -/** - * - * @업무그룹명: 프로그램관리VO - * @설명: - * @최초작성일: 2020. 3. 26. 오후 1:32:49 - * @최초작성자: 박민규 - * @author (주)엑스아이티 개발팀 - * @since 2002. 2. 2. - * @version 1.0 Copyright(c) XIT All rights reserved. - */ -public class XitProgramMngVO extends BaseVO { - /** - * serialVersionUID - */ - private static final long serialVersionUID = 1L; - - - /** 프로그램파일명 */ - private String progrmFileNm; - /** 프로그램저장경로 */ - private String progrmStrePath; - /** 프로그램한글명 */ - private String progrmKoreanNm; - /** URL */ - private String URL; - /** 프로그램설명 */ - private String progrmDc; - - /** - * progrmFileNm attribute를 리턴한다. - * @return String - */ - public String getProgrmFileNm() { - return progrmFileNm; - } - /** - * progrmFileNm attribute 값을 설정한다. - * @param progrmFileNm String - */ - public void setProgrmFileNm(String progrmFileNm) { - this.progrmFileNm = progrmFileNm; - } - /** - * progrmStrePath attribute를 리턴한다. - * @return String - */ - public String getProgrmStrePath() { - return progrmStrePath; - } - /** - * progrmStrePath attribute 값을 설정한다. - * @param progrmStrePath String - */ - public void setProgrmStrePath(String progrmStrePath) { - this.progrmStrePath = progrmStrePath; - } - /** - * progrmKoreanNm attribute를 리턴한다. - * @return String - */ - public String getProgrmKoreanNm() { - return progrmKoreanNm; - } - /** - * progrmKoreanNm attribute 값을 설정한다. - * @param progrmKoreanNm String - */ - public void setProgrmKoreanNm(String progrmKoreanNm) { - this.progrmKoreanNm = progrmKoreanNm; - } - /** - * url attribute를 리턴한다. - * @return String - */ - public String getURL() { - return URL; - } - /** - * URL attribute 값을 설정한다. - * @param URL String - */ - public void setURL(String URL) { - this.URL = URL; - } - /** - * progrmDc attribute를 리턴한다. - * @return StringS - */ - public String getProgrmDc() { - return progrmDc; - } - /** - * progrmDc attribute 값을 설정한다. - * @param progrmDc String - */ - public void setProgrmDc(String progrmDc) { - this.progrmDc = progrmDc; - } -} diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/program/service/XitProgramMngService.java b/src/main/java/kr/xit/framework/biz/mng/menu/program/service/XitProgramMngService.java deleted file mode 100644 index 3ed378d3..00000000 --- a/src/main/java/kr/xit/framework/biz/mng/menu/program/service/XitProgramMngService.java +++ /dev/null @@ -1,81 +0,0 @@ -package kr.xit.framework.biz.mng.menu.program.service; - -import java.util.List; -import java.util.Map; - -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngSearchVO; -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngVO; -import org.apache.ibatis.session.RowBounds; - -/** - * - * @업무그룹명: 프로그램관리 Service - * @설명: - * @최초작성일: 2020. 3. 26. 오전 10:07:11 - * @최초작성자: 박민규 - * @author (주)엑스아이티 개발팀 - * @since 2002. 2. 2. - * @version 1.0 Copyright(c) XIT All rights reserved. - */ -public interface XitProgramMngService { - - /** - * 
메소드 설명: 프로그램관리 목록 조회
- * @param map - * @return List 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - public List findList(Map paramMap, RowBounds rowBounds); - - /** - * 
메소드 설명: 프로그램관리 목록 총건수 조회
- * @param searchVO - * @return int 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - public int findListTotCnt(XitProgramMngSearchVO searchVO); - - /** - * 
메소드 설명: 프로그램관리 상세정보 조회
- * @param vo - * @return XitProgramMngVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - public XitProgramMngVO findView(XitProgramMngVO vo); - - /** - * 
메소드 설명: 프로그램관리 등록
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - public void addProc(XitProgramMngVO vo); - - /** - * 
메소드 설명: 프로그램관리 수정
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - public void modifyProc(XitProgramMngVO vo); - - /** - * 
메소드 설명: 프로그램관리 삭제
- * @param vo void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - public void removeProc(XitProgramMngVO vo); - - /** - * 
메소드 설명: 프로그램관리 다건 삭제
- * @param progrmFileNms void 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 27. - */ - public void removesProc(String progrmFileNms); - -} diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/program/service/impl/XitProgramMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/menu/program/service/impl/XitProgramMngServiceImpl.java deleted file mode 100644 index 2924d6df..00000000 --- a/src/main/java/kr/xit/framework/biz/mng/menu/program/service/impl/XitProgramMngServiceImpl.java +++ /dev/null @@ -1,141 +0,0 @@ -package kr.xit.framework.biz.mng.menu.program.service.impl; - -import java.sql.SQLException; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.apache.ibatis.session.RowBounds; -import org.springframework.stereotype.Service; - -import kr.xit.framework.biz.cmm.model.ProgrmListVO; -import kr.xit.framework.biz.cmm.service.XitFrameCrudService; -import kr.xit.framework.biz.mng.menu.program.dao.XitProgramMngMapper; -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngSearchVO; -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngVO; -import kr.xit.framework.biz.mng.menu.program.service.XitProgramMngService; -import kr.xit.framework.core.message.XitMessageSource; - -@Service -public class XitProgramMngServiceImpl implements XitProgramMngService{ - - @Resource - private XitProgramMngMapper xitProgramMngMapper; - @Resource - private XitFrameCrudService xitFrameCrudService; - @Resource - private XitMessageSource xitMessageSource; - - @Override - public List findList(Map paramMap, RowBounds rowBounds) { - return xitProgramMngMapper.findList(paramMap, rowBounds); - } - - @Override - public int findListTotCnt(XitProgramMngSearchVO searchVO) { - int result = 0; - try { - result = xitProgramMngMapper.findListTotCnt(searchVO); - } catch (SQLException e) { - throw new RuntimeException("프로그램관리 목록 총건수 조회 FAIL::", e); - } - return result; - } - - @Override - public XitProgramMngVO findView(XitProgramMngVO vo) { - XitProgramMngVO result = null; - try { - result = xitProgramMngMapper.findView(vo); - } catch (SQLException e) { - throw new RuntimeException("프로그램관리 상세정보 조회 FAIL::", e); - } - return result; - } - - @Override - public void addProc(XitProgramMngVO vo) { - /** - * 필수값 설정 - */ - ProgrmListVO progrmListVO = convertToCrudVO(vo); - - /** - * 처리 - */ - xitFrameCrudService.addXitProgrmList(progrmListVO); - - } - - @Override - public void modifyProc(XitProgramMngVO vo) { - /** - * 필수값 설정 - */ - ProgrmListVO progrmListVO = convertToCrudVO(vo); - - /** - * 처리 - */ - xitFrameCrudService.modifyXitProgrmList(progrmListVO); - - } - - @Override - public void removeProc(XitProgramMngVO vo) { - /** - * 필수값 설정 - */ - ProgrmListVO progrmListVO = convertToCrudVO(vo); - - /** - * 처리 - */ - xitFrameCrudService.removeXitProgrmList(progrmListVO); - - } - - @Override - public void removesProc(String progrmFileNms) { - - /** - * 유효성 확인 - */ - String[] delProgrmFileNm = progrmFileNms.split(","); - if (delProgrmFileNm == null || (delProgrmFileNm.length == 0)) { - throw new RuntimeException(xitMessageSource.getMessage("fail.common.delete")); - } - - - /** - * 처리 - */ - String [] arrProgrmFileNm = progrmFileNms.split(","); - for (int i=0; i메소드 설명: 메뉴VO를 CRUD Service의 VO로 변환 한다. - * @return XitProgrmListVO 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 27. - */ - private ProgrmListVO convertToCrudVO(XitProgramMngVO vo) { - ProgrmListVO progrmListVO = new ProgrmListVO(); - progrmListVO.setProgrm_file_nm (vo.getProgrmFileNm()); - progrmListVO.setProgrm_stre_cours(vo.getProgrmStrePath()); - progrmListVO.setProgrm_korean_nm (vo.getProgrmKoreanNm()); - progrmListVO.setProgrm_dc (vo.getProgrmDc()); - progrmListVO.setUrl (vo.getURL()); - - return progrmListVO; - } -} diff --git a/src/main/java/kr/xit/framework/biz/mng/menu/program/web/XitProgramMngController.java b/src/main/java/kr/xit/framework/biz/mng/menu/program/web/XitProgramMngController.java deleted file mode 100644 index 82c9c4aa..00000000 --- a/src/main/java/kr/xit/framework/biz/mng/menu/program/web/XitProgramMngController.java +++ /dev/null @@ -1,329 +0,0 @@ -package kr.xit.framework.biz.mng.menu.program.web; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import kr.xit.framework.core.model.ResultResponse; -import kr.xit.framework.support.mybatis.MybatisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.ui.ModelMap; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngSearchVO; -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngVO; -import kr.xit.framework.biz.mng.menu.program.service.XitProgramMngService; -import kr.xit.framework.core.constants.FrameworkConstants; -import kr.xit.framework.core.constants.FrameworkConstants.TILES_TYPE; -import kr.xit.framework.core.message.XitMessageSource; -import kr.xit.framework.core.utils.XitCmmnUtil; -import kr.xit.framework.core.validation.XitBeanValidator; -import org.springframework.web.servlet.ModelAndView; - -/** - * - * @업무그룹명: 프로그램관리 Controller - * @설명: - * @최초작성일: 2020. 3. 25. 오후 4:05:40 - * @최초작성자: 박민규 - * @author (주)엑스아이티 개발팀 - * @since 2002. 2. 2. - * @version 1.0 Copyright(c) XIT All rights reserved. - */ -@Controller -//@RequestMapping(value = "/_mng_/menu/program/") -@RequestMapping(value = "/framework/biz/mng/menu/program/") -public class XitProgramMngController { - - @Resource - private XitProgramMngService xitProgramMngService; - @Autowired - private XitBeanValidator beanValidator; - @Resource(name = "xitMessageSource") - XitMessageSource xitMessageSource; - - @Value("#{prop['Globals.Xit.Pagination.PageUnit']}") - private int PAGE_UNIT; - @Value("#{prop['Globals.Xit.Pagination.PageSize']}") - private int PAGE_SIZE; - - /** - * 
메소드 설명: 프로그램관리 목록 페이지
- * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 25. - */ - @RequestMapping(value = "ProgramMng2.do", method={RequestMethod.GET, RequestMethod.POST}) - public String ProgramMng2(@ModelAttribute("searchVO") XitProgramMngSearchVO searchVO, ModelMap model - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef) { - - // 내역 조회 - - //searchVO.setPageUnit(Integer.parseInt(XitProperties.getProperty("Globals.Xit.Pagination.PageUnit"))); - //searchVO.setPageSize(Integer.parseInt(XitProperties.getProperty("Globals.Xit.Pagination.PageSize"))); - - /** pageing */ - //PaginationInfo paginationInfo = new PaginationInfo(); - //paginationInfo.setCurrentPageNo(searchVO.getPageIndex()); - //paginationInfo.setRecordCountPerPage(searchVO.getPageUnit()); - //paginationInfo.setPageSize(searchVO.getPageSize()); - - //searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - //searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); - //searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - //model.addAttribute("list_progrmmanage", xitProgramMngService.findList(searchVO)); - //model.addAttribute("searchVO", searchVO); - - //int totCnt = xitProgramMngService.findListTotCnt(searchVO); - //paginationInfo.setTotalRecordCount(totCnt); - //model.addAttribute("paginationInfo", paginationInfo); - - if (!"".equals(tilesDef)) - tilesDef = "." + tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/menu/program/XitProgramMng"+tilesDef; - } - - - @RequestMapping(value = "ProgramMng.do", method={RequestMethod.GET, RequestMethod.POST}) - public ModelAndView ProgramMng() { - return new ModelAndView(); - } - - - /** - * 메소드 설명: 자료 검색 - * Paging처리 : parameter로 Map 사용 - * @RequestParam 필요 - * @param paramMap - * @return String 요청처리 후 응답객체 - * @author: 최정민 - * @date: 2022. 10. 13. - */ - - /*@PostMapping(value = "ProgramMng_list.ajax")*/ - @RequestMapping(value = "ProgramMngList.do", method = {RequestMethod.GET, RequestMethod.POST}) - public ModelAndView finds(@RequestParam Map paramMap) { - - return ResultResponse.of(xitProgramMngService.findList(paramMap, MybatisUtils.getPagingInfo(paramMap))); - } - - - /** - * 
메소드 설명: 요청 페이지로 이동 한다.
- * @param cmd - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) - * @param model - * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - @RequestMapping(value = "ProgramMng_{cmd}.do", method={RequestMethod.GET, RequestMethod.POST}) - public String ProgramMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef - , @ModelAttribute("progrmManageVO") XitProgramMngVO vo - , ModelMap model) { - switch (cmd) { - case "input": //등록 페이지 - break; - case "edit": //수정 페이지 - case "view": //상세 페이지 - XitProgramMngVO xitProgramMngVO = xitProgramMngService.findView(vo); - model.addAttribute("progrmManageVO", xitProgramMngVO); - break; - default: - throw new RuntimeException("유효하지 않은 요청 입니다."); - } - - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/menu/program/XitProgramMng_"+cmd+tilesDef; - - } - - - /** - * 
메소드 설명: 요청 팝업 페이지 이동 한다.
- * @param cmd - * @param model - * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2020. 3. 26. - */ - @RequestMapping(value = "ProgramMng_{cmd}_popup.do", method={RequestMethod.GET, RequestMethod.POST}) - public String ProgramMng_page_popup(@PathVariable String cmd - , @ModelAttribute("searchVO") XitProgramMngSearchVO searchVO - , @ModelAttribute("progrmManageVO") XitProgramMngVO vo, ModelMap model) { - switch (cmd) { - case "FileNmSearch": //프로그램 파일명 조회 페이지 - // 내역 조회 - - searchVO.setPageUnit(PAGE_UNIT); - searchVO.setPageSize(PAGE_SIZE); - - /** pageing */ - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(searchVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(searchVO.getPageUnit()); - paginationInfo.setPageSize(searchVO.getPageSize()); - - searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); - searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - /*model.addAttribute("list_progrmmanage", xitProgramMngService.findList(searchVO));*/ - model.addAttribute("searchVO", searchVO); - - int totCnt = xitProgramMngService.findListTotCnt(searchVO); - paginationInfo.setTotalRecordCount(totCnt); - model.addAttribute("paginationInfo", paginationInfo); - break; - case "input" : - break; - case "edit" : - XitProgramMngVO xitProgramMngVO = xitProgramMngService.findView(vo); - model.addAttribute("progrmManageVO", xitProgramMngVO); - break; - default: - throw new RuntimeException("유효하지 않은 요청 입니다."); - } - - - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/menu/program/XitProgramMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); - } - - - - /** - * 
메소드 설명: 프로그램관리 CUD 처리
- * @return String 요청처리 후 응답객체 - * @author: 박민규 - * @throws IOException - * @throws ServletException - * @date: 2020. 3. 25. - */ - @RequestMapping(value = "ProgramMng_{cmd}_proc.do", method=RequestMethod.POST) - public void ProgramMng_cmd_proc(@PathVariable String cmd - ,@ModelAttribute("progrmManageVO") XitProgramMngVO vo - ,@RequestParam(value="checkedProgrmFileNmForDel", required=false, defaultValue="") String checkedProgrmFileNmForDel - ,BindingResult bindingResult - ,Model model - ,HttpServletRequest request - ,HttpServletResponse response - ) throws ServletException, IOException { - - /** - * 처리 분기 - */ - String sLocationUrl = "forward:/_mng_/menu/program/ProgramMngList.do"; - String resultMsg = null; - switch (cmd) { - case "insert": //등록 - //유효성 확인 - //2020.11.24. 주석처리 - beanValidator.validate(vo, bindingResult); -// beanValidator.validate("progrmManageVO", vo, bindingResult); - if (bindingResult.hasErrors()) { -// throw new RuntimeException(xitMessageSource.getMessage("fail.common.insert")); - resultMsg = xitMessageSource.getMessage("fail.common.insert"); - sLocationUrl = "forward:/_mng_/menu/program/ProgramMng_input.do"; - break; - } - if (vo.getProgrmDc() == null || vo.getProgrmDc().equals("")) { - vo.setProgrmDc(" "); - } - //처리 - xitProgramMngService.addProc(vo); - resultMsg = xitMessageSource.getMessage("success.common.insert"); - break; - -// case "inserts": //다건 등록 -// break; - - case "update": //수정 - //유효성 확인 - //2020.11.24. 주석처리 - beanValidator.validate(vo, bindingResult); -// beanValidator.validate("progrmManageVO", vo, bindingResult); - if (bindingResult.hasErrors()) { -// throw new RuntimeException(xitMessageSource.getMessage("fail.common.update")); - resultMsg = xitMessageSource.getMessage("fail.common.update"); - sLocationUrl = "forward:/_mng_/menu/program/ProgramMng_edit.do"; - break; - } - if (vo.getProgrmDc() == null || vo.getProgrmDc().equals("")) { - vo.setProgrmDc(" "); - } - //처리 - xitProgramMngService.modifyProc(vo); - resultMsg = xitMessageSource.getMessage("success.common.update"); - break; - - case "delete": //삭제 - //처리 - try { - xitProgramMngService.removeProc(vo); - resultMsg = xitMessageSource.getMessage("success.common.delete"); - break; - } catch (RuntimeException e) { - resultMsg = e.getMessage(); - sLocationUrl = "forward:/_mng_/menu/program/ProgramMng_edit.do"; - } catch (Exception e) { - resultMsg = xitMessageSource.getMessage("fail.common.delete"); - sLocationUrl = "forward:/_mng_/menu/program/ProgramMng_edit.do"; - } - break; - - case "deletes": //다건 삭제 - //처리 - try { - xitProgramMngService.removesProc(checkedProgrmFileNmForDel); - resultMsg = xitMessageSource.getMessage("success.common.delete"); - } catch (RuntimeException e) { - resultMsg = e.getMessage(); - } catch (Exception e) { - resultMsg = xitMessageSource.getMessage("fail.common.delete"); - } - break; - - default: - new RuntimeException("유효하지 않은 요청 입니다."); - } - - - - /** - * 응답 설정 - */ - /* ============================ - * 2020.09.10 박민규 - * 서버 호출 방식에 관계 없이 응답처리가 가능하도록 개선 - * -기존 호출방식도 유지하며 ajax로 서버호출 시 json 으로 응답처리가 가능하도록 개선 - * [AS-IS] 반환타입 String, return url에 "forward"구문으로 처리 - * [TO-BE] 반환타입 void, DispatchServlet으로 forward 처리, ajax 호출인 경우 json응답처리 서비스로 forward - ============================ */ - //2020.09.10 주석처리 -// model.addAttribute("resultMsg", resultMsg); -// return sLocationUrl; - model.addAttribute("resultMsg", resultMsg); - if(XitCmmnUtil.isAjaxRequest(request)){ //ajax 요청시 - //반환 데이터 설정 - Map resultMap = new HashMap(); - resultMap.put("resultMsg", resultMsg); - XitCmmnUtil.forwardForAjaxRequest(request, response, resultMap); - }else { //submit 요청 시 - XitCmmnUtil.forwardForSubmitRequest(request, response, sLocationUrl, model.asMap()); - } - } -} diff --git a/src/main/java/kr/xit/framework/biz/mng/user/opt/service/impl/XitUserEtcOptMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/user/opt/service/impl/XitUserEtcOptMngServiceImpl.java index 43b700c1..571d9756 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/opt/service/impl/XitUserEtcOptMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/opt/service/impl/XitUserEtcOptMngServiceImpl.java @@ -113,11 +113,11 @@ public class XitUserEtcOptMngServiceImpl implements XitUserEtcOptMngService { */ private XitUserEtcOptionVO convertToCrudVO(XitUserEtcOptMngVO vo) { XitUserEtcOptionVO crudVO = new XitUserEtcOptionVO(); - crudVO.setUser_id (vo.getUserId()); //사용자 id - crudVO.setJob_data_author (vo.getJobDataAuthor()); //업무 데이터 권한 - crudVO.setUser_manage_author (vo.getUserManageAuthor()); //사용자 관리 권한 - crudVO.setElctrnsanctn_use_at(vo.getElctrnsanctnUseAt()); //전자결재 사용 여부 - crudVO.setJob_confm_author_at(vo.getJobConfmAuthorAt()); //업무 승인 권한 여부 + crudVO.setUserId(vo.getUserId()); //사용자 id + crudVO.setJobDataAuthor(vo.getJobDataAuthor()); //업무 데이터 권한 + crudVO.setUserManageAuthor(vo.getUserManageAuthor()); //사용자 관리 권한 + crudVO.setElctrnsanctnUseAt(vo.getElctrnsanctnUseAt()); //전자결재 사용 여부 + crudVO.setJobConfmAuthorAt(vo.getJobConfmAuthorAt()); //업무 승인 권한 여부 return crudVO; } diff --git a/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitEntUserRegMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitEntUserRegMngServiceImpl.java index add746dd..f3dcc862 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitEntUserRegMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitEntUserRegMngServiceImpl.java @@ -97,10 +97,10 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { XitEntrprsMberVO crudVO = convertToCrudVO(vo); //그룹의 기본권한 조회 및 설정 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); - userScrtySetupVO.setScrty_setup_trget_id(crudVO.getEsntl_id()); - userScrtySetupVO.setMber_ty_code("USR02"); - String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroup_id()); - userScrtySetupVO.setAuthor_code(defaultAuthorCode); + userScrtySetupVO.setScrtySetupTrgetId(crudVO.getEsntlId()); + userScrtySetupVO.setMberTyCode("USR02"); + String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroupId()); + userScrtySetupVO.setAuthorCode(defaultAuthorCode); /** * 처리 @@ -124,10 +124,10 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { * 필수값 설정 */ XitEntrprsMberVO crudVO = convertToCrudVO(vo); - crudVO.setEntrprs_mber_password(null); + crudVO.setEntrprsMberPassword(null); boolean isChangedGroupId = false; //그룹ID 변경 여부 XitEntrprsMberVO curUserInfo = xitFrameCrudService.findXitEntrprsMber(crudVO); - if(!crudVO.getGroup_id().equals(curUserInfo.getGroup_id())) + if(!crudVO.getGroupId().equals(curUserInfo.getGroupId())) isChangedGroupId = true; /* ======================================= * 2020.11.16. 박민규 @@ -135,8 +135,8 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { * -사유: esntl_id의 경우 회원의 고유식별자이므로 변경 되어선 안됨. * -작업내용: crudVO.setEsntl_id(null) 코드 추가 ======================================= */ - String uniqId = crudVO.getEsntl_id(); - crudVO.setEsntl_id(null); + String uniqId = crudVO.getEsntlId(); + crudVO.setEsntlId(null); /* ======================================= * 2020.11.16. 박민규 * 고유식별자 확인 코드 추가 @@ -144,7 +144,7 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { * -작업내용: 현재 사용자정보와 요청값 확인코드 추가 * -> if(!curUserInfo.getEsntl_id().equals(uniqId)) ======================================= */ - if(!curUserInfo.getEsntl_id().equals(uniqId)) + if(!curUserInfo.getEsntlId().equals(uniqId)) throw new RuntimeException("사용자 고유식별값이 일치하지 않습니다."); @@ -156,12 +156,12 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { if(isChangedGroupId) { //그룹ID가 변경되었을 경우 //그룹의 기본권한 조회 및 설정 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); - userScrtySetupVO.setScrty_setup_trget_id(uniqId); - String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroup_id()); - userScrtySetupVO.setAuthor_code(defaultAuthorCode); + userScrtySetupVO.setScrtySetupTrgetId(uniqId); + String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroupId()); + userScrtySetupVO.setAuthorCode(defaultAuthorCode); //사용자의 권한 갱신 if(XitCmmnUtil.isEmpty(xitFrameCrudService.findXitUserScrtySetup(userScrtySetupVO))) { - userScrtySetupVO.setMber_ty_code("USR02"); + userScrtySetupVO.setMberTyCode("USR02"); xitFrameCrudService.addXitUserScrtySetup(userScrtySetupVO); }else { xitFrameCrudService.modifyXitUserScrtySetup(userScrtySetupVO); @@ -203,8 +203,8 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { * 필수값 설정 */ XitEntrprsMberVO crudVO = new XitEntrprsMberVO(); - crudVO.setEntrprs_mber_id(id); - crudVO.setEntrprs_mber_password(encryptNewPass); + crudVO.setEntrprsMberId(id); + crudVO.setEntrprsMberPassword(encryptNewPass); /** @@ -258,30 +258,30 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { XitEntrprsMberVO crudVO = new XitEntrprsMberVO(); - crudVO.setEntrprs_mber_id (vo.getEntrprsmberId()); //기업 회원 id - crudVO.setEntrprs_se_code (vo.getEntrprsSeCode()); //기업 구분 코드 + crudVO.setEntrprsMberId(vo.getEntrprsmberId()); //기업 회원 id + crudVO.setEntrprsSeCode(vo.getEntrprsSeCode()); //기업 구분 코드 crudVO.setBizrno (vo.getBizrno()); //사업자등록번호 crudVO.setJurirno (vo.getJurirno()); //법인등록번호 - crudVO.setCmpny_nm (vo.getCmpnyNm()); //회사 명 + crudVO.setCmpnyNm(vo.getCmpnyNm()); //회사 명 crudVO.setCxfc (vo.getCxfc()); //대표이사 crudVO.setZip (vo.getZip()); //우편번호 crudVO.setAdres (vo.getAdres()); //주소 - crudVO.setEntrprs_middle_telno (vo.getEntrprsMiddleTelno()); //기업 중간 전화번호 + crudVO.setEntrprsMiddleTelno(vo.getEntrprsMiddleTelno()); //기업 중간 전화번호 crudVO.setFxnum (vo.getFxnum()); //팩스번호 crudVO.setInduty_code (vo.getIndutyCode()); //업종 코드 - crudVO.setApplcnt_nm (vo.getApplcntNm()); //신청인 명 - crudVO.setApplcnt_ihidnum (vo.getApplcntIhidnum()); //신청인 주민등록번호 - crudVO.setSbscrb_de (vo.getSbscrbDe()); //가입 일 - crudVO.setEntrprs_mber_sttus (vo.getEntrprsMberSttus()); //기업 회원 상태 - crudVO.setEntrprs_mber_password (password); //기업 회원 비밀번호 - crudVO.setEntrprs_mber_password_hint(vo.getEntrprsMberPasswordHint()); //기업 회원 비밀번호 힌트 - crudVO.setEntrprs_mber_password_cnsr(vo.getEntrprsMberPasswordCnsr()); //기업 회원 비밀번호 정답 - crudVO.setGroup_id (vo.getGroupId()); //그룹 id - crudVO.setDetail_adres (vo.getDetailAdres()); //상세 주소 - crudVO.setEntrprs_end_telno (vo.getEntrprsEndTelno()); //기업 끝 전화번호 + crudVO.setApplcntNm(vo.getApplcntNm()); //신청인 명 + crudVO.setApplcntIhidnum(vo.getApplcntIhidnum()); //신청인 주민등록번호 + crudVO.setSbscrbDe(vo.getSbscrbDe()); //가입 일 + crudVO.setEntrprsMberSttus(vo.getEntrprsMberSttus()); //기업 회원 상태 + crudVO.setEntrprsMberPassword(password); //기업 회원 비밀번호 + crudVO.setEntrprsMberPasswordHint(vo.getEntrprsMberPasswordHint()); //기업 회원 비밀번호 힌트 + crudVO.setEntrprsMberPasswordCnsr(vo.getEntrprsMberPasswordCnsr()); //기업 회원 비밀번호 정답 + crudVO.setGroupId(vo.getGroupId()); //그룹 id + crudVO.setDetailAdres(vo.getDetailAdres()); //상세 주소 + crudVO.setEntrprsEndTelno(vo.getEntrprsEndTelno()); //기업 끝 전화번호 crudVO.setArea_no (vo.getAreaNo()); //지역 번호 - crudVO.setApplcnt_email_adres (vo.getApplcntEmailAdres()); //신청자 이메일 주소 - crudVO.setEsntl_id (vo.getUniqId()); //고유 id + crudVO.setApplcntEmailAdres(vo.getApplcntEmailAdres()); //신청자 이메일 주소 + crudVO.setEsntlId(vo.getUniqId()); //고유 id return crudVO; } @@ -316,15 +316,15 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { //사용자(수정대상) 권한 조회 String trgetAuthorCode = null; XitUserScrtySetupVO vo = new XitUserScrtySetupVO(); - vo.setScrty_setup_trget_id(uniqId); + vo.setScrtySetupTrgetId(uniqId); vo = xitFrameCrudService.findXitUserScrtySetup(vo); - trgetAuthorCode = vo.getAuthor_code(); + trgetAuthorCode = vo.getAuthorCode(); //사용자(수정자) 권한 조회 String userAuthorCode = null; vo = new XitUserScrtySetupVO(); - vo.setScrty_setup_trget_id(loginVO.getUniqId()); + vo.setScrtySetupTrgetId(loginVO.getUniqId()); vo = xitFrameCrudService.findXitUserScrtySetup(vo); - userAuthorCode = vo.getAuthor_code(); + userAuthorCode = vo.getAuthorCode(); /** @@ -340,22 +340,22 @@ public class XitEntUserRegMngServiceImpl implements XitEntUserRegMngService { } //사용자관리권한별 분기 XitUserInfoVO trgetUserInfoVO = new XitUserInfoVO(); - trgetUserInfoVO.setEsntl_id(uniqId); + trgetUserInfoVO.setEsntlId(uniqId); trgetUserInfoVO = xitFrameCrudService.findXitUserInfos(trgetUserInfoVO).get(0); //사용자(수정대상) 정보 조회 XitUserInfoVO loginUserInfoVO = new XitUserInfoVO(); - loginUserInfoVO.setEsntl_id(uniqId); + loginUserInfoVO.setEsntlId(uniqId); loginUserInfoVO = xitFrameCrudService.findXitUserInfos(loginUserInfoVO).get(0); //사용자(수정자) 정보 조회 switch(loginVO.getUserManageAuthor()) { case "ALL": //모든 사용자 return true; case "DEPT": //자신이 속한 부서의 모든 사용자 - if(loginUserInfoVO.getPstinst_code().equals(trgetUserInfoVO.getPstinst_code())) + if(loginUserInfoVO.getPstinstCode().equals(trgetUserInfoVO.getPstinstCode())) return true; break; // case "ONESELF": //본인정보만 // return true; case "ORGNZT": //자신이 속한 조직의 모든 사용자 - if(loginVO.getOrgnztId().equals(trgetUserInfoVO.getOrgnzt_id())) + if(loginVO.getOrgnztId().equals(trgetUserInfoVO.getOrgnztId())) return true; break; // case "ORGNZT_N_CHILD": //자신이 속한 조직의 모든 하위 조직 사용자(ex: 종로구청이 담당하는 조직) diff --git a/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitGnrUserRegMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitGnrUserRegMngServiceImpl.java index 0b987b7e..a4405236 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitGnrUserRegMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitGnrUserRegMngServiceImpl.java @@ -97,10 +97,10 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ XitGnrlMberVO crudVO = this.convertToCrudVO(vo); //그룹의 기본권한 조회 및 설정 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); - userScrtySetupVO.setScrty_setup_trget_id(crudVO.getEsntl_id()); - userScrtySetupVO.setMber_ty_code("USR01"); - String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroup_id()); - userScrtySetupVO.setAuthor_code(defaultAuthorCode); + userScrtySetupVO.setScrtySetupTrgetId(crudVO.getEsntlId()); + userScrtySetupVO.setMberTyCode("USR01"); + String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroupId()); + userScrtySetupVO.setAuthorCode(defaultAuthorCode); /** * 처리 @@ -127,7 +127,7 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ crudVO.setPassword(null); boolean isChangedGroupId = false; //그룹ID 변경 여부 XitGnrlMberVO curUserInfo = xitFrameCrudService.findXitGnrlMber(crudVO); - if(!crudVO.getGroup_id().equals(curUserInfo.getGroup_id())) + if(!crudVO.getGroupId().equals(curUserInfo.getGroupId())) isChangedGroupId = true; /* ======================================= * 2020.11.16. 박민규 @@ -135,8 +135,8 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ * -사유: esntl_id의 경우 회원의 고유식별자이므로 변경 되어선 안됨. * -작업내용: crudVO.setEsntl_id(null) 코드 추가 ======================================= */ - String uniqId = crudVO.getEsntl_id(); - crudVO.setEsntl_id(null); + String uniqId = crudVO.getEsntlId(); + crudVO.setEsntlId(null); /* ======================================= * 2020.11.16. 박민규 * 고유식별자 확인 코드 추가 @@ -144,7 +144,7 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ * -작업내용: 현재 사용자정보와 요청값 확인코드 추가 * -> if(!curUserInfo.getEsntl_id().equals(uniqId)) ======================================= */ - if(!curUserInfo.getEsntl_id().equals(uniqId)) + if(!curUserInfo.getEsntlId().equals(uniqId)) throw new RuntimeException("사용자 고유식별값이 일치하지 않습니다."); @@ -156,12 +156,12 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ if(isChangedGroupId) { //그룹ID가 변경되었을 경우 //그룹의 기본권한 조회 및 설정 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); - userScrtySetupVO.setScrty_setup_trget_id(uniqId); - String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroup_id()); - userScrtySetupVO.setAuthor_code(defaultAuthorCode); + userScrtySetupVO.setScrtySetupTrgetId(uniqId); + String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroupId()); + userScrtySetupVO.setAuthorCode(defaultAuthorCode); //사용자의 권한 갱신 if(XitCmmnUtil.isEmpty(xitFrameCrudService.findXitUserScrtySetup(userScrtySetupVO))) { - userScrtySetupVO.setMber_ty_code("USR01"); + userScrtySetupVO.setMberTyCode("USR01"); xitFrameCrudService.addXitUserScrtySetup(userScrtySetupVO); }else { xitFrameCrudService.modifyXitUserScrtySetup(userScrtySetupVO); @@ -203,7 +203,7 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ * 필수값 설정 */ XitGnrlMberVO crudVO = new XitGnrlMberVO(); - crudVO.setMber_id(id); + crudVO.setMberId(id); crudVO.setPassword(encryptNewPass); @@ -258,26 +258,26 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ XitGnrlMberVO crudVO = new XitGnrlMberVO(); - crudVO.setMber_id (vo.getMberId()); //회원 id + crudVO.setMberId(vo.getMberId()); //회원 id crudVO.setPassword (password); //비밀번호 - crudVO.setPassword_hint (vo.getPasswordHint()); //비밀번호 힌트 - crudVO.setPassword_cnsr (vo.getPasswordCnsr()); //비밀번호 정답 + crudVO.setPasswordHint(vo.getPasswordHint()); //비밀번호 힌트 + crudVO.setPasswordCnsr(vo.getPasswordCnsr()); //비밀번호 정답 crudVO.setIhidnum (vo.getIhidnum()); //주민등록번호 - crudVO.setMber_nm (vo.getMberNm()); //회원 명 + crudVO.setMberNm(vo.getMberNm()); //회원 명 crudVO.setZip (vo.getZip()); //우편번호 crudVO.setAdres (vo.getAdres()); //주소 - crudVO.setArea_no (vo.getAreaNo()); //지역 번호 - crudVO.setMber_sttus (vo.getMberSttus()); //회원 상태 - crudVO.setDetail_adres (vo.getDetailAdres()); //상세 주소 - crudVO.setEnd_telno (vo.getEndTelno()); //끝 전화번호 + crudVO.setAreaNo(vo.getAreaNo()); //지역 번호 + crudVO.setMberSttus(vo.getMberSttus()); //회원 상태 + crudVO.setDetailAdres(vo.getDetailAdres()); //상세 주소 + crudVO.setEndTelno(vo.getEndTelno()); //끝 전화번호 crudVO.setMbtlnum (vo.getMoblphonNo()); //이동전화번호 - crudVO.setGroup_id (vo.getGroupId()); //그룹 id - crudVO.setMber_fxnum (vo.getMberFxnum()); //회원 팩스번호 - crudVO.setMber_email_adres (vo.getMberEmailAdres()); //회원 이메일 주소 - crudVO.setMiddle_telno (vo.getMiddleTelno()); //중간 전화번호 - crudVO.setSbscrb_de (vo.getSbscrbDe()); //가입 일자 - crudVO.setSexdstn_code (vo.getSexdstnCode()); //성별 코드 - crudVO.setEsntl_id (vo.getUniqId()); //고유 id + crudVO.setGroupId(vo.getGroupId()); //그룹 id + crudVO.setMberFxnum(vo.getMberFxnum()); //회원 팩스번호 + crudVO.setMberEmailAdres(vo.getMberEmailAdres()); //회원 이메일 주소 + crudVO.setMiddleTelno(vo.getMiddleTelno()); //중간 전화번호 + crudVO.setSbscrbDe(vo.getSbscrbDe()); //가입 일자 + crudVO.setSexdstnCode(vo.getSexdstnCode()); //성별 코드 + crudVO.setEsntlId(vo.getUniqId()); //고유 id return crudVO; } @@ -312,15 +312,15 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ //사용자(수정대상) 권한 조회 String trgetAuthorCode = null; XitUserScrtySetupVO vo = new XitUserScrtySetupVO(); - vo.setScrty_setup_trget_id(uniqId); + vo.setScrtySetupTrgetId(uniqId); vo = xitFrameCrudService.findXitUserScrtySetup(vo); - trgetAuthorCode = vo.getAuthor_code(); + trgetAuthorCode = vo.getAuthorCode(); //사용자(수정자) 권한 조회 String userAuthorCode = null; vo = new XitUserScrtySetupVO(); - vo.setScrty_setup_trget_id(loginVO.getUniqId()); + vo.setScrtySetupTrgetId(loginVO.getUniqId()); vo = xitFrameCrudService.findXitUserScrtySetup(vo); - userAuthorCode = vo.getAuthor_code(); + userAuthorCode = vo.getAuthorCode(); /** @@ -336,22 +336,22 @@ public class XitGnrUserRegMngServiceImpl implements XitGnrUserRegMngService{ } //사용자관리권한별 분기 XitUserInfoVO trgetUserInfoVO = new XitUserInfoVO(); - trgetUserInfoVO.setEsntl_id(uniqId); + trgetUserInfoVO.setEsntlId(uniqId); trgetUserInfoVO = xitFrameCrudService.findXitUserInfos(trgetUserInfoVO).get(0); //사용자(수정대상) 정보 조회 XitUserInfoVO loginUserInfoVO = new XitUserInfoVO(); - loginUserInfoVO.setEsntl_id(uniqId); + loginUserInfoVO.setEsntlId(uniqId); loginUserInfoVO = xitFrameCrudService.findXitUserInfos(loginUserInfoVO).get(0); //사용자(수정자) 정보 조회 switch(loginVO.getUserManageAuthor()) { case "ALL": //모든 사용자 return true; case "DEPT": //자신이 속한 부서의 모든 사용자 - if(loginUserInfoVO.getPstinst_code().equals(trgetUserInfoVO.getPstinst_code())) + if(loginUserInfoVO.getPstinstCode().equals(trgetUserInfoVO.getPstinstCode())) return true; break; // case "ONESELF": //본인정보만 // return true; case "ORGNZT": //자신이 속한 조직의 모든 사용자 - if(loginVO.getOrgnztId().equals(trgetUserInfoVO.getOrgnzt_id())) + if(loginVO.getOrgnztId().equals(trgetUserInfoVO.getOrgnztId())) return true; break; // case "ORGNZT_N_CHILD": //자신이 속한 조직의 모든 하위 조직 사용자(ex: 종로구청이 담당하는 조직) diff --git a/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitUserRegMngServiceImpl.java b/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitUserRegMngServiceImpl.java index 9fbbc0fb..9b582070 100644 --- a/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitUserRegMngServiceImpl.java +++ b/src/main/java/kr/xit/framework/biz/mng/user/reg/service/impl/XitUserRegMngServiceImpl.java @@ -97,15 +97,15 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { XitUserInfoVO userInfoVO = convertToCrudVO(vo); //그룹의 기본권한 조회 및 설정 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); - userScrtySetupVO.setScrty_setup_trget_id(userInfoVO.getEsntl_id()); - userScrtySetupVO.setMber_ty_code("USR03"); - String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(userInfoVO.getGroup_id()); - userScrtySetupVO.setAuthor_code(defaultAuthorCode); + userScrtySetupVO.setScrtySetupTrgetId(userInfoVO.getEsntlId()); + userScrtySetupVO.setMberTyCode("USR03"); + String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(userInfoVO.getGroupId()); + userScrtySetupVO.setAuthorCode(defaultAuthorCode); //사용자 기타옵션 기본값 설정 XitUserEtcOptionVO userEtcOptionVO = new XitUserEtcOptionVO(); - userEtcOptionVO.setUser_id(userInfoVO.getUser_id()); - userEtcOptionVO.setJob_data_author("ONESELF"); //업무 데이터 권한 - userEtcOptionVO.setUser_manage_author("ONESELF"); //사용자 관리 권한 + userEtcOptionVO.setUserId(userInfoVO.getUserId()); + userEtcOptionVO.setJobDataAuthor("ONESELF"); //업무 데이터 권한 + userEtcOptionVO.setUserManageAuthor("ONESELF"); //사용자 관리 권한 /** * 처리 @@ -135,7 +135,7 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { crudVO.setPassword(null); boolean isChangedGroupId = false; //그룹ID 변경 여부 XitUserInfoVO curUserInfo = xitFrameCrudService.findXitUserInfo(crudVO); - if(!crudVO.getGroup_id().equals(curUserInfo.getGroup_id())) + if(!crudVO.getGroupId().equals(curUserInfo.getGroupId())) isChangedGroupId = true; /* ======================================= * 2020.11.16. 박민규 @@ -143,8 +143,8 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { * -사유: esntl_id의 경우 회원의 고유식별자이므로 변경 되어선 안됨. * -작업내용: crudVO.setEsntl_id(null) 코드 추가 ======================================= */ - String uniqId = crudVO.getEsntl_id(); - crudVO.setEsntl_id(null); + String uniqId = crudVO.getEsntlId(); + crudVO.setEsntlId(null); /* ======================================= * 2020.11.16. 박민규 * 고유식별자 확인 코드 추가 @@ -152,7 +152,7 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { * -작업내용: 현재 사용자정보와 요청값 확인코드 추가 * -> if(!curUserInfo.getEsntl_id().equals(uniqId)) ======================================= */ - if(!curUserInfo.getEsntl_id().equals(uniqId)) + if(!curUserInfo.getEsntlId().equals(uniqId)) throw new RuntimeException("사용자 고유식별값이 일치하지 않습니다."); @@ -166,12 +166,12 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { if(isChangedGroupId) { //그룹ID가 변경되었을 경우 //그룹의 기본권한 조회 및 설정 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); - userScrtySetupVO.setScrty_setup_trget_id(uniqId); - String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroup_id()); - userScrtySetupVO.setAuthor_code(defaultAuthorCode); + userScrtySetupVO.setScrtySetupTrgetId(uniqId); + String defaultAuthorCode = xitFrameUnitService.getDefaultAuthorCode(crudVO.getGroupId()); + userScrtySetupVO.setAuthorCode(defaultAuthorCode); //사용자의 권한 갱신 if(XitCmmnUtil.isEmpty(xitFrameCrudService.findXitUserScrtySetup(userScrtySetupVO))) { - userScrtySetupVO.setMber_ty_code("USR03"); + userScrtySetupVO.setMberTyCode("USR03"); xitFrameCrudService.addXitUserScrtySetup(userScrtySetupVO); }else { xitFrameCrudService.modifyXitUserScrtySetup(userScrtySetupVO); @@ -213,7 +213,7 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { * 필수값 설정 */ XitUserInfoVO xitUserInfoVO = new XitUserInfoVO(); - xitUserInfoVO.setUser_id(id); + xitUserInfoVO.setUserId(id); xitUserInfoVO.setPassword(encryptNewPass); @@ -250,12 +250,12 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { if (userTy.equals("USR03")){ //업무사용자 삭제 //필수값 설정 XitUserInfoVO xitUserInfoVO = new XitUserInfoVO(); - xitUserInfoVO.setUser_id(userId); + xitUserInfoVO.setUserId(userId); //사용자보안설정 삭제 try { XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); - userScrtySetupVO.setScrty_setup_trget_id(xitFrameCrudService.findXitUserInfo(xitUserInfoVO).getEsntl_id()); + userScrtySetupVO.setScrtySetupTrgetId(xitFrameCrudService.findXitUserInfo(xitUserInfoVO).getEsntlId()); if(XitCmmnUtil.notEmpty(xitFrameCrudService.findXitUserScrtySetup(userScrtySetupVO))) xitFrameCrudService.removeXitUserScrtySetup(userScrtySetupVO); } catch (Exception e) { @@ -271,7 +271,7 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { }else if(userTy.equals("USR01")){ //일반회원 삭제 //필수값 설정 XitGnrlMberVO gnrlMberVO = new XitGnrlMberVO(); - gnrlMberVO.setMber_id(userId); + gnrlMberVO.setMberId(userId); //일반회원 삭제 xitFrameCrudService.removeXitGnrlMber(gnrlMberVO); @@ -279,7 +279,7 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { }else if(userTy.equals("USR02")){ //기업회원 삭제 //필수값 설정 XitEntrprsMberVO entrprsMberVO = new XitEntrprsMberVO(); - entrprsMberVO.setEntrprs_mber_id(userId); + entrprsMberVO.setEntrprsMberId(userId); //기업회원 삭제 xitFrameCrudService.removeXitEntrprsMber(entrprsMberVO); @@ -327,33 +327,33 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { XitUserInfoVO userInfoVO = new XitUserInfoVO(); - userInfoVO.setUser_id (vo.getEmplyrId()); //사용자 id - userInfoVO.setOrgnzt_id (vo.getOrgnztId()); //조직 id - userInfoVO.setUser_nm (vo.getEmplyrNm()); //사용자 명 + userInfoVO.setUserId(vo.getEmplyrId()); //사용자 id + userInfoVO.setOrgnztId(vo.getOrgnztId()); //조직 id + userInfoVO.setUserNm(vo.getEmplyrNm()); //사용자 명 userInfoVO.setPassword (password); //비밀번호 - userInfoVO.setEmpl_no (vo.getEmplNo()); //사원 번호 + userInfoVO.setEmplNo(vo.getEmplNo()); //사원 번호 userInfoVO.setIhidnum (vo.getIhidnum()); //주민등록번호 - userInfoVO.setSexdstn_code (vo.getSexdstnCode()); //성별 코드 + userInfoVO.setSexdstnCode(vo.getSexdstnCode()); //성별 코드 userInfoVO.setBrthdy (vo.getBrth()); //생일 userInfoVO.setFxnum (vo.getFxnum()); //팩스번호 - userInfoVO.setHouse_adres (vo.getHomeadres()); //주택 주소 - userInfoVO.setPassword_hint (vo.getPasswordHint()); //비밀번호 힌트 - userInfoVO.setPassword_cnsr (vo.getPasswordCnsr()); //비밀번호 정답 - userInfoVO.setHouse_end_telno (vo.getHomeendTelno()); //주택 끝 전화번호 - userInfoVO.setArea_no (vo.getAreaNo()); //지역 번호 - userInfoVO.setDetail_adres (vo.getDetailAdres()); //상세 주소 + userInfoVO.setHouseAdres(vo.getHomeadres()); //주택 주소 + userInfoVO.setPasswordHint(vo.getPasswordHint()); //비밀번호 힌트 + userInfoVO.setPasswordCnsr(vo.getPasswordCnsr()); //비밀번호 정답 + userInfoVO.setHouseEndTelno(vo.getHomeendTelno()); //주택 끝 전화번호 + userInfoVO.setAreaNo(vo.getAreaNo()); //지역 번호 + userInfoVO.setDetailAdres(vo.getDetailAdres()); //상세 주소 userInfoVO.setZip (vo.getZip()); //우편번호 - userInfoVO.setOffm_telno (vo.getOffmTelno()); //사무실 전화번호 + userInfoVO.setOffmTelno(vo.getOffmTelno()); //사무실 전화번호 userInfoVO.setMbtlnum (vo.getMoblphonNo()); //이동전화번호 - userInfoVO.setEmail_adres (vo.getEmailAdres()); //이메일 주소 - userInfoVO.setOfcps_nm (vo.getOfcpsNm()); //직위 명 - userInfoVO.setHouse_middle_telno (vo.getHomemiddleTelno()); //주택 중간 전화번호 - userInfoVO.setGroup_id (vo.getGroupId()); //그룹 id - userInfoVO.setPstinst_code (vo.getInsttCode()); //소속기관 코드 - userInfoVO.setUser_sttus_code (vo.getEmplyrSttusCode()); //사용자 상태 코드 - userInfoVO.setEsntl_id (vo.getUniqId()); //고유 id - userInfoVO.setCrtfc_dn_value (vo.getSubDn()); //인증 dn 값 - userInfoVO.setSbscrb_de (vo.getSbscrbDe()); //가입 일 + userInfoVO.setEmailAdres(vo.getEmailAdres()); //이메일 주소 + userInfoVO.setOfcpsNm(vo.getOfcpsNm()); //직위 명 + userInfoVO.setHouseMiddleTelno(vo.getHomemiddleTelno()); //주택 중간 전화번호 + userInfoVO.setGroupId(vo.getGroupId()); //그룹 id + userInfoVO.setPstinstCode(vo.getInsttCode()); //소속기관 코드 + userInfoVO.setUserSttusCode(vo.getEmplyrSttusCode()); //사용자 상태 코드 + userInfoVO.setEsntlId(vo.getUniqId()); //고유 id + userInfoVO.setCrtfcDnValue(vo.getSubDn()); //인증 dn 값 + userInfoVO.setSbscrbDe(vo.getSbscrbDe()); //가입 일 return userInfoVO; } @@ -420,15 +420,15 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { //사용자(수정대상) 권한 조회 String trgetAuthorCode = null; XitUserScrtySetupVO vo = new XitUserScrtySetupVO(); - vo.setScrty_setup_trget_id(uniqId); + vo.setScrtySetupTrgetId(uniqId); vo = xitFrameCrudService.findXitUserScrtySetup(vo); - trgetAuthorCode = vo.getAuthor_code(); + trgetAuthorCode = vo.getAuthorCode(); //사용자(수정자) 권한 조회 String userAuthorCode = null; vo = new XitUserScrtySetupVO(); - vo.setScrty_setup_trget_id(loginVO.getUniqId()); + vo.setScrtySetupTrgetId(loginVO.getUniqId()); vo = xitFrameCrudService.findXitUserScrtySetup(vo); - userAuthorCode = vo.getAuthor_code(); + userAuthorCode = vo.getAuthorCode(); /** @@ -444,22 +444,22 @@ public class XitUserRegMngServiceImpl implements XitUserRegMngService { } //사용자관리권한별 분기 XitUserInfoVO trgetUserInfoVO = new XitUserInfoVO(); - trgetUserInfoVO.setEsntl_id(uniqId); + trgetUserInfoVO.setEsntlId(uniqId); trgetUserInfoVO = xitFrameCrudService.findXitUserInfos(trgetUserInfoVO).get(0); //사용자(수정대상) 정보 조회 XitUserInfoVO loginUserInfoVO = new XitUserInfoVO(); - loginUserInfoVO.setEsntl_id(uniqId); + loginUserInfoVO.setEsntlId(uniqId); loginUserInfoVO = xitFrameCrudService.findXitUserInfos(loginUserInfoVO).get(0); //사용자(수정자) 정보 조회 switch(loginVO.getUserManageAuthor()) { case "ALL": //모든 사용자 return true; case "DEPT": //자신이 속한 부서의 모든 사용자 - if(loginUserInfoVO.getPstinst_code().equals(trgetUserInfoVO.getPstinst_code())) + if(loginUserInfoVO.getPstinstCode().equals(trgetUserInfoVO.getPstinstCode())) return true; break; // case "ONESELF": //본인정보만 // return true; case "ORGNZT": //자신이 속한 조직의 모든 사용자 - if(loginVO.getOrgnztId().equals(trgetUserInfoVO.getOrgnzt_id())) + if(loginVO.getOrgnztId().equals(trgetUserInfoVO.getOrgnztId())) return true; break; // case "ORGNZT_N_CHILD": //자신이 속한 조직의 모든 하위 조직 사용자(ex: 종로구청이 담당하는 조직) diff --git a/src/main/java/kr/xit/framework/biz/mng/web/ProgramMngController.java b/src/main/java/kr/xit/framework/biz/mng/web/ProgramMngController.java index 265ea3e6..6f4ad80c 100644 --- a/src/main/java/kr/xit/framework/biz/mng/web/ProgramMngController.java +++ b/src/main/java/kr/xit/framework/biz/mng/web/ProgramMngController.java @@ -23,9 +23,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngSearchVO; -import kr.xit.framework.biz.mng.menu.program.model.XitProgramMngVO; -import kr.xit.framework.biz.mng.menu.program.service.XitProgramMngService; import kr.xit.framework.biz.mng.model.ProgramMngSearchVO; import kr.xit.framework.biz.mng.model.ProgramMngVO; import kr.xit.framework.biz.mng.service.ProgramMngService; @@ -132,7 +129,7 @@ public class ProgramMngController { * @author: 박민규 * @date: 2020. 3. 26. */ - @RequestMapping(value = "/ProgramMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) + @RequestMapping(value = "/program_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String ProgramMng_page(@PathVariable String cmd , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef , @ModelAttribute("progrmManageVO") ProgramMngVO vo @@ -152,7 +149,7 @@ public class ProgramMngController { if(!"".equals(tilesDef)) tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/menu/program/XitProgramMng_"+cmd+tilesDef; + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/menu/mngProgramMng_"+cmd+tilesDef; } @@ -165,7 +162,7 @@ public class ProgramMngController { * @author: 박민규 * @date: 2020. 3. 26. */ - @RequestMapping(value = "/ProgramMng_{cmd}_popup", method={RequestMethod.GET, RequestMethod.POST}) + @RequestMapping(value = "/program_{cmd}_popup", method={RequestMethod.GET, RequestMethod.POST}) public String ProgramMng_page_popup(@PathVariable String cmd , @ModelAttribute("searchVO") ProgramMngSearchVO searchVO , @ModelAttribute("progrmManageVO") ProgramMngVO vo, ModelMap model) { @@ -204,7 +201,7 @@ public class ProgramMngController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/menu/program/XitProgramMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/menu/mngProgramMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); } @@ -217,7 +214,7 @@ public class ProgramMngController { * @throws ServletException * @date: 2020. 3. 25. */ - @RequestMapping(value = "/ProgramMng_{cmd}_proc", method=RequestMethod.POST) + @RequestMapping(value = "/program_{cmd}_proc", method=RequestMethod.POST) public void ProgramMng_cmd_proc(@PathVariable String cmd ,@ModelAttribute("progrmManageVO") ProgramMngVO vo ,@RequestParam(value="checkedProgrmFileNmForDel", required=false, defaultValue="") String checkedProgrmFileNmForDel @@ -230,7 +227,7 @@ public class ProgramMngController { /** * 처리 분기 */ - String sLocationUrl = "forward:/_mng_/menu/program/ProgramMngList.do"; + String sLocationUrl = "forward:/mng/menu/programList.do"; String resultMsg = null; switch (cmd) { case "insert": //등록 @@ -241,7 +238,7 @@ public class ProgramMngController { if (bindingResult.hasErrors()) { // throw new RuntimeException(xitMessageSource.getMessage("fail.common.insert")); resultMsg = xitMessageSource.getMessage("fail.common.insert"); - sLocationUrl = "forward:/_mng_/menu/program/ProgramMng_input.do"; + sLocationUrl = "forward:/mng/menu/program_input.do"; break; } if (vo.getProgrmDc() == null || vo.getProgrmDc().equals("")) { @@ -263,7 +260,7 @@ public class ProgramMngController { if (bindingResult.hasErrors()) { // throw new RuntimeException(xitMessageSource.getMessage("fail.common.update")); resultMsg = xitMessageSource.getMessage("fail.common.update"); - sLocationUrl = "forward:/_mng_/menu/program/ProgramMng_edit.do"; + sLocationUrl = "forward:/mng/menu/program_edit.do"; break; } if (vo.getProgrmDc() == null || vo.getProgrmDc().equals("")) { @@ -282,10 +279,10 @@ public class ProgramMngController { break; } catch (RuntimeException e) { resultMsg = e.getMessage(); - sLocationUrl = "forward:/_mng_/menu/program/ProgramMng_edit.do"; + sLocationUrl = "forward:/mng/menu/program_edit.do"; } catch (Exception e) { resultMsg = xitMessageSource.getMessage("fail.common.delete"); - sLocationUrl = "forward:/_mng_/menu/program/ProgramMng_edit.do"; + sLocationUrl = "forward:/mng/menu/program_edit.do"; } break; diff --git a/src/main/java/kr/xit/framework/core/model/BaseVO.java b/src/main/java/kr/xit/framework/core/model/BaseVO.java index 26ec4a9f..819622d6 100644 --- a/src/main/java/kr/xit/framework/core/model/BaseVO.java +++ b/src/main/java/kr/xit/framework/core/model/BaseVO.java @@ -1,16 +1,13 @@ package kr.xit.framework.core.model; import java.io.Serializable; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * @@ -22,514 +19,18 @@ import org.slf4j.LoggerFactory; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@Setter +@Getter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +@ToString public class BaseVO implements Serializable{ - private static final Logger logger = LoggerFactory.getLogger(BaseVO.class); - /** * serialVersionUID */ private static final long serialVersionUID = 966032273162649197L; - private int tot_cnt; - public int getTot_cnt() { - return tot_cnt; - } - public void setTot_cnt(int tot_cnt) { - this.tot_cnt = tot_cnt; - } - - -// /** -// * toString -// */ -// public String toString() { -// StringBuffer buffer = new StringBuffer(); -//// buffer.append("\n◁▶FIELD BEGIN◀▷ ◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆"); -// buffer.append("\n◁▶"+this.getClass().getName()+"◀▷ ◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆"); -// -// Field[] fields = null; -// Field[] fields1 = this.getClass().getDeclaredFields(); // this 객체의 fields -// Field[] fields2 = this.getClass().getSuperclass().getDeclaredFields(); // super 객체의 fields -// -// // 두 객체의 fields를 합침. -// fields = new Field[fields1.length + fields2.length]; -// System.arraycopy(fields1, 0, fields, 0, fields1.length); -// System.arraycopy(fields2, 0, fields, fields1.length, fields2.length); -// -// try { -// Method _method = null; // getter -// String _methodName = null; // getter name -// for (int i = 0; i < fields.length; i++) { -// // field의 getter name을 작성 -// _methodName = "get" + fields[i].getName().substring(0, 1).toUpperCase() + fields[i].getName().substring(1); -// -// try { -// // getter를 가져옴 -// _method = this.getClass().getMethod(_methodName, (Class[])null); -// -// if (_method != null) { -// // 출력문자열 작성 -// buffer.append("\n").append(fields[i].getName()).append("=").append(_method.invoke(this, (Object[])null)); -// -// // 가독성을 위해 컬럼 사이에 ', '를 넣음 -// if (i < fields.length - 1) buffer.append(", "); -// } -// } catch (Exception e) { -//// LOGGER.debug(fields[i].getName() + " 속성의 getter method가 존재하지 않거나 접근할 수 없어 출력 문자열에서 누락됩니다.[" + e.getMessage() + "]"); -// } -// } -// } catch (Exception e) { -// logger.error(e.getMessage(), e); -// -// return super.toString(); -// } -//// buffer.append("\n◁▶FIELD END◀▷ ◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆◇◆"); -// return buffer.toString(); -// } - - /** - * toString - */ - public String toString() { - return ToStringBuilder.reflectionToString(this); - } - - - - /** - * 
메소드 설명: Map을 Object(VO)로 변환하여 반환
- * @param map - * @return Object 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2019. 4. 24. - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - public Object convertMapToObject(Map map){ - - Iterator itr = map.keySet().iterator(); - while (itr.hasNext()) { - String key = (String) itr.next(); - String _methodName = "set" + key.substring(0,1).toUpperCase() + key.substring(1); - - Method[] _methods1 = this.getClass().getDeclaredMethods(); //this 객체의 methods - Method[] _methods2 = this.getClass().getSuperclass().getDeclaredMethods(); //super 객체의 methods - - //this와 super의 methods 병합 - Method[] _methods = new Method[_methods1.length+_methods2.length]; - System.arraycopy(_methods1, 0, _methods, 0, _methods1.length); - System.arraycopy(_methods2, 0, _methods, _methods1.length, _methods2.length); - - //param set - try { - for(Method method : _methods){ - if(_methodName.equals(method.getName())){ - method.invoke(this, map.get(key)); - } - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - - } - - - return this; - } - - - /** - * 
메소드 설명: JSONObject을 현재객체(VO)로 변환하여 반환
- * @param jsonObj JSONObject - * @return Object 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2019. 6. 4. - */ - public Object convertJSONObjectToObject(Object jsonObj){ -// if(jsonObj instanceof framework.egov.comext.jfile.org.json.JSONObject) { -// return this.convertJSONObjectToObject((framework.egov.comext.jfile.org.json.JSONObject)jsonObj); -// }else if(jsonObj instanceof org.json.simple.JSONObject) { -// return this.convertJSONObjectToObject((org.json.simple.JSONObject)jsonObj); -// }else { -// LOGGER.debug("유효하지 않은 변환 요청"); -// } - -// return this; - - - if(jsonObj instanceof org.json.simple.JSONObject) { - return this.convertJSONObjectToObject((org.json.simple.JSONObject)jsonObj); - }else { - logger.debug("유효하지 않은 변환 요청"); - } - - return this; - } - @SuppressWarnings("unchecked") - private Object convertJSONObjectToObject(org.json.simple.JSONObject jsonObj){ - Iterator itr = jsonObj.keySet().iterator(); - while (itr.hasNext()) { - String key = (String) itr.next(); - String _methodName = "set" + key.substring(0,1).toUpperCase() + key.substring(1); - - Method[] _methods1 = this.getClass().getDeclaredMethods(); //this 객체의 methods - Method[] _methods2 = this.getClass().getSuperclass().getDeclaredMethods(); //super 객체의 methods - - //this와 super의 methods 병합 - Method[] _methods = new Method[_methods1.length+_methods2.length]; - System.arraycopy(_methods1, 0, _methods, 0, _methods1.length); - System.arraycopy(_methods2, 0, _methods, _methods1.length, _methods2.length); - - //param set - try { - for(Method method : _methods){ - if(_methodName.equals(method.getName())){ - method.invoke(this, jsonObj.get(key)); - } - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - - } - - return this; - } -// private Object convertJSONObjectToObject(framework.egov.comext.jfile.org.json.JSONObject jsonObj){ -// Iterator itr = jsonObj.keys(); -// while (itr.hasNext()) { -// String key = (String) itr.next(); -// String _methodName = "set" + key.substring(0,1).toUpperCase() + key.substring(1); -// -// Method[] _methods1 = this.getClass().getDeclaredMethods(); //this 객체의 methods -// Method[] _methods2 = this.getClass().getSuperclass().getDeclaredMethods(); //super 객체의 methods -// -// //this와 super의 methods 병합 -// Method[] _methods = new Method[_methods1.length+_methods2.length]; -// System.arraycopy(_methods1, 0, _methods, 0, _methods1.length); -// System.arraycopy(_methods2, 0, _methods, _methods1.length, _methods2.length); -// -// //param set -// try { -// for(Method method : _methods){ -// if(_methodName.equals(method.getName())){ -// method.invoke(this, jsonObj.get(key)); -// } -// } -// } catch (IllegalAccessException e) { -// e.printStackTrace(); -// } catch (IllegalArgumentException e) { -// e.printStackTrace(); -// } catch (InvocationTargetException e) { -// e.printStackTrace(); -// } catch (JSONException e) { -// e.printStackTrace(); -// } -// -// } -// -// return this; -// } - - - /** - * 
메소드 설명: Object(VO)간 동일 필드 매핑 후 반환
- * @param fromClass - * @return Object 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2019. 6. 4. - */ - public Object convertObjectToObject(Object fromClass) { - - //this객체 Field 설정 - Field[] fields = null; - Field[] fields1 = this.getClass().getDeclaredFields(); // this 객체의 fields - Field[] fields2 = this.getClass().getSuperclass().getDeclaredFields(); // super 객체의 fields - fields = new Field[fields1.length + fields2.length]; - System.arraycopy(fields1, 0, fields, 0, fields1.length); - System.arraycopy(fields2, 0, fields, fields1.length, fields2.length); - - - - for(Field field : fields) { - String key = field.getName(); - String _getterMethodName = "get" + key.substring(0,1).toUpperCase() + key.substring(1); - String _setterMethodName = "set" + key.substring(0,1).toUpperCase() + key.substring(1); - - - //fromClass의 메소드 취합 - Method[] _methods1 = fromClass.getClass().getDeclaredMethods(); //this 객체의 methods - Method[] _methods2 = fromClass.getClass().getSuperclass().getDeclaredMethods(); //super 객체의 methods - Map _mMethods = new HashMap<>(); - for(Method method : _methods1) - _mMethods.put(method.getName(), method.getName()); - for(Method method : _methods2) - _mMethods.put(method.getName(), method.getName()); - - //param set - if(_mMethods.get(_getterMethodName)!=null) { - try { - Field fromField = fromClass.getClass().getDeclaredField(key); - Object value = null; - fromField.setAccessible(true); - value = fromField.get(fromClass); - fromField.setAccessible(false); - - Method method = this.getClass().getMethod(_setterMethodName, String.class); - method.invoke(this, value); - - }catch (SecurityException | NoSuchMethodException e) { -// e.printStackTrace(); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { -// e.printStackTrace(); - } catch (NoSuchFieldException e) { -// e.printStackTrace(); - } - } - - } - - - - return this; - } - - - /** - * 
메소드 설명: 부모객체를 자식객체로 캐스팅 후 반환한다.
- * @param toClass - * @return Object 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2019. 8. 9. - */ - public Object downCast(Object toClass) { - return this.convertToObject(toClass); - } -// /** -// * 
메소드 설명: 현재 객체를 대상객체(toClass)로 필드매핑하여 반환
-// * @param toClass -// * @return Object 요청처리 후 응답객체 -// * @author: 박민규 -// * @date: 2019. 8. 9. -// */ -// public Object convertToObject(Object toClass) { -// -// //this객체 Field 설정 -// Field[] fields = null; -// Field[] fields1 = toClass.getClass().getDeclaredFields(); // this 객체의 fields -// Field[] fields2 = toClass.getClass().getSuperclass().getDeclaredFields(); // super 객체의 fields -// fields = new Field[fields1.length + fields2.length]; -// System.arraycopy(fields1, 0, fields, 0, fields1.length); -// System.arraycopy(fields2, 0, fields, fields1.length, fields2.length); -// -// -// -// for(Field field : fields) { -// String key = field.getName(); -// String _getterMethodName = "get" + key.substring(0,1).toUpperCase() + key.substring(1); -// String _setterMethodName = "set" + key.substring(0,1).toUpperCase() + key.substring(1); -// -// -// //fromClass의 메소드 취합 -// Method[] _methods1 = this.getClass().getDeclaredMethods(); //this 객체의 methods -// Method[] _methods2 = this.getClass().getSuperclass().getDeclaredMethods(); //super 객체의 methods -// Map _mMethods = new HashMap<>(); -// for(Method method : _methods1) -// _mMethods.put(method.getName(), method.getName()); -// for(Method method : _methods2) -// _mMethods.put(method.getName(), method.getName()); -// -// //param set -// if(_mMethods.get(_getterMethodName)!=null) { -// try { -// Field fromField = this.getClass().getDeclaredField(key); -// Object value = null; -// fromField.setAccessible(true); -// value = fromField.get(this); -// fromField.setAccessible(false); -// -//// Method method = toClass.getClass().getMethod(_setterMethodName, String.class); -// Method method = toClass.getClass().getMethod(_setterMethodName, this.getClass().getDeclaredField(key).getType()); -// method.invoke(toClass, value); -// -// }catch (SecurityException | NoSuchMethodException e) { -// e.printStackTrace(); -// } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { -// e.printStackTrace(); -// } catch (NoSuchFieldException e) { -// e.printStackTrace(); -// } -// } -// -// } -// -// -// -// return toClass; -// } - /** - * 
메소드 설명: 현재 객체를 대상객체(toClass)로 필드매핑하여 반환
- * @param toClass - * @return Object 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2019. 8. 9. - */ - public Object convertToObject(Object toClass) { - - //toClass 전체 필드 get - int _cntToFields = 0; - Class _tmpToClass = toClass.getClass(); - while(true) { - Field[] fields = _tmpToClass.getDeclaredFields(); - _cntToFields += fields.length; - - _tmpToClass = _tmpToClass.getSuperclass(); - if(_tmpToClass==null) - break; - } - //toClass 전체 필드 set - Field[] toFields = new Field[_cntToFields]; - _tmpToClass = toClass.getClass(); - int idx = 0; - while(true) { - Field[] flds = _tmpToClass.getDeclaredFields(); - - System.arraycopy(flds, 0, toFields, idx, flds.length); - idx += flds.length; - - - _tmpToClass = _tmpToClass.getSuperclass(); - if(_tmpToClass==null) - break; - } - //fromClass 전체 메소드 set - Class _tmpFromClass = this.getClass(); - Map _mMethods = new HashMap<>(); - while(true) { - Method[] _methods = _tmpFromClass.getDeclaredMethods(); - for(Method method : _methods) - _mMethods.put(method.getName(), method.getName()); - - _tmpFromClass = _tmpFromClass.getSuperclass(); - if(_tmpFromClass==null) - break; - } - - - for(Field field : toFields) { - String key = field.getName(); - String _getterMethodName = "get" + key.substring(0,1).toUpperCase() + key.substring(1); -// String _setterMethodName = "set" + key.substring(0,1).toUpperCase() + key.substring(1); - - - //param set - if(_mMethods.get(_getterMethodName)!=null) { - try { - //value get - Field _fromField = null; - _tmpFromClass = this.getClass(); - while(true) { - try { - _fromField = _tmpFromClass.getDeclaredField(key); - break; - } catch (NoSuchFieldException e) { -// e.printStackTrace(); - } - - _tmpFromClass = _tmpFromClass.getSuperclass(); - if(_tmpFromClass==null) - break; - } - _fromField.setAccessible(true); - Object value = _fromField.get(this); - - - //value set - _tmpToClass = toClass.getClass(); - Field toField = null; - while(true) { - try { - toField = _tmpToClass.getDeclaredField(key); - toField.setAccessible(true); - toField.set(toClass, value); - break; - } catch (NoSuchFieldException e) { -// e.printStackTrace(); - } - - _tmpToClass = _tmpToClass.getSuperclass(); - if(_tmpToClass==null) - break; - } - - - - }catch (SecurityException e) { - e.printStackTrace(); - } catch (IllegalAccessException | IllegalArgumentException e) { - e.printStackTrace(); - } - } - - } - - - - return toClass; - } - - - - /** - * 
메소드 설명: Map을 Object(VO)로 변환하여 반환
- * @param map - * @param objClass - * @return Object 요청처리 후 응답객체 - * @author: 박민규 - * @date: 2019. 4. 24. - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - public Object convertMapToObject(Map map, Object objClass){ - - Iterator itr = map.keySet().iterator(); - while (itr.hasNext()) { - String key = (String) itr.next(); - String _methodName = "set" + key.substring(0,1).toUpperCase() + key.substring(1); - - Method[] _methods1 = objClass.getClass().getDeclaredMethods(); //this 객체의 methods - Method[] _methods2 = objClass.getClass().getSuperclass().getDeclaredMethods(); //super 객체의 methods - - //this와 super의 methods 병합 - Method[] _methods = new Method[_methods1.length+_methods2.length]; - System.arraycopy(_methods1, 0, _methods, 0, _methods1.length); - System.arraycopy(_methods2, 0, _methods, _methods1.length, _methods2.length); - - //param set - try { - for(Method method : _methods){ - if(_methodName.equals(method.getName())){ - method.invoke(objClass, map.get(key)); - } - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - - } - - - return objClass; - } + private int totCnt; } diff --git a/src/main/java/kr/xit/framework/core/model/XitAttachFileRespVO.java b/src/main/java/kr/xit/framework/core/model/XitAttachFileRespVO.java index 8531c20a..08521761 100644 --- a/src/main/java/kr/xit/framework/core/model/XitAttachFileRespVO.java +++ b/src/main/java/kr/xit/framework/core/model/XitAttachFileRespVO.java @@ -3,6 +3,12 @@ package kr.xit.framework.core.model; import java.util.List; import kr.xit.framework.biz.cmm.model.XitFileDetailInfoVO; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * @@ -14,6 +20,13 @@ import kr.xit.framework.biz.cmm.model.XitFileDetailInfoVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ + +@Setter +@Getter +@NoArgsConstructor +@AllArgsConstructor +@ToString +@EqualsAndHashCode(callSuper = false) public class XitAttachFileRespVO extends XitFileDetailInfoVO{ /** * serialVersionUID @@ -21,12 +34,4 @@ public class XitAttachFileRespVO extends XitFileDetailInfoVO{ private static final long serialVersionUID = -7580534222030605959L; protected List listAttachFileVO; - - public List getListAttachFileVO() { - return listAttachFileVO; - } - public void setListAttachFileVO(List listAttachFileVO) { - this.listAttachFileVO = listAttachFileVO; - } - } diff --git a/src/main/java/kr/xit/framework/core/model/XitMenuManageVO.java b/src/main/java/kr/xit/framework/core/model/XitMenuManageVO.java index 16bdcdb5..ae7e756c 100644 --- a/src/main/java/kr/xit/framework/core/model/XitMenuManageVO.java +++ b/src/main/java/kr/xit/framework/core/model/XitMenuManageVO.java @@ -2,6 +2,13 @@ package kr.xit.framework.core.model; import org.apache.commons.lang3.builder.ToStringBuilder; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + /** * * @업무그룹명: 메뉴목록관리VO @@ -13,6 +20,12 @@ import org.apache.commons.lang3.builder.ToStringBuilder; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@Setter +@Getter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +@ToString public class XitMenuManageVO { /** 메뉴정보 */ @@ -50,323 +63,19 @@ public class XitMenuManageVO { /** Login 메뉴관련 VO변수 */ /** tmp_Id */ - private String tmp_Id; + private String tmpId; /** tmp_Password */ - private String tmp_Password; + private String tmpPassword; /** tmp_Name */ - private String tmp_Name; + private String tmpName; /** tmp_UserSe */ - private String tmp_UserSe; + private String tmpUserSe; /** tmp_Email */ - private String tmp_Email; + private String tmpEmail; /** tmp_OrgnztId */ - private String tmp_OrgnztId; + private String tmpOrgnztId; /** tmp_UniqId */ - private String tmp_UniqId; + private String tmpUniqId; /** tmp_Cmd */ - private String tmp_Cmd; - - /** - * menuNo attribute를 리턴한다. - * @return int - */ - public int getMenuNo() { - return menuNo; - } - /** - * menuNo attribute 값을 설정한다. - * @param menuNo int - */ - public void setMenuNo(int menuNo) { - this.menuNo = menuNo; - } - /** - * menuOrdr attribute를 리턴한다. - * @return int - */ - public int getMenuOrdr() { - return menuOrdr; - } - /** - * menuOrdr attribute 값을 설정한다. - * @param menuOrdr int - */ - public void setMenuOrdr(int menuOrdr) { - this.menuOrdr = menuOrdr; - } - /** - * menuNm attribute를 리턴한다. - * @return String - */ - public String getMenuNm() { - return menuNm; - } - /** - * menuNm attribute 값을 설정한다. - * @param menuNm String - */ - public void setMenuNm(String menuNm) { - this.menuNm = menuNm; - } - /** - * upperMenuId attribute를 리턴한다. - * @return int - */ - public int getUpperMenuId() { - return upperMenuId; - } - /** - * upperMenuId attribute 값을 설정한다. - * @param upperMenuId int - */ - public void setUpperMenuId(int upperMenuId) { - this.upperMenuId = upperMenuId; - } - /** - * menuDc attribute를 리턴한다. - * @return String - */ - public String getMenuDc() { - return menuDc; - } - /** - * menuDc attribute 값을 설정한다. - * @param menuDc String - */ - public void setMenuDc(String menuDc) { - this.menuDc = menuDc; - } - /** - * relateImagePath attribute를 리턴한다. - * @return String - */ - public String getRelateImagePath() { - return relateImagePath; - } - /** - * relateImagePath attribute 값을 설정한다. - * @param relateImagePath String - */ - public void setRelateImagePath(String relateImagePath) { - this.relateImagePath = relateImagePath; - } - /** - * relateImageNm attribute를 리턴한다. - * @return String - */ - public String getRelateImageNm() { - return relateImageNm; - } - /** - * relateImageNm attribute 값을 설정한다. - * @param relateImageNm String - */ - public void setRelateImageNm(String relateImageNm) { - this.relateImageNm = relateImageNm; - } - /** - * progrmFileNm attribute를 리턴한다. - * @return String - */ - public String getProgrmFileNm() { - return progrmFileNm; - } - /** - * progrmFileNm attribute 값을 설정한다. - * @param progrmFileNm String - */ - public void setProgrmFileNm(String progrmFileNm) { - this.progrmFileNm = progrmFileNm; - } - /** - * chkURL attribute를 리턴한다. - * @return String - */ - public String getChkURL() { - return chkURL; - } - /** - * chkURL attribute 값을 설정한다. - * @param chkURL String - */ - public void setChkURL(String chkURL) { - this.chkURL = chkURL; - } - /** - * creatPersonId attribute를 리턴한다. - * @return String - */ - public String getCreatPersonId() { - return creatPersonId; - } - /** - * creatPersonId attribute 값을 설정한다. - * @param creatPersonId String - */ - public void setCreatPersonId(String creatPersonId) { - this.creatPersonId = creatPersonId; - } - /** - * authorCode attribute를 리턴한다. - * @return String - */ - public String getAuthorCode() { - return authorCode; - } - /** - * authorCode attribute 값을 설정한다. - * @param authorCode String - */ - public void setAuthorCode(String authorCode) { - this.authorCode = authorCode; - } - - /** - * tmp_Id attribute를 리턴한다. - * @return String - */ - public String getTmp_Id() { - return tmp_Id; - } - /** - * tmp_Id attribute 값을 설정한다. - * @param tmp_Id String - */ - public void setTmp_Id(String tmp_Id) { - this.tmp_Id = tmp_Id; - } - /** - * tmp_Password attribute를 리턴한다. - * @return String - */ - public String getTmp_Password() { - return tmp_Password; - } - /** - * tmp_Password attribute 값을 설정한다. - * @param tmp_Password String - */ - public void setTmp_Password(String tmp_Password) { - this.tmp_Password = tmp_Password; - } - /** - * tmp_Name attribute를 리턴한다. - * @return String - */ - public String getTmp_Name() { - return tmp_Name; - } - /** - * tmp_Name attribute 값을 설정한다. - * @param tmp_Name String - */ - public void setTmp_Name(String tmp_Name) { - this.tmp_Name = tmp_Name; - } - /** - * tmp_UserSe attribute를 리턴한다. - * @return String - */ - public String getTmp_UserSe() { - return tmp_UserSe; - } - /** - * tmp_UserSe attribute 값을 설정한다. - * @param tmp_UserSe String - */ - public void setTmp_UserSe(String tmp_UserSe) { - this.tmp_UserSe = tmp_UserSe; - } - /** - * tmp_Email attribute를 리턴한다. - * @return String - */ - public String getTmp_Email() { - return tmp_Email; - } - /** - * tmp_Email attribute 값을 설정한다. - * @param tmp_Email String - */ - public void setTmp_Email(String tmp_Email) { - this.tmp_Email = tmp_Email; - } - /** - * tmp_OrgnztId attribute를 리턴한다. - * @return String - */ - public String getTmp_OrgnztId() { - return tmp_OrgnztId; - } - /** - * tmp_OrgnztId attribute 값을 설정한다. - * @param tmp_OrgnztId String - */ - public void setTmp_OrgnztId(String tmp_OrgnztId) { - this.tmp_OrgnztId = tmp_OrgnztId; - } - /** - * tmp_UniqId attribute를 리턴한다. - * @return String - */ - public String getTmp_UniqId() { - return tmp_UniqId; - } - /** - * tmp_UniqId attribute 값을 설정한다. - * @param tmp_UniqId String - */ - public void setTmp_UniqId(String tmp_UniqId) { - this.tmp_UniqId = tmp_UniqId; - } - /** - * tmp_Cmd attribute를 리턴한다. - * @return String - */ - public String getTmp_Cmd() { - return tmp_Cmd; - } - /** - * tmp_Cmd attribute 값을 설정한다. - * @param tmp_Cmd String - */ - public void setTmp_Cmd(String tmp_Cmd) { - this.tmp_Cmd = tmp_Cmd; - } - - /** - * tempValue attribute를 리턴한다. - * @return String - */ - public String getTempValue() { - return tempValue; - } - /** - * tempValue attribute 값을 설정한다. - * @param tempValue String - */ - public void setTempValue(String tempValue) { - this.tempValue = tempValue; - } - /** - * tempInt attribute를 리턴한다. - * @return int - */ - public int getTempInt() { - return tempInt; - } - /** - * tempInt attribute 값을 설정한다. - * @param tempInt int - */ - public void setTempInt(int tempInt) { - this.tempInt = tempInt; - } - /** - * toString 메소드를 대치한다. - */ - public String toString() { - return ToStringBuilder.reflectionToString(this); - } - + private String tmpCmd; } diff --git a/src/main/java/kr/xit/framework/core/model/XitRollingNotiVO.java b/src/main/java/kr/xit/framework/core/model/XitRollingNotiVO.java index c1070889..9c43a388 100644 --- a/src/main/java/kr/xit/framework/core/model/XitRollingNotiVO.java +++ b/src/main/java/kr/xit/framework/core/model/XitRollingNotiVO.java @@ -3,6 +3,12 @@ package kr.xit.framework.core.model; import java.util.List; import kr.xit.framework.biz.cmm.model.XitBbsVO; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * @@ -14,61 +20,17 @@ import kr.xit.framework.biz.cmm.model.XitBbsVO; * @since 2002. 2. 2. * @version 1.0 Copyright(c) XIT All rights reserved. */ +@Setter +@Getter +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode +@ToString public class XitRollingNotiVO { - /* ================================ - * 2020.10.14. 박민규 - * 싱글톤 설정 방식 변경으로 인한 주석 처리 - * -사유: java 싱글턴 패턴 사용 시 객체 공유범위가 프로세스 단위로 동작. - * 추후 범용성을 위해서라도 Spring 싱글턴 패턴 방식으로 변경 - * ex) java 싱글톤 -> 클래스로더 기준으로 객체 공유. war 파일 한개당 클래스 로더 1:1 배치되기 때문에 다른 war에서 참조 불가 - * spring 싱글톤 -> ApplicationContext 기준으로 객체 공유. web.xml의 root 하나와 servlet context 여러개 등록 시에도 참조 가능. - * -작업내용: - * 1)기존 singleton 객체 생성 메서드 주석처리 및 spring bean 등록 - * 2)객체 취득 시 getInstance() 대신 @Resource로 주입받아 사용 하도록 관련 코드 수정 - ================================ */ - //2020.10.14. 주석처리 - /* - private XitRollingNotiVO() {} - private static class BillPughSingleton{ - //BillPugh의 Singletone 패턴(Lazy Initialization. LazyHolder. Thread-safe) - private static final XitRollingNotiVO instance = new XitRollingNotiVO(); - } - public static XitRollingNotiVO getInstance() { - return BillPughSingleton.instance; - } - */ - private List list; //게시글 목록 private String bbsId; //게시판 id private String parntsSntncNo; //부모 글 번호 private String useAt; //사용 여부 - - public List getList() { - return list; - } - public void setList(List list) { - this.list = list; - } - public String getBbsId() { - return bbsId; - } - public void setBbsId(String bbsId) { - this.bbsId = bbsId; - } - public String getParntsSntncNo() { - return parntsSntncNo; - } - public void setParntsSntncNo(String parntsSntncNo) { - this.parntsSntncNo = parntsSntncNo; - } - public String getUseAt() { - return useAt; - } - public void setUseAt(String useAt) { - this.useAt = useAt; - } - - }