cctv modify

src/main/java/com/its/op/controller/its/common/CommonController.java

@@ -32,6 +32,8 @@ public class CommonController {
     private final TbClctSystStupService clctSystStupService;
     private final CommonService commonService;
     private final TbSectGradService sectGradClsfService;
+//    private final TbCmmnClsfCdService cmmnClsfCdService;
+//    private final TbCmmnCdService cmmnCdService;
 
     // /api/database/clct-syst-stup 와 동일
     @ApiOperation(value = "수집시스템 조회(TB_CLCT_SYST_STUP)", response = TbClctSystStupDto.class, responseContainer = "ArrayList")
@@ -83,6 +85,12 @@ public class CommonController {
     public List<TbSectGradClsfDto> findAllSectGradCdList() {
         return this.sectGradClsfService.findAll();
     }
+//
+//    @ApiOperation(value = "소분류코드-개별조회-목록(TB_CMMN_CD)", response = TbCmmnCdDto.class, responseContainer = "ArrayList")
+//    @GetMapping(value = "/code/cmmn-cd/{cmmnCd}", produces = {"application/json; charset=utf8"})
+//    public List<TbCmmnCdDto> findAllByCmmnClsfCd(@PathVariable final String cmmnCd) {
+//        return this.cmmnCdService.findAllByCmmnClsfCd(cmmnCd);
+//    }
 
     //    @ApiOperation(value = "현재기상정보조회", response = WeatherInfoDto.class, responseContainer = "ArrayList")
 //    @GetMapping(value = "/weather-info", produces = {"application/json; charset=utf8"})

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

@@ -24,21 +24,37 @@ public class TbCctvCtlrDto implements Serializable {
     @JsonProperty("cctv_ctlr_nmbr")
     private Long cctvCtlrNmbr;
 
-    @ApiModelProperty("CCTV 명칭")  // Y VARCHAR2(10)
+    @ApiModelProperty("CCTV 제어기 ID")  // Y VARCHAR2(10)
     @JsonProperty("cctv_ctlr_id")
     private String cctvCtlrId;
 
-    @ApiModelProperty("")  // Y VARCHAR2(40)
+    @ApiModelProperty("CCTV 명칭")  // Y VARCHAR2(40)
     @JsonProperty("cctv_nm")
     private String cctvNm;
 
+    @ApiModelProperty("설치 위치 명")  // Y VARCHAR2(40)
+    @JsonProperty("istl_lctn_nm")
+    private String istlLctnNm;
+
+    @ApiModelProperty("설치 위치 주소")  // Y VARCHAR2(200)
+    @JsonProperty("istl_lctn_addr")
+    private String istlLctnAddr;
+
     @ApiModelProperty("CCTV 제어기 아이피")  // Y VARCHAR2(20)
     @JsonProperty("cctv_ctlr_ip")
     private String cctvCtlrIp;
 
-    @ApiModelProperty("CCTV 제어기 포트")  // Y VARCHAR2(5)
+    @ApiModelProperty("CCTV 제어기 포트")  // Y NUMBER(5)
     @JsonProperty("cctv_ctlr_port")
-    private String cctvCtlrPort;
+    private Integer cctvCtlrPort;
+
+    @ApiModelProperty("CCTV 제어기 지역번호")  // Y NUMBER(5)
+    @JsonProperty("cctv_ctlr_local_no")
+    private Integer cctvCtlrLocalNo;
+
+    @ApiModelProperty("CCTV 유형 코드('CCTVT')")  // Y VARCHAR2(7)
+    @JsonProperty("cctv_type_cd")
+    private String cctvTypeCd;
 
     @ApiModelProperty("CCTV 자막기 아이피")  // Y VARCHAR2(20)
     @JsonProperty("cctv_capt_ip")
@@ -46,23 +62,15 @@ public class TbCctvCtlrDto implements Serializable {
 
     @ApiModelProperty("CCTV 자막기 포트")  // Y VARCHAR2(5)
     @JsonProperty("cctv_capt_port")
-    private String cctvCaptPort;
-
-    @ApiModelProperty("CCTV 광장비 아이피")  // Y VARCHAR2(20)
-    @JsonProperty("cctv_fibr_ip")
-    private String cctvFibrIp;
-
-    @ApiModelProperty("CCTV 인코더 아이피")  // Y VARCHAR2(20)
-    @JsonProperty("cctv_encd_ip")
-    private String cctvEncdIp;
+    private Integer cctvCaptPort;
 
     @ApiModelProperty("스트리밍 서버 아이피")  // Y VARCHAR2(20)
     @JsonProperty("strm_svr_ip")
     private String strmSvrIp;
 
-    @ApiModelProperty("스트리밍 서버 포트")  // Y VARCHAR2(5)
+    @ApiModelProperty("스트리밍 서버 포트")  // Y NUMBER(5)
     @JsonProperty("strm_svr_port")
-    private String strmSvrPort;
+    private Integer strmSvrPort;
 
     @ApiModelProperty("스트리밍 세션 명")  // Y VARCHAR2(200)
     @JsonProperty("strm_sesn_nm")
@@ -76,17 +84,33 @@ public class TbCctvCtlrDto implements Serializable {
     @JsonProperty("y_crdn")
     private Double yCrdn;
 
-    @ApiModelProperty("설치 위치 명")  // Y VARCHAR2(40)
-    @JsonProperty("istl_lctn_nm")
-    private String istlLctnNm;
+    @ApiModelProperty("스트리밍 RTSP 주소")  // Y VARCHAR2(200)
+    @JsonProperty("strm_rtsp_addr")
+    private String strmRtspAddr;
 
-    @ApiModelProperty("설치 위치 주소")  // Y VARCHAR2(200)
-    @JsonProperty("istl_lctn_addr")
-    private String istlLctnAddr;
+    @ApiModelProperty("스트리밍 HTTP 주소")  // Y VARCHAR2(200)
+    @JsonProperty("strm_http_addr")
+    private String strmHttpAddr;
 
-    @ApiModelProperty("CCTV 채널")  // Y NUMBER(2)
-    @JsonProperty("cctv_chnl")
-    private Integer cctvChnl;
+    @ApiModelProperty("인터넷 HLS 주소")  // 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("CCTV 대체 영상 이미지 번호")  // Y VARCHAR2(5)
+    @JsonProperty("altt_imag_nmbr")
+    private String alttImagNmbr;
+
+    @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
+    @JsonProperty("altt_imag_dspl_yn")
+    private String alttImagDsplYn;
+
+    @ApiModelProperty("운영자 제어 여부")  // Y CHAR(1)
+    @JsonProperty("syop_cntl_yn")
+    private String syopCntlYn;
 
     @ApiModelProperty("링크ID")  // Y NUMBER(10)
     @JsonProperty("link_id")
@@ -100,82 +124,38 @@ public class TbCctvCtlrDto implements Serializable {
     @JsonProperty("cctv_id")
     private String cctvId;
 
-    @ApiModelProperty("연계 포트")  // Y VARCHAR2(5)
-    @JsonProperty("rely_port")
-    private String relyPort;
-
-    @ApiModelProperty("스트리밍 RTSP 주소")  // Y VARCHAR2(200)
-    @JsonProperty("strm_rtsp_addr")
-    private String strmRtspAddr;
-
-    @ApiModelProperty("스트리밍 RTMP 주소")  // Y VARCHAR2(200)
-    @JsonProperty("strm_rtmp_addr")
-    private String strmRtmpAddr;
-
-    @ApiModelProperty("스트리밍 HTTP 주소")  // Y VARCHAR2(200)
-    @JsonProperty("strm_http_addr")
-    private String strmHttpAddr;
-
-    @ApiModelProperty("스트리밍 저장 주소")  // Y VARCHAR2(200)
-    @JsonProperty("strm_stor_addr")
-    private String strmStorAddr;
-
-    @ApiModelProperty("지역 코드")  // Y VARCHAR2(7)
-    @JsonProperty("area_cd")
-    private String areaCd;
-
-    @ApiModelProperty("CCTV 유형")  // Y VARCHAR2(10)
-    @JsonProperty("cctv_type")
-    private String cctvType;
-
-    @ApiModelProperty("CCTV 대체 영상")  // Y BLOB
-    @JsonProperty("cctv_sbst_imgn")
-    private byte[] cctvSbstImgn;
-
-    @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
-    @JsonProperty("cctv_sbst_dspl_yn")
-    private String cctvSbstDsplYn;
-
     @ApiModelProperty("CCTV 지역 구분")  // Y VARCHAR2(7)
     @JsonProperty("cctv_area_dvsn")
     private String cctvAreaDvsn;
 
-    @ApiModelProperty("외부 RTMP 주소")  // Y VARCHAR2(200)
-    @JsonProperty("intr_rtmp_addr")
-    private String intrRtmpAddr;
+    @ApiModelProperty("사용 여부")  // Y CHAR(1)
+    @JsonProperty("use_yn")
+    private String useYn;
 
-    @ApiModelProperty("외부 HTTP 주소")  // Y VARCHAR2(200)
-    @JsonProperty("intr_http_addr")
-    private String intrHttpAddr;
+    @ApiModelProperty("팬 ON 온도")  // Y NUMBER(3)
+    @JsonProperty("fan_on_tmpr")
+    private Integer fanOnTmpr;
 
-    @ApiModelProperty("WEB RTC ID")  // Y VARCHAR2(56)
-    @JsonProperty("web_rtc_id")
-    private String webRtcId;
+    @ApiModelProperty("팬 OFF 온도")  // Y NUMBER(3)
+    @JsonProperty("fan_off_tmpr")
+    private Integer fanOffTmpr;
 
-    @ApiModelProperty("운영자 제어 여부")  // Y CHAR(1)
-    @JsonProperty("syop_cntl_yn")
-    private String syopCntlYn;
+    @ApiModelProperty("히터 ON 온도")  // Y NUMBER(3)
+    @JsonProperty("hetr_on_tmpr")
+    private Integer hetrOnTmpr;
+
+    @ApiModelProperty("히터 OFF 온도")  // Y NUMBER(3)
+    @JsonProperty("hetr_off_tmpr")
+    private Integer hetrOffTmpr;
 
     @ApiModelProperty("삭제 여부")  // Y CHAR(1)
     @JsonProperty("del_yn")
     private String delYn;
 
     // Code Description Field
-    @ApiModelProperty("지역 코드 설명")
-    @JsonProperty("area_desc")    // AREA_CD
-    private String areaDesc;
-
-    @ApiModelProperty("CCTV 대체 표출 여부 설명")
-    @JsonProperty("cctv_sbst_dspl_desc")    // CCTV_SBST_DSPL_YN
-    private String cctvSbstDsplDesc;
-
-    @ApiModelProperty("운영자 제어 여부 설명")
-    @JsonProperty("syop_cntl_desc")    // SYOP_CNTL_YN
-    private String syopCntlDesc;
-
-    @ApiModelProperty("삭제 여부 설명")
-    @JsonProperty("del_desc")    // DEL_YN
-    private String delDesc;
+    @ApiModelProperty("CCTV 유형 코드('CCTVT') 설명")
+    @JsonProperty("cctv_type_desc")    // CCTV_TYPE_CD
+    private String cctvTypeDesc;
 
     @ApiModel("TbCctvCtlrUpdReq(CCTV 제어기 정보변경)")
     @Getter
@@ -189,55 +169,65 @@ public class TbCctvCtlrDto implements Serializable {
         @PositiveOrZero
         private Long cctvCtlrNmbr;
 
-        @ApiModelProperty("CCTV 명칭, Nullable = Y, VARCHAR2(10)")  // Y VARCHAR2(10)
+        @ApiModelProperty("CCTV 제어기 ID, Nullable = Y, VARCHAR2(10)")  // Y VARCHAR2(10)
         @JsonProperty("cctv_ctlr_id")
         @Size(min=1, max=10)
         private String cctvCtlrId;
 
-        @ApiModelProperty(", Nullable = Y, VARCHAR2(40)")  // Y VARCHAR2(40)
+        @ApiModelProperty("CCTV 명칭, Nullable = Y, VARCHAR2(40)")  // Y VARCHAR2(40)
         @JsonProperty("cctv_nm")
         @Size(min=1, max=40)
         private String cctvNm;
 
+        @ApiModelProperty("설치 위치 명, Nullable = Y, VARCHAR2(40)")  // Y VARCHAR2(40)
+        @JsonProperty("istl_lctn_nm")
+        @Size(min=1, max=40)
+        private String istlLctnNm;
+
+        @ApiModelProperty("설치 위치 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
+        @JsonProperty("istl_lctn_addr")
+        @Size(min=1, max=200)
+        private String istlLctnAddr;
+
         @ApiModelProperty("CCTV 제어기 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("cctv_ctlr_ip")
         @Size(min=1, max=20)
         private String cctvCtlrIp;
 
-        @ApiModelProperty("CCTV 제어기 포트, Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
+        @ApiModelProperty("CCTV 제어기 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("cctv_ctlr_port")
-        @Size(min=1, max=5)
-        private String cctvCtlrPort;
+        @PositiveOrZero
+        private Integer cctvCtlrPort;
+
+        @ApiModelProperty("CCTV 제어기 지역번호, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
+        @JsonProperty("cctv_ctlr_local_no")
+        @PositiveOrZero
+        private Integer cctvCtlrLocalNo;
+
+        @ApiModelProperty("CCTV 유형 코드('CCTVT'), Nullable = Y, VARCHAR2(7)")  // Y VARCHAR2(7)
+        @JsonProperty("cctv_type_cd")
+        @Size(min=1, max=7)
+        private String cctvTypeCd;
 
         @ApiModelProperty("CCTV 자막기 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("cctv_capt_ip")
         @Size(min=1, max=20)
         private String cctvCaptIp;
 
-        @ApiModelProperty("CCTV 자막기 포트, Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
+        @ApiModelProperty("CCTV 자막기 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("cctv_capt_port")
-        @Size(min=1, max=5)
-        private String cctvCaptPort;
-
-        @ApiModelProperty("CCTV 광장비 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
-        @JsonProperty("cctv_fibr_ip")
-        @Size(min=1, max=20)
-        private String cctvFibrIp;
-
-        @ApiModelProperty("CCTV 인코더 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
-        @JsonProperty("cctv_encd_ip")
-        @Size(min=1, max=20)
-        private String cctvEncdIp;
+        @PositiveOrZero
+        private Integer cctvCaptPort;
 
         @ApiModelProperty("스트리밍 서버 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("strm_svr_ip")
         @Size(min=1, max=20)
         private String strmSvrIp;
 
-        @ApiModelProperty("스트리밍 서버 포트, Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
+        @ApiModelProperty("스트리밍 서버 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("strm_svr_port")
-        @Size(min=1, max=5)
-        private String strmSvrPort;
+        @PositiveOrZero
+        private Integer strmSvrPort;
 
         @ApiModelProperty("스트리밍 세션 명, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
         @JsonProperty("strm_sesn_nm")
@@ -252,20 +242,42 @@ public class TbCctvCtlrDto implements Serializable {
         @JsonProperty("y_crdn")
         private Double yCrdn;
 
-        @ApiModelProperty("설치 위치 명, Nullable = Y, VARCHAR2(40)")  // Y VARCHAR2(40)
-        @JsonProperty("istl_lctn_nm")
-        @Size(min=1, max=40)
-        private String istlLctnNm;
+        @ApiModelProperty("스트리밍 RTSP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
+        @JsonProperty("strm_rtsp_addr")
+        @Size(min=1, max=200)
+        private String strmRtspAddr;
 
-        @ApiModelProperty("설치 위치 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
-        @JsonProperty("istl_lctn_addr")
+        @ApiModelProperty("스트리밍 HTTP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
+        @JsonProperty("strm_http_addr")
         @Size(min=1, max=200)
-        private String istlLctnAddr;
+        private String strmHttpAddr;
 
-        @ApiModelProperty("CCTV 채널, Nullable = Y, NUMBER(2)")  // Y NUMBER(2)
-        @JsonProperty("cctv_chnl")
-        @PositiveOrZero
-        private Integer cctvChnl;
+        @ApiModelProperty("인터넷 HLS 주소, 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(56)
+        @JsonProperty("web_rtc_id")
+        @Size(min=1, 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;
+
+        @ApiModelProperty("운영자 제어 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
+        @JsonProperty("syop_cntl_yn")
+        @Size(min=1, max=1)
+        @Pattern(regexp = "[YN]")
+        private String syopCntlYn;
 
         @ApiModelProperty("링크ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("link_id")
@@ -282,76 +294,36 @@ public class TbCctvCtlrDto implements Serializable {
         @Size(min=1, max=10)
         private String cctvId;
 
-        @ApiModelProperty("연계 포트, Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
-        @JsonProperty("rely_port")
-        @Size(min=1, max=5)
-        private String relyPort;
-
-        @ApiModelProperty("스트리밍 RTSP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
-        @JsonProperty("strm_rtsp_addr")
-        @Size(min=1, max=200)
-        private String strmRtspAddr;
-
-        @ApiModelProperty("스트리밍 RTMP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
-        @JsonProperty("strm_rtmp_addr")
-        @Size(min=1, max=200)
-        private String strmRtmpAddr;
-
-        @ApiModelProperty("스트리밍 HTTP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
-        @JsonProperty("strm_http_addr")
-        @Size(min=1, max=200)
-        private String strmHttpAddr;
-
-        @ApiModelProperty("스트리밍 저장 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
-        @JsonProperty("strm_stor_addr")
-        @Size(min=1, max=200)
-        private String strmStorAddr;
-
-        @ApiModelProperty("지역 코드, Nullable = Y, VARCHAR2(7)")  // Y VARCHAR2(7)
-        @JsonProperty("area_cd")
-        @Size(min=1, max=7)
-        private String areaCd;
-
-        @ApiModelProperty("CCTV 유형, Nullable = Y, VARCHAR2(10)")  // Y VARCHAR2(10)
-        @JsonProperty("cctv_type")
-        @Size(min=1, max=10)
-        private String cctvType;
-
-        @ApiModelProperty("CCTV 대체 영상, Nullable = Y, Image Data")  // Y BLOB
-        @JsonProperty("cctv_sbst_imgn")
-        private byte[] cctvSbstImgn;
-
-        @ApiModelProperty("CCTV 대체 표출 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
-        @JsonProperty("cctv_sbst_dspl_yn")
-        @Size(min=1, max=1)
-        @Pattern(regexp = "[YN]")
-        private String cctvSbstDsplYn;
-
         @ApiModelProperty("CCTV 지역 구분, Nullable = Y, VARCHAR2(7)")  // Y VARCHAR2(7)
         @JsonProperty("cctv_area_dvsn")
         @Size(min=1, max=7)
         private String cctvAreaDvsn;
 
-        @ApiModelProperty("외부 RTMP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
-        @JsonProperty("intr_rtmp_addr")
-        @Size(min=1, max=200)
-        private String intrRtmpAddr;
+        @ApiModelProperty("사용 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
+        @JsonProperty("use_yn")
+        @Size(min=1, max=1)
+        @Pattern(regexp = "[YN]")
+        private String useYn;
 
-        @ApiModelProperty("외부 HTTP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
-        @JsonProperty("intr_http_addr")
-        @Size(min=1, max=200)
-        private String intrHttpAddr;
+        @ApiModelProperty("팬 ON 온도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
+        @JsonProperty("fan_on_tmpr")
+        @PositiveOrZero
+        private Integer fanOnTmpr;
 
-        @ApiModelProperty("WEB RTC ID, Nullable = Y, VARCHAR2(56)")  // Y VARCHAR2(200)
-        @JsonProperty("web_rtc_id")
-        @Size(min=1, max=56)
-        private String webRtcId;
+        @ApiModelProperty("팬 OFF 온도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
+        @JsonProperty("fan_off_tmpr")
+        @PositiveOrZero
+        private Integer fanOffTmpr;
 
-        @ApiModelProperty("운영자 제어 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
-        @JsonProperty("syop_cntl_yn")
-        @Size(min=1, max=1)
-        @Pattern(regexp = "[YN]")
-        private String syopCntlYn;
+        @ApiModelProperty("히터 ON 온도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
+        @JsonProperty("hetr_on_tmpr")
+        @PositiveOrZero
+        private Integer hetrOnTmpr;
+
+        @ApiModelProperty("히터 OFF 온도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
+        @JsonProperty("hetr_off_tmpr")
+        @PositiveOrZero
+        private Integer hetrOffTmpr;
 
         @ApiModelProperty("삭제 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
         @JsonProperty("del_yn")
@@ -360,49 +332,40 @@ 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 web_rtc_id, String syop_cntl_yn, 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_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;
+            this.istlLctnNm = istl_lctn_nm;
+            this.istlLctnAddr = istl_lctn_addr;
             this.cctvCtlrIp = cctv_ctlr_ip;
             this.cctvCtlrPort = cctv_ctlr_port;
+            this.cctvCtlrLocalNo = cctv_ctlr_local_no;
+            this.cctvTypeCd = cctv_type_cd;
             this.cctvCaptIp = cctv_capt_ip;
             this.cctvCaptPort = cctv_capt_port;
-            this.cctvFibrIp = cctv_fibr_ip;
-            this.cctvEncdIp = cctv_encd_ip;
             this.strmSvrIp = strm_svr_ip;
             this.strmSvrPort = strm_svr_port;
             this.strmSesnNm = strm_sesn_nm;
             this.xCrdn = x_crdn;
             this.yCrdn = y_crdn;
-            this.istlLctnNm = istl_lctn_nm;
-            this.istlLctnAddr = istl_lctn_addr;
-            this.cctvChnl = cctv_chnl;
-            this.linkId = link_id;
-            this.nodeId = node_id;
-            this.cctvId = cctv_id;
-            this.relyPort = rely_port;
             this.strmRtspAddr = strm_rtsp_addr;
-            this.strmRtmpAddr = strm_rtmp_addr;
             this.strmHttpAddr = strm_http_addr;
-            this.strmStorAddr = strm_stor_addr;
-            this.areaCd = area_cd;
-            this.cctvType = cctv_type;
-            this.cctvSbstDsplYn = cctv_sbst_dspl_yn;
-            this.cctvAreaDvsn = cctv_area_dvsn;
-            this.intrRtmpAddr = intr_rtmp_addr;
             this.intrHttpAddr = intr_http_addr;
             this.webRtcId = web_rtc_id;
+            this.alttImagNmbr = altt_imag_nmbr;
+            this.alttImagDsplYn = altt_imag_dspl_yn;
             this.syopCntlYn = syop_cntl_yn;
+            this.linkId = link_id;
+            this.nodeId = node_id;
+            this.cctvId = cctv_id;
+            this.cctvAreaDvsn = cctv_area_dvsn;
+            this.useYn = use_yn;
+            this.fanOnTmpr = fan_on_tmpr;
+            this.fanOffTmpr = fan_off_tmpr;
+            this.hetrOnTmpr = hetr_on_tmpr;
+            this.hetrOffTmpr = hetr_off_tmpr;
             this.delYn = del_yn;
-
-            // FOR KISA Secure Coding pass
-            //this.cctvSbstImgn = cctv_sbst_imgn;
-            this.cctvSbstImgn = null;
-            if (cctv_sbst_imgn != null && cctv_sbst_imgn.length > 0) {
-                this.cctvSbstImgn = new byte[cctv_sbst_imgn.length];
-                System.arraycopy(cctv_sbst_imgn, 0, this.cctvSbstImgn, 0, cctv_sbst_imgn.length);
-            }
         }
 
         public TbCctvCtlr toEntity() {
@@ -410,37 +373,35 @@ public class TbCctvCtlrDto implements Serializable {
                     .cctvCtlrNmbr(this.cctvCtlrNmbr)
                     .cctvCtlrId(this.cctvCtlrId)
                     .cctvNm(this.cctvNm)
+                    .istlLctnNm(this.istlLctnNm)
+                    .istlLctnAddr(this.istlLctnAddr)
                     .cctvCtlrIp(this.cctvCtlrIp)
                     .cctvCtlrPort(this.cctvCtlrPort)
+                    .cctvCtlrLocalNo(this.cctvCtlrLocalNo)
+                    .cctvTypeCd(this.cctvTypeCd)
                     .cctvCaptIp(this.cctvCaptIp)
                     .cctvCaptPort(this.cctvCaptPort)
-                    .cctvFibrIp(this.cctvFibrIp)
-                    .cctvEncdIp(this.cctvEncdIp)
                     .strmSvrIp(this.strmSvrIp)
                     .strmSvrPort(this.strmSvrPort)
                     .strmSesnNm(this.strmSesnNm)
                     .xCrdn(this.xCrdn)
                     .yCrdn(this.yCrdn)
-                    .istlLctnNm(this.istlLctnNm)
-                    .istlLctnAddr(this.istlLctnAddr)
-                    .cctvChnl(this.cctvChnl)
-                    .linkId(this.linkId)
-                    .nodeId(this.nodeId)
-                    .cctvId(this.cctvId)
-                    .relyPort(this.relyPort)
                     .strmRtspAddr(this.strmRtspAddr)
-                    .strmRtmpAddr(this.strmRtmpAddr)
                     .strmHttpAddr(this.strmHttpAddr)
-                    .strmStorAddr(this.strmStorAddr)
-                    .areaCd(this.areaCd)
-                    .cctvType(this.cctvType)
-                    .cctvSbstImgn(this.cctvSbstImgn)
-                    .cctvSbstDsplYn(this.cctvSbstDsplYn)
-                    .cctvAreaDvsn(this.cctvAreaDvsn)
-                    .intrRtmpAddr(this.intrRtmpAddr)
                     .intrHttpAddr(this.intrHttpAddr)
                     .webRtcId(this.webRtcId)
+                    .alttImagNmbr(this.alttImagNmbr)
+                    .alttImagDsplYn(this.alttImagDsplYn)
                     .syopCntlYn(this.syopCntlYn)
+                    .linkId(this.linkId)
+                    .nodeId(this.nodeId)
+                    .cctvId(this.cctvId)
+                    .cctvAreaDvsn(this.cctvAreaDvsn)
+                    .useYn(this.useYn)
+                    .fanOnTmpr(this.fanOnTmpr)
+                    .fanOffTmpr(this.fanOffTmpr)
+                    .hetrOnTmpr(this.hetrOnTmpr)
+                    .hetrOffTmpr(this.hetrOffTmpr)
                     .delYn(this.delYn)
                     .build();
         }

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

@@ -1,12 +1,15 @@
 package com.its.op.entity.its.cctv;
 
-import com.its.op.global.CodeManager;
 import com.its.op.dto.its.cctv.TbCctvCtlrDto;
 import com.its.op.dto.its.cctv.TbCctvCtlrSttsDto;
+import com.its.op.global.CodeManager;
 import com.its.utils.ItsUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -31,45 +34,53 @@ public class TbCctvCtlr implements Serializable {
     @Column(name = "CCTV_CTLR_NMBR", nullable = false, columnDefinition = "NUMBER", length = 10)
     private Long cctvCtlrNmbr;
 
-    @ApiModelProperty("CCTV 명칭")  // Y VARCHAR2(10)
+    @ApiModelProperty("CCTV 제어기 ID")  // Y VARCHAR2(10)
     @Column(name = "CCTV_CTLR_ID", length = 10)
     private String cctvCtlrId;
 
-    @ApiModelProperty("")  // Y VARCHAR2(40)
+    @ApiModelProperty("CCTV 명칭")  // Y VARCHAR2(40)
     @Column(name = "CCTV_NM", length = 40)
     private String cctvNm;
 
+    @ApiModelProperty("설치 위치 명")  // Y VARCHAR2(40)
+    @Column(name = "ISTL_LCTN_NM", length = 40)
+    private String istlLctnNm;
+
+    @ApiModelProperty("설치 위치 주소")  // Y VARCHAR2(200)
+    @Column(name = "ISTL_LCTN_ADDR", length = 200)
+    private String istlLctnAddr;
+
     @ApiModelProperty("CCTV 제어기 아이피")  // Y VARCHAR2(20)
     @Column(name = "CCTV_CTLR_IP", length = 20)
     private String cctvCtlrIp;
 
-    @ApiModelProperty("CCTV 제어기 포트")  // Y VARCHAR2(5)
-    @Column(name = "CCTV_CTLR_PORT", length = 5)
-    private String cctvCtlrPort;
+    @ApiModelProperty("CCTV 제어기 포트")  // Y NUMBER(5)
+    @Column(name = "CCTV_CTLR_PORT", columnDefinition = "NUMBER", length = 5)
+    private Integer cctvCtlrPort;
+
+    @ApiModelProperty("CCTV 제어기 지역번호")  // Y NUMBER(5)
+    @Column(name = "CCTV_CTLR_LOCAL_NO", columnDefinition = "NUMBER", length = 5)
+    private Integer cctvCtlrLocalNo;
+
+    @ApiModelProperty("CCTV 유형 코드('CCTVT')")  // Y VARCHAR2(7)
+    @Column(name = "CCTV_TYPE_CD", length = 7)
+    private String cctvTypeCd;
 
     @ApiModelProperty("CCTV 자막기 아이피")  // Y VARCHAR2(20)
     @Column(name = "CCTV_CAPT_IP", length = 20)
     private String cctvCaptIp;
 
-    @ApiModelProperty("CCTV 자막기 포트")  // Y VARCHAR2(5)
-    @Column(name = "CCTV_CAPT_PORT", length = 5)
-    private String cctvCaptPort;
-
-    @ApiModelProperty("CCTV 광장비 아이피")  // Y VARCHAR2(20)
-    @Column(name = "CCTV_FIBR_IP", length = 20)
-    private String cctvFibrIp;
-
-    @ApiModelProperty("CCTV 인코더 아이피")  // Y VARCHAR2(20)
-    @Column(name = "CCTV_ENCD_IP", length = 20)
-    private String cctvEncdIp;
+    @ApiModelProperty("CCTV 자막기 포트")  // Y NUMBER(5)
+    @Column(name = "CCTV_CAPT_PORT", columnDefinition = "NUMBER", length = 5)
+    private Integer cctvCaptPort;
 
     @ApiModelProperty("스트리밍 서버 아이피")  // Y VARCHAR2(20)
     @Column(name = "STRM_SVR_IP", length = 20)
     private String strmSvrIp;
 
-    @ApiModelProperty("스트리밍 서버 포트")  // Y VARCHAR2(5)
-    @Column(name = "STRM_SVR_PORT", length = 5)
-    private String strmSvrPort;
+    @ApiModelProperty("스트리밍 서버 포트")  // Y NUMBER(5)
+    @Column(name = "STRM_SVR_PORT", columnDefinition = "NUMBER", length = 5)
+    private Integer strmSvrPort;
 
     @ApiModelProperty("스트리밍 세션 명")  // Y VARCHAR2(200)
     @Column(name = "STRM_SESN_NM", length = 200)
@@ -83,17 +94,33 @@ public class TbCctvCtlr implements Serializable {
     @Column(name = "Y_CRDN", columnDefinition = "NUMBER", length = 10, precision = 8)
     private Double yCrdn;
 
-    @ApiModelProperty("설치 위치 명")  // Y VARCHAR2(40)
-    @Column(name = "ISTL_LCTN_NM", length = 40)
-    private String istlLctnNm;
+    @ApiModelProperty("스트리밍 RTSP 주소")  // Y VARCHAR2(200)
+    @Column(name = "STRM_RTSP_ADDR", length = 200)
+    private String strmRtspAddr;
 
-    @ApiModelProperty("설치 위치 주소")  // Y VARCHAR2(200)
-    @Column(name = "ISTL_LCTN_ADDR", length = 200)
-    private String istlLctnAddr;
+    @ApiModelProperty("스트리밍 HTTP 주소")  // Y VARCHAR2(200)
+    @Column(name = "STRM_HTTP_ADDR", length = 200)
+    private String strmHttpAddr;
+
+    @ApiModelProperty("인터넷 HLS 주소")  // 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("CCTV 대체 영상 이미지 번호")  // Y VARCHAR2(5)
+    @Column(name = "ALTT_IMAG_NMBR", length = 5)
+    private String alttImagNmbr;
 
-    @ApiModelProperty("CCTV 채널")  // Y NUMBER(2)
-    @Column(name = "CCTV_CHNL", columnDefinition = "NUMBER", length = 2)
-    private Integer cctvChnl;
+    @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
+    @Column(name = "ALTT_IMAG_DSPL_YN", columnDefinition = "CHAR", length = 1)
+    private String alttImagDsplYn;
+
+    @ApiModelProperty("운영자 제어 여부")  // Y CHAR(1)
+    @Column(name = "SYOP_CNTL_YN", columnDefinition = "CHAR", length = 1)
+    private String syopCntlYn;
 
     @ApiModelProperty("링크ID")  // Y NUMBER(10)
     @Column(name = "LINK_ID", columnDefinition = "NUMBER", length = 10)
@@ -107,62 +134,29 @@ public class TbCctvCtlr implements Serializable {
     @Column(name = "CCTV_ID", length = 10)
     private String cctvId;
 
-    @ApiModelProperty("연계 포트")  // Y VARCHAR2(5)
-    @Column(name = "RELY_PORT", length = 5)
-    private String relyPort;
-
-    @ApiModelProperty("스트리밍 RTSP 주소")  // Y VARCHAR2(200)
-    @Column(name = "STRM_RTSP_ADDR", length = 200)
-    private String strmRtspAddr;
-
-    @ApiModelProperty("스트리밍 RTMP 주소")  // Y VARCHAR2(200)
-    @Column(name = "STRM_RTMP_ADDR", length = 200)
-    private String strmRtmpAddr;
-
-    @ApiModelProperty("스트리밍 HTTP 주소")  // Y VARCHAR2(200)
-    @Column(name = "STRM_HTTP_ADDR", length = 200)
-    private String strmHttpAddr;
-
-    @ApiModelProperty("스트리밍 저장 주소")  // Y VARCHAR2(200)
-    @Column(name = "STRM_STOR_ADDR", length = 200)
-    private String strmStorAddr;
-
-    @ApiModelProperty("지역 코드")  // Y VARCHAR2(7)
-    @Column(name = "AREA_CD", length = 7)
-    private String areaCd;
-
-    @ApiModelProperty("CCTV 유형")  // Y VARCHAR2(10)
-    @Column(name = "CCTV_TYPE", length = 10)
-    private String cctvType;
-
-    @ApiModelProperty("CCTV 대체 영상")  // Y BLOB
-    @Lob
-    @Column(name = "CCTV_SBST_IMGN")
-    private byte[] cctvSbstImgn;
-
-    @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
-    @Column(name = "CCTV_SBST_DSPL_YN", columnDefinition = "CHAR", length = 1)
-    private String cctvSbstDsplYn;
-
     @ApiModelProperty("CCTV 지역 구분")  // Y VARCHAR2(7)
     @Column(name = "CCTV_AREA_DVSN", length = 7)
     private String cctvAreaDvsn;
 
-    @ApiModelProperty("외부 RTMP 주소")  // Y VARCHAR2(200)
-    @Column(name = "INTR_RTMP_ADDR", length = 200)
-    private String intrRtmpAddr;
+    @ApiModelProperty("사용 여부")  // Y CHAR(1)
+    @Column(name = "USE_YN", columnDefinition = "CHAR", length = 1)
+    private String useYn;
 
-    @ApiModelProperty("외부 HTTP 주소")  // Y VARCHAR2(200)
-    @Column(name = "INTR_HTTP_ADDR", length = 200)
-    private String intrHttpAddr;
+    @ApiModelProperty("팬 ON 온도")  // Y NUMBER(3)
+    @Column(name = "FAN_ON_TMPR", columnDefinition = "NUMBER", length = 3)
+    private Integer fanOnTmpr;
 
-    @ApiModelProperty("WEB RTC ID")  // Y VARCHAR2(56)
-    @Column(name = "WEB_RTC_ID", length = 56)
-    private String webRtcId;
+    @ApiModelProperty("팬 OFF 온도")  // Y NUMBER(3)
+    @Column(name = "FAN_OFF_TMPR", columnDefinition = "NUMBER", length = 3)
+    private Integer fanOffTmpr;
 
-    @ApiModelProperty("운영자 제어 여부")  // Y CHAR(1)
-    @Column(name = "SYOP_CNTL_YN", columnDefinition = "CHAR", length = 1)
-    private String syopCntlYn;
+    @ApiModelProperty("히터 ON 온도")  // Y NUMBER(3)
+    @Column(name = "HETR_ON_TMPR", columnDefinition = "NUMBER", length = 3)
+    private Integer hetrOnTmpr;
+
+    @ApiModelProperty("히터 OFF 온도")  // Y NUMBER(3)
+    @Column(name = "HETR_OFF_TMPR", columnDefinition = "NUMBER", length = 3)
+    private Integer hetrOffTmpr;
 
     @ApiModelProperty("삭제 여부")  // Y CHAR(1)
     @Column(name = "DEL_YN", columnDefinition = "CHAR", length = 1)
@@ -178,43 +172,43 @@ public class TbCctvCtlr implements Serializable {
     }
 
     public TbCctvCtlrDto toDto() {
-        return TbCctvCtlrDto.builder()
+        TbCctvCtlrDto dto = TbCctvCtlrDto.builder()
                 .cctvCtlrNmbr(this.cctvCtlrNmbr)
                 .cctvCtlrId(this.cctvCtlrId)
                 .cctvNm(this.cctvNm)
+                .istlLctnNm(this.istlLctnNm)
+                .istlLctnAddr(this.istlLctnAddr)
                 .cctvCtlrIp(this.cctvCtlrIp)
                 .cctvCtlrPort(this.cctvCtlrPort)
+                .cctvCtlrLocalNo(this.cctvCtlrLocalNo)
+                .cctvTypeCd(this.cctvTypeCd)
                 .cctvCaptIp(this.cctvCaptIp)
                 .cctvCaptPort(this.cctvCaptPort)
-                .cctvFibrIp(this.cctvFibrIp)
-                .cctvEncdIp(this.cctvEncdIp)
                 .strmSvrIp(this.strmSvrIp)
                 .strmSvrPort(this.strmSvrPort)
                 .strmSesnNm(this.strmSesnNm)
                 .xCrdn(this.xCrdn)
                 .yCrdn(this.yCrdn)
-                .istlLctnNm(this.istlLctnNm)
-                .istlLctnAddr(this.istlLctnAddr)
-                .cctvChnl(this.cctvChnl)
-                .linkId(this.linkId)
-                .nodeId(this.nodeId)
-                .cctvId(this.cctvId)
-                .relyPort(this.relyPort)
                 .strmRtspAddr(this.strmRtspAddr)
-                .strmRtmpAddr(this.strmRtmpAddr)
                 .strmHttpAddr(this.strmHttpAddr)
-                .strmStorAddr(this.strmStorAddr)
-                .areaCd(this.areaCd)
-                .cctvType(this.cctvType)
-                .cctvSbstImgn(this.cctvSbstImgn)
-                .cctvSbstDsplYn(this.cctvSbstDsplYn)
-                .cctvAreaDvsn(this.cctvAreaDvsn)
-                .intrRtmpAddr(this.intrRtmpAddr)
                 .intrHttpAddr(this.intrHttpAddr)
                 .webRtcId(this.webRtcId)
+                .alttImagNmbr(this.alttImagNmbr)
+                .alttImagDsplYn(this.alttImagDsplYn)
                 .syopCntlYn(this.syopCntlYn)
+                .linkId(this.linkId)
+                .nodeId(this.nodeId)
+                .cctvId(this.cctvId)
+                .cctvAreaDvsn(this.cctvAreaDvsn)
+                .useYn(this.useYn)
+                .fanOnTmpr(this.fanOnTmpr)
+                .fanOffTmpr(this.fanOffTmpr)
+                .hetrOnTmpr(this.hetrOnTmpr)
+                .hetrOffTmpr(this.hetrOffTmpr)
                 .delYn(this.delYn)
                 .build();
+        dto.setCctvTypeDesc(CodeManager.getCodeDesc(CodeManager.CCTV_TYPE_CD, dto.getCctvTypeCd()));
+        return dto;
     }
 
     public TbCctvCtlrSttsDto toSttsDto() {
@@ -254,37 +248,35 @@ public class TbCctvCtlr implements Serializable {
     public void updateInfo(TbCctvCtlrDto.TbCctvCtlrUpdReq req) {
         this.cctvCtlrId = req.getCctvCtlrId();
         this.cctvNm = req.getCctvNm();
+        this.istlLctnNm = req.getIstlLctnNm();
+        this.istlLctnAddr = req.getIstlLctnAddr();
         this.cctvCtlrIp = req.getCctvCtlrIp();
         this.cctvCtlrPort = req.getCctvCtlrPort();
+        this.cctvCtlrLocalNo = req.getCctvCtlrLocalNo();
+        this.cctvTypeCd = req.getCctvTypeCd();
         this.cctvCaptIp = req.getCctvCaptIp();
         this.cctvCaptPort = req.getCctvCaptPort();
-        this.cctvFibrIp = req.getCctvFibrIp();
-        this.cctvEncdIp = req.getCctvEncdIp();
         this.strmSvrIp = req.getStrmSvrIp();
         this.strmSvrPort = req.getStrmSvrPort();
         this.strmSesnNm = req.getStrmSesnNm();
         this.xCrdn = req.getXCrdn();
         this.yCrdn = req.getYCrdn();
-        this.istlLctnNm = req.getIstlLctnNm();
-        this.istlLctnAddr = req.getIstlLctnAddr();
-        this.cctvChnl = req.getCctvChnl();
-        this.linkId = req.getLinkId();
-        this.nodeId = req.getNodeId();
-        this.cctvId = req.getCctvId();
-        this.relyPort = req.getRelyPort();
         this.strmRtspAddr = req.getStrmRtspAddr();
-        this.strmRtmpAddr = req.getStrmRtmpAddr();
         this.strmHttpAddr = req.getStrmHttpAddr();
-        this.strmStorAddr = req.getStrmStorAddr();
-        this.areaCd = req.getAreaCd();
-        this.cctvType = req.getCctvType();
-        this.cctvSbstImgn = req.getCctvSbstImgn();
-        this.cctvSbstDsplYn = req.getCctvSbstDsplYn();
-        this.cctvAreaDvsn = req.getCctvAreaDvsn();
-        this.intrRtmpAddr = req.getIntrRtmpAddr();
         this.intrHttpAddr = req.getIntrHttpAddr();
         this.webRtcId = req.getWebRtcId();
+        this.alttImagNmbr = req.getAlttImagNmbr();
+        this.alttImagDsplYn = req.getAlttImagDsplYn();
         this.syopCntlYn = req.getSyopCntlYn();
+        this.linkId = req.getLinkId();
+        this.nodeId = req.getNodeId();
+        this.cctvId = req.getCctvId();
+        this.cctvAreaDvsn = req.getCctvAreaDvsn();
+        this.useYn = req.getUseYn();
+        this.fanOnTmpr = req.getFanOnTmpr();
+        this.fanOffTmpr = req.getFanOffTmpr();
+        this.hetrOnTmpr = req.getHetrOnTmpr();
+        this.hetrOffTmpr = req.getHetrOffTmpr();
         this.delYn = req.getDelYn();
     }
 

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

@@ -69,7 +69,7 @@ public class TbCctvMonitoring implements Serializable {
         if (this.cctv != null) {
             dto.setCctvCtlrId(this.cctv.getCctvCtlrId());
             dto.setIstlLctnNm(this.cctv.getIstlLctnNm());
-            dto.setStrmRtmpAddr(this.cctv.getStrmRtmpAddr());
+            dto.setStrmRtmpAddr(this.cctv.getStrmSesnNm());
             dto.setStrmHttpAddr(this.cctv.getStrmHttpAddr());
         }
         else {

src/main/java/com/its/op/global/CodeManager.java

@@ -96,6 +96,8 @@ public class CodeManager {
     public static final String FAN_STTS_CD          = "PAS";    // 팬상태
     public static final String HETR_STTS_CD         = "HTS";    // 히터상태
 
+    public static final String CCTV_TYPE_CD          = "CCTVT"; // CCTV 유형 코드
+
     public static final String DTCT_TYPE_CD         = "DTT";    // 검지기유형
     //public static final String DTCT_TYPE_CD = "ACD";    // 검지기방향
 

src/main/java/com/its/op/service/its/cctv/CctvControlService.java

@@ -354,11 +354,11 @@ public class CctvControlService {
     public CctvControlDto.CctvControlRes controlPtz(Long id, CctvControlDto.CctvControlPtzReq req) {
         log.info("{}", req);
         TbCctvCtlr cctv = this.requireOne(id);
-        if (StringUtils.equals("1", cctv.getCctvType())) {
+        if (StringUtils.equals("1", cctv.getCctvTypeCd())) {
             // 제노 CCTV
             return this.controlPtzZeno(cctv.getCctvCtlrIp(), "root", "pass", req);
         }
-        else if (StringUtils.equals("2", cctv.getCctvType())) {
+        else if (StringUtils.equals("2", cctv.getCctvTypeCd())) {
             // 프로브디지털
             return this.controlPtzProbe(cctv.getCctvCtlrIp(), "admin", "12345", req);
         }
@@ -374,11 +374,11 @@ public class CctvControlService {
     public CctvControlDto.CctvControlRes controlPreset(Long id, CctvControlDto.CctvControlPresetReq req) {
         log.info("{}", req);
         TbCctvCtlr cctv = this.requireOne(id);
-        if (StringUtils.equals("1", cctv.getCctvType())) {
+        if (StringUtils.equals("1", cctv.getCctvTypeCd())) {
             // 제노 CCTV
             return this.controlPresetZeno(cctv.getCctvCtlrIp(), "root", "pass", req);
         }
-        else if (StringUtils.equals("2", cctv.getCctvType())) {
+        else if (StringUtils.equals("2", cctv.getCctvTypeCd())) {
             // 프로브디지털
             return this.controlPresetProbe(cctv.getCctvCtlrIp(), "admin", "12345", req);
         }

src/main/java/com/its/op/service/its/cctv/TbCctvCtlrService.java

@@ -166,7 +166,7 @@ public class TbCctvCtlrService {
                         .fcltNmbr(String.valueOf(obj.getCctvCtlrNmbr()))
                         .fcltId(obj.getCctvCtlrId())
                         .fcltNm(obj.getIstlLctnNm())
-                        .fcltKind(obj.getCctvType())
+                        .fcltKind(obj.getCctvTypeCd())
                         .xCrdn(obj.getXCrdn())
                         .yCrdn(obj.getYCrdn())
                         .strmUrl(obj.getStrmSesnNm())