Browse Source

ifsc name add

shjung 3 years ago
parent
commit
56aa682208

+ 3 - 6
src/main/java/com/its/op/model/dto/CmtrGradClsfDto.java

@@ -1,11 +1,11 @@
 package com.its.op.model.dto;
 
+import com.its.op.global.CodeManager;
 import com.its.op.model.entity.CmtrGradClsf;
 import lombok.*;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -20,7 +20,7 @@ public class CmtrGradClsfDto implements Serializable {
         private final String  CNGS_GRAD_YN;       //	N	CHAR(1)	    Y	'N'		정체 등급 여부
 
         private final String SECT_GRAD_DESC;
-        //private final String CMTR_GRAD_DESC;
+        private final String CMTR_GRAD_DESC;
 
         public CmtrGradClsfInfo(CmtrGradClsf entity) {
             this.SECT_GRAD_CD   = entity.getSECT_GRAD_CD();
@@ -30,7 +30,7 @@ public class CmtrGradClsfDto implements Serializable {
             this.CNGS_GRAD_YN   = entity.getCNGS_GRAD_YN();
 
             this.SECT_GRAD_DESC = "[" + this.SECT_GRAD_CD + "]" + entity.getSect().getSECT_GRAD_NM();
-            //this.CMTR_GRAD_DESC = "[" + this.CMTR_GRAD_CD + "]" + entity.getGrad().getCMMN_CD_KOR_NM();
+            this.CMTR_GRAD_DESC = CodeManager.getCodeDesc(CodeManager.CMTR_GRAD_CD, this.CMTR_GRAD_CD);
         }
     }
 
@@ -47,16 +47,13 @@ public class CmtrGradClsfDto implements Serializable {
         @Size(min=1, max=7)
         private String  CMTR_GRAD_CD;       //	N	VARCHAR2(7)	N			소통 등급 코드
 
-        @Positive
         private Integer LWST_TRVL_SPED;     //	N	NUMBER(3)	Y	0		최저 통행 속도
-        @Positive
         private Integer HGHS_TRVL_SPED;     //	N	NUMBER(3)	Y	0		최고 통행 속도
 
         @Size(min=1, max=1)
         @Pattern(regexp = "[YN]")
         private String CNGS_GRAD_YN;        //	N	CHAR(1)	        Y	'N'		정체 등급 여부
 
-
         @Builder
         public CmtrGradClsfUpdateReq(String  SECT_GRAD_CD, String  CMTR_GRAD_CD, Integer LWST_TRVL_SPED, Integer HGHS_TRVL_SPED, String CNGS_GRAD_YN) {
             this.SECT_GRAD_CD   = SECT_GRAD_CD;

+ 4 - 0
src/main/java/com/its/op/model/dto/RoadIfscRltnDto.java

@@ -22,6 +22,8 @@ public class RoadIfscRltnDto implements Serializable {
         private final Long    T_NODE_ID;      //	N	NUMBER(10)	    Y			종료 노드 ID
         private final String  SECT_GRAD_CD;   //	N	VARCHAR2(7)	    Y			구간 등급 코드
 
+        private final String IFSC_NM;
+
         private final String FROM_NODE;
         private final String TO_NODE;
         private final String DRCT_CD_DESC;
@@ -38,6 +40,8 @@ public class RoadIfscRltnDto implements Serializable {
             this.SECT_LNGT    = entity.getIfsc().getSECT_LNGT();
             this.SECT_GRAD_CD = entity.getIfsc().getSECT_GRAD_CD();
 
+            this.IFSC_NM = entity.getIfsc().getIFSC_NM();
+
             this.FROM_NODE = NodeManager.getNodeName(this.F_NODE_ID);
             this.TO_NODE = NodeManager.getNodeName(this.T_NODE_ID);
 

+ 0 - 54
src/main/java/com/its/op/model/entity/CmmnCdSingle.java

@@ -1,54 +0,0 @@
-package com.its.op.model.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.ColumnDefault;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@DynamicInsert @DynamicUpdate
-@Getter
-@NoArgsConstructor
-@Builder
-@AllArgsConstructor
-@Entity
-@Table(name = "TB_CMMN_CD")
-@IdClass(CmmnCdKey.class)
-public class CmmnCdSingle implements Serializable {
-
-    @Id
-    @Column(nullable = false, length = 7)
-    private String CMMN_CD;             //	N	VARCHAR2(7)	    N			공통 코드
-
-    @Id
-    @Column(nullable = false, length = 5)
-    private String CMMN_CLSF_CD;        //	N	VARCHAR2(5)	    N			공통 분류 코드
-
-    @Column(nullable = false, length = 100)
-    private String CMMN_CD_KOR_NM;      //	N	VARCHAR2(100)	Y			공통 코드 한글 명
-
-    @Column(length = 100)
-    private String CMMN_CD_ENGL_NM;     //	N	VARCHAR2(100)	Y			공통 코드 영문 명
-
-    @Column(length = 40)
-    private String CMMN_CD_ABBR;        //	N	VARCHAR2(40)	Y			공통 코드 약어
-
-    @Column(length = 600)
-    private String RMRK;                //	N	VARCHAR2(600)	Y			비고
-
-    @Column(length = 60)
-    private String ATRB1;               //	N	VARCHAR2(60)	Y			속성1
-
-    @Column(length = 60)
-    private String ATRB2;               //	N	VARCHAR2(60)	Y			속성2
-
-    @Column(columnDefinition = "CHAR", length = 1)
-    @ColumnDefault(value = "Y")
-    private String USE_YN;              //	N	CHAR(1)	        Y	'N'		사용 여부
-
-}

+ 0 - 17
src/main/java/com/its/op/model/entity/CmtrGradClsf.java

@@ -43,23 +43,6 @@ public class CmtrGradClsf {
     @JoinColumn(insertable=false, updatable=false, name="SECT_GRAD_CD", referencedColumnName = "SECT_GRAD_CD")
     private SectGradClsf sect = new SectGradClsf();
 
-    /*@OneToOne//(fetch = FetchType.EAGER)
-    @JoinColumn(insertable=false, updatable=false, name="CMTR_GRAD_CD", referencedColumnName = "CMMN_CD")*/
-    /*@JoinColumns({
-            @JoinColumn(name="CMTR_GRAD_CD", referencedColumnName="CMMN_CD"),
-            @JoinColumn(name="CMTR_GRAD_CD", referencedColumnName="CMMN_CLSF_CD")
-    })
-    private CmmnCd grad = new CmmnCd();*/
-    /*private CmmnCdSingle grad = new CmmnCdSingle();
-    public CmmnCdSingle getGrad() {
-        return this.grad;
-    }*/
-   /* @ManyToOne
-    //@Fetch(FetchMode.JOIN)
-    @JoinColumn(insertable=false, updatable=false, name="CMMN_CLSF_CD")
-    @NotFound(action = NotFoundAction.IGNORE) // 값이 발견되지 않으면 무시
-    private CmmnCd grad = new CmmnCd();*/
-
     public void updateInfo(CmtrGradClsfDto.CmtrGradClsfUpdateReq req) {
         this.LWST_TRVL_SPED = req.getLWST_TRVL_SPED();
         this.HGHS_TRVL_SPED = req.getHGHS_TRVL_SPED();

+ 0 - 10
src/main/java/com/its/op/repository/CmmnCdSingleRepository.java

@@ -1,10 +0,0 @@
-package com.its.op.repository;
-
-import com.its.op.model.entity.CmmnCdSingle;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface CmmnCdSingleRepository extends JpaRepository<CmmnCdSingle, String> {
-
-}