ddd

src/main/java/com/its/op/dto/its/cctv/TbCctvCtlrDto.java

@@ -283,7 +283,7 @@ public class TbCctvCtlrDto implements Serializable {
 
         @ApiModelProperty("WEB RTC 서버 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("web_rtc_svr_ip")
-        @Size(min=1, max=20)
+        @Size(min=0, max=20)
         private String webRtcSvrIp;
 
         @ApiModelProperty("WEB RTC 서버 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
@@ -293,7 +293,7 @@ public class TbCctvCtlrDto implements Serializable {
 
         @ApiModelProperty("WEB RTC ID, Nullable = Y, VARCHAR2(56)")  // Y VARCHAR2(56)
         @JsonProperty("web_rtc_id")
-        @Size(min=1, max=56)
+        @Size(min=0, max=56)
         private String webRtcId;
 
         @ApiModelProperty("CCTV 대체 영상 이미지 번호, Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
@@ -366,7 +366,8 @@ public class TbCctvCtlrDto implements Serializable {
         private String delYn;
 
         @Builder
-        public TbCctvCtlrUpdReq(Long cctv_ctlr_nmbr, String cctv_ctlr_id, String cctv_nm, String istl_lctn_nm, String istl_lctn_addr, String cctv_ctlr_ip, Integer cctv_ctlr_port, Integer cctv_ctlr_local_no, String cctv_type_cd, String cctv_capt_ip, Integer cctv_capt_port, String strm_svr_ip, Integer strm_svr_port, String strm_sesn_nm, Double x_crdn, Double y_crdn, String strm_rtsp_addr, String strm_http_addr, String intr_http_addr, String web_rtc_svr_ip, Integer web_rtc_svr_port, String web_rtc_id, String altt_imag_nmbr, String altt_imag_dspl_yn, String syop_cntl_yn, Long link_id, Long node_id, String cctv_id, String cctv_area_dvsn, String use_yn, Integer fan_on_tmpr, Integer fan_off_tmpr, Integer hetr_on_tmpr, Integer hetr_off_tmpr, String del_yn) {
+        public TbCctvCtlrUpdReq(Long cctv_ctlr_nmbr, String cctv_ctlr_id, String cctv_nm, String istl_lctn_nm, String istl_lctn_addr, String cctv_ctlr_ip, Integer cctv_ctlr_port, Integer cctv_ctlr_local_no, String cctv_type_cd, String cctv_capt_ip, Integer cctv_capt_port, String strm_svr_ip, Integer strm_svr_port, String strm_sesn_nm, Double x_crdn, Double y_crdn, String strm_rtsp_addr, String strm_http_addr, String intr_http_addr,
+                                String web_rtc_svr_ip, Integer web_rtc_svr_port, String web_rtc_id, String altt_imag_nmbr, String altt_imag_dspl_yn, String syop_cntl_yn, Long link_id, Long node_id, String cctv_id, String cctv_area_dvsn, String use_yn, Integer fan_on_tmpr, Integer fan_off_tmpr, Integer hetr_on_tmpr, Integer hetr_off_tmpr, String del_yn) {
             this.cctvCtlrNmbr = cctv_ctlr_nmbr;
             this.cctvCtlrId = cctv_ctlr_id;
             this.cctvNm = cctv_nm;

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

@@ -9,6 +9,7 @@ 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;
 
@@ -169,6 +170,27 @@ public class TbVmsCtlrDto implements Serializable {
     @JsonProperty("strm_rtsp_addr")
     private String strmRtspAddr;
 
+
+    @ApiModelProperty("WEB RTC 서버 아이피")  // Y VARCHAR2(20)
+    @JsonProperty("web_rtc_svr_ip")
+    private String webRtcSvrIp;
+
+    @ApiModelProperty("WEB RTC 서버 포트")  // Y NUMBER(5)
+    @JsonProperty("web_rtc_svr_port")
+    private Integer webRtcSvrPort;
+
+    @ApiModelProperty("WEB RTC ID")  // Y VARCHAR2(56)
+    @JsonProperty("web_rtc_id")
+    private String webRtcId;
+
+    @ApiModelProperty("CCTV 대체 영상 이미지 번호")  // Y VARCHAR2(5)
+    @JsonProperty("altt_imag_nmbr")
+    private String alttImagNmbr;
+
+    @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
+    @JsonProperty("altt_imag_dspl_yn")
+    private String alttImagDsplYn;
+
     // Code Description Field
     @ApiModelProperty("VMS 유형 코드(TB_VMS_TYPE) 설명")
     @JsonProperty("vms_type_desc")    // VMS_TYPE_CD
@@ -369,8 +391,36 @@ public class TbVmsCtlrDto implements Serializable {
         @Size(min=1, max=200)
         private String strmRtspAddr;
 
+        @ApiModelProperty("WEB RTC 서버 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
+        @JsonProperty("web_rtc_svr_ip")
+        @Size(min=0, max=20)
+        private String webRtcSvrIp;
+
+        @ApiModelProperty("WEB RTC 서버 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
+        @JsonProperty("web_rtc_svr_port")
+        @PositiveOrZero
+        private Integer webRtcSvrPort;
+
+        @ApiModelProperty("WEB RTC ID, Nullable = Y, VARCHAR2(56)")  // Y VARCHAR2(56)
+        @JsonProperty("web_rtc_id")
+        @Size(min=0, max=56)
+        private String webRtcId;
+
+        @ApiModelProperty("CCTV 대체 영상 이미지 번호, Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
+        @JsonProperty("altt_imag_nmbr")
+        @Size(min=1, max=5)
+        private String alttImagNmbr;
+
+        @ApiModelProperty("CCTV 대체 표출 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
+        @JsonProperty("altt_imag_dspl_yn")
+        @Size(min=1, max=1)
+        @Pattern(regexp = "[YN]")
+        private String alttImagDsplYn;
+
         @Builder
-        public TbVmsCtlrUpdReq(Long vms_ctlr_nmbr, String vms_ctlr_id, String vms_nm, String vms_ctlr_ip, Integer vms_ctlr_port, Integer vms_ctlr_local_no, String vms_type_cd, String istl_lctn_nm, Double x_crdn, Double y_crdn, String del_yn, String web_cmra_ip, Integer web_cmra_port, String web_cmra_id, String web_cmra_pwd, String strm_sesn_nm, String oper_mode, Integer vms_max_phse_num, Integer def_phse_chng_cycl, String panl_on_time, String panl_off_time, Integer panl_pwer_mode, Integer fan_mode, Integer fan_run_tmpr, Integer hetr_mode, Integer hetr_run_tmpr, Integer brgh_mode, Integer brgh_curr_step, Integer brgh_week_step, Integer brgh_nght_step, Integer modl_err_rate, Integer cmnc_fail_rate, String web_cmra_cmpy, String web_cmra_mdl, String istl_lctn_addr, String strm_http_addr, String strm_rtsp_addr) {
+        public TbVmsCtlrUpdReq(Long vms_ctlr_nmbr, String vms_ctlr_id, String vms_nm, String vms_ctlr_ip, Integer vms_ctlr_port, Integer vms_ctlr_local_no, String vms_type_cd, String istl_lctn_nm, Double x_crdn, Double y_crdn, String del_yn,
+                               String web_cmra_ip, Integer web_cmra_port, String web_cmra_id, String web_cmra_pwd, String strm_sesn_nm, String oper_mode, Integer vms_max_phse_num, Integer def_phse_chng_cycl, String panl_on_time, String panl_off_time, Integer panl_pwer_mode, Integer fan_mode, Integer fan_run_tmpr, Integer hetr_mode, Integer hetr_run_tmpr, Integer brgh_mode, Integer brgh_curr_step, Integer brgh_week_step, Integer brgh_nght_step, Integer modl_err_rate, Integer cmnc_fail_rate, String web_cmra_cmpy, String web_cmra_mdl, String istl_lctn_addr, String strm_http_addr, String strm_rtsp_addr,
+                               String web_rtc_svr_ip, Integer web_rtc_svr_port, String web_rtc_id, String altt_imag_nmbr, String altt_imag_dspl_yn) {
             this.vmsCtlrNmbr = vms_ctlr_nmbr;
             this.vmsCtlrId = vms_ctlr_id;
             this.vmsNm = vms_nm;
@@ -408,6 +458,11 @@ public class TbVmsCtlrDto implements Serializable {
             this.istlLctnAddr = istl_lctn_addr;
             this.strmHttpAddr = strm_http_addr;
             this.strmRtspAddr = strm_rtsp_addr;
+            this.webRtcSvrIp = web_rtc_svr_ip;
+            this.webRtcSvrPort = web_rtc_svr_port;
+            this.webRtcId = web_rtc_id;
+            this.alttImagNmbr = altt_imag_nmbr;
+            this.alttImagDsplYn = altt_imag_dspl_yn;
         }
 
         public TbVmsCtlr toEntity() {
@@ -449,6 +504,11 @@ public class TbVmsCtlrDto implements Serializable {
                     .istlLctnAddr(this.istlLctnAddr)
                     .strmHttpAddr(this.strmHttpAddr)
                     .strmRtspAddr(this.strmRtspAddr)
+                    .webRtcSvrIp(this.webRtcSvrIp)
+                    .webRtcSvrPort(this.webRtcSvrPort)
+                    .webRtcId(this.webRtcId)
+                    .alttImagNmbr(this.alttImagNmbr)
+                    .alttImagDsplYn(this.alttImagDsplYn)
                     .build();
         }
 

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

@@ -60,6 +60,18 @@ public class TbVmsMonitoringDto implements Serializable {
     @JsonProperty("strm_rtsp_addr")
     private String strmRtspAddr;
 
+    @ApiModelProperty("WEB RTC 서버 IP")
+    @JsonProperty("web_rtc_svr_ip")
+    private String webRtcSvrIp;
+
+    @ApiModelProperty("WEB RTC 포트")
+    @JsonProperty("web_rtc_svr_port")
+    private Integer webRtcSvrPort;
+
+    @ApiModelProperty("WEB RTC ID")
+    @JsonProperty("web_rtc_id")
+    private String webRtcId;
+
     @ApiModel("TbVmsMonitoringUpdReq(VMS 모니터링 화면 정보변경)")
     @Getter
     @Setter

src/main/java/com/its/op/entity/its/vms/TbVmsCtlr.java

@@ -179,6 +179,26 @@ public class TbVmsCtlr implements Serializable {
     @Column(name = "STRM_RTSP_ADDR", length = 200)
     private String strmRtspAddr;
 
+    @ApiModelProperty("WEB RTC 서버 아이피")  // Y VARCHAR2(20)
+    @Column(name = "WEB_RTC_SVR_IP", length = 20)
+    private String webRtcSvrIp;
+
+    @ApiModelProperty("WEB RTC 서버 포트")  // Y NUMBER(5)
+    @Column(name = "WEB_RTC_SVR_PORT", columnDefinition = "NUMBER", length = 5)
+    private Integer webRtcSvrPort;
+
+    @ApiModelProperty("WEB RTC ID")  // Y VARCHAR2(56)
+    @Column(name = "WEB_RTC_ID", length = 56)
+    private String webRtcId;
+
+    @ApiModelProperty("CCTV 대체 영상 이미지 번호")  // Y VARCHAR2(5)
+    @Column(name = "ALTT_IMAG_NMBR", length = 5)
+    private String alttImagNmbr;
+
+    @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
+    @Column(name = "ALTT_IMAG_DSPL_YN", columnDefinition = "CHAR", length = 1)
+    private String alttImagDsplYn;
+
     @OneToOne
     @JoinColumn(insertable=false, updatable=false, name="VMS_TYPE_CD", referencedColumnName = "VMS_TYPE_CD")
     @NotFound(action = NotFoundAction.IGNORE)
@@ -232,6 +252,11 @@ public class TbVmsCtlr implements Serializable {
                 .istlLctnAddr(this.istlLctnAddr)
                 .strmHttpAddr(this.strmHttpAddr)
                 .strmRtspAddr(this.strmRtspAddr)
+                .webRtcSvrIp(this.webRtcSvrIp)
+                .webRtcSvrPort(this.webRtcSvrPort)
+                .webRtcId(this.webRtcId)
+                .alttImagNmbr(this.alttImagNmbr)
+                .alttImagDsplYn(this.alttImagDsplYn)
                 .build();
 
         //dto.setVmsUsagTypeDesc(CodeManager.getCodeDescShort(CodeManager.VMS_USAG_TYPE_CD, dto.getVmsUsagTypeCd()));
@@ -405,6 +430,11 @@ public class TbVmsCtlr implements Serializable {
         this.istlLctnAddr = req.getIstlLctnAddr();
         this.strmHttpAddr = req.getStrmHttpAddr();
         this.strmRtspAddr = req.getStrmRtspAddr();
+        this.webRtcSvrIp = req.getWebRtcSvrIp();
+        this.webRtcSvrPort = req.getWebRtcSvrPort();
+        this.webRtcId = req.getWebRtcId();
+        this.alttImagNmbr = req.getAlttImagNmbr();
+        this.alttImagDsplYn = req.getAlttImagDsplYn();
     }
 
 }

src/main/java/com/its/op/entity/its/vms/TbVmsMonitoring.java

@@ -66,6 +66,9 @@ public class TbVmsMonitoring implements Serializable {
             dto.setStrmSesnNm(this.vms.getStrmSesnNm());
             dto.setStrmHttpAddr(this.vms.getStrmHttpAddr());
             dto.setStrmRtspAddr(this.vms.getStrmRtspAddr());
+            dto.setWebRtcSvrIp(this.vms.getWebRtcSvrIp());
+            dto.setWebRtcSvrPort(this.vms.getWebRtcSvrPort());
+            dto.setWebRtcId(this.vms.getWebRtcId());
         }
         else {
             dto.setVmsCtlrId("-");
@@ -73,6 +76,9 @@ public class TbVmsMonitoring implements Serializable {
             dto.setStrmSesnNm("");
             dto.setStrmHttpAddr("");
             dto.setStrmRtspAddr("");
+            dto.setWebRtcSvrIp("");
+            dto.setWebRtcSvrPort(0);
+            dto.setWebRtcId("");
         }
 
         return dto;