local traffic grade add

src/main/java/com/its/op/dto/its/code/TbCmtrGradClsfDto.java

@@ -20,6 +20,10 @@ import java.io.Serializable;
 public class TbCmtrGradClsfDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("기준 구간 등급 코드")  // N VARCHAR(7)
+    @JsonProperty("sect_grad_tp")
+    private String sectGradTp;
+
     @ApiModelProperty("구간 등급 코드")  // N VARCHAR(7)
     @JsonProperty("sect_grad_cd")
     private String sectGradCd;
@@ -56,6 +60,12 @@ public class TbCmtrGradClsfDto implements Serializable {
     @NoArgsConstructor//(access = AccessLevel.PROTECTED)
     public static class TbCmtrGradClsfUpdReq {
 
+        @ApiModelProperty("기준 구간 등급 코드, Nullable = N, VARCHAR(1)")  // N VARCHAR(7)
+        @JsonProperty("sect_grad_tp")
+        @Size(min=1, max=1)
+        @Pattern(regexp = "[ML]")
+        private String sectGradTp;
+
         @ApiModelProperty("구간 등급 코드, Nullable = N, VARCHAR(7)")  // N VARCHAR(7)
         @JsonProperty("sect_grad_cd")
         @Size(min=1, max=7)
@@ -83,7 +93,8 @@ public class TbCmtrGradClsfDto implements Serializable {
         private String cngsGradYn;
 
         @Builder
-        public TbCmtrGradClsfUpdReq(String sect_grad_cd, String cmtr_grad_cd, Integer lwst_trvl_sped, Integer hghs_trvl_sped, String cngs_grad_yn) {
+        public TbCmtrGradClsfUpdReq(String sect_grad_tp, String sect_grad_cd, String cmtr_grad_cd, Integer lwst_trvl_sped, Integer hghs_trvl_sped, String cngs_grad_yn) {
+            this.sectGradTp = sect_grad_tp;
             this.sectGradCd = sect_grad_cd;
             this.cmtrGradCd = cmtr_grad_cd;
             this.lwstTrvlSped = lwst_trvl_sped;
@@ -93,6 +104,7 @@ public class TbCmtrGradClsfDto implements Serializable {
 
         public TbSectGradStup toEntity() {
             return TbSectGradStup.builder()
+                    .sectGradTp(this.sectGradTp)
                     .sectGradCd(this.sectGradCd)
                     .cmtrGradCd(this.cmtrGradCd)
                     .lwstTrvlSped(this.lwstTrvlSped)

src/main/java/com/its/op/dto/its/common/TrafDto.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -41,4 +42,8 @@ public class TrafDto implements Serializable {
     @JsonProperty("prcn_dt")
     private String prcnDt;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @Column(name = "LOCAL_GRAD_CD", length = 7)
+    private String localGradCd;
+
 }

src/main/java/com/its/op/dto/its/ifsc/TbIfscTrafDto.java

@@ -53,6 +53,10 @@ public class TbIfscTrafDto implements Serializable {
     @JsonProperty("data_num")
     private Integer dataNum;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @JsonProperty("local_grad_cd")
+    private String localGradCd;
+
     // Code Description Field
     @ApiModelProperty("구간 명")
     @JsonProperty("ifsc_nm")
@@ -73,8 +77,13 @@ public class TbIfscTrafDto implements Serializable {
     @ApiModelProperty("방향 설명")
     @JsonProperty("drct_cd_desc")
     private String drctDesc;
+
     @ApiModelProperty("소통 등급 코드 설명")
     @JsonProperty("cmtr_grad_desc")
     private String cmtrGradDesc;
 
+    @ApiModelProperty("지역 소통 등급 코드 설명")
+    @JsonProperty("local_grad_desc")
+    private String localGradDesc;
+
 }

src/main/java/com/its/op/dto/its/link/TbLinkTrafDto.java

@@ -77,6 +77,10 @@ public class TbLinkTrafDto implements Serializable {
     @JsonProperty("data_num")
     private Integer dataNum;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @JsonProperty("local_grad_cd")
+    private String localGradCd;
+
     // Code Description Field
     @ApiModelProperty("소통 등급 코드 설명")
     @JsonProperty("cmtr_grad_desc")    // CMTR_GRAD_CD
@@ -118,4 +122,8 @@ public class TbLinkTrafDto implements Serializable {
     @JsonProperty("link_leng")
     private Integer linkLeng;
 
+    @ApiModelProperty("지역 소통 등급 코드 설명")
+    @JsonProperty("local_grad_desc")
+    private String localGradDesc;
+
 }

src/main/java/com/its/op/dto/its/road/TbRoadTrafDto.java

@@ -53,6 +53,10 @@ public class TbRoadTrafDto implements Serializable {
     @JsonProperty("data_num")
     private Integer dataNum;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @JsonProperty("local_grad_cd")
+    private String localGradCd;
+
     // Code Description Field
     @ApiModelProperty("도로 명")
     @JsonProperty("road_name")
@@ -73,8 +77,13 @@ public class TbRoadTrafDto implements Serializable {
     @ApiModelProperty("방향 설명")
     @JsonProperty("drct_cd_desc")
     private String drctDesc;
+
     @ApiModelProperty("소통 등급 코드 설명")
     @JsonProperty("cmtr_grad_desc")
     private String cmtrGradDesc;
 
+    @ApiModelProperty("지역 소통 등급 코드 설명")
+    @JsonProperty("local_grad_desc")
+    private String localGradDesc;
+
 }

src/main/java/com/its/op/entity/its/code/TbSectGradStup.java

@@ -26,6 +26,11 @@ import java.io.Serializable;
 public class TbSectGradStup implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("구간 등급 기준 코드")  // N VARCHAR(1)
+    @Id
+    @Column(name = "SECT_GRAD_TP", nullable = false, length = 1)
+    private String sectGradTp;
+
     @ApiModelProperty("구간 등급 코드")  // N VARCHAR(7)
     @Id
     @Column(name = "SECT_GRAD_CD", nullable = false, length = 7)
@@ -54,6 +59,7 @@ public class TbSectGradStup implements Serializable {
 
     public TbCmtrGradClsfDto toDto() {
         TbCmtrGradClsfDto dto = TbCmtrGradClsfDto.builder()
+                .sectGradTp(this.sectGradTp)
                 .sectGradCd(this.sectGradCd)
                 .cmtrGradCd(this.cmtrGradCd)
                 .lwstTrvlSped(this.lwstTrvlSped)
@@ -72,10 +78,10 @@ public class TbSectGradStup implements Serializable {
         return dto;
     }
 
-    public TbSectGradStup(String sectGradCd, String cmtrGradCd) {
-        this.sectGradCd = sectGradCd;
-        this.cmtrGradCd = cmtrGradCd;
-    }
+//    public TbSectGradStup(String sectGradCd, String cmtrGradCd) {
+//        this.sectGradCd = sectGradCd;
+//        this.cmtrGradCd = cmtrGradCd;
+//    }
 
     public void updateInfo(TbCmtrGradClsfDto.TbCmtrGradClsfUpdReq req) {
         this.lwstTrvlSped = req.getLwstTrvlSped();

src/main/java/com/its/op/entity/its/code/TbSectGradStupKey.java

@@ -15,6 +15,9 @@ import java.io.Serializable;
 public class TbSectGradStupKey implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    // SECT_GRAD_TP, 구간 등급 기준 코드  // N VARCHAR(1)
+    private String sectGradTp;
+
     // SECT_GRAD_CD, 구간 등급 코드  // N VARCHAR(7)
     private String sectGradCd;
 

src/main/java/com/its/op/entity/its/ifsc/TbIfscTraf.java

@@ -63,6 +63,10 @@ public class TbIfscTraf implements Serializable {
     @Column(name = "DATA_NUM", columnDefinition = "NUMBER", length = 3)
     private Integer dataNum;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @Column(name = "LOCAL_GRAD_CD", length = 7)
+    private String localGradCd;
+
     @OneToOne
     @JoinColumn(insertable=false, updatable=false, name="IFSC_ID", referencedColumnName = "IFSC_ID")
     @NotFound(action = NotFoundAction.IGNORE)
@@ -79,10 +83,12 @@ public class TbIfscTraf implements Serializable {
                 .trvlHh(this.trvlHh)
                 .cmtrGradCd(this.cmtrGradCd)
                 .dataNum(this.dataNum)
+                .localGradCd(this.localGradCd)
                 .build();
 
         if (this.cmtrGradCd == null) {
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
 
@@ -95,12 +101,15 @@ public class TbIfscTraf implements Serializable {
         }
         if (dto.getMissYn().equals("Y")) {
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         dto.setDrctDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.DRCT_CD, dto.getDrctCd()));
         if (this.cmtrGradCd == null) {
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         dto.setCmtrGradDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.CMTR_GRAD_CD, this.cmtrGradCd));
+        dto.setLocalGradDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.CMTR_GRAD_CD, this.localGradCd));
 
         return dto;
     }
@@ -111,6 +120,7 @@ public class TbIfscTraf implements Serializable {
                 .sped(this.sped)
                 .cmtrGradCd(this.cmtrGradCd)
                 .trvlHh(this.trvlHh)
+                .localGradCd(this.localGradCd)
                 .build();
 
         dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, dto.getCmtrGradCd()));
@@ -118,6 +128,7 @@ public class TbIfscTraf implements Serializable {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         return dto;
     }
@@ -133,6 +144,7 @@ public class TbIfscTraf implements Serializable {
                 .trvlHh(this.trvlHh)
                 .cmtrGradCd(this.cmtrGradCd)
                 .dataNum(this.dataNum)
+                .localGradCd(this.localGradCd)
                 .build();
     }
 }

src/main/java/com/its/op/entity/its/ifsc/TbIfscTrafSimple.java

@@ -63,6 +63,10 @@ public class TbIfscTrafSimple implements Serializable {
     @Column(name = "DATA_NUM", columnDefinition = "NUMBER", length = 3)
     private Integer dataNum;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @Column(name = "LOCAL_GRAD_CD", length = 7)
+    private String localGradCd;
+
     public TrafDto toDto() {
         TrafDto dto = TrafDto.builder()
                 .id(this.ifscId)
@@ -70,6 +74,7 @@ public class TbIfscTrafSimple implements Serializable {
                 .cmtrGradCd(this.cmtrGradCd)
                 .trvlHh(this.trvlHh)
                 .prcnDt(this.prcnDt)
+                .localGradCd(this.localGradCd)
                 .build();
 
         dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
@@ -77,6 +82,7 @@ public class TbIfscTrafSimple implements Serializable {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         return dto;
     }

src/main/java/com/its/op/entity/its/link/TbLinkTraf.java

@@ -90,6 +90,10 @@ public class TbLinkTraf implements Serializable {
     @Column(name = "DATA_NUM", columnDefinition = "NUMBER", length = 3)
     private Integer dataNum;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @Column(name = "LOCAL_GRAD_CD", length = 7)
+    private String localGradCd;
+
     @OneToOne
     @JoinColumn(insertable=false, updatable=false, name="LINK_ID", referencedColumnName = "LINK_ID")
     @NotFound(action = NotFoundAction.IGNORE)
@@ -112,10 +116,12 @@ public class TbLinkTraf implements Serializable {
                 .prcnSorc(this.prcnSorc)
                 .adjsSorc(this.adjsSorc)
                 .dataNum(this.dataNum)
+                .localGradCd(this.localGradCd)
                 .build();
 
         if (this.cmtrGradCd == null) {
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         dto.setMissYn(this.missYn.equals("N") ? ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd) : "Y");
 
@@ -134,8 +140,11 @@ public class TbLinkTraf implements Serializable {
         }
         if (dto.getMissYn().equals("Y")) {
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         dto.setCmtrGradDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.CMTR_GRAD_CD, this.cmtrGradCd));
+        dto.setLocalGradDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.CMTR_GRAD_CD, this.localGradCd));
+
         dto.setPrcnSorcDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.PRCN_SORC, this.prcnSorc));
         if (dto.getPrcnSorcDesc().contains(CmmnCdManager.defUnknownDesc)) {
             dto.setPrcnSorcDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.ADJS_SORC, this.prcnSorc));
@@ -152,6 +161,7 @@ public class TbLinkTraf implements Serializable {
                 .trvlHh(this.trvlHh)
                 .cmtrGradCd(this.cmtrGradCd)
                 .missYn(this.missYn)
+                .localGradCd(this.localGradCd)
                 .build();
 
         dto.setMissYn(this.missYn.equals("N") ? ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd) : "Y");
@@ -159,6 +169,7 @@ public class TbLinkTraf implements Serializable {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
 
         return dto;
@@ -181,6 +192,7 @@ public class TbLinkTraf implements Serializable {
                 .prcnSorc(this.prcnSorc)
                 .adjsSorc(this.adjsSorc)
                 .dataNum(this.dataNum)
+                .localGradCd(this.localGradCd)
                 .build();
     }
     public TbLinkTraf toTrafEntity() {

src/main/java/com/its/op/entity/its/link/TbLinkTrafSimple.java

@@ -87,6 +87,10 @@ public class TbLinkTrafSimple implements Serializable {
     @Column(name = "DATA_NUM", columnDefinition = "NUMBER", length = 3)
     private Integer dataNum;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @Column(name = "LOCAL_GRAD_CD", length = 7)
+    private String localGradCd;
+
     public TrafDto toDto() {
         TrafDto dto = TrafDto.builder()
                 .id(this.linkId)
@@ -95,6 +99,7 @@ public class TbLinkTrafSimple implements Serializable {
                 .cmtrGradCd(this.cmtrGradCd)
                 .missYn(this.missYn)
                 .prcnDt(this.prcnDt)
+                .localGradCd(this.localGradCd)
                 .build();
 
         dto.setMissYn(("N").equals(this.missYn) ? ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd) : "Y");
@@ -102,6 +107,7 @@ public class TbLinkTrafSimple implements Serializable {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         return dto;
     }

src/main/java/com/its/op/entity/its/road/TbRoadTraf.java

@@ -66,6 +66,10 @@ public class TbRoadTraf implements Serializable {
     @Column(name = "DATA_NUM", columnDefinition = "NUMBER", length = 3)
     private Integer dataNum;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @Column(name = "LOCAL_GRAD_CD", length = 7)
+    private String localGradCd;
+
     @OneToOne
     @JoinColumn(insertable=false, updatable=false, name="ROAD_ID", referencedColumnName = "ROAD_ID")
     @NotFound(action = NotFoundAction.IGNORE)
@@ -82,10 +86,12 @@ public class TbRoadTraf implements Serializable {
                 .trvlHh(this.trvlHh)
                 .cmtrGradCd(this.cmtrGradCd)
                 .dataNum(this.dataNum)
+                .localGradCd(this.localGradCd)
                 .build();
 
         if (this.cmtrGradCd == null) {
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
 
@@ -98,12 +104,15 @@ public class TbRoadTraf implements Serializable {
         }
         if (dto.getMissYn().equals("Y")) {
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         dto.setDrctDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.DRCT_CD, dto.getDrctCd()));
         if (this.cmtrGradCd == null) {
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         dto.setCmtrGradDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.CMTR_GRAD_CD, this.cmtrGradCd));
+        dto.setLocalGradDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.CMTR_GRAD_CD, this.localGradCd));
 
         return dto;
     }
@@ -114,6 +123,7 @@ public class TbRoadTraf implements Serializable {
                 .sped(this.sped)
                 .cmtrGradCd(this.cmtrGradCd)
                 .trvlHh(this.trvlHh)
+                .localGradCd(this.localGradCd)
                 .build();
 
         dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, dto.getCmtrGradCd()));
@@ -121,6 +131,7 @@ public class TbRoadTraf implements Serializable {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         return dto;
     }
@@ -136,6 +147,7 @@ public class TbRoadTraf implements Serializable {
                 .trvlHh(this.trvlHh)
                 .cmtrGradCd(this.cmtrGradCd)
                 .dataNum(this.dataNum)
+                .localGradCd(this.localGradCd)
                 .build();
     }
 

src/main/java/com/its/op/entity/its/road/TbRoadTrafSimple.java

@@ -63,6 +63,10 @@ public class TbRoadTrafSimple implements Serializable {
     @Column(name = "DATA_NUM", columnDefinition = "NUMBER", length = 3)
     private Integer dataNum;
 
+    @ApiModelProperty("지역 소통 등급 코드")  // Y VARCHAR(7)
+    @Column(name = "LOCAL_GRAD_CD", length = 7)
+    private String localGradCd;
+
     public TrafDto toDto() {
         TrafDto dto = TrafDto.builder()
                 .id(this.roadId)
@@ -70,6 +74,7 @@ public class TbRoadTrafSimple implements Serializable {
                 .cmtrGradCd(this.cmtrGradCd)
                 .trvlHh(this.trvlHh)
                 .prcnDt(this.prcnDt)
+                .localGradCd(this.localGradCd)
                 .build();
 
         dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
@@ -77,6 +82,7 @@ public class TbRoadTrafSimple implements Serializable {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CmmnCdManager.MISS_SPED_GRAD);
+            dto.setLocalGradCd(CmmnCdManager.MISS_SPED_GRAD);
         }
         return dto;
     }

src/main/resources/application.yml

@@ -39,7 +39,7 @@ server:
 
 spring:
   profiles:
-    active: prod
+    active: dev
   main:
     banner-mode: off
   application: