shjung 2 years ago
parent
commit
b626b7bd55

+ 16 - 5
src/main/java/com/its/op/dto/its/cctv/TbCctvCtlrDto.java

@@ -140,14 +140,18 @@ public class TbCctvCtlrDto implements Serializable {
     @JsonProperty("cctv_area_dvsn")
     private String cctvAreaDvsn;
 
-    @ApiModelProperty("외부 HTTP 주소")  // Y VARCHAR2(200)
+    @ApiModelProperty("외부 RTMP 주소")  // Y VARCHAR2(200)
     @JsonProperty("intr_rtmp_addr")
     private String intrRtmpAddr;
 
-    @ApiModelProperty("")  // Y VARCHAR2(200)
+    @ApiModelProperty("외부 HTTP 주소")  // Y VARCHAR2(200)
     @JsonProperty("intr_http_addr")
     private String intrHttpAddr;
 
+    @ApiModelProperty("WEB RTC ID")  // Y VARCHAR2(56)
+    @JsonProperty("web_rtc_id")
+    private String webRtcId;
+
     @ApiModelProperty("운영자 제어 여부")  // Y CHAR(1)
     @JsonProperty("syop_cntl_yn")
     private String syopCntlYn;
@@ -328,16 +332,21 @@ public class TbCctvCtlrDto implements Serializable {
         @Size(min=1, max=7)
         private String cctvAreaDvsn;
 
-        @ApiModelProperty("외부 HTTP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
+        @ApiModelProperty("외부 RTMP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
         @JsonProperty("intr_rtmp_addr")
         @Size(min=1, max=200)
         private String intrRtmpAddr;
 
-        @ApiModelProperty(", Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
+        @ApiModelProperty("외부 HTTP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
         @JsonProperty("intr_http_addr")
         @Size(min=1, max=200)
         private String intrHttpAddr;
 
+        @ApiModelProperty("WEB RTC ID, Nullable = Y, VARCHAR2(56)")  // Y VARCHAR2(200)
+        @JsonProperty("web_rtc_id")
+        @Size(min=1, max=56)
+        private String webRtcId;
+
         @ApiModelProperty("운영자 제어 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
         @JsonProperty("syop_cntl_yn")
         @Size(min=1, max=1)
@@ -351,7 +360,7 @@ public class TbCctvCtlrDto implements Serializable {
         private String delYn;
 
         @Builder
-        public TbCctvCtlrUpdReq(Long cctv_ctlr_nmbr, String cctv_ctlr_id, String cctv_nm, String cctv_ctlr_ip, String cctv_ctlr_port, String cctv_capt_ip, String cctv_capt_port, String cctv_fibr_ip, String cctv_encd_ip, String strm_svr_ip, String strm_svr_port, String strm_sesn_nm, Double x_crdn, Double y_crdn, String istl_lctn_nm, String istl_lctn_addr, Integer cctv_chnl, Long link_id, Long node_id, String cctv_id, String rely_port, String strm_rtsp_addr, String strm_rtmp_addr, String strm_http_addr, String strm_stor_addr, String area_cd, String cctv_type, byte[] cctv_sbst_imgn, String cctv_sbst_dspl_yn, String cctv_area_dvsn, String intr_rtmp_addr, String intr_http_addr, String syop_cntl_yn, String del_yn) {
+        public TbCctvCtlrUpdReq(Long cctv_ctlr_nmbr, String cctv_ctlr_id, String cctv_nm, String cctv_ctlr_ip, String cctv_ctlr_port, String cctv_capt_ip, String cctv_capt_port, String cctv_fibr_ip, String cctv_encd_ip, String strm_svr_ip, String strm_svr_port, String strm_sesn_nm, Double x_crdn, Double y_crdn, String istl_lctn_nm, String istl_lctn_addr, Integer cctv_chnl, Long link_id, Long node_id, String cctv_id, String rely_port, String strm_rtsp_addr, String strm_rtmp_addr, String strm_http_addr, String strm_stor_addr, String area_cd, String cctv_type, byte[] cctv_sbst_imgn, String cctv_sbst_dspl_yn, String cctv_area_dvsn, String intr_rtmp_addr, String intr_http_addr, String web_rtc_id, String syop_cntl_yn, String del_yn) {
             this.cctvCtlrNmbr = cctv_ctlr_nmbr;
             this.cctvCtlrId = cctv_ctlr_id;
             this.cctvNm = cctv_nm;
@@ -383,6 +392,7 @@ public class TbCctvCtlrDto implements Serializable {
             this.cctvAreaDvsn = cctv_area_dvsn;
             this.intrRtmpAddr = intr_rtmp_addr;
             this.intrHttpAddr = intr_http_addr;
+            this.webRtcId = web_rtc_id;
             this.syopCntlYn = syop_cntl_yn;
             this.delYn = del_yn;
 
@@ -429,6 +439,7 @@ public class TbCctvCtlrDto implements Serializable {
                     .cctvAreaDvsn(this.cctvAreaDvsn)
                     .intrRtmpAddr(this.intrRtmpAddr)
                     .intrHttpAddr(this.intrHttpAddr)
+                    .webRtcId(this.webRtcId)
                     .syopCntlYn(this.syopCntlYn)
                     .delYn(this.delYn)
                     .build();

+ 8 - 2
src/main/java/com/its/op/entity/its/cctv/TbCctvCtlr.java

@@ -148,14 +148,18 @@ public class TbCctvCtlr implements Serializable {
     @Column(name = "CCTV_AREA_DVSN", length = 7)
     private String cctvAreaDvsn;
 
-    @ApiModelProperty("외부 HTTP 주소")  // Y VARCHAR2(200)
+    @ApiModelProperty("외부 RTMP 주소")  // Y VARCHAR2(200)
     @Column(name = "INTR_RTMP_ADDR", length = 200)
     private String intrRtmpAddr;
 
-    @ApiModelProperty("")  // Y VARCHAR2(200)
+    @ApiModelProperty("외부 HTTP 주소")  // Y VARCHAR2(200)
     @Column(name = "INTR_HTTP_ADDR", length = 200)
     private String intrHttpAddr;
 
+    @ApiModelProperty("WEB RTC ID")  // Y VARCHAR2(56)
+    @Column(name = "WEB_RTC_ID", length = 56)
+    private String webRtcId;
+
     @ApiModelProperty("운영자 제어 여부")  // Y CHAR(1)
     @Column(name = "SYOP_CNTL_YN", columnDefinition = "CHAR", length = 1)
     private String syopCntlYn;
@@ -207,6 +211,7 @@ public class TbCctvCtlr implements Serializable {
                 .cctvAreaDvsn(this.cctvAreaDvsn)
                 .intrRtmpAddr(this.intrRtmpAddr)
                 .intrHttpAddr(this.intrHttpAddr)
+                .webRtcId(this.webRtcId)
                 .syopCntlYn(this.syopCntlYn)
                 .delYn(this.delYn)
                 .build();
@@ -278,6 +283,7 @@ public class TbCctvCtlr implements Serializable {
         this.cctvAreaDvsn = req.getCctvAreaDvsn();
         this.intrRtmpAddr = req.getIntrRtmpAddr();
         this.intrHttpAddr = req.getIntrHttpAddr();
+        this.webRtcId = req.getWebRtcId();
         this.syopCntlYn = req.getSyopCntlYn();
         this.delYn = req.getDelYn();
     }