diff --git a/src/main/java/com/kbds/itamserveradmin/domain/asset/entity/AssetNotice.java b/src/main/java/com/kbds/itamserveradmin/domain/asset/entity/AssetNotice.java index 0bd7899..9faef97 100644 --- a/src/main/java/com/kbds/itamserveradmin/domain/asset/entity/AssetNotice.java +++ b/src/main/java/com/kbds/itamserveradmin/domain/asset/entity/AssetNotice.java @@ -5,7 +5,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.tomcat.util.http.parser.ContentRange; import javax.persistence.*; diff --git a/src/main/java/com/kbds/itamserveradmin/domain/contract/entity/OpStatus.java b/src/main/java/com/kbds/itamserveradmin/domain/contract/entity/OpStatus.java index e69de29..cc1dddd 100644 --- a/src/main/java/com/kbds/itamserveradmin/domain/contract/entity/OpStatus.java +++ b/src/main/java/com/kbds/itamserveradmin/domain/contract/entity/OpStatus.java @@ -0,0 +1,5 @@ +package com.kbds.itamserveradmin.domain.contract.entity; + +public enum OpStatus { + IN_OPERATION, IN_DISPOSAL +} diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corperation/controller/CooperationController.java b/src/main/java/com/kbds/itamserveradmin/domain/corperation/controller/CooperationController.java deleted file mode 100644 index 9ff48eb..0000000 --- a/src/main/java/com/kbds/itamserveradmin/domain/corperation/controller/CooperationController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.kbds.itamserveradmin.domain.cooperation.controller; - -public class CooperationController { -} diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corperation/entity/Corporation.java b/src/main/java/com/kbds/itamserveradmin/domain/corperation/entity/Corporation.java deleted file mode 100644 index b841ee9..0000000 --- a/src/main/java/com/kbds/itamserveradmin/domain/corperation/entity/Corporation.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.kbds.itamserveradmin.domain.cooperation.entity; - -import com.kbds.itamserveradmin.domain.contract.entity.Contract; -import com.kbds.itamserveradmin.domain.department.entity.Department; -import com.kbds.itamserveradmin.domain.user.entity.User; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Data -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class Cooperation { - @Id - @Column(name = "corp_id") - private String corpId; - - @Column(name = "corp_name") - private String corpName; - - @Column(name = "crn") - private String corpNum; - - @Column(name = "corp_contact") - private String corpContact; - - @Column(name = "corp_addr") - private String corpAddr; - - @Column(name = "corp_site") - private String corpSite; - - @Column(name = "corp_head") - private String corpHead; - - @Column(name = "corp_note") - private String corpNote; - - @Column(name = "is_sub_corp") - private boolean isSubCorp; - - //==연관관계==// - @OneToMany(mappedBy = "cooperation",fetch = FetchType.LAZY) - @Builder.Default - private List departments = new ArrayList<>(); - - @OneToMany(mappedBy = "cooperation",fetch = FetchType.LAZY) - @Builder.Default - private List users = new ArrayList<>(); - -// @OneToMany(mappedBy ="cooperation") -// private List assets = new ArrayList<>(); - - @OneToMany(mappedBy = "corp",fetch = FetchType.LAZY) - @Builder.Default - private List contracts = new ArrayList<>(); - - //==연관관계==// - - -} diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corperation/repository/CorporationRepository.java b/src/main/java/com/kbds/itamserveradmin/domain/corperation/repository/CorporationRepository.java deleted file mode 100644 index 8bc2904..0000000 --- a/src/main/java/com/kbds/itamserveradmin/domain/corperation/repository/CorporationRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.kbds.itamserveradmin.domain.cooperation.repository; - -import com.kbds.itamserveradmin.domain.cooperation.entity.Cooperation; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface CooperationRepository extends JpaRepository { - -} diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corperation/service/CooperationService.java b/src/main/java/com/kbds/itamserveradmin/domain/corperation/service/CooperationService.java deleted file mode 100644 index ce17232..0000000 --- a/src/main/java/com/kbds/itamserveradmin/domain/corperation/service/CooperationService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.kbds.itamserveradmin.domain.cooperation.service; - -public interface CooperationService { -} diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corperation/service/CooperationServiceImpl.java b/src/main/java/com/kbds/itamserveradmin/domain/corperation/service/CooperationServiceImpl.java deleted file mode 100644 index 9eaf94f..0000000 --- a/src/main/java/com/kbds/itamserveradmin/domain/corperation/service/CooperationServiceImpl.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.kbds.itamserveradmin.domain.cooperation.service; - -public class CooperationServiceImpl implements CooperationService{ -} diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corporation/controller/CooperationController.java b/src/main/java/com/kbds/itamserveradmin/domain/corporation/controller/CorporationController.java similarity index 64% rename from src/main/java/com/kbds/itamserveradmin/domain/corporation/controller/CooperationController.java rename to src/main/java/com/kbds/itamserveradmin/domain/corporation/controller/CorporationController.java index 5702cee..b9cd859 100644 --- a/src/main/java/com/kbds/itamserveradmin/domain/corporation/controller/CooperationController.java +++ b/src/main/java/com/kbds/itamserveradmin/domain/corporation/controller/CorporationController.java @@ -1,4 +1,4 @@ package com.kbds.itamserveradmin.domain.corporation.controller; -public class CooperationController { +public class CorporationController { } diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corporation/repository/CooperationRepository.java b/src/main/java/com/kbds/itamserveradmin/domain/corporation/repository/CorporationRepository.java similarity index 77% rename from src/main/java/com/kbds/itamserveradmin/domain/corporation/repository/CooperationRepository.java rename to src/main/java/com/kbds/itamserveradmin/domain/corporation/repository/CorporationRepository.java index 14ba95b..f3dde0d 100644 --- a/src/main/java/com/kbds/itamserveradmin/domain/corporation/repository/CooperationRepository.java +++ b/src/main/java/com/kbds/itamserveradmin/domain/corporation/repository/CorporationRepository.java @@ -3,6 +3,6 @@ import com.kbds.itamserveradmin.domain.corporation.entity.Corporation; import org.springframework.data.jpa.repository.JpaRepository; -public interface CooperationRepository extends JpaRepository { +public interface CorporationRepository extends JpaRepository { } diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CooperationServiceImpl.java b/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CooperationServiceImpl.java deleted file mode 100644 index 2824e1c..0000000 --- a/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CooperationServiceImpl.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.kbds.itamserveradmin.domain.corporation.service; - -public class CooperationServiceImpl implements CooperationService{ -} diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CooperationService.java b/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CorporationService.java similarity index 62% rename from src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CooperationService.java rename to src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CorporationService.java index 4df041e..e834b07 100644 --- a/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CooperationService.java +++ b/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CorporationService.java @@ -1,4 +1,4 @@ package com.kbds.itamserveradmin.domain.corporation.service; -public interface CooperationService { +public interface CorporationService { } diff --git a/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CorporationServiceImpl.java b/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CorporationServiceImpl.java new file mode 100644 index 0000000..6aa20ff --- /dev/null +++ b/src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CorporationServiceImpl.java @@ -0,0 +1,4 @@ +package com.kbds.itamserveradmin.domain.corporation.service; + +public class CorporationServiceImpl implements CorporationService { +}