Merge branch 'main' of http://115.91.94.42:3000/PYEONGTAEK/its-op-server

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

@@ -104,27 +104,27 @@ public class TbCmmnCdDto implements Serializable {
 
         @ApiModelProperty("공통 코드 영문 명, Nullable = Y, VARCHAR(100)")  // Y VARCHAR(100)
         @JsonProperty("cmmn_cd_engl_nm")
-        @Size(min=1, max=100)
+        @Size(max=100)
         private String cmmnCdEnglNm;
 
         @ApiModelProperty("공통 코드 약어, Nullable = Y, VARCHAR(40)")  // Y VARCHAR(40)
         @JsonProperty("cmmn_cd_abbr")
-        @Size(min=1, max=40)
+        @Size(max=40)
         private String cmmnCdAbbr;
 
         @ApiModelProperty("비고, Nullable = Y, VARCHAR(600)")  // Y VARCHAR(600)
         @JsonProperty("rmrk")
-        @Size(min=1, max=600)
+        @Size(max=600)
         private String rmrk;
 
         @ApiModelProperty("속성1, Nullable = Y, VARCHAR(60)")  // Y VARCHAR(60)
         @JsonProperty("atrb1")
-        @Size(min=1, max=60)
+        @Size(max=60)
         private String atrb1;
 
         @ApiModelProperty("속성2, Nullable = Y, VARCHAR(60)")  // Y VARCHAR(60)
         @JsonProperty("atrb2")
-        @Size(min=1, max=60)
+        @Size(max=60)
         private String atrb2;
 
         @ApiModelProperty("사용 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)

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

@@ -88,17 +88,17 @@ public class TbCmmnClsfCdDto implements Serializable {
 
         @ApiModelProperty("공통 분류 영문 명, Nullable = Y, VARCHAR(100)")  // Y VARCHAR(100)
         @JsonProperty("cmmn_clsf_engl_nm")
-        @Size(min=1, max=100)
+        @Size(max=100)
         private String cmmnClsfEnglNm;
 
         @ApiModelProperty("사용 시스템 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
         @JsonProperty("use_syst_cd")
-        @Size(min=1, max=7)
+        @Size(max=7)
         private String useSystCd;
 
         @ApiModelProperty("비고, Nullable = Y, VARCHAR(600)")  // Y VARCHAR(600)
         @JsonProperty("rmrk")
-        @Size(min=1, max=600)
+        @Size(max=600)
         private String rmrk;
 
         @ApiModelProperty("사용 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)

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

@@ -42,8 +42,4 @@ 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,10 +53,6 @@ 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")
@@ -82,8 +78,4 @@ public class TbIfscTrafDto implements Serializable {
     @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,10 +77,6 @@ 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
@@ -122,8 +118,4 @@ 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,10 +53,6 @@ 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")
@@ -82,8 +78,4 @@ public class TbRoadTrafDto implements Serializable {
     @JsonProperty("cmtr_grad_desc")
     private String cmtrGradDesc;
 
-    @ApiModelProperty("지역 소통 등급 코드 설명")
-    @JsonProperty("local_grad_desc")
-    private String localGradDesc;
-
 }

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

@@ -63,10 +63,6 @@ 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)
@@ -83,12 +79,10 @@ 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));
 
@@ -101,15 +95,12 @@ 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;
     }
@@ -120,7 +111,6 @@ 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()));
@@ -128,7 +118,6 @@ 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;
     }
@@ -144,7 +133,6 @@ 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,10 +63,6 @@ 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)
@@ -74,7 +70,6 @@ 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));
@@ -82,7 +77,6 @@ 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,10 +90,6 @@ 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)
@@ -116,12 +112,10 @@ 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");
 
@@ -140,10 +134,8 @@ 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)) {
@@ -161,7 +153,6 @@ 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");
@@ -169,7 +160,6 @@ 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;
@@ -192,7 +182,6 @@ 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,10 +87,6 @@ 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)
@@ -99,7 +95,6 @@ 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");
@@ -107,7 +102,6 @@ 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,10 +66,6 @@ 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)
@@ -86,12 +82,10 @@ 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));
 
@@ -104,15 +98,12 @@ 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;
     }
@@ -123,7 +114,6 @@ 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()));
@@ -131,7 +121,6 @@ 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;
     }
@@ -147,7 +136,6 @@ 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,10 +63,6 @@ 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)
@@ -74,7 +70,6 @@ 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));
@@ -82,7 +77,6 @@ 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;
     }