dd

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

@@ -60,15 +60,15 @@ public class TbCctvCtlrDto implements Serializable {
     @JsonProperty("cctv_capt_ip")
     private String cctvCaptIp;
 
-    @ApiModelProperty("CCTV 자막기 포트")  // Y VARCHAR2(5)
+    @ApiModelProperty("CCTV 자막기 포트")  // Y NUMBER(5)
     @JsonProperty("cctv_capt_port")
     private Integer cctvCaptPort;
 
-    @ApiModelProperty("스트리밍 서버 아이피")  // Y VARCHAR2(20)
+    @ApiModelProperty("스트리밍 서버 아이피--->분배서버ip")  // Y VARCHAR2(20)
     @JsonProperty("strm_svr_ip")
     private String strmSvrIp;
 
-    @ApiModelProperty("스트리밍 서버 포트")  // Y NUMBER(5)
+    @ApiModelProperty("스트리밍 서버 포트--->분배서버port")  // Y NUMBER(5)
     @JsonProperty("strm_svr_port")
     private Integer strmSvrPort;
 
@@ -96,6 +96,14 @@ public class TbCctvCtlrDto implements Serializable {
     @JsonProperty("intr_http_addr")
     private String intrHttpAddr;
 
+    @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;
@@ -157,6 +165,22 @@ public class TbCctvCtlrDto implements Serializable {
     @JsonProperty("cctv_type_desc")    // CCTV_TYPE_CD
     private String cctvTypeDesc;
 
+    @ApiModelProperty("CCTV 대체 표출 여부 설명")
+    @JsonProperty("altt_imag_dspl_desc")    // ALTT_IMAG_DSPL_YN
+    private String alttImagDsplDesc;
+
+    @ApiModelProperty("운영자 제어 여부 설명")
+    @JsonProperty("syop_cntl_desc")    // SYOP_CNTL_YN
+    private String syopCntlDesc;
+
+    @ApiModelProperty("사용 여부 설명")
+    @JsonProperty("use_desc")    // USE_YN
+    private String useDesc;
+
+    @ApiModelProperty("삭제 여부 설명")
+    @JsonProperty("del_desc")    // DEL_YN
+    private String delDesc;
+
     @ApiModel("TbCctvCtlrUpdReq(CCTV 제어기 정보변경)")
     @Getter
     @Setter
@@ -219,12 +243,12 @@ public class TbCctvCtlrDto implements Serializable {
         @PositiveOrZero
         private Integer cctvCaptPort;
 
-        @ApiModelProperty("스트리밍 서버 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
+        @ApiModelProperty("스트리밍 서버 아이피--->분배서버ip, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("strm_svr_ip")
         @Size(min=1, max=20)
         private String strmSvrIp;
 
-        @ApiModelProperty("스트리밍 서버 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
+        @ApiModelProperty("스트리밍 서버 포트--->분배서버port, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("strm_svr_port")
         @PositiveOrZero
         private Integer strmSvrPort;
@@ -257,6 +281,16 @@ public class TbCctvCtlrDto implements Serializable {
         @Size(min=1, max=200)
         private String intrHttpAddr;
 
+        @ApiModelProperty("WEB RTC 서버 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
+        @JsonProperty("web_rtc_svr_ip")
+        @Size(min=1, 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=1, max=56)
@@ -332,7 +366,7 @@ 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_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;
@@ -352,6 +386,8 @@ public class TbCctvCtlrDto implements Serializable {
             this.strmRtspAddr = strm_rtsp_addr;
             this.strmHttpAddr = strm_http_addr;
             this.intrHttpAddr = intr_http_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;
@@ -389,6 +425,8 @@ public class TbCctvCtlrDto implements Serializable {
                     .strmRtspAddr(this.strmRtspAddr)
                     .strmHttpAddr(this.strmHttpAddr)
                     .intrHttpAddr(this.intrHttpAddr)
+                    .webRtcSvrIp(this.webRtcSvrIp)
+                    .webRtcSvrPort(this.webRtcSvrPort)
                     .webRtcId(this.webRtcId)
                     .alttImagNmbr(this.alttImagNmbr)
                     .alttImagDsplYn(this.alttImagDsplYn)

src/main/java/com/its/op/entity/its/cctv/TbCctvCtlr.java

@@ -74,11 +74,11 @@ public class TbCctvCtlr implements Serializable {
     @Column(name = "CCTV_CAPT_PORT", columnDefinition = "NUMBER", length = 5)
     private Integer cctvCaptPort;
 
-    @ApiModelProperty("스트리밍 서버 아이피")  // Y VARCHAR2(20)
+    @ApiModelProperty("스트리밍 서버 아이피--->분배서버ip")  // Y VARCHAR2(20)
     @Column(name = "STRM_SVR_IP", length = 20)
     private String strmSvrIp;
 
-    @ApiModelProperty("스트리밍 서버 포트")  // Y NUMBER(5)
+    @ApiModelProperty("스트리밍 서버 포트--->분배서버port")  // Y NUMBER(5)
     @Column(name = "STRM_SVR_PORT", columnDefinition = "NUMBER", length = 5)
     private Integer strmSvrPort;
 
@@ -106,6 +106,14 @@ public class TbCctvCtlr implements Serializable {
     @Column(name = "INTR_HTTP_ADDR", length = 200)
     private String intrHttpAddr;
 
+    @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;
@@ -192,6 +200,8 @@ public class TbCctvCtlr implements Serializable {
                 .strmRtspAddr(this.strmRtspAddr)
                 .strmHttpAddr(this.strmHttpAddr)
                 .intrHttpAddr(this.intrHttpAddr)
+                .webRtcSvrIp(this.webRtcSvrIp)
+                .webRtcSvrPort(this.webRtcSvrPort)
                 .webRtcId(this.webRtcId)
                 .alttImagNmbr(this.alttImagNmbr)
                 .alttImagDsplYn(this.alttImagDsplYn)
@@ -221,13 +231,6 @@ public class TbCctvCtlr implements Serializable {
                 .cmncSttsCd(CodeManager.CMNC_STTS_ERROR)
                 .build();
 
-//        private String cmncSttsDesc;
-//        private String cboxDoorSttsDesc;
-//        private String frontDoorSttsDesc;
-//        private String backDoorSttsDesc;
-//        private String fanSttsDesc;
-//        private String hetrSttsDesc;
-//        private String videoInputDesc;
         if (this.state != null) {
             dto.setUpdtDt(this.state.getUpdtDt());
 
@@ -285,6 +288,8 @@ public class TbCctvCtlr implements Serializable {
         this.strmRtspAddr = req.getStrmRtspAddr();
         this.strmHttpAddr = req.getStrmHttpAddr();
         this.intrHttpAddr = req.getIntrHttpAddr();
+        this.webRtcSvrIp = req.getWebRtcSvrIp();
+        this.webRtcSvrPort = req.getWebRtcSvrPort();
         this.webRtcId = req.getWebRtcId();
         this.alttImagNmbr = req.getAlttImagNmbr();
         this.alttImagDsplYn = req.getAlttImagDsplYn();