diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index acadce4..dc8b1e2 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mariadb true true @@ -15,17 +15,5 @@ $ProjectFileDir$ - - mariadb - true - org.mariadb.jdbc.Driver - jdbc:mariadb://192.168.3.233:3306/pub - - - - - - $ProjectFileDir$ - \ No newline at end of file diff --git a/java/src/main/java/com/leejk0523/javavue/login/dao/UserLoginDao.java b/java/src/main/java/com/leejk0523/javavue/login/dao/UserLoginDao.java index feedf23..c617f8e 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/dao/UserLoginDao.java +++ b/java/src/main/java/com/leejk0523/javavue/login/dao/UserLoginDao.java @@ -1,12 +1,10 @@ package com.leejk0523.javavue.login.dao; import com.leejk0523.javavue.login.vo.AdminMember; -import com.leejk0523.javavue.login.vo.DefaultMember; import com.leejk0523.javavue.login.vo.In; import com.leejk0523.javavue.login.vo.Member; import com.leejk0523.javavue.model.AsaAdminMember; import com.leejk0523.javavue.model.QAsaAdminMember; -import com.leejk0523.javavue.model.QIstInst; import com.querydsl.core.types.Projections; import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport; @@ -21,21 +19,17 @@ public class UserLoginDao extends QuerydslRepositorySupport { public Member findByMemberId(In in) { QAsaAdminMember asaAdminMember = QAsaAdminMember.asaAdminMember; - QIstInst inst = QIstInst.istInst; return from(asaAdminMember) - .innerJoin(inst).on(asaAdminMember.instNo.eq(inst.instNo)) .select(Projections.bean( AdminMember.class, asaAdminMember.adminId.as("memberId"), asaAdminMember.adminName.as("memberName"), asaAdminMember.adminPassword.as("memberPassword"), - asaAdminMember.useYn.as("memberEnabled"), + asaAdminMember.adminActive.as("memberEnabled"), asaAdminMember.adminLoginFailCount.as("memberFailureCount"), asaAdminMember.adminLock.as("memberLocked"), - asaAdminMember.instNo.as("instNo"), - asaAdminMember.adminDepartment.as("deptNm"), - inst.instNm + asaAdminMember.orgId.as("orgzId") )) .where(asaAdminMember.adminId.eq(in.getMemberId())) .fetchOne(); diff --git a/java/src/main/java/com/leejk0523/javavue/login/vo/AdminMember.java b/java/src/main/java/com/leejk0523/javavue/login/vo/AdminMember.java index cc732cb..5af9f3a 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/vo/AdminMember.java +++ b/java/src/main/java/com/leejk0523/javavue/login/vo/AdminMember.java @@ -16,12 +16,10 @@ public class AdminMember implements Member { private String memberId; private String memberName; private String memberPassword; - private String instNo; + private String orgzId; private Type type; private Boolean memberEnabled; private Boolean memberLocked; private Integer memberFailureCount; private String plainPassword; - private String deptNm; - private Integer roleLvl; } diff --git a/java/src/main/java/com/leejk0523/javavue/login/vo/DefaultMember.java b/java/src/main/java/com/leejk0523/javavue/login/vo/DefaultMember.java deleted file mode 100644 index b709928..0000000 --- a/java/src/main/java/com/leejk0523/javavue/login/vo/DefaultMember.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.leejk0523.javavue.login.vo; - -import com.leejk0523.javavue.model.AsaUserMember; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class DefaultMember implements Member { - private AsaUserMember member; - private Long memberNo; - private String memberId; - private String memberName; - private String memberPassword; - private String instNo; - private Type type; - private Boolean memberEnabled; - private Boolean memberLocked; - private Integer memberFailureCount; - private String plainPassword; - private String deptNm; - private Integer roleLvl; -} diff --git a/java/src/main/java/com/leejk0523/javavue/login/vo/Member.java b/java/src/main/java/com/leejk0523/javavue/login/vo/Member.java index 0dbfb94..a64e0e9 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/vo/Member.java +++ b/java/src/main/java/com/leejk0523/javavue/login/vo/Member.java @@ -11,12 +11,11 @@ public interface Member { Integer getMemberFailureCount(); void setPlainPassword(String plainPassword); String getPlainPassword(); - String getInstNo(); - String getDeptNm(); - Integer getRoleLvl(); + String getOrgzId(); enum Type { USER, ADMIN } } + diff --git a/java/src/main/java/com/leejk0523/javavue/login/vo/Out.java b/java/src/main/java/com/leejk0523/javavue/login/vo/Out.java index c677e3a..1b77e5b 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/vo/Out.java +++ b/java/src/main/java/com/leejk0523/javavue/login/vo/Out.java @@ -1,16 +1,17 @@ package com.leejk0523.javavue.login.vo; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.leejk0523.javavue.model.AsaMenu; import com.leejk0523.javavue.model.AsaRole; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.io.Serializable; -import java.time.LocalDateTime; import java.util.List; +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class Out implements Serializable { private static final long serialVersionUID = 1L; @@ -21,9 +22,7 @@ public class Out implements Serializable { private String memberId; @JsonIgnore - private String instNo; - - private String instNm; + private String orgzId; @JsonIgnore private List roles; @@ -34,13 +33,8 @@ public class Out implements Serializable { @JsonIgnore private String accessIpAddress; - @JsonIgnore - private Integer roleLvl; - private String memberName; - private String deptNm; - private List menuList; private List permitApiList; @@ -50,17 +44,15 @@ public class Out implements Serializable { @NoArgsConstructor @AllArgsConstructor @Builder - public static class Menu implements Serializable { + public static class Menu implements Serializable{ private static final long serialVersionUID = -6699279565175110630L; private String menuId; private String upMenuId; private Integer menuDepth; private String menuName; -// private AsaMenu.Type menuType; + private AsaMenu.Type menuType; private String menuUrl; - private Integer bcId; - private Integer contentId; private List children; } @@ -69,9 +61,8 @@ public class Out implements Serializable { @NoArgsConstructor @AllArgsConstructor @Builder - public static class PermitApi implements Serializable { + public static class PermitApi implements Serializable{ private static final long serialVersionUID = 385854228342672220L; private String menuUrl; } - } diff --git a/java/src/main/java/com/leejk0523/javavue/model/AsaAdminMember.java b/java/src/main/java/com/leejk0523/javavue/model/AsaAdminMember.java index fd75253..a464085 100644 --- a/java/src/main/java/com/leejk0523/javavue/model/AsaAdminMember.java +++ b/java/src/main/java/com/leejk0523/javavue/model/AsaAdminMember.java @@ -1,49 +1,28 @@ package com.leejk0523.javavue.model; -import com.fasterxml.jackson.annotation.JsonProperty; - +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.micrometer.common.util.StringUtils; import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.GenericGenerator; +import jakarta.validation.constraints.*; +import lombok.*; +import org.hibernate.annotations.ColumnTransformer; import java.time.LocalDateTime; -import java.util.List; @Data @Builder @NoArgsConstructor @AllArgsConstructor @Entity -@Table(name = "ASA_ADMIN_MEMBER") +@Table(name = "asa_admin_member") public class AsaAdminMember { @Id - @GenericGenerator(name = "uuid", strategy = "org.hibernate.id.UUIDGenerator") - @GeneratedValue(generator = "uuid") - @Column(name = "ADMIN_NO", nullable = false) - private String adminNo; - @Size(max = 50) @Column(name = "ADMIN_ID", nullable = false, length = 50) private String adminId; - @Size(max = 10) - @Column(name = "INST_NO", length = 10) - private String instNo; - - @Enumerated(EnumType.STRING) - @Column(name = "CERT_TYPE", length = 20) - private CertType certType; - - @Column(name = "CERT_VL", length = 100) - private String certVl; - - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @JsonIgnore @Size(max = 200) @NotNull @Column(name = "ADMIN_PASSWORD", nullable = false, length = 200) @@ -62,12 +41,28 @@ public class AsaAdminMember { private String adminEmail; @Size(max = 100) - @Column(name = "ADMIN_TEL", length = 100) - private String adminTel; + @Column(name = "ADMIN_TEL1", length = 100) + private String adminTel1; @Size(max = 100) - @Column(name = "ADMIN_MOBILE", length = 100) - private String adminMobile; + @Column(name = "ADMIN_TEL2", length = 100) + private String adminTel2; + + @Size(max = 100) + @Column(name = "ADMIN_TEL3", length = 100) + private String adminTel3; + + @Size(max = 100) + @Column(name = "ADMIN_MOBILE1", length = 100) + private String adminMobile1; + + @Size(max = 100) + @Column(name = "ADMIN_MOBILE2", length = 100) + private String adminMobile2; + + @Size(max = 100) + @Column(name = "ADMIN_MOBILE3", length = 100) + private String adminMobile3; @Size(max = 50) @Column(name = "ADMIN_FAX", length = 50) @@ -85,76 +80,91 @@ public class AsaAdminMember { @Column(name = "ADMIN_ADDRESS_DETAIL", length = 200) private String adminAddressDetail; + @Column(name = "ADMIN_REGDATE") + private LocalDateTime adminRegdate; + @Column(name = "ADMIN_LOGIN_LAST_DATE") private LocalDateTime adminLoginLastDate; @Column(name = "ADMIN_PW_LAST_UPDATE") private LocalDateTime adminPwLastUpdate; + @Size(max = 100) + @Deprecated + @Column(name = "ADMIN_ORGANIZATION", length = 100) + private String adminOrganization; + @Size(max = 100) @Deprecated @Column(name = "ADMIN_DEPARTMENT", length = 100) private String adminDepartment; + @Size(max = 100) + @Deprecated + @Column(name = "ADMIN_TEAM", length = 100) + private String adminTeam; + + @Size(max = 100) + @Deprecated + @Column(name = "ADMIN_POSITION", length = 100) + private String adminPosition; + + @Size(max = 200) + @Column(name = "ADMIN_ROLE", length = 200) + private String adminRole; + + @Size(max = 50) + @Deprecated + @Column(name = "ADMIN_MANAGEMENT_LEVEL", length = 50) + private String adminManagementLevel; + @Column(name = "ADMIN_LOGIN_FAIL_COUNT") private Integer adminLoginFailCount; @Column(name = "ADMIN_LOGIN_FAIL_DATE") private LocalDateTime adminLoginFailDate; + @NotNull + @Column(name = "ADMIN_ACTIVE", nullable = false) + private Boolean adminActive; + @Column(name = "ADMIN_LOCK") private Boolean adminLock; - @Enumerated(EnumType.STRING) - @Column(name = "ADMIN_STATUS", length = 20, nullable = false) - private AdminStatus adminStatus; + @Column(name = "ADMIN_LONG_TERM") + private Boolean adminLongTerm; - @Column(name = "APRV_DT") - private LocalDateTime aprvDt; + @Column(name = "SITE_ID", length = 20, nullable = false) + private String siteId; - @Column(name = "RJCT_DT") - private LocalDateTime rjctDt; + @Column(name = "ORG_ID", length = 36) + private String orgId; - @Column(name = "RJCT_RSN", length = 200) - private String rjctRsn; + @Size(max = 100) + @Column(name = "ADMIN_TEL", length = 100) + private String adminTel; - @Column(name = "USE_YN", length = 1, nullable = false) - private Boolean useYn; + @Size(max = 100) + @Column(name = "ADMIN_MOBILE", length = 100) + private String adminMobile; - @Column(name = "DEL_YN", length = 1, nullable = false) - private Boolean delYn; - - @Column(name = "FRST_RGTR_ID", length = 50, nullable = false) - private String frstRgtrId; - - @Column(name = "FRST_REG_DT", nullable = false) - private LocalDateTime frstRegDt; - - @Column(name = "LAST_MDFR_ID", length = 50) - private String lastMdfrId; - - @Column(name = "LAST_MDFCN_DT") - private LocalDateTime lastMdfcnDt; - - @Transient - private List roleList; - - @Data - public static class Role { - private String adminId; - private String roleCode; - private String roleName; - private Boolean roleJoin; + public String getAdminTel() { + if (StringUtils.isNotBlank(this.getAdminTel1()) + && StringUtils.isNotBlank(this.getAdminTel2()) + && StringUtils.isNotBlank(this.getAdminTel3())) { + return this.getAdminTel1() + "-" + this.getAdminTel2() + "-" + this.getAdminTel3(); + } else { + return null; + } } - public enum CertType { - IPIN, - PHONE - } - - public enum AdminStatus { - NONE, - APRV, - RJCT + public String getAdminMobile() { + if (StringUtils.isNotBlank(this.getAdminMobile1()) + && StringUtils.isNotBlank(this.getAdminMobile2()) + && StringUtils.isNotBlank(this.getAdminMobile3())) { + return this.getAdminMobile1() + "-" + this.getAdminMobile2() + "-" + this.getAdminMobile3(); + } else { + return null; + } } } \ No newline at end of file diff --git a/java/src/main/java/com/leejk0523/javavue/model/AsaMenu.java b/java/src/main/java/com/leejk0523/javavue/model/AsaMenu.java new file mode 100644 index 0000000..5f8c1e2 --- /dev/null +++ b/java/src/main/java/com/leejk0523/javavue/model/AsaMenu.java @@ -0,0 +1,126 @@ +package com.leejk0523.javavue.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.Size; +import lombok.*; +import org.hibernate.annotations.GenericGenerator; + +import jakarta.persistence.*; +import java.time.LocalDateTime; +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "asa_menu") +public class AsaMenu { + + @Id + @Size(max = 100) + @GenericGenerator(name = "uuid", strategy = "org.hibernate.id.UUIDGenerator") + @GeneratedValue(generator = "uuid") + @Column(name = "menu_id", length = 100, nullable = false) + private String menuId; + + @Column(name = "site_id", length = 30, nullable = false) + private String siteId; + + @Size(max = 100) + @Column(name = "up_menu_id", length = 100) + private String upMenuId; + + @Column(name = "menu_depth", nullable = false) + private Integer menuDepth; + + @Column(name = "menu_order", nullable = false) + private Integer menuOrder; + + @Size(max = 200) + @Column(name = "menu_name", length = 200, nullable = false) + private String menuName; + + @Enumerated(EnumType.STRING) + @Column(name = "menu_type", length = 20, nullable = false) + private Type menuType; + + @Enumerated(EnumType.STRING) + @Column(name = "menu_feature", length = 20, nullable = false) + private Feature menuFeature; + + @Column(name = "menu_layout", length = 50) + private String menuLayout; + + @Column(name = "menu_url", length = 200) + private String menuUrl; + + @Column(name = "menu_method", length = 200) + private String menuMethod; + + @Column(name = "menu_description", length = 1000) + private String menuDescription; + + @Enumerated(EnumType.STRING) + @Column(name = "menu_link_target", length = 20, nullable = false) + private Target menuLinkTarget; + + @Column(name = "menu_use_satisfaction", nullable = false) + private Boolean menuUseSatisfaction; + + @Column(name = "menu_use_mng_info", nullable = false) + private Boolean menuUseMngInfo; + + @Column(name = "menu_mng_id", length = 50) + private String menuMngId; + + @Enumerated(EnumType.STRING) + @Column(name = "menu_status", length = 20, nullable = false) + private Status menuStatus; + + @Column(name = "menu_reg_date", nullable = false) + private LocalDateTime menuRegDate; + + @Column(name = "menu_reg_id", length = 50, nullable = false) + private String menuRegId; + + @Column(name = "menu_upd_date") + private LocalDateTime menuUpdDate; + + @Column(name = "menu_upd_id", length = 50) + private String menuUpdId; + + @Transient + @JsonProperty("_children") + private List children; + + @Getter + public enum Type { + MENU, + PAGE, + API, + TAB + + } + + @Getter + public enum Feature { + PAGE, + LIST, + DETAIL, + CREATE, + UPDATE, + DELETE + } + + public enum Target { + CURRENT, + BLANK + } + + public enum Status { + ENABLED, + HIDDEN, + DISABLED, + } +} \ No newline at end of file diff --git a/java/src/main/java/com/leejk0523/javavue/model/AsaRole.java b/java/src/main/java/com/leejk0523/javavue/model/AsaRole.java index dc4691f..2d3d44f 100644 --- a/java/src/main/java/com/leejk0523/javavue/model/AsaRole.java +++ b/java/src/main/java/com/leejk0523/javavue/model/AsaRole.java @@ -1,13 +1,12 @@ package com.leejk0523.javavue.model; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; @@ -17,6 +16,7 @@ import java.time.LocalDateTime; @Builder @Entity @Table(name = "asa_role") +@IdClass(AsaRole.Key.class) public class AsaRole implements Serializable { private static final long serialVersionUID = 690922257948242364L; @@ -25,6 +25,7 @@ public class AsaRole implements Serializable { @Column(name = "ROLE_CODE", nullable = false, length = 100) private String roleCode; + @Id @Size(max = 20) @Column(name = "SITE_ID", nullable = false, length = 20) private String siteId; @@ -33,32 +34,28 @@ public class AsaRole implements Serializable { @Column(name = "ROLE_NAME", length = 100) private String roleName; - @Column(name = "ROLE_LVL", precision = 2) - private Integer roleLvl; - @Size(max = 1000) @Column(name = "ROLE_DESCRIPTION", length = 1000) private String roleDescription; + @Column(name = "ROLE_REGDATE") + private LocalDateTime roleRegdate; + + @Column(name = "ROLE_DEFAULT") + private Integer roleDefault; + + @Column(name = "ROLE_ADMIN") + private Integer roleAdmin; + @Column(name = "ROLE_JOIN") - private Boolean roleJoin; + private Integer roleJoin; - @Column(name = "USE_YN", length = 1, nullable = false) - private Boolean useYn; + @Data + public static class Key implements Serializable { + private static final long serialVersionUID = 1745833326981056763L; - @Column(name = "DEL_YN", length = 1, nullable = false) - private Boolean delYn; - - @Column(name = "FRST_RGTR_ID", length = 50, nullable = false) - private String frstRgtrId; - - @Column(name = "FRST_REG_DT", nullable = false) - private LocalDateTime frstRegDt; - - @Column(name = "LAST_MDFR_ID", length = 50) - private String lastMdfrId; - - @Column(name = "LAST_MDFCN_DT") - private LocalDateTime lastMdfcnDt; + private String roleCode; + private String siteId; + } } \ No newline at end of file diff --git a/java/src/main/java/com/leejk0523/javavue/model/AsaUserMember.java b/java/src/main/java/com/leejk0523/javavue/model/AsaUserMember.java deleted file mode 100644 index 21d0248..0000000 --- a/java/src/main/java/com/leejk0523/javavue/model/AsaUserMember.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.leejk0523.javavue.model; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.GenericGenerator; - -import jakarta.persistence.*; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; - -import java.time.LocalDateTime; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Entity -@Table(name = "ASA_USER_MEMBER") -public class AsaUserMember { - - @Id - @GenericGenerator(name = "uuid", strategy = "org.hibernate.id.UUIDGenerator") - @GeneratedValue(generator = "uuid") - @Column(name = "USER_NO", nullable = false) - private String userNo; - - @Size(max = 50) - @Column(name = "USER_ID", length = 50) - private String userId; - - @Size(max = 200) - @NotNull - @Column(name = "USER_PASSWORD", nullable = false, length = 200) - private String userPassword; - - @Size(max = 50) - @Column(name = "USER_LOGIN_TYPE", length = 50) - private String userLoginType; - - @Size(max = 200) - @Column(name = "USER_NAME", length = 200) - private String userName; - - @Size(max = 20) - @Column(name = "USER_THUMBNAIL_IMAGE", length = 20) - private String userThumbnailImage; - - @Size(max = 100) - @Column(name = "USER_TEL", length=100) - private String userTel; - - @Size(max = 100) - @Column(name = "USER_MOBILE", length=100) - private String userMobile; - - @Size(max = 20) - @Column(name = "USER_SEX", length = 20) - private String userSex; - - @Size(max = 200) - @Column(name = "USER_EMAIL", length = 200) - private String userEmail; - - @Size(max = 100) - @Column(name = "USER_ZIPCODE", length = 100) - private String userZipcode; - - @Size(max = 200) - @Column(name = "USER_ADDRESS", length = 200) - private String userAddress; - - @Size(max = 200) - @Column(name = "USER_ADDRESS_DETAIL", length = 200) - private String userAddressDetail; - - @Column(name = "USER_LOGIN_LAST_DATE") - private LocalDateTime userLoginLastDate; - - @Column(name = "USER_PW_LAST_UPDATED") - private LocalDateTime userPwLastUpdated; - - @Column(name = "USER_MAILING") - private Boolean userMailing; - - @Column(name = "USER_SMS") - private Boolean userSms; - - @Column(name = "PUSH_SEND") - private Boolean pushSend; - - @Column(name = "USE_TERMS_AGREE") - private Boolean useTermsAgree; - - @Column(name = "PRIVACY_TERMS_AGREE") - private Boolean privacyTermsAgree; - - @Column(name = "LOCATION_TERMS_AGREE") - private Boolean locationTermsAgree; - - @Column(name = "MARKETING_TERMS_AGREE") - private Boolean marketingTermsAgree; - - @Size(max = 100) - @Column(name = "USER_SIGN_UP_KEY", length = 100) - private String userSignUpKey; - - @Size(max = 500) - @Column(name = "USER_SIGN_UP_KEY_CHECKED", length = 500) - private String userSignUpKeyChecked; - - @Size(max = 20) - @Column(name = "USER_SNS", length = 20) - private String userSns; - - @Size(max = 50) - @Column(name = "USER_SNS_ID", length = 50) - private String userSnsId; - - @Size(max = 100) - @Column(name = "USER_SNS_HOME", length = 100) - private String userSnsHome; - - @Column(name = "TERM_CHECK_DATE") - private LocalDateTime termCheckDate; - - @Column(name = "TERM_CHECK_EMAIL_SENDED") - private Boolean termCheckEmailSended; - - @Column(name = "USER_LOCK") - private Boolean userLock; - - @Column(name = "USER_LOGIN_FAIL_COUNT") - private Integer userLoginFailCount; - - @Column(name = "USER_LOGIN_FAIL_DATE") - private LocalDateTime userLoginFailDate; - - @Column(name = "USE_YN", length = 1, nullable = false) - private Boolean useYn; - - @Column(name = "DEL_YN", length = 1, nullable = false) - private Boolean delYn; - - @Column(name = "FRST_RGTR_ID", length = 50, nullable = false) - private String frstRgtrId; - - @Column(name = "FRST_REG_DT", nullable = false) - private LocalDateTime frstRegDt; - - @Column(name = "LAST_MDFR_ID", length = 50) - private String lastMdfrId; - - @Column(name = "LAST_MDFCN_DT") - private LocalDateTime lastMdfcnDt; -} \ No newline at end of file diff --git a/java/src/main/java/com/leejk0523/javavue/model/IstInst.java b/java/src/main/java/com/leejk0523/javavue/model/IstInst.java deleted file mode 100644 index d189a8b..0000000 --- a/java/src/main/java/com/leejk0523/javavue/model/IstInst.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.leejk0523.javavue.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import jakarta.persistence.*; - -import java.time.LocalDateTime; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Entity -@Table(name = "IST_INST") -public class IstInst { - - @Id - @Column(name = "INST_NO", length = 10, nullable = false) - private String instNo; - - @Column(name = "INST_CLSF_CD", length = 6, nullable = false) - private String instClsfCd; - - @Column(name = "INST_NM", length = 200, nullable = false) - private String instNm; - - @Column(name = "INST_ENG_NM", length = 100) - private String instEngNm; - - @Column(name = "INST_ABBR_NM", length = 300) - private String instAbbrNm; - - @Column(name = "INST_EML_ADDR", length = 320) - private String instEmlAddr; - - @Column(name = "INST_TELNO", length = 11) - private String instTelno; - - @Column(name = "INST_FXNO", length = 11) - private String instFxno; - - @Column(name = "INST_ZIP", length = 5) - private String instZip; - - @Column(name = "INST_ADDR", length = 200) - private String instAddr; - - @Column(name = "INST_DADDR", length = 200) - private String instDaddr; - - @Column(name = "INST_BRNO", length = 10) - private String instBrno; - - @Column(name = "INST_RPRSV_NM", length = 100) - private String instRprsvNm; - - @Column(name = "INST_EXPLN", length = 4000) - private String instExpln; - - @Column(name = "USE_YN", length = 1, nullable = false) - private Boolean useYn; - - @Column(name = "FRST_RGTR_ID", length = 50, nullable = false) - private String frstRgtrId; - - @Column(name = "FRST_REG_DT", nullable = false) - private LocalDateTime frstRegDt; - - @Column(name = "LAST_MDFR_ID", length = 50) - private String lastMdfrId; - - @Column(name = "LAST_MDFCN_DT") - private LocalDateTime lastMdfcnDt; -} diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties index d2a14ab..b9c05fe 100644 --- a/java/src/main/resources/application.properties +++ b/java/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.application.name=javavue -spring.datasource.url=jdbc:mariadb://localhost:3306/pub -spring.datasource.username=daniel +spring.datasource.url=jdbc:mariadb://leejk0523.com:3306/pub +spring.datasource.username=leejk0523 spring.datasource.password=Ghtkssk0325