ddd

src/main/java/com/its/op/dto/its/vms/TbVmsFormDto.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -138,7 +139,7 @@ public class TbVmsFormDto implements Serializable {
 
         @ApiModelProperty("VMS FORM 설명, Nullable = Y, VARCHAR(200)")  // Y VARCHAR(200)
         @JsonProperty("vms_form_expl")
-        //@Size(min=1, max=200)
+        @Size(max=200)
         @Size(max=200)
         private String vmsFormExpl;
 
@@ -161,6 +162,17 @@ public class TbVmsFormDto implements Serializable {
         @JsonProperty("vms_form_imag")
         private byte[] vmsFormImag;
 
+        @ApiModelProperty("갱신 일시, Nullable = Y, VARCHAR2(14)")  // Y VARCHAR2(14)
+        @JsonProperty("updt_dt")
+        @Size(min=1, max=14)
+        private String updtDt;
+
+        @ApiModelProperty("폼유효여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
+        @JsonProperty("valid_yn")
+        @Size(min=1, max=1)
+        @Pattern(regexp = "[YN]")
+        private String validYn;
+
         @ApiModelProperty("FORM 객체 목록")
         @JsonProperty("objects")
         List<TbVmsFormObjectDto.TbVmsFormObjectUpdReq> objects = new ArrayList<>();
@@ -177,6 +189,8 @@ public class TbVmsFormDto implements Serializable {
                     .vmsFormDsplMthdCd(this.vmsFormDsplMthdCd)
                     .symbLibNmbr(this.symbLibNmbr)
                     .vmsFormImag(this.vmsFormImag)
+                    .updtDt(this.updtDt)
+                    .validYn(this.validYn)
                     .build();
         }
 

src/main/java/com/its/op/dto/its/vms/TbVmsSymbLibDto.java

@@ -2,6 +2,7 @@ package com.its.op.dto.its.vms;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.its.op.entity.its.vms.TbVmsSymbLib;
+import com.its.utils.ItsUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -115,7 +116,7 @@ public class TbVmsSymbLibDto implements Serializable {
 
         @ApiModelProperty("심벌 파일 명, Nullable = Y, VARCHAR2(60)")  // Y VARCHAR2(60)
         @JsonProperty("symb_file_nm")
-        @Size(min=1, max=60)
+        @Size(max=60)
         private String symbFileNm;
 
         @ApiModelProperty("심벌 유형(SBT0:일반심벌이미지,SBT1:소통정보배경,SBT2:소통정보이미지,SBT3:동영상,SBT4:대기환경등급), Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
@@ -145,7 +146,7 @@ public class TbVmsSymbLibDto implements Serializable {
 
         @ApiModelProperty("갱신 일시, Nullable = N, VARCHAR2(14)")  // N VARCHAR2(14)
         @JsonProperty("updt_dt")
-        @Size(min=1, max=14)
+        @Size(max=14)
         private String updtDt;
 
         @Builder
@@ -161,6 +162,10 @@ public class TbVmsSymbLibDto implements Serializable {
             this.delYn = del_yn;
             this.updtDt = updt_dt;
             this.symbExpl = symb_expl;
+            if (this.delYn == null) {
+                this.delYn = "N";
+            }
+            this.updtDt = ItsUtils.getSysTime();
 
             //this.redData = red_data;
             // FOR KISA Secure Coding pass
@@ -207,9 +212,9 @@ public class TbVmsSymbLibDto implements Serializable {
                     .symbType(this.symbType)
                     .aviData(this.aviData)
                     .imagSize(this.imagSize)
-                    .playTm(this.playTm)
-                    .delYn(this.delYn)
-                    .updtDt(this.updtDt)
+                    .playTm(this.playTm == null ? 0 : this.playTm)
+                    .delYn(this.delYn == null ? "N" : this.delYn)
+                    .updtDt(this.updtDt == null ? ItsUtils.getSysTime() : this.updtDt)
                     .build();
         }
 

src/main/java/com/its/op/service/its/vms/TbVmsSymbLibService.java

@@ -65,9 +65,9 @@ public class TbVmsSymbLibService {
         List<TbVmsSymbLibDto> result = new ArrayList<>();
         List<TbVmsSymbLib> data = this.repo.findAll();
         for (TbVmsSymbLib entity : data) {
-            //TODO if (entity.getVmsTypeCd() != null && this.VMP_TYPE_CD.equals(entity.getVmsTypeCd())) {
+            if (entity.getSymbType() != null && this.SYMB_TYPE.equals(entity.getSymbType())) {
                 result.add(entity.toDto());
-            //}
+            }
         }
         return result;
     }
@@ -81,8 +81,9 @@ public class TbVmsSymbLibService {
     // 데이터 변경
     public TbVmsSymbLibDto updateById(Integer id, TbVmsSymbLibDto.TbVmsSymbLibUpdReq req) {
         TbVmsSymbLib entity = requireOne(id);
-        //TODO req.setVmsTypeCd(this.VMP_TYPE_CD);
+        req.setSymbType(this.SYMB_TYPE);
         req.setRgstDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
+        req.setUpdtDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
         entity.updateInfo(req);
         this.repo.save(entity);
         return entity.toDto();
@@ -92,8 +93,9 @@ public class TbVmsSymbLibService {
     public List<TbVmsSymbLibDto> mergeInfoList(List<TbVmsSymbLibDto.TbVmsSymbLibUpdReq> reqList) {
         List<TbVmsSymbLibDto> result = new ArrayList<>();
         for (TbVmsSymbLibDto.TbVmsSymbLibUpdReq req : reqList) {
-            //TODO req.setVmsTypeCd(this.VMP_TYPE_CD);
+            req.setSymbType(this.SYMB_TYPE);
             req.setRgstDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
+            req.setUpdtDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
             TbVmsSymbLib obj = req.toEntity();
             this.repo.save(obj);
             result.add(obj.toDto());
@@ -103,8 +105,9 @@ public class TbVmsSymbLibService {
 
     // 데이터 변경 또는 생성-개별(데이터가 존재하면 업데이트 없으면 신규로 생성)
     public TbVmsSymbLibDto mergeInfo(TbVmsSymbLibDto.TbVmsSymbLibUpdReq req) {
-        //TODO req.setVmsTypeCd(this.VMP_TYPE_CD);
+        req.setSymbType(this.SYMB_TYPE);
         req.setRgstDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
+        req.setUpdtDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
         TbVmsSymbLib obj = req.toEntity();
         this.repo.save(obj);
         return obj.toDto();