Преглед на файлове

builder pattern object direct return

shjung преди 3 години
родител
ревизия
23b2f669d7
променени са 57 файла, в които са добавени 278 реда и са изтрити 379 реда
  1. 1 3
      src/main/java/com/its/api/its/model/dto/atrd/TbAtrdDto.java
  2. 4 6
      src/main/java/com/its/api/its/model/dto/atrd/TbAtrdRoadRltnDto.java
  3. 6 8
      src/main/java/com/its/api/its/model/dto/cctv/TbCctvCtlrDto.java
  4. 6 8
      src/main/java/com/its/api/its/model/dto/cctv/TbCctvMonitoringDto.java
  5. 6 6
      src/main/java/com/its/api/its/model/dto/cctv/TbCctvPsetDto.java
  6. 3 2
      src/main/java/com/its/api/its/model/dto/cctv/TbCctvScnrDto.java
  7. 4 6
      src/main/java/com/its/api/its/model/dto/code/TbClctSystStupDto.java
  8. 1 3
      src/main/java/com/its/api/its/model/dto/code/TbCmmnCdDto.java
  9. 1 3
      src/main/java/com/its/api/its/model/dto/code/TbCmmnClsfCdDto.java
  10. 4 6
      src/main/java/com/its/api/its/model/dto/code/TbCmtrGradClsfDto.java
  11. 1 3
      src/main/java/com/its/api/its/model/dto/code/TbSectGradClsfDto.java
  12. 3 5
      src/main/java/com/its/api/its/model/dto/database/TbCnctIntnDto.java
  13. 1 3
      src/main/java/com/its/api/its/model/dto/database/TbLeglHldyInfrDto.java
  14. 1 3
      src/main/java/com/its/api/its/model/dto/facility/TbFcltCmpyDto.java
  15. 2 2
      src/main/java/com/its/api/its/model/dto/facility/TbFcltInfrDto.java
  16. 7 9
      src/main/java/com/its/api/its/model/dto/ifsc/TbIfsc15mStatDto.java
  17. 6 8
      src/main/java/com/its/api/its/model/dto/ifsc/TbIfscDto.java
  18. 5 7
      src/main/java/com/its/api/its/model/dto/ifsc/TbIfscLinkRltnDto.java
  19. 5 7
      src/main/java/com/its/api/its/model/dto/ifsc/TbReptCngsSectDto.java
  20. 5 7
      src/main/java/com/its/api/its/model/dto/incident/TbIncdEstmSectDto.java
  21. 1 3
      src/main/java/com/its/api/its/model/dto/incident/TbIncdOcrrDto.java
  22. 3 5
      src/main/java/com/its/api/its/model/dto/incident/TbIncdOcrrVmsDto.java
  23. 5 7
      src/main/java/com/its/api/its/model/dto/link/TbClctSystSttsHsDto.java
  24. 7 9
      src/main/java/com/its/api/its/model/dto/link/TbLink15mStatDto.java
  25. 12 14
      src/main/java/com/its/api/its/model/dto/link/TbLinkDto.java
  26. 6 8
      src/main/java/com/its/api/its/model/dto/link/TbLinkSyopTrafDto.java
  27. 3 5
      src/main/java/com/its/api/its/model/dto/node/TbNodeDto.java
  28. 1 3
      src/main/java/com/its/api/its/model/dto/oper/TbOperSystDto.java
  29. 3 5
      src/main/java/com/its/api/its/model/dto/oper/TbOperSystMenuDto.java
  30. 1 3
      src/main/java/com/its/api/its/model/dto/oper/TbUserGropInfrDto.java
  31. 5 7
      src/main/java/com/its/api/its/model/dto/parking/ParkingLotDto.java
  32. 7 9
      src/main/java/com/its/api/its/model/dto/road/TbRoad15mStatDto.java
  33. 6 8
      src/main/java/com/its/api/its/model/dto/road/TbRoadDto.java
  34. 5 7
      src/main/java/com/its/api/its/model/dto/road/TbRoadIfscRltnDto.java
  35. 2 4
      src/main/java/com/its/api/its/model/dto/unit/TbUnitSystDto.java
  36. 5 7
      src/main/java/com/its/api/its/model/dto/vds/TbVdsCtlrDto.java
  37. 9 11
      src/main/java/com/its/api/its/model/dto/vds/TbVdsDtctDto.java
  38. 3 5
      src/main/java/com/its/api/its/model/dto/vds/TbVdsDtctLinkRltnDto.java
  39. 5 7
      src/main/java/com/its/api/its/model/dto/vms/TbVmsCmtrInfrDto.java
  40. 11 11
      src/main/java/com/its/api/its/model/dto/vms/TbVmsCtlrDto.java
  41. 3 5
      src/main/java/com/its/api/its/model/dto/vms/TbVmsFormBckghueDto.java
  42. 9 11
      src/main/java/com/its/api/its/model/dto/vms/TbVmsFormDto.java
  43. 21 23
      src/main/java/com/its/api/its/model/dto/vms/TbVmsFormObjectDto.java
  44. 4 6
      src/main/java/com/its/api/its/model/dto/vms/TbVmsFormPrrtDto.java
  45. 5 7
      src/main/java/com/its/api/its/model/dto/vms/TbVmsIfscCmtrGradDto.java
  46. 2 4
      src/main/java/com/its/api/its/model/dto/vms/TbVmsIfscDto.java
  47. 4 4
      src/main/java/com/its/api/its/model/dto/vms/TbVmsIfscRltnDto.java
  48. 5 7
      src/main/java/com/its/api/its/model/dto/vms/TbVmsLinkIfscDto.java
  49. 4 6
      src/main/java/com/its/api/its/model/dto/vms/TbVmsLumSetSchDto.java
  50. 5 7
      src/main/java/com/its/api/its/model/dto/vms/TbVmsMonitoringDto.java
  51. 17 19
      src/main/java/com/its/api/its/model/dto/vms/TbVmsMsgDsplSchDto.java
  52. 7 9
      src/main/java/com/its/api/its/model/dto/vms/TbVmsSymbIfscDto.java
  53. 3 5
      src/main/java/com/its/api/its/model/dto/vms/TbVmsSymbLibDto.java
  54. 3 4
      src/main/java/com/its/api/its/model/dto/vms/TbVmsSymbLibIfscVMP1Dto.java
  55. 3 4
      src/main/java/com/its/api/its/model/dto/vms/TbVmsSymbLibIfscVMP2Dto.java
  56. 10 12
      src/main/java/com/its/api/its/model/dto/vms/TbVmsTypeDto.java
  57. 1 3
      src/main/java/com/its/api/its/model/dto/vms/TbVmsUsagTypeDto.java

+ 1 - 3
src/main/java/com/its/api/its/model/dto/atrd/TbAtrdDto.java

@@ -96,15 +96,13 @@ public class TbAtrdDto implements Serializable {
         }
 
         public TbAtrd toEntity() {
-            TbAtrd entity = TbAtrd.builder()
+            return TbAtrd.builder()
                     .atrdId(this.atrdId)
                     .atrdNm(this.atrdNm)
                     .drctCd(this.drctCd)
                     .areaCd(this.areaCd)
                     .delYn(this.delYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 4 - 6
src/main/java/com/its/api/its/model/dto/atrd/TbAtrdRoadRltnDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 
 /**
@@ -82,12 +82,12 @@ public class TbAtrdRoadRltnDto implements Serializable {
 
         @ApiModelProperty("도로 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("road_id")
-        @Positive
+        @PositiveOrZero
         private Long roadId;
 
         @ApiModelProperty("순서, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("ord")
-        @Positive
+        @PositiveOrZero
         private Integer ord;
 
         @Builder
@@ -97,13 +97,11 @@ public class TbAtrdRoadRltnDto implements Serializable {
         }
 
         public TbAtrdRoadRltn toEntity(String atrdId) {
-            TbAtrdRoadRltn entity = TbAtrdRoadRltn.builder()
+            return TbAtrdRoadRltn.builder()
                     .atrdId(atrdId)
                     .roadId(this.roadId)
                     .ord(this.ord)
                     .build();
-
-            return entity;
         }
 
     }

+ 6 - 8
src/main/java/com/its/api/its/model/dto/cctv/TbCctvCtlrDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -190,7 +190,7 @@ public class TbCctvCtlrDto implements Serializable {
 
         @ApiModelProperty("CCTV 관리 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("cctv_mngm_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long cctvMngmNmbr;
 
         @ApiModelProperty("CCTV 제어기 ID, Nullable = Y, VARCHAR(30)")  // Y VARCHAR(30)
@@ -263,7 +263,7 @@ public class TbCctvCtlrDto implements Serializable {
 
         @ApiModelProperty("CCTV 채널, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("cctv_chnl")
-        @Positive
+        @PositiveOrZero
         private Integer cctvChnl;
 
         @ApiModelProperty("삭제 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -294,12 +294,12 @@ public class TbCctvCtlrDto implements Serializable {
 
         @ApiModelProperty("링크ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("link_id")
-        @Positive
+        @PositiveOrZero
         private Long linkId;
 
         @ApiModelProperty("노드ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("node_id")
-        @Positive
+        @PositiveOrZero
         private Long nodeId;
 
         @ApiModelProperty("공단 CCTV ID, Nullable = Y, VARCHAR(10)")  // Y VARCHAR(10)
@@ -409,7 +409,7 @@ public class TbCctvCtlrDto implements Serializable {
         }
 
         public TbCctvCtlr toEntity() {
-            TbCctvCtlr entity = TbCctvCtlr.builder()
+            return TbCctvCtlr.builder()
                     .cctvMngmNmbr(this.cctvMngmNmbr)
                     .cctvCtlrId(this.cctvCtlrId)
                     .cctvCtlrIp(this.cctvCtlrIp)
@@ -447,8 +447,6 @@ public class TbCctvCtlrDto implements Serializable {
                     .intrRtmpAddr(this.intrRtmpAddr)
                     .syopCntlYn(this.syopCntlYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 6 - 8
src/main/java/com/its/api/its/model/dto/cctv/TbCctvMonitoringDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 
 /**
@@ -62,7 +62,7 @@ public class TbCctvMonitoringDto implements Serializable {
 
         /*@ApiModelProperty("모니터링유형(1:예비,2,예비,3,영상,4:예비), Nullable = N, NUMBER(3)")  // N NUMBER(3)
         @JsonProperty("monitoring_type")
-        @Positive*/
+        @PositiveOrZero*/
         @JsonIgnore
         private Integer monitoringType;
 
@@ -74,17 +74,17 @@ public class TbCctvMonitoringDto implements Serializable {
 
         @ApiModelProperty("모니터링순서, Nullable = N, NUMBER(3)")  // N NUMBER(3)
         @JsonProperty("monitoring_seq")
-        @Positive
+        @PositiveOrZero
         private Integer monitoringSeq;
 
         @ApiModelProperty("웹카메라 제어기번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("cctv_ctlr_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long cctvCtlrNmbr;
 
         //@ApiModelProperty("화면에 보여지는 방식(0:기본,1:화면맞춤)), Nullable = Y, NUMBER(1)")  // Y NUMBER(1)
         //@JsonProperty("view_mode")
-        //@Positive
+        //@PositiveOrZero
         @JsonIgnore
         private Integer viewMode = 0;
 
@@ -98,15 +98,13 @@ public class TbCctvMonitoringDto implements Serializable {
         }
 
         public TbCctvMonitoring toEntity(Integer monitoringType, String monitoringNm) {
-            TbCctvMonitoring entity = TbCctvMonitoring.builder()
+            return TbCctvMonitoring.builder()
                     .monitoringType(monitoringType)
                     .monitoringNm(monitoringNm)
                     .monitoringSeq(this.monitoringSeq)
                     .cctvCtlrNmbr(this.cctvCtlrNmbr)
                     .viewMode(this.viewMode)
                     .build();
-
-            return entity;
         }
 
     }

+ 6 - 6
src/main/java/com/its/api/its/model/dto/cctv/TbCctvPsetDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -63,7 +63,7 @@ public class TbCctvPsetDto implements Serializable {
 
         @ApiModelProperty("CCTV 관리 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("cctv_mngm_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long cctvMngmNmbr;
 
         @ApiModelProperty("프리셋 번호, Nullable = N, VARCHAR(3)")  // N VARCHAR(3)
@@ -73,22 +73,22 @@ public class TbCctvPsetDto implements Serializable {
 
         @ApiModelProperty("팬 값, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("pan_val")
-        @Positive
+        @PositiveOrZero
         private Integer panVal;
 
         @ApiModelProperty("틸트 값, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("tilt_val")
-        @Positive
+        @PositiveOrZero
         private Integer tiltVal;
 
         @ApiModelProperty("줌 값, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("zoom_val")
-        @Positive
+        @PositiveOrZero
         private Integer zoomVal;
 
         @ApiModelProperty("초점 값, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("focs_val")
-        @Positive
+        @PositiveOrZero
         private Integer focsVal;
 
         @ApiModelProperty("프리셋 명, Nullable = Y, VARCHAR(100)")  // Y VARCHAR(100)

+ 3 - 2
src/main/java/com/its/api/its/model/dto/cctv/TbCctvScnrDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -66,7 +66,7 @@ public class TbCctvScnrDto implements Serializable {
 
         @ApiModelProperty("CCTV 관리 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("cctv_mngm_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long cctvMngmNmbr;
 
         @ApiModelProperty("시작 시각, Nullable = N, VARCHAR(6)")  // N VARCHAR(6)
@@ -101,6 +101,7 @@ public class TbCctvScnrDto implements Serializable {
                     .build();
 
             entity.initEndHms();
+
             return entity;
         }
 

+ 4 - 6
src/main/java/com/its/api/its/model/dto/code/TbClctSystStupDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -67,7 +67,7 @@ public class TbClctSystStupDto implements Serializable {
 
         @ApiModelProperty("수집 시스템 번호, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("clct_syst_nmbr")
-        @Positive
+        @PositiveOrZero
         private Short clctSystNmbr;
 
         @ApiModelProperty("수집 시스템 명, Nullable = N, VARCHAR(30)")  // N VARCHAR(30)
@@ -82,7 +82,7 @@ public class TbClctSystStupDto implements Serializable {
 
         @ApiModelProperty("수집 최대 개수, Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
         @JsonProperty("clct_max_num")
-        @Positive
+        @PositiveOrZero
         private Short clctMaxNum;
 
         @ApiModelProperty("사용 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -102,7 +102,7 @@ public class TbClctSystStupDto implements Serializable {
         }
 
         public TbClctSystStup toEntity() {
-            TbClctSystStup entity = TbClctSystStup.builder()
+            return TbClctSystStup.builder()
                     .clctSystCd(this.clctSystCd)
                     .clctSystNmbr(this.clctSystNmbr)
                     .clctSystNm(this.clctSystNm)
@@ -110,8 +110,6 @@ public class TbClctSystStupDto implements Serializable {
                     .clctMaxNum(this.clctMaxNum)
                     .useYn(this.useYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 1 - 3
src/main/java/com/its/api/its/model/dto/code/TbCmmnCdDto.java

@@ -187,7 +187,7 @@ public class TbCmmnCdDto implements Serializable {
         }
 
         public TbCmmnCd toEntity() {
-            TbCmmnCd entity = TbCmmnCd.builder()
+            return TbCmmnCd.builder()
                     .cmmnCd(this.cmmnCd)
                     .cmmnClsfCd(this.cmmnClsfCd)
                     .cmmnCdKorNm(this.cmmnCdKorNm)
@@ -202,8 +202,6 @@ public class TbCmmnCdDto implements Serializable {
                     .lastCrprNmbr(this.lastCrprNmbr)
                     .lastCrctDt(this.lastCrctDt)
                     .build();
-
-            return entity;
         }
 
     }

+ 1 - 3
src/main/java/com/its/api/its/model/dto/code/TbCmmnClsfCdDto.java

@@ -135,7 +135,7 @@ public class TbCmmnClsfCdDto implements Serializable {
         }
 
         public TbCmmnClsfCd toEntity() {
-            TbCmmnClsfCd entity = TbCmmnClsfCd.builder()
+            return TbCmmnClsfCd.builder()
                     .cmmnClsfCd(this.cmmnClsfCd)
                     .msgTypeCd(this.msgTypeCd)
                     .cmmnClsfKorNm(this.cmmnClsfKorNm)
@@ -144,8 +144,6 @@ public class TbCmmnClsfCdDto implements Serializable {
                     .rmrk(this.rmrk)
                     .useYn(this.useYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 4 - 6
src/main/java/com/its/api/its/model/dto/code/TbCmtrGradClsfDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -68,12 +68,12 @@ public class TbCmtrGradClsfDto implements Serializable {
 
         @ApiModelProperty("최저 통행 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("lwst_trvl_sped")
-        @Positive
+        @PositiveOrZero
         private Integer lwstTrvlSped;
 
         @ApiModelProperty("최고 통행 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("hghs_trvl_sped")
-        @Positive
+        @PositiveOrZero
         private Integer hghsTrvlSped;
 
         @ApiModelProperty("정체 등급 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -92,15 +92,13 @@ public class TbCmtrGradClsfDto implements Serializable {
         }
 
         public TbCmtrGradClsf toEntity() {
-            TbCmtrGradClsf entity = TbCmtrGradClsf.builder()
+            return TbCmtrGradClsf.builder()
                     .sectGradCd(this.sectGradCd)
                     .cmtrGradCd(this.cmtrGradCd)
                     .lwstTrvlSped(this.lwstTrvlSped)
                     .hghsTrvlSped(this.hghsTrvlSped)
                     .cngsGradYn(this.cngsGradYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 1 - 3
src/main/java/com/its/api/its/model/dto/code/TbSectGradClsfDto.java

@@ -55,12 +55,10 @@ public class TbSectGradClsfDto implements Serializable {
         }
 
         public TbSectGradClsf toEntity() {
-            TbSectGradClsf entity = TbSectGradClsf.builder()
+            return TbSectGradClsf.builder()
                     .sectGradCd(this.sectGradCd)
                     .sectGradNm(this.sectGradNm)
                     .build();
-
-            return entity;
         }
 
     }

+ 3 - 5
src/main/java/com/its/api/its/model/dto/database/TbCnctIntnDto.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -63,7 +63,7 @@ public class TbCnctIntnDto implements Serializable {
 
         @ApiModelProperty("연계 기관 관리 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("cnct_intn_mngm_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long cnctIntnMngmNmbr;
 
         @ApiModelProperty("연계 기관 명, Nullable = Y, VARCHAR(50)")  // Y VARCHAR(50)
@@ -109,7 +109,7 @@ public class TbCnctIntnDto implements Serializable {
         }
 
         public TbCnctIntn toEntity() {
-            TbCnctIntn entity = TbCnctIntn.builder()
+            return TbCnctIntn.builder()
                     .cnctIntnMngmNmbr(this.cnctIntnMngmNmbr)
                     .cnctIntnNm(this.cnctIntnNm)
                     .cnctIntnTypeCd(this.cnctIntnTypeCd)
@@ -118,8 +118,6 @@ public class TbCnctIntnDto implements Serializable {
                     .rmrk(this.rmrk)
                     .delYn(this.delYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 1 - 3
src/main/java/com/its/api/its/model/dto/database/TbLeglHldyInfrDto.java

@@ -76,14 +76,12 @@ public class TbLeglHldyInfrDto implements Serializable {
         }
 
         public TbLeglHldyInfr toEntity() {
-            TbLeglHldyInfr entity = TbLeglHldyInfr.builder()
+            return TbLeglHldyInfr.builder()
                     .ymd(this.ymd)
                     .dayTypeCd(this.dayTypeCd)
                     .leglHldyNm(this.leglHldyNm)
                     .rmrk(this.rmrk)
                     .build();
-
-            return entity;
         }
 
     }

+ 1 - 3
src/main/java/com/its/api/its/model/dto/facility/TbFcltCmpyDto.java

@@ -193,7 +193,7 @@ public class TbFcltCmpyDto implements Serializable {
         }
 
         public TbFcltCmpy toEntity() {
-            TbFcltCmpy entity = TbFcltCmpy.builder()
+            return TbFcltCmpy.builder()
                     .cmpyId(this.cmpyId)
                     .cmpyNm(this.cmpyNm)
                     .brno(this.brno)
@@ -210,8 +210,6 @@ public class TbFcltCmpyDto implements Serializable {
                     .chngDt(this.chngDt)
                     .delYn(this.delYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 2 - 2
src/main/java/com/its/api/its/model/dto/facility/TbFcltInfrDto.java

@@ -165,7 +165,7 @@ public class TbFcltInfrDto implements Serializable {
 
         @ApiModelProperty("사용 년수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("use_year")
-        //@Positive
+        //@PositiveOrZero
         private Integer useYear;
 
         @ApiModelProperty("입고 일시, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
@@ -225,7 +225,7 @@ public class TbFcltInfrDto implements Serializable {
 
         @ApiModelProperty("금액, Nullable = Y, NUMBER(15)")  // Y NUMBER(15)
         @JsonProperty("amt")
-        //@Positive
+        //@PositiveOrZero
         private Long amt;
 
         @ApiModelProperty("삭제 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)

+ 7 - 9
src/main/java/com/its/api/its/model/dto/ifsc/TbIfsc15mStatDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -65,7 +65,7 @@ public class TbIfsc15mStatDto implements Serializable {
 
         @ApiModelProperty("정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long ifscId;
 
         @ApiModelProperty("통계 일시, Nullable = N, VARCHAR(14)")  // N VARCHAR(14)
@@ -80,12 +80,12 @@ public class TbIfsc15mStatDto implements Serializable {
 
         @ApiModelProperty("교통량, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("tfvl")
-        @Positive
+        @PositiveOrZero
         private Integer tfvl;
 
         @ApiModelProperty("속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("sped")
-        @Positive
+        @PositiveOrZero
         private Integer sped;
 
         @ApiModelProperty("점유 율, , NUMBER(5,2)")  // Y NUMBER(5,2)
@@ -94,12 +94,12 @@ public class TbIfsc15mStatDto implements Serializable {
 
         @ApiModelProperty("통행 시간, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("trvl_hh")
-        @Positive
+        @PositiveOrZero
         private Integer trvlHh;
 
         @ApiModelProperty("데이터 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("data_num")
-        @Positive
+        @PositiveOrZero
         private Integer dataNum;
 
         @Builder
@@ -115,7 +115,7 @@ public class TbIfsc15mStatDto implements Serializable {
         }
 
         public TbIfsc15mStat toEntity() {
-            TbIfsc15mStat entity = TbIfsc15mStat.builder()
+            return TbIfsc15mStat.builder()
                     .ifscId(this.ifscId)
                     .statDt(this.statDt)
                     .dayTypeCd(this.dayTypeCd)
@@ -125,8 +125,6 @@ public class TbIfsc15mStatDto implements Serializable {
                     .trvlHh(this.trvlHh)
                     .dataNum(this.dataNum)
                     .build();
-
-            return entity;
         }
 
     }

+ 6 - 8
src/main/java/com/its/api/its/model/dto/ifsc/TbIfscDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -97,7 +97,7 @@ public class TbIfscDto implements Serializable {
 
         @ApiModelProperty("정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long ifscId;
 
         @ApiModelProperty("정보제공구간 명, Nullable = Y, VARCHAR(100)")  // Y VARCHAR(100)
@@ -122,7 +122,7 @@ public class TbIfscDto implements Serializable {
 
         @ApiModelProperty("구간 길이, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("sect_lngt")
-        @Positive
+        @PositiveOrZero
         private Integer sectLngt;
 
         @ApiModelProperty("외부 연계 구간 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -144,12 +144,12 @@ public class TbIfscDto implements Serializable {
 
         @ApiModelProperty("시작 노드 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("f_node_id")
-        @Positive
+        @PositiveOrZero
         private Long fNodeId;
 
         @ApiModelProperty("종료 노드 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("t_node_id")
-        @Positive
+        @PositiveOrZero
         private Long tNodeId;
 
         @ApiModelProperty("구간 등급 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
@@ -180,7 +180,7 @@ public class TbIfscDto implements Serializable {
         }
 
         public TbIfsc toEntity() {
-            TbIfsc entity = TbIfsc.builder()
+            return TbIfsc.builder()
                     .ifscId(this.ifscId)
                     .ifscNm(this.ifscNm)
                     .drctCd(this.drctCd)
@@ -195,8 +195,6 @@ public class TbIfscDto implements Serializable {
                     .sectGradCd(this.sectGradCd)
                     .areaCd(this.areaCd)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/ifsc/TbIfscLinkRltnDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 
 /**
@@ -93,17 +93,17 @@ public class TbIfscLinkRltnDto implements Serializable {
 /*
         @ApiModelProperty("정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long ifscId;*/
 
         @ApiModelProperty("링크ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("link_id")
-        @Positive
+        @PositiveOrZero
         private Long linkId;
 
         @ApiModelProperty("순서, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("ord")
-        @Positive
+        @PositiveOrZero
         private Integer ord;
 
         @Builder
@@ -113,13 +113,11 @@ public class TbIfscLinkRltnDto implements Serializable {
         }
 
         public TbIfscLinkRltn toEntity(Long ifscId) {
-            TbIfscLinkRltn entity = TbIfscLinkRltn.builder()
+            return TbIfscLinkRltn.builder()
                     .ifscId(ifscId)
                     .linkId(this.linkId)
                     .ord(this.ord)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/ifsc/TbReptCngsSectDto.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -91,7 +91,7 @@ public class TbReptCngsSectDto implements Serializable {
 
         @ApiModelProperty("정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long ifscId;
 
         /*@ApiModelProperty("통계 년월, Nullable = N, VARCHAR(6)")  // N VARCHAR(6)
@@ -117,12 +117,12 @@ public class TbReptCngsSectDto implements Serializable {
 
         @ApiModelProperty("평균 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("avrg_sped")
-        @Positive
+        @PositiveOrZero
         private Integer avrgSped;
 
         @ApiModelProperty("평균 통행 시간, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("avrg_trvl_hh")
-        @Positive
+        @PositiveOrZero
         private Integer avrgTrvlHh;
 
         /*@ApiModelProperty("확정 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -159,7 +159,7 @@ public class TbReptCngsSectDto implements Serializable {
         }
 
         public TbReptCngsSect toEntity() {
-            TbReptCngsSect entity = TbReptCngsSect.builder()
+            return TbReptCngsSect.builder()
                     .ifscId(this.ifscId)
                     .statYm(this.statYm)
                     .dayTypeCd(this.dayTypeCd)
@@ -171,8 +171,6 @@ public class TbReptCngsSectDto implements Serializable {
                     .crtnYmd(this.crtnYmd)
                     .reptCngsSectOrgnCd(this.reptCngsSectOrgnCd)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/incident/TbIncdEstmSectDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -74,7 +74,7 @@ public class TbIncdEstmSectDto implements Serializable {
 
         @ApiModelProperty("링크ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("link_id")
-        @Positive
+        @PositiveOrZero
         private Long linkId;
 
         @ApiModelProperty("검지 일시, Nullable = N, VARCHAR(14)")  // N VARCHAR(14)
@@ -84,12 +84,12 @@ public class TbIncdEstmSectDto implements Serializable {
 
         @ApiModelProperty("수집 속도 평균, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("clct_sped_avrg")
-        @Positive
+        @PositiveOrZero
         private Integer clctSpedAvrg;
 
         @ApiModelProperty("예상 속도 평균, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("estm_sped_avrg")
-        @Positive
+        @PositiveOrZero
         private Integer estmSpedAvrg;
 
         @ApiModelProperty("사실 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -108,15 +108,13 @@ public class TbIncdEstmSectDto implements Serializable {
         }
 
         public TbIncdEstmSect toEntity() {
-            TbIncdEstmSect entity = TbIncdEstmSect.builder()
+            return TbIncdEstmSect.builder()
                     .linkId(this.linkId)
                     .detcDt(this.detcDt)
                     .clctSpedAvrg(this.clctSpedAvrg)
                     .estmSpedAvrg(this.estmSpedAvrg)
                     .realYn(this.realYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 1 - 3
src/main/java/com/its/api/its/model/dto/incident/TbIncdOcrrDto.java

@@ -510,7 +510,7 @@ public class TbIncdOcrrDto implements Serializable {
         }
 
         public TbIncdOcrr toEntity() {
-            TbIncdOcrr entity = TbIncdOcrr.builder()
+            return TbIncdOcrr.builder()
                     .incdOcrrId(this.incdOcrrId)
                     .rgstDt(this.rgstDt)
                     .incdOrgnCd(this.incdOrgnCd)
@@ -553,8 +553,6 @@ public class TbIncdOcrrDto implements Serializable {
                     .recrPerd(this.recrPerd)
                     .linkId(this.linkId)
                     .build();
-
-            return entity;
         }
 
     }

+ 3 - 5
src/main/java/com/its/api/its/model/dto/incident/TbIncdOcrrVmsDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -163,7 +163,7 @@ public class TbIncdOcrrVmsDto implements Serializable {
 
         @ApiModelProperty("링크ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("link_id")
-        @Positive
+        @PositiveOrZero
         private Long linkId;
 
         @Builder
@@ -184,7 +184,7 @@ public class TbIncdOcrrVmsDto implements Serializable {
         }
 
         public TbIncdOcrrVms toEntity() {
-            TbIncdOcrrVms entity = TbIncdOcrrVms.builder()
+            return TbIncdOcrrVms.builder()
                     .incdOcrrId(this.incdOcrrId)
                     .strtLctnNm(this.strtLctnNm)
                     .endLctnNm(this.endLctnNm)
@@ -199,8 +199,6 @@ public class TbIncdOcrrVmsDto implements Serializable {
                     .incdEndPrarDt(this.incdEndPrarDt)
                     .linkId(this.linkId)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/link/TbClctSystSttsHsDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -63,17 +63,17 @@ public class TbClctSystSttsHsDto implements Serializable {
 
         @ApiModelProperty("수집 개수, Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
         @JsonProperty("clct_num")
-        @Positive
+        @PositiveOrZero
         private Integer clctNum;
 
         @ApiModelProperty("필터링 개수, Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
         @JsonProperty("fltr_num")
-        @Positive
+        @PositiveOrZero
         private Integer fltrNum;
 
         @ApiModelProperty("퓨전 개수, Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
         @JsonProperty("fusn_num")
-        @Positive
+        @PositiveOrZero
         private Integer fusnNum;
 
         @Builder
@@ -86,15 +86,13 @@ public class TbClctSystSttsHsDto implements Serializable {
         }
 
         public TbClctSystSttsHs toEntity() {
-            TbClctSystSttsHs entity = TbClctSystSttsHs.builder()
+            return TbClctSystSttsHs.builder()
                     .clctSystCd(this.clctSystCd)
                     .prcnDt(this.prcnDt)
                     .clctNum(this.clctNum)
                     .fltrNum(this.fltrNum)
                     .fusnNum(this.fusnNum)
                     .build();
-
-            return entity;
         }
 
     }

+ 7 - 9
src/main/java/com/its/api/its/model/dto/link/TbLink15mStatDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -65,7 +65,7 @@ public class TbLink15mStatDto implements Serializable {
 
         @ApiModelProperty("링크ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("link_id")
-        @Positive
+        @PositiveOrZero
         private Long linkId;
 
         @ApiModelProperty("통계 일시, Nullable = N, VARCHAR(14)")  // N VARCHAR(14)
@@ -80,12 +80,12 @@ public class TbLink15mStatDto implements Serializable {
 
         @ApiModelProperty("교통량, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("tfvl")
-        @Positive
+        @PositiveOrZero
         private Integer tfvl;
 
         @ApiModelProperty("속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("sped")
-        @Positive
+        @PositiveOrZero
         private Integer sped;
 
         @ApiModelProperty("점유 율, , NUMBER(5,2)")  // Y NUMBER(5,2)
@@ -94,12 +94,12 @@ public class TbLink15mStatDto implements Serializable {
 
         @ApiModelProperty("통행 시간, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("trvl_hh")
-        @Positive
+        @PositiveOrZero
         private Integer trvlHh;
 
         @ApiModelProperty("데이터 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("data_num")
-        @Positive
+        @PositiveOrZero
         private Integer dataNum;
 
         @Builder
@@ -115,7 +115,7 @@ public class TbLink15mStatDto implements Serializable {
         }
 
         public TbLink15mStat toEntity() {
-            TbLink15mStat entity = TbLink15mStat.builder()
+            return TbLink15mStat.builder()
                     .linkId(this.linkId)
                     .statDt(this.statDt)
                     .dayTypeCd(this.dayTypeCd)
@@ -125,8 +125,6 @@ public class TbLink15mStatDto implements Serializable {
                     .trvlHh(this.trvlHh)
                     .dataNum(this.dataNum)
                     .build();
-
-            return entity;
         }
 
     }

+ 12 - 14
src/main/java/com/its/api/its/model/dto/link/TbLinkDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -166,17 +166,17 @@ public class TbLinkDto implements Serializable {
 
         @ApiModelProperty("링크ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("link_id")
-        @Positive
+        @PositiveOrZero
         private Long linkId;
 
         @ApiModelProperty("시작노드ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("f_node_id")
-        @Positive
+        @PositiveOrZero
         private Long fNodeId;
 
         @ApiModelProperty("종료노드ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("t_node_id")
-        @Positive
+        @PositiveOrZero
         private Long tNodeId;
 
         @ApiModelProperty("도로사용여부, Nullable = N, VARCHAR(1)")  // N VARCHAR(1)
@@ -186,7 +186,7 @@ public class TbLinkDto implements Serializable {
 
         @ApiModelProperty("차로수, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("lanes")
-        @Positive
+        @PositiveOrZero
         private Integer lanes;
 
         @ApiModelProperty("도로등급, Nullable = Y, VARCHAR(3)")  // Y VARCHAR(3)
@@ -221,7 +221,7 @@ public class TbLinkDto implements Serializable {
 
         @ApiModelProperty("최고제한속도, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("max_spd")
-        @Positive
+        @PositiveOrZero
         private Integer maxSpd;
 
         @ApiModelProperty("통행제한차량, Nullable = Y, VARCHAR(3)")  // Y VARCHAR(3)
@@ -231,17 +231,17 @@ public class TbLinkDto implements Serializable {
 
         @ApiModelProperty("통과제한하중, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("rest_w")
-        @Positive
+        @PositiveOrZero
         private Integer restW;
 
         @ApiModelProperty("통과제한높이, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("rest_h")
-        @Positive
+        @PositiveOrZero
         private Integer restH;
 
         @ApiModelProperty("연장, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("link_leng")
-        @Positive
+        @PositiveOrZero
         private Integer linkLeng;
 
         @ApiModelProperty("비고, Nullable = Y, VARCHAR(50)")  // Y VARCHAR(50)
@@ -257,7 +257,7 @@ public class TbLinkDto implements Serializable {
 
         @ApiModelProperty("디폴트 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("dflt_sped")
-        @Positive
+        @PositiveOrZero
         private Integer dfltSped;
 
         @ApiModelProperty("디폴트 속도 사용 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -278,7 +278,7 @@ public class TbLinkDto implements Serializable {
 
         @ApiModelProperty("파라미터ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("para_id")
-        @Positive
+        @PositiveOrZero
         private Long paraId;
 
         @Builder
@@ -309,7 +309,7 @@ public class TbLinkDto implements Serializable {
         }
 
         public TbLink toEntity() {
-            TbLink entity = TbLink.builder()
+            return TbLink.builder()
                     .linkId(this.linkId)
                     .fNodeId(this.fNodeId)
                     .tNodeId(this.tNodeId)
@@ -334,8 +334,6 @@ public class TbLinkDto implements Serializable {
                     .areaCd(this.areaCd)
                     .paraId(this.paraId)
                     .build();
-
-            return entity;
         }
 
     }

+ 6 - 8
src/main/java/com/its/api/its/model/dto/link/TbLinkSyopTrafDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -72,7 +72,7 @@ public class TbLinkSyopTrafDto implements Serializable {
 
         @ApiModelProperty("링크ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("link_id")
-        @Positive
+        @PositiveOrZero
         private Long linkId;
 
         @ApiModelProperty("생성 일시, Nullable = N, VARCHAR(14)")  // N VARCHAR(14)
@@ -92,12 +92,12 @@ public class TbLinkSyopTrafDto implements Serializable {
 
         @ApiModelProperty("교통량, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("tfvl")
-        @Positive
+        @PositiveOrZero
         private Integer tfvl;
 
         @ApiModelProperty("속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("sped")
-        @Positive
+        @PositiveOrZero
         private Integer sped;
 
         @ApiModelProperty("점유 율, , NUMBER(5,2)")  // Y NUMBER(5,2)
@@ -106,7 +106,7 @@ public class TbLinkSyopTrafDto implements Serializable {
 
         @ApiModelProperty("통행 시간, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("trvl_hh")
-        @Positive
+        @PositiveOrZero
         private Integer trvlHh;
 
         @Builder
@@ -122,7 +122,7 @@ public class TbLinkSyopTrafDto implements Serializable {
         }
 
         public TbLinkSyopTraf toEntity() {
-            TbLinkSyopTraf entity = TbLinkSyopTraf.builder()
+            return TbLinkSyopTraf.builder()
                     .linkId(this.linkId)
                     .crtnDt(this.crtnDt)
                     .aplyStrtDt(this.aplyStrtDt)
@@ -132,8 +132,6 @@ public class TbLinkSyopTrafDto implements Serializable {
                     .ocpyRate(this.ocpyRate)
                     .trvlHh(this.trvlHh)
                     .build();
-
-            return entity;
         }
 
     }

+ 3 - 5
src/main/java/com/its/api/its/model/dto/node/TbNodeDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -65,7 +65,7 @@ public class TbNodeDto implements Serializable {
 
         @ApiModelProperty("노드ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("node_id")
-        @Positive
+        @PositiveOrZero
         private Long nodeId;
 
         @ApiModelProperty("노드유형, Nullable = Y, VARCHAR(3)")  // Y VARCHAR(3)
@@ -109,7 +109,7 @@ public class TbNodeDto implements Serializable {
         }
 
         public TbNode toEntity() {
-            TbNode entity = TbNode.builder()
+            return TbNode.builder()
                     .nodeId(this.nodeId)
                     .nodeType(this.nodeType)
                     .nodeName(this.nodeName)
@@ -118,8 +118,6 @@ public class TbNodeDto implements Serializable {
                     .xCrdn(this.xCrdn)
                     .yCrdn(this.yCrdn)
                     .build();
-
-            return entity;
         }
 
     }

+ 1 - 3
src/main/java/com/its/api/its/model/dto/oper/TbOperSystDto.java

@@ -81,14 +81,12 @@ public class TbOperSystDto implements Serializable {
         }
 
         public TbOperSyst toEntity() {
-            TbOperSyst entity = TbOperSyst.builder()
+            return TbOperSyst.builder()
                     .operSystId(this.operSystId)
                     .operSystName(this.operSystName)
                     .crtnDt(this.crtnDt)
                     .delYn(this.delYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 3 - 5
src/main/java/com/its/api/its/model/dto/oper/TbOperSystMenuDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -67,7 +67,7 @@ public class TbOperSystMenuDto implements Serializable {
 
         @ApiModelProperty("메뉴레벨, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("menu_levl")
-        @Positive
+        @PositiveOrZero
         private Integer menuLevl;
 
         @ApiModelProperty("운영시스템ID, Nullable = Y, VARCHAR(30)")  // Y VARCHAR(30)
@@ -85,15 +85,13 @@ public class TbOperSystMenuDto implements Serializable {
         }
 
         public TbOperSystMenu toEntity() {
-            TbOperSystMenu entity = TbOperSystMenu.builder()
+            return TbOperSystMenu.builder()
                     .operSystMenuId(this.operSystMenuId)
                     .menuName(this.menuName)
                     .delYn(this.delYn)
                     .menuLevl(this.menuLevl)
                     .operSystId(this.operSystId)
                     .build();
-
-            return entity;
         }
 
     }

+ 1 - 3
src/main/java/com/its/api/its/model/dto/oper/TbUserGropInfrDto.java

@@ -77,14 +77,12 @@ public class TbUserGropInfrDto implements Serializable {
         }
 
         public TbUserGropInfr toEntity() {
-            TbUserGropInfr entity = TbUserGropInfr.builder()
+            return TbUserGropInfr.builder()
                     .gropId(this.gropId)
                     .gropNm(this.gropNm)
                     .expl(this.expl)
                     .delYn(this.delYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/parking/ParkingLotDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -109,17 +109,17 @@ public class ParkingLotDto implements Serializable {
 
         @ApiModelProperty("주차면수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("parkingcnt")
-        @Positive
+        @PositiveOrZero
         private Integer parkingCnt;
 
         @ApiModelProperty("위치X, Nullable = Y, NUMBER(11,8)")  // Y NUMBER(0)
         @JsonProperty("coordx")
-        @Positive
+        @PositiveOrZero
         private Double coordx;
 
         @ApiModelProperty("위치Y, Nullable = Y, NUMBER(10,8)")  // Y NUMBER(0)
         @JsonProperty("coordy")
-        @Positive
+        @PositiveOrZero
         private Double coordy;
 
         //@ApiModelProperty("주차정보플래그, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -168,7 +168,7 @@ public class ParkingLotDto implements Serializable {
         }
 
         public ParkingLot toEntity() {
-            ParkingLot entity = ParkingLot.builder()
+            return ParkingLot.builder()
                     .parkingId(this.parkingId)
                     .parkingName(this.parkingName)
                     .location(this.location)
@@ -183,8 +183,6 @@ public class ParkingLotDto implements Serializable {
                     .eLocation(this.eLocation)
                     .eAddress(this.eAddress)
                     .build();
-
-            return entity;
         }
 
     }

+ 7 - 9
src/main/java/com/its/api/its/model/dto/road/TbRoad15mStatDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -65,7 +65,7 @@ public class TbRoad15mStatDto implements Serializable {
 
         @ApiModelProperty("도로 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("road_id")
-        @Positive
+        @PositiveOrZero
         private Long roadId;
 
         @ApiModelProperty("통계 일시, Nullable = N, VARCHAR(14)")  // N VARCHAR(14)
@@ -80,12 +80,12 @@ public class TbRoad15mStatDto implements Serializable {
 
         @ApiModelProperty("교통량, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("tfvl")
-        @Positive
+        @PositiveOrZero
         private Integer tfvl;
 
         @ApiModelProperty("속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("sped")
-        @Positive
+        @PositiveOrZero
         private Integer sped;
 
         @ApiModelProperty("점유 율, , NUMBER(5,2)")  // Y NUMBER(5,2)
@@ -94,12 +94,12 @@ public class TbRoad15mStatDto implements Serializable {
 
         @ApiModelProperty("통행 시간, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("trvl_hh")
-        @Positive
+        @PositiveOrZero
         private Integer trvlHh;
 
         @ApiModelProperty("데이터 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("data_num")
-        @Positive
+        @PositiveOrZero
         private Integer dataNum;
 
         @Builder
@@ -115,7 +115,7 @@ public class TbRoad15mStatDto implements Serializable {
         }
 
         public TbRoad15mStat toEntity() {
-            TbRoad15mStat entity = TbRoad15mStat.builder()
+            return TbRoad15mStat.builder()
                     .roadId(this.roadId)
                     .statDt(this.statDt)
                     .dayTypeCd(this.dayTypeCd)
@@ -125,8 +125,6 @@ public class TbRoad15mStatDto implements Serializable {
                     .trvlHh(this.trvlHh)
                     .dataNum(this.dataNum)
                     .build();
-
-            return entity;
         }
 
     }

+ 6 - 8
src/main/java/com/its/api/its/model/dto/road/TbRoadDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -89,7 +89,7 @@ public class TbRoadDto implements Serializable {
 
         @ApiModelProperty("도로 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("road_id")
-        @Positive
+        @PositiveOrZero
         private Long roadId;
 
         @ApiModelProperty("도로명, Nullable = Y, VARCHAR(50)")  // Y VARCHAR(50)
@@ -120,17 +120,17 @@ public class TbRoadDto implements Serializable {
 
         @ApiModelProperty("구간 길이, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("sect_lngt")
-        @Positive
+        @PositiveOrZero
         private Integer sectLngt;
 
         @ApiModelProperty("시작 노드 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("f_node_id")
-        @Positive
+        @PositiveOrZero
         private Long fNodeId;
 
         @ApiModelProperty("종료 노드 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("t_node_id")
-        @Positive
+        @PositiveOrZero
         private Long tNodeId;
 
         @ApiModelProperty("구간 등급 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
@@ -159,7 +159,7 @@ public class TbRoadDto implements Serializable {
         }
 
         public TbRoad toEntity() {
-            TbRoad entity = TbRoad.builder()
+            return TbRoad.builder()
                     .roadId(this.roadId)
                     .roadName(this.roadName)
                     .drctCd(this.drctCd)
@@ -172,8 +172,6 @@ public class TbRoadDto implements Serializable {
                     .sectGradCd(this.sectGradCd)
                     .areaCd(this.areaCd)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/road/TbRoadIfscRltnDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 
 /**
@@ -81,17 +81,17 @@ public class TbRoadIfscRltnDto implements Serializable {
 
         /*@ApiModelProperty("도로 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("road_id")
-        @Positive
+        @PositiveOrZero
         private Long roadId;*/
 
         @ApiModelProperty("정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long ifscId;
 
         @ApiModelProperty("순서, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("ord")
-        @Positive
+        @PositiveOrZero
         private Integer ord;
 
         @Builder
@@ -101,13 +101,11 @@ public class TbRoadIfscRltnDto implements Serializable {
         }
 
         public TbRoadIfscRltn toEntity(Long roadId) {
-            TbRoadIfscRltn entity = TbRoadIfscRltn.builder()
+            return TbRoadIfscRltn.builder()
                     .roadId(roadId)
                     .ifscId(this.ifscId)
                     .ord(this.ord)
                     .build();
-
-            return entity;
         }
 
     }

+ 2 - 4
src/main/java/com/its/api/its/model/dto/unit/TbUnitSystDto.java

@@ -87,7 +87,7 @@ public class TbUnitSystDto implements Serializable {
 
         @ApiModelProperty("시스템 번호, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("syst_nmbr")
-        //@Positive
+        //@PositiveOrZero
         private Integer systNmbr;
 
         @ApiModelProperty("시스템 명, Nullable = Y, VARCHAR(100)")  // Y VARCHAR(100)
@@ -148,7 +148,7 @@ public class TbUnitSystDto implements Serializable {
         }
 
         public TbUnitSyst toEntity() {
-            TbUnitSyst entity = TbUnitSyst.builder()
+            return TbUnitSyst.builder()
                     .systId(this.systId)
                     .systType(this.systType)
                     .systNmbr(this.systNmbr)
@@ -161,8 +161,6 @@ public class TbUnitSystDto implements Serializable {
                     .delYn(this.delYn)
                     .sttsDsplYn(this.sttsDsplYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/vds/TbVdsCtlrDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -134,17 +134,17 @@ public class TbVdsCtlrDto implements Serializable {
 
         @ApiModelProperty("제어기 수집 주기, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("ctlr_clct_cycl")
-        @Positive
+        @PositiveOrZero
         private Integer ctlrClctCycl;
 
         @ApiModelProperty("제어기 상태 주기, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("ctlr_stts_cycl")
-        @Positive
+        @PositiveOrZero
         private Integer ctlrSttsCycl;
 
         @ApiModelProperty("루프 보드 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("loop_bord_num")
-        @Positive
+        @PositiveOrZero
         private Integer loopBordNum;
 
         @ApiModelProperty("삭제 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -171,7 +171,7 @@ public class TbVdsCtlrDto implements Serializable {
         }
 
         public TbVdsCtlr toEntity() {
-            TbVdsCtlr entity = TbVdsCtlr.builder()
+            return TbVdsCtlr.builder()
                     .ctlrMngmNmbr(this.ctlrMngmNmbr)
                     .vdsCtlrId(this.vdsCtlrId)
                     .ctlrTypeCd(this.ctlrTypeCd)
@@ -186,8 +186,6 @@ public class TbVdsCtlrDto implements Serializable {
                     .loopBordNum(this.loopBordNum)
                     .delYn(this.delYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 9 - 11
src/main/java/com/its/api/its/model/dto/vds/TbVdsDtctDto.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -157,12 +157,12 @@ public class TbVdsDtctDto implements Serializable {
 
         @ApiModelProperty("정지선 거리, Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
         @JsonProperty("stln_dstc")
-        @Positive
+        @PositiveOrZero
         private Integer stlnDstc;
 
         @ApiModelProperty("설치 차로, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("istl_lane")
-        @Positive
+        @PositiveOrZero
         private Integer istlLane;
 
         @ApiModelProperty("DET 번호, Nullable = Y, VARCHAR(1)")  // Y VARCHAR(1)
@@ -172,22 +172,22 @@ public class TbVdsDtctDto implements Serializable {
 
         @ApiModelProperty("감도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("snst")
-        @Positive
+        @PositiveOrZero
         private Integer snst;
 
         @ApiModelProperty("검지기 유효 거리, Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
         @JsonProperty("dtct_vald_dstc")
-        @Positive
+        @PositiveOrZero
         private Integer dtctValdDstc;
 
         @ApiModelProperty("중형차 상한 길이, Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
         @JsonProperty("mdvh_uplm_lngt")
-        @Positive
+        @PositiveOrZero
         private Integer mdvhUplmLngt;
 
         @ApiModelProperty("중형차 하한 길이, Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
         @JsonProperty("mdvh_lwlm_lngt")
-        @Positive
+        @PositiveOrZero
         private Integer mdvhLwlmLngt;
 
         @ApiModelProperty("사용 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -243,7 +243,7 @@ public class TbVdsDtctDto implements Serializable {
 
         @ApiModelProperty("링크ID")  // N NUMBER(10)
         @JsonProperty("link_id")
-        @Positive
+        @PositiveOrZero
         private Long linkId;
 
         @Builder
@@ -272,7 +272,7 @@ public class TbVdsDtctDto implements Serializable {
         }
 
         public TbVdsDtct toEntity() {
-            TbVdsDtct entity = TbVdsDtct.builder()
+            return TbVdsDtct.builder()
                     .dtctNmbr(this.dtctNmbr)
                     .dtctTypeCd(this.dtctTypeCd)
                     .stlnDstc(this.stlnDstc)
@@ -294,8 +294,6 @@ public class TbVdsDtctDto implements Serializable {
                     .maxSped(this.maxSped)
                     .minSped(this.minSped)
                     .build();
-
-            return entity;
         }
 
     }

+ 3 - 5
src/main/java/com/its/api/its/model/dto/vds/TbVdsDtctLinkRltnDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -42,7 +42,7 @@ public class TbVdsDtctLinkRltnDto implements Serializable {
 
         @ApiModelProperty("링크ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("link_id")
-        @Positive
+        @PositiveOrZero
         private Long linkId;
 
         @Builder
@@ -52,12 +52,10 @@ public class TbVdsDtctLinkRltnDto implements Serializable {
         }
 
         public TbVdsDtctLinkRltn toEntity() {
-            TbVdsDtctLinkRltn entity = TbVdsDtctLinkRltn.builder()
+            return TbVdsDtctLinkRltn.builder()
                     .dtctNmbr(this.dtctNmbr)
                     .linkId(this.linkId)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/vms/TbVmsCmtrInfrDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -65,7 +65,7 @@ public class TbVmsCmtrInfrDto implements Serializable {
 
         @ApiModelProperty("VMS 정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long vmsIfscId;
 
         @ApiModelProperty("등록 일시, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
@@ -75,7 +75,7 @@ public class TbVmsCmtrInfrDto implements Serializable {
 
         @ApiModelProperty("속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("sped")
-        @Positive
+        @PositiveOrZero
         private Integer sped;
 
         @ApiModelProperty("소통 등급 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
@@ -85,7 +85,7 @@ public class TbVmsCmtrInfrDto implements Serializable {
 
         @ApiModelProperty("통행 시간, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
         @JsonProperty("trvl_hh")
-        @Positive
+        @PositiveOrZero
         private Integer trvlHh;
 
         @Builder
@@ -98,15 +98,13 @@ public class TbVmsCmtrInfrDto implements Serializable {
         }
 
         public TbVmsCmtrInfr toEntity() {
-            TbVmsCmtrInfr entity = TbVmsCmtrInfr.builder()
+            return TbVmsCmtrInfr.builder()
                     .vmsIfscId(this.vmsIfscId)
                     .rgstDt(this.rgstDt)
                     .sped(this.sped)
                     .cmtrGradCd(this.cmtrGradCd)
                     .trvlHh(this.trvlHh)
                     .build();
-
-            return entity;
         }
 
     }

+ 11 - 11
src/main/java/com/its/api/its/model/dto/vms/TbVmsCtlrDto.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -239,7 +239,7 @@ public class TbVmsCtlrDto implements Serializable {
 
         @ApiModelProperty("VMS 제어기 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ctlr_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long vmsCtlrNmbr;
 
         @ApiModelProperty("VMS ID, Nullable = Y, VARCHAR(4)")  // Y VARCHAR(4)
@@ -294,37 +294,37 @@ public class TbVmsCtlrDto implements Serializable {
 
         @ApiModelProperty("VMS 통신 오류 기본 값, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("vms_cmnc_err_bass_val")
-        @Positive
+        @PositiveOrZero
         private Integer vmsCmncErrBassVal;
 
         @ApiModelProperty("VMS 야간 휘도 단계, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("vms_nght_brgh_step")
-        @Positive
+        @PositiveOrZero
         private Integer vmsNghtBrghStep;
 
         @ApiModelProperty("VMS 주간 휘도 단계, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("vms_week_brgh_step")
-        @Positive
+        @PositiveOrZero
         private Integer vmsWeekBrghStep;
 
         @ApiModelProperty("VMS 표출면 변경 주기, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("vms_phse_chng_cycl")
-        @Positive
+        @PositiveOrZero
         private Integer vmsPhseChngCycl;
 
         @ApiModelProperty("VMS 모듈 오류 율, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("vms_modl_err_rate")
-        @Positive
+        @PositiveOrZero
         private Integer vmsModlErrRate;
 
         @ApiModelProperty("통신장애 SLOT 번호, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("cmncfail_slot_nmbr")
-        @Positive
+        @PositiveOrZero
         private Integer cmncfailSlotNmbr;
 
         @ApiModelProperty("전원 장애 SLOT 번호, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("pwer_fail_slot_nmbr")
-        @Positive
+        @PositiveOrZero
         private Integer pwerFailSlotNmbr;
 
         @ApiModelProperty("삭제 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -353,7 +353,7 @@ public class TbVmsCtlrDto implements Serializable {
 
         @ApiModelProperty("VMS 최대 표출면 개수, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("vms_max_phse_num")
-        @Positive
+        @PositiveOrZero
         private Integer vmsMaxPhseNum;
 
         @ApiModelProperty("최초 등록자 번호, Nullable = Y, VARCHAR(20)")  // Y VARCHAR(20)
@@ -422,7 +422,7 @@ public class TbVmsCtlrDto implements Serializable {
 
         @ApiModelProperty("VMS 위치 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("vms_loc_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long vmsLocIfscId;
 
         @ApiModelProperty("팬 동작 온도, , NUMBER(6,3)")  // Y NUMBER(6,3)

+ 3 - 5
src/main/java/com/its/api/its/model/dto/vms/TbVmsFormBckghueDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -49,7 +49,7 @@ public class TbVmsFormBckghueDto implements Serializable {
 
         @ApiModelProperty("VMS FORM 배경 색상 코드, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_form_bckg_hue_cd")
-        @Positive
+        @PositiveOrZero
         private Long vmsFormBckgHueCd;
 
         @ApiModelProperty("VMS FORM 배경 색상 명, Nullable = Y, VARCHAR(60)")  // Y VARCHAR(60)
@@ -70,13 +70,11 @@ public class TbVmsFormBckghueDto implements Serializable {
         }
 
         public TbVmsFormBckghue toEntity() {
-            TbVmsFormBckghue entity = TbVmsFormBckghue.builder()
+            return TbVmsFormBckghue.builder()
                     .vmsFormBckgHueCd(this.vmsFormBckgHueCd)
                     .vmsFormBckgHueNm(this.vmsFormBckgHueNm)
                     .edtnCd(this.edtnCd)
                     .build();
-
-            return entity;
         }
 
     }

+ 9 - 11
src/main/java/com/its/api/its/model/dto/vms/TbVmsFormDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -97,7 +97,7 @@ public class TbVmsFormDto implements Serializable {
 
         @ApiModelProperty("VMS FORM ID, Nullable = N, NUMBER(5)")  // N NUMBER(5)
         @JsonProperty("vms_form_id")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormId;
 
         @ApiModelProperty("VMS 유형 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
@@ -107,12 +107,12 @@ public class TbVmsFormDto implements Serializable {
 
         @ApiModelProperty("VMS FORM 유형 코드, Nullable = N, NUMBER(3)")  // N NUMBER(3)
         @JsonProperty("vms_form_type_cd")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormTypeCd;
 
         @ApiModelProperty("VMS FORM 배경 색상 코드, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_form_bckg_hue_cd")
-        @Positive
+        @PositiveOrZero
         private Long vmsFormBckgHueCd;
 
         @ApiModelProperty("VMS FORM 명, Nullable = Y, VARCHAR(60)")  // Y VARCHAR(60)
@@ -127,12 +127,12 @@ public class TbVmsFormDto implements Serializable {
 
         @ApiModelProperty("VMS 메시지 표출 방향 코드, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("vms_msg_dspl_drct_cd")
-        @Positive
+        @PositiveOrZero
         private Integer vmsMsgDsplDrctCd;
 
         @ApiModelProperty("심벌라이브러리 번호, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("symb_lib_nmbr")
-        @Positive
+        @PositiveOrZero
         private Integer symbLibNmbr;
 
         @ApiModelProperty("VMS FORM 이미지, Nullable = Y, Image Data")  // Y BLOB
@@ -141,12 +141,12 @@ public class TbVmsFormDto implements Serializable {
 
         @ApiModelProperty("VMS 메시지 표출 방법 코드, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("vms_msg_dspl_mthd_cd")
-        @Positive
+        @PositiveOrZero
         private Integer vmsMsgDsplMthdCd;
 
         @ApiModelProperty("CCTV 관리 번호, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("cctv_mngm_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long cctvMngmNmbr;
 
         @Builder
@@ -165,7 +165,7 @@ public class TbVmsFormDto implements Serializable {
         }
 
         public TbVmsForm toEntity() {
-            TbVmsForm entity = TbVmsForm.builder()
+            return TbVmsForm.builder()
                     .vmsFormId(this.vmsFormId)
                     .vmsTypeCd(this.vmsTypeCd)
                     .vmsFormTypeCd(this.vmsFormTypeCd)
@@ -178,8 +178,6 @@ public class TbVmsFormDto implements Serializable {
                     .vmsMsgDsplMthdCd(this.vmsMsgDsplMthdCd)
                     .cctvMngmNmbr(this.cctvMngmNmbr)
                     .build();
-
-            return entity;
         }
 
     }

+ 21 - 23
src/main/java/com/its/api/its/model/dto/vms/TbVmsFormObjectDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -138,52 +138,52 @@ public class TbVmsFormObjectDto implements Serializable {
 
         @ApiModelProperty("FORM OBJECT ID, Nullable = N, NUMBER(5)")  // N NUMBER(5)
         @JsonProperty("form_object_id")
-        @Positive
+        @PositiveOrZero
         private Integer formObjectId;
 
         @ApiModelProperty("VMS FORM ID, Nullable = N, NUMBER(5)")  // N NUMBER(5)
         @JsonProperty("vms_form_id")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormId;
 
         @ApiModelProperty("VMS FORM 표출 행, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("vms_form_dspl_row")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormDsplRow;
 
         @ApiModelProperty("VMS FORM 표출 칼럼, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("vms_form_dspl_clmn")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormDsplClmn;
 
         @ApiModelProperty("VMS FORM OBJECT 유형 코드, Nullable = N, NUMBER(3)")  // N NUMBER(3)
         @JsonProperty("vms_form_object_type_cd")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormObjectTypeCd;
 
         @ApiModelProperty("VMS 글꼴 유형 코드, Nullable = N, NUMBER(3)")  // N NUMBER(3)
         @JsonProperty("vms_font_type_cd")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFontTypeCd;
 
         @ApiModelProperty("VMS 글꼴 색상 코드, Nullable = N, NUMBER(9)")  // N NUMBER(9)
         @JsonProperty("vms_font_hue_cd")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFontHueCd;
 
         @ApiModelProperty("VMS 글꼴 방식 코드, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("vms_font_styl_cd")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFontStylCd;
 
         @ApiModelProperty("VMS 글꼴 크기, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("vms_font_size")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFontSize;
 
         @ApiModelProperty("VMS 표출 문자열정열방식(0:LEFT,1:RIGHT,2:CENTER), Nullable = Y, NUMBER(1)")  // Y NUMBER(1)
         @JsonProperty("vms_font_align")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFontAlign;
 
         @ApiModelProperty("VMS 표출 텍스트, Nullable = Y, VARCHAR(200)")  // Y VARCHAR(200)
@@ -197,37 +197,37 @@ public class TbVmsFormObjectDto implements Serializable {
 
         @ApiModelProperty("VMS 표출 X좌표, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("vms_dspl_xcrdn")
-        @Positive
+        @PositiveOrZero
         private Integer vmsDsplXcrdn;
 
         @ApiModelProperty("VMS 표출 Y좌표, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("vms_dspl_ycrdn")
-        @Positive
+        @PositiveOrZero
         private Integer vmsDsplYcrdn;
 
         @ApiModelProperty("VMS 표출 넓이, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("vms_dspl_width")
-        @Positive
+        @PositiveOrZero
         private Integer vmsDsplWidth;
 
         @ApiModelProperty("VMS 표출 높이, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("vms_dspl_height")
-        @Positive
+        @PositiveOrZero
         private Integer vmsDsplHeight;
 
         @ApiModelProperty("VMS 표출 점멸 여부(0:지속, 1:점멸), Nullable = Y, NUMBER(1)")  // Y NUMBER(1)
         @JsonProperty("vms_dspl_blinking")
-        @Positive
+        @PositiveOrZero
         private Integer vmsDsplBlinking;
 
         @ApiModelProperty("VMS 표출 배경색상코드, Nullable = Y, NUMBER(1)")  // Y NUMBER(1)
         @JsonProperty("vms_dspl_bkcolor")
-        @Positive
+        @PositiveOrZero
         private Integer vmsDsplBkcolor;
 
         @ApiModelProperty("VMS 표출 크기(문자:문자길이,이미지:이미지전체크기), Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
         @JsonProperty("vms_dspl_size")
-        @Positive
+        @PositiveOrZero
         private Integer vmsDsplSize;
 
         @ApiModelProperty("FILL-IN 메시지 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -238,12 +238,12 @@ public class TbVmsFormObjectDto implements Serializable {
 
         @ApiModelProperty("심벌라이브러리 번호, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("symb_lib_nmbr")
-        @Positive
+        @PositiveOrZero
         private Integer symbLibNmbr;
 
         @ApiModelProperty("VMS 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long vmsIfscId;
 
         @Builder
@@ -273,7 +273,7 @@ public class TbVmsFormObjectDto implements Serializable {
         }
 
         public TbVmsFormObject toEntity() {
-            TbVmsFormObject entity = TbVmsFormObject.builder()
+            return TbVmsFormObject.builder()
                     .formObjectId(this.formObjectId)
                     .vmsFormId(this.vmsFormId)
                     .vmsFormDsplRow(this.vmsFormDsplRow)
@@ -297,8 +297,6 @@ public class TbVmsFormObjectDto implements Serializable {
                     .symbLibNmbr(this.symbLibNmbr)
                     .vmsIfscId(this.vmsIfscId)
                     .build();
-
-            return entity;
         }
 
     }

+ 4 - 6
src/main/java/com/its/api/its/model/dto/vms/TbVmsFormPrrtDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -62,12 +62,12 @@ public class TbVmsFormPrrtDto implements Serializable {
 
         @ApiModelProperty("VMS FORM 우선순위, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("vms_form_prrt")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormPrrt;
 
         @ApiModelProperty("VMS FORM 유형 코드, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("vms_form_type_cd")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormTypeCd;
 
         @ApiModelProperty("VMS 용도 유형 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
@@ -84,14 +84,12 @@ public class TbVmsFormPrrtDto implements Serializable {
         }
 
         public TbVmsFormPrrt toEntity() {
-            TbVmsFormPrrt entity = TbVmsFormPrrt.builder()
+            return TbVmsFormPrrt.builder()
                     .vmsFormPrrtCd(this.vmsFormPrrtCd)
                     .vmsFormPrrt(this.vmsFormPrrt)
                     .vmsFormTypeCd(this.vmsFormTypeCd)
                     .vmsUsagTypeCd(this.vmsUsagTypeCd)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/vms/TbVmsIfscCmtrGradDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -83,7 +83,7 @@ public class TbVmsIfscCmtrGradDto implements Serializable {
 
         @ApiModelProperty("VMS 정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long vmsIfscId;
 
         @ApiModelProperty("소통 등급 코드, Nullable = N, VARCHAR(7)")  // N VARCHAR(7)
@@ -93,12 +93,12 @@ public class TbVmsIfscCmtrGradDto implements Serializable {
 
         @ApiModelProperty("최저속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("lwstsped")
-        @Positive
+        @PositiveOrZero
         private Integer lwstsped;
 
         @ApiModelProperty("최고속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("hghssped")
-        @Positive
+        @PositiveOrZero
         private Integer hghssped;
 
         @Builder
@@ -110,14 +110,12 @@ public class TbVmsIfscCmtrGradDto implements Serializable {
         }
 
         public TbVmsIfscCmtrGrad toEntity() {
-            TbVmsIfscCmtrGrad entity = TbVmsIfscCmtrGrad.builder()
+            return TbVmsIfscCmtrGrad.builder()
                     .vmsIfscId(this.vmsIfscId)
                     .cmtrGradCd(this.cmtrGradCd)
                     .lwstsped(this.lwstsped)
                     .hghssped(this.hghssped)
                     .build();
-
-            return entity;
         }
 
     }

+ 2 - 4
src/main/java/com/its/api/its/model/dto/vms/TbVmsIfscDto.java

@@ -84,7 +84,7 @@ public class TbVmsIfscDto implements Serializable {
 
         @ApiModelProperty("VMS 정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long vmsIfscId;
 
         @ApiModelProperty("VMS 정보제공구간 명, Nullable = Y, VARCHAR(60)")  // Y VARCHAR(60)
@@ -170,7 +170,7 @@ public class TbVmsIfscDto implements Serializable {
         }
 
         public TbVmsIfsc toEntity() {
-            TbVmsIfsc entity = TbVmsIfsc.builder()
+            return TbVmsIfsc.builder()
                     .vmsIfscId(this.vmsIfscId)
                     .vmsIfscNm(this.vmsIfscNm)
                     .edtnCd(this.edtnCd)
@@ -181,8 +181,6 @@ public class TbVmsIfscDto implements Serializable {
                     .spotNm(this.spotNm)
                     .axisYn(this.axisYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 4 - 4
src/main/java/com/its/api/its/model/dto/vms/TbVmsIfscRltnDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -52,12 +52,12 @@ public class TbVmsIfscRltnDto implements Serializable {
 
         @ApiModelProperty("VMS 정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long vmsIfscId;
 
         @ApiModelProperty("표출 우선순위, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
         @JsonProperty("dspl_prrt")
-        @Positive
+        @PositiveOrZero
         private Integer dsplPrrt;
     }
 
@@ -70,7 +70,7 @@ public class TbVmsIfscRltnDto implements Serializable {
 
         @ApiModelProperty("VMS 제어기 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ctlr_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long vmsCtlrNmbr;
 
         @ApiModelProperty("VMS 정보제공구간 목록")

+ 5 - 7
src/main/java/com/its/api/its/model/dto/vms/TbVmsLinkIfscDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 
 /**
@@ -66,17 +66,17 @@ public class TbVmsLinkIfscDto implements Serializable {
 
         @ApiModelProperty("VMS 정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long vmsIfscId;
 
         @ApiModelProperty("정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long ifscId;
 
         @ApiModelProperty("순서, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("ord")
-        @Positive
+        @PositiveOrZero
         private Integer ord;
 
         @Builder
@@ -87,13 +87,11 @@ public class TbVmsLinkIfscDto implements Serializable {
         }
 
         public TbVmsLinkIfsc toEntity() {
-            TbVmsLinkIfsc entity = TbVmsLinkIfsc.builder()
+            return TbVmsLinkIfsc.builder()
                     .vmsIfscId(this.vmsIfscId)
                     .ifscId(this.ifscId)
                     .ord(this.ord)
                     .build();
-
-            return entity;
         }
 
     }

+ 4 - 6
src/main/java/com/its/api/its/model/dto/vms/TbVmsLumSetSchDto.java

@@ -8,7 +8,7 @@ import lombok.*;
 
 import javax.persistence.Column;
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -63,7 +63,7 @@ public class TbVmsLumSetSchDto implements Serializable {
 
         @ApiModelProperty("VMS 제어기 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ctlr_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long vmsCtlrNmbr;
 
         @ApiModelProperty("설정시각(HH24MI), Nullable = N, VARCHAR(4)")  // N VARCHAR(4)
@@ -73,7 +73,7 @@ public class TbVmsLumSetSchDto implements Serializable {
 
         @ApiModelProperty("휘도값(0:자동,1~100), Nullable = N, NUMBER(3)")  // N NUMBER(3)
         @JsonProperty("luminance")
-        @Positive
+        @PositiveOrZero
         private Integer luminance;
 
         @ApiModelProperty("사용여부(Y:시용,N:사용안함), Nullable = N, CHAR(1)")  // N CHAR(1)
@@ -91,14 +91,12 @@ public class TbVmsLumSetSchDto implements Serializable {
         }
 
         public TbVmsLumSetSch toEntity() {
-            TbVmsLumSetSch entity = TbVmsLumSetSch.builder()
+            return TbVmsLumSetSch.builder()
                     .vmsCtlrNmbr(this.vmsCtlrNmbr)
                     .schTime(this.schTime)
                     .luminance(this.luminance)
                     .useYn(this.useYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 5 - 7
src/main/java/com/its/api/its/model/dto/vms/TbVmsMonitoringDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -57,7 +57,7 @@ public class TbVmsMonitoringDto implements Serializable {
 
         @ApiModelProperty("모니터링유형(1:현시,2,시나리오,3,영상), Nullable = N, NUMBER(3)")  // N NUMBER(3)
         @JsonProperty("monitoring_type")
-        @Positive
+        @PositiveOrZero
         private Integer monitoringType;
 
         @ApiModelProperty("모니터링명칭, Nullable = N, VARCHAR(40)")  // N VARCHAR(40)
@@ -67,12 +67,12 @@ public class TbVmsMonitoringDto implements Serializable {
 
         @ApiModelProperty("모니터링순서, Nullable = N, NUMBER(3)")  // N NUMBER(3)
         @JsonProperty("monitoring_seq")
-        @Positive
+        @PositiveOrZero
         private Integer monitoringSeq;
 
         @ApiModelProperty("VMS 제어기 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ctlr_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long vmsCtlrNmbr;
 
         @Builder
@@ -84,14 +84,12 @@ public class TbVmsMonitoringDto implements Serializable {
         }
 
         public TbVmsMonitoring toEntity(Integer monitoringType, String monitoringNm) {
-            TbVmsMonitoring entity = TbVmsMonitoring.builder()
+            return TbVmsMonitoring.builder()
                     .monitoringType(monitoringType)
                     .monitoringNm(monitoringNm)
                     .monitoringSeq(this.monitoringSeq)
                     .vmsCtlrNmbr(this.vmsCtlrNmbr)
                     .build();
-
-            return entity;
         }
 
     }

+ 17 - 19
src/main/java/com/its/api/its/model/dto/vms/TbVmsMsgDsplSchDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -118,7 +118,7 @@ public class TbVmsMsgDsplSchDto implements Serializable {
 
         @ApiModelProperty("VMS 제어기 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ctlr_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long vmsCtlrNmbr;
 
         @ApiModelProperty("스케줄 유형 코드(0:교통정보,1:돌발,2:공사/행사문안,3:홍보문안,4:우회도로,5:고정스케줄, 6:기본스케줄), Nullable = N, VARCHAR(7)")  // N VARCHAR(7)
@@ -128,22 +128,22 @@ public class TbVmsMsgDsplSchDto implements Serializable {
 
         @ApiModelProperty("PHASE, Nullable = N, NUMBER(2)")  // N NUMBER(2)
         @JsonProperty("phase")
-        @Positive
+        @PositiveOrZero
         private Integer phase;
 
         @ApiModelProperty("VMS FORM ID, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("vms_form_id")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormId;
 
         @ApiModelProperty("1단 VMS 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("frst_vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long frstVmsIfscId;
 
         @ApiModelProperty("2단 VMS 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("secd_vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long secdVmsIfscId;
 
         @ApiModelProperty("VMS FORM 우선순위 코드, Nullable = Y, VARCHAR(3)")  // Y VARCHAR(3)
@@ -153,7 +153,7 @@ public class TbVmsMsgDsplSchDto implements Serializable {
 
         @ApiModelProperty("표출 시간, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("dspl_hh")
-        @Positive
+        @PositiveOrZero
         private Integer dsplHh;
 
         @ApiModelProperty("표출 시작 시간, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
@@ -168,12 +168,12 @@ public class TbVmsMsgDsplSchDto implements Serializable {
 
         @ApiModelProperty("3단 VMS 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("thir_vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long thirVmsIfscId;
 
         @ApiModelProperty("4단 VMS 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("four_vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long fourVmsIfscId;
 
         @ApiModelProperty("사용여부(Y:시용,N:사용안함), Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -184,22 +184,22 @@ public class TbVmsMsgDsplSchDto implements Serializable {
 
         @ApiModelProperty("1단 이미지 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("frst_img_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long frstImgIfscId;
 
         @ApiModelProperty("2단 이미지 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("secd_img_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long secdImgIfscId;
 
         @ApiModelProperty("3단 이미지 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("thir_img_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long thirImgIfscId;
 
         @ApiModelProperty("4단 이미지 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("four_img_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long fourImgIfscId;
 
         @Builder
@@ -224,7 +224,7 @@ public class TbVmsMsgDsplSchDto implements Serializable {
         }
 
         public TbVmsMsgDsplSch toEntity() {
-            TbVmsMsgDsplSch entity = TbVmsMsgDsplSch.builder()
+            return TbVmsMsgDsplSch.builder()
                     .vmsCtlrNmbr(this.vmsCtlrNmbr)
                     .trfcSituTypeCd(this.trfcSituTypeCd)
                     .phase(this.phase)
@@ -243,8 +243,6 @@ public class TbVmsMsgDsplSchDto implements Serializable {
                     .thirImgIfscId(this.thirImgIfscId)
                     .fourImgIfscId(this.fourImgIfscId)
                     .build();
-
-            return entity;
         }
 
     }
@@ -257,7 +255,7 @@ public class TbVmsMsgDsplSchDto implements Serializable {
 
         @ApiModelProperty("VMS 제어기 번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
         @JsonProperty("vms_ctlr_nmbr")
-        @Positive
+        @PositiveOrZero
         private Long vmsCtlrNmbr;
 
         @ApiModelProperty("스케줄 유형 코드(0:교통정보,1:돌발,2:공사/행사문안,3:홍보문안,4:우회도로,5:고정스케줄, 6:기본스케줄), Nullable = N, VARCHAR(7)")
@@ -268,12 +266,12 @@ public class TbVmsMsgDsplSchDto implements Serializable {
 
         @ApiModelProperty("PHASE, Nullable = N, NUMBER(2)")  // N NUMBER(2)
         @JsonProperty("phase")
-        @Positive
+        @PositiveOrZero
         private Integer phase;
 
         @ApiModelProperty("VMS FORM ID, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("vms_form_id")
-        @Positive
+        @PositiveOrZero
         private Integer vmsFormId;
 
         @Builder

+ 7 - 9
src/main/java/com/its/api/its/model/dto/vms/TbVmsSymbIfscDto.java

@@ -8,7 +8,7 @@ import lombok.*;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 
 /**
@@ -50,31 +50,31 @@ public class TbVmsSymbIfscDto implements Serializable {
 
         @ApiModelProperty("심벌라이브러리 번호, Nullable = N, NUMBER(4)")  // N NUMBER(4)
         @JsonProperty("symb_lib_nmbr")
-        @Positive
+        @PositiveOrZero
         private Integer symbLibNmbr;
 
         @ApiModelProperty("셀 ID, Nullable = N, NUMBER(4)")  // N NUMBER(4)
         @JsonProperty("cell_id")
-        @Positive
+        @PositiveOrZero
         private Integer cellId;
 
         @ApiModelProperty("이미지내 셀좌표 X, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("posx")
-        //@Positive
+        //@PositiveOrZero
         @Min(value = 0)
         @Max(value = 9999)
         private Integer posx;
 
         @ApiModelProperty("이미지내 셀좌표 Y, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("posy")
-        //@Positive
+        //@PositiveOrZero
         @Min(value = 0)
         @Max(value = 9999)
         private Integer posy;
 
         @ApiModelProperty("VMS 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("vms_ifsc_id")
-        @Positive
+        @PositiveOrZero
         private Long vmsIfscId;
 
         @Builder
@@ -88,15 +88,13 @@ public class TbVmsSymbIfscDto implements Serializable {
 
 
         public TbVmsSymbIfsc toEntity() {
-            TbVmsSymbIfsc entity = TbVmsSymbIfsc.builder()
+            return TbVmsSymbIfsc.builder()
                     .symbLibNmbr(this.symbLibNmbr)
                     .cellId(this.cellId)
                     .posx(this.posx)
                     .posy(this.posy)
                     .vmsIfscId(this.vmsIfscId)
                     .build();
-
-            return entity;
         }
 
     }

+ 3 - 5
src/main/java/com/its/api/its/model/dto/vms/TbVmsSymbLibDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -76,7 +76,7 @@ public class TbVmsSymbLibDto implements Serializable {
 
         @ApiModelProperty("심벌라이브러리 번호, Nullable = N, NUMBER(4)")  // N NUMBER(4)
         @JsonProperty("symb_lib_nmbr")
-        @Positive
+        @PositiveOrZero
         private Integer symbLibNmbr;
 
         @ApiModelProperty("등록 일시, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
@@ -136,7 +136,7 @@ public class TbVmsSymbLibDto implements Serializable {
 
 
         public TbVmsSymbLib toEntity() {
-            TbVmsSymbLib entity = TbVmsSymbLib.builder()
+            return TbVmsSymbLib.builder()
                     .symbLibNmbr(this.symbLibNmbr)
                     .rgstDt(this.rgstDt)
                     .redData(this.redData)
@@ -147,8 +147,6 @@ public class TbVmsSymbLibDto implements Serializable {
                     .symbImagType(this.symbImagType)
                     .symbFileNm(this.symbFileNm)
                     .build();
-
-            return entity;
         }
 
     }

+ 3 - 4
src/main/java/com/its/api/its/model/dto/vms/TbVmsSymbLibIfscVMP1Dto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
@@ -96,7 +96,7 @@ public class TbVmsSymbLibIfscVMP1Dto implements Serializable {
 
         @ApiModelProperty("심벌라이브러리 번호, Nullable = N, NUMBER(4)")  // N NUMBER(4)
         @JsonProperty("symb_lib_nmbr")
-        @Positive
+        @PositiveOrZero
         private Integer symbLibNmbr;
 
         @ApiModelProperty("등록 일시, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
@@ -160,7 +160,7 @@ public class TbVmsSymbLibIfscVMP1Dto implements Serializable {
         }
 
         public TbVmsSymbLibDto.TbVmsSymbLibUpdReq toLibReq() {
-            TbVmsSymbLibDto.TbVmsSymbLibUpdReq req = TbVmsSymbLibDto.TbVmsSymbLibUpdReq.builder()
+            return TbVmsSymbLibDto.TbVmsSymbLibUpdReq.builder()
                     .symb_lib_nmbr(this.symbLibNmbr)
                     .rgst_dt(this.rgstDt)
                     .red_data(this.redData)
@@ -171,7 +171,6 @@ public class TbVmsSymbLibIfscVMP1Dto implements Serializable {
                     .symb_imag_type(this.symbImagType)
                     .symb_file_nm(this.symbFileNm)
                     .build();
-            return req;
         }
 
     }

+ 3 - 4
src/main/java/com/its/api/its/model/dto/vms/TbVmsSymbLibIfscVMP2Dto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -96,7 +96,7 @@ public class TbVmsSymbLibIfscVMP2Dto implements Serializable {
 
         @ApiModelProperty("심벌라이브러리 번호, Nullable = N, NUMBER(4)")  // N NUMBER(4)
         @JsonProperty("symb_lib_nmbr")
-        @Positive
+        @PositiveOrZero
         private Integer symbLibNmbr;
 
         @ApiModelProperty("등록 일시, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
@@ -159,7 +159,7 @@ public class TbVmsSymbLibIfscVMP2Dto implements Serializable {
         }
 
         public TbVmsSymbLibDto.TbVmsSymbLibUpdReq toLibReq() {
-            TbVmsSymbLibDto.TbVmsSymbLibUpdReq req = TbVmsSymbLibDto.TbVmsSymbLibUpdReq.builder()
+            return TbVmsSymbLibDto.TbVmsSymbLibUpdReq.builder()
                     .symb_lib_nmbr(this.symbLibNmbr)
                     .rgst_dt(this.rgstDt)
                     .red_data(this.redData)
@@ -170,7 +170,6 @@ public class TbVmsSymbLibIfscVMP2Dto implements Serializable {
                     .symb_imag_type(this.symbImagType)
                     .symb_file_nm(this.symbFileNm)
                     .build();
-            return req;
         }
 
     }

+ 10 - 12
src/main/java/com/its/api/its/model/dto/vms/TbVmsTypeDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -88,42 +88,42 @@ public class TbVmsTypeDto implements Serializable {
 
         @ApiModelProperty("VMS 너비, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("vms_wdth")
-        @Positive
+        @PositiveOrZero
         private Integer vmsWdth;
 
         @ApiModelProperty("VMS 높이, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("vms_hght")
-        @Positive
+        @PositiveOrZero
         private Integer vmsHght;
 
         @ApiModelProperty("행 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("row_num")
-        @Positive
+        @PositiveOrZero
         private Integer rowNum;
 
         @ApiModelProperty("열 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("col_num")
-        @Positive
+        @PositiveOrZero
         private Integer colNum;
 
         @ApiModelProperty("모듈 행 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("modl_row_num")
-        @Positive
+        @PositiveOrZero
         private Integer modlRowNum;
 
         @ApiModelProperty("모듈 열 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("modl_col_num")
-        @Positive
+        @PositiveOrZero
         private Integer modlColNum;
 
         @ApiModelProperty("전원모듈 행 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("powr_row_num")
-        @Positive
+        @PositiveOrZero
         private Integer powrRowNum;
 
         @ApiModelProperty("전원모듈 열 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("powr_col_num")
-        @Positive
+        @PositiveOrZero
         private Integer powrColNum;
 
         @ApiModelProperty("사용 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -148,7 +148,7 @@ public class TbVmsTypeDto implements Serializable {
         }
 
         public TbVmsType toEntity() {
-            TbVmsType entity = TbVmsType.builder()
+            return TbVmsType.builder()
                     .vmsTypeCd(this.vmsTypeCd)
                     .vmsTypeNm(this.vmsTypeNm)
                     .vmsWdth(this.vmsWdth)
@@ -161,8 +161,6 @@ public class TbVmsTypeDto implements Serializable {
                     .powrColNum(this.powrColNum)
                     .useYn(this.useYn)
                     .build();
-
-            return entity;
         }
 
     }

+ 1 - 3
src/main/java/com/its/api/its/model/dto/vms/TbVmsUsagTypeDto.java

@@ -78,14 +78,12 @@ public class TbVmsUsagTypeDto implements Serializable {
         }
 
         public TbVmsUsagType toEntity() {
-            TbVmsUsagType entity = TbVmsUsagType.builder()
+            return TbVmsUsagType.builder()
                     .vmsUsagTypeCd(this.vmsUsagTypeCd)
                     .vmsUsagTypeNm(this.vmsUsagTypeNm)
                     .vmsUsagTypeEnglNm(this.vmsUsagTypeEnglNm)
                     .useYn(this.useYn)
                     .build();
-
-            return entity;
         }
 
     }