ddd

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

@@ -108,9 +108,9 @@ public class TbCctvCtlrDto implements Serializable {
     @JsonProperty("web_rtc_id")
     private String webRtcId;
 
-    @ApiModelProperty("CCTV 대체 영상 이미지 번호")  // Y VARCHAR2(5)
+    @ApiModelProperty("대체 영상 이미지 번호")  // Y NUMBER(5)
     @JsonProperty("altt_imag_nmbr")
-    private String alttImagNmbr;
+    private Integer alttImagNmbr;
 
     @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
     @JsonProperty("altt_imag_dspl_yn")
@@ -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=0, max=20)
+        @Size(max=20)
         private String webRtcSvrIp;
 
         @ApiModelProperty("WEB RTC 서버 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
@@ -293,13 +293,13 @@ public class TbCctvCtlrDto implements Serializable {
 
         @ApiModelProperty("WEB RTC ID, Nullable = Y, VARCHAR2(56)")  // Y VARCHAR2(56)
         @JsonProperty("web_rtc_id")
-        @Size(min=0, max=56)
+        @Size(max=56)
         private String webRtcId;
 
-        @ApiModelProperty("CCTV 대체 영상 이미지 번호, Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
+        @ApiModelProperty("CCTV 대체 영상 이미지 번호, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("altt_imag_nmbr")
-        @Size(min=1, max=5)
-        private String alttImagNmbr;
+        @PositiveOrZero
+        private Integer alttImagNmbr;
 
         @ApiModelProperty("CCTV 대체 표출 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
         @JsonProperty("altt_imag_dspl_yn")
@@ -367,7 +367,7 @@ public class TbCctvCtlrDto implements Serializable {
 
         @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) {
+                                String web_rtc_svr_ip, Integer web_rtc_svr_port, String web_rtc_id, Integer 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

@@ -183,9 +183,9 @@ public class TbVmsCtlrDto implements Serializable {
     @JsonProperty("web_rtc_id")
     private String webRtcId;
 
-    @ApiModelProperty("CCTV 대체 영상 이미지 번호")  // Y VARCHAR2(5)
+    @ApiModelProperty("대체 영상 이미지 번호")  // Y NUMBER(5)
     @JsonProperty("altt_imag_nmbr")
-    private String alttImagNmbr;
+    private Integer alttImagNmbr;
 
     @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
     @JsonProperty("altt_imag_dspl_yn")
@@ -229,12 +229,12 @@ public class TbVmsCtlrDto implements Serializable {
 
         @ApiModelProperty("VMS 제어기 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("vms_ctlr_port")
-        @Positive
+        @PositiveOrZero
         private Integer vmsCtlrPort;
 
         @ApiModelProperty("VMS 제어기 지역번호, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("vms_ctlr_local_no")
-        @Positive
+        @PositiveOrZero
         private Integer vmsCtlrLocalNo;
 
         @ApiModelProperty("VMS 유형 코드(TB_VMS_TYPE), Nullable = Y, VARCHAR2(7)")  // Y VARCHAR2(7)
@@ -244,15 +244,17 @@ public class TbVmsCtlrDto implements Serializable {
 
         @ApiModelProperty("설치 위치 명, Nullable = Y, VARCHAR2(40)")  // Y VARCHAR2(40)
         @JsonProperty("istl_lctn_nm")
-        @Size(min=1, max=40)
+        @Size(max=40)
         private String istlLctnNm;
 
         @ApiModelProperty("X 좌표, , NUMBER(11,8)")  // Y NUMBER(11,8)
         @JsonProperty("x_crdn")
+        @PositiveOrZero
         private Double xCrdn;
 
         @ApiModelProperty("Y 좌표, , NUMBER(10,8)")  // Y NUMBER(10,8)
         @JsonProperty("y_crdn")
+        @PositiveOrZero
         private Double yCrdn;
 
         @ApiModelProperty("삭제 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
@@ -263,27 +265,27 @@ public class TbVmsCtlrDto implements Serializable {
 
         @ApiModelProperty("웹 카메라 아이피, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("web_cmra_ip")
-        @Size(min=1, max=20)
+        @Size(max=20)
         private String webCmraIp;
 
         @ApiModelProperty("웹카메라 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("web_cmra_port")
-        @Positive
+        @PositiveOrZero
         private Integer webCmraPort;
 
         @ApiModelProperty("웹카메라 ID, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("web_cmra_id")
-        @Size(min=1, max=20)
+        @Size(max=20)
         private String webCmraId;
 
         @ApiModelProperty("웹카메라 비밀번호, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("web_cmra_pwd")
-        @Size(min=1, max=20)
+        @Size(max=20)
         private String webCmraPwd;
 
         @ApiModelProperty("스트리밍 세션 명, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
         @JsonProperty("strm_sesn_nm")
-        @Size(min=1, max=200)
+        @Size(max=200)
         private String strmSesnNm;
 
         @ApiModelProperty("운영 모드, Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
@@ -313,87 +315,87 @@ public class TbVmsCtlrDto implements Serializable {
 
         @ApiModelProperty("전광판 전원 모드(0x00:꺼짐,0x01:켜짐,0x02:자동,0x09:알수없음), Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("panl_pwer_mode")
-        @Positive
+        @PositiveOrZero
         private Integer panlPwerMode;
 
         @ApiModelProperty("FAN 동작모드(0x00:꺼짐,0x01:켜짐,0x02:자동,0x09:알수없음), Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("fan_mode")
-        @Positive
+        @PositiveOrZero
         private Integer fanMode;
 
         @ApiModelProperty("팬 동작 온도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("fan_run_tmpr")
-        @Positive
+        @PositiveOrZero
         private Integer fanRunTmpr;
 
         @ApiModelProperty("히터 동작모드(0x00:꺼짐,0x01:켜짐,0x02:자동,0x09:알수없음), Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("hetr_mode")
-        @Positive
+        @PositiveOrZero
         private Integer hetrMode;
 
         @ApiModelProperty("히터 동작 온도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("hetr_run_tmpr")
-        @Positive
+        @PositiveOrZero
         private Integer hetrRunTmpr;
 
         @ApiModelProperty("휘도 모드(0x00:주간,0x01:야간,0x02:자동,0x09:수동), Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("brgh_mode")
-        @Positive
+        @PositiveOrZero
         private Integer brghMode;
 
         @ApiModelProperty("휘도 현재 단계(0~100), Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("brgh_curr_step")
-        @Positive
+        @PositiveOrZero
         private Integer brghCurrStep;
 
         @ApiModelProperty("휘도 주간 단계(0~100), Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("brgh_week_step")
-        @Positive
+        @PositiveOrZero
         private Integer brghWeekStep;
 
         @ApiModelProperty("휘도 야간 단계(0~100), Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("brgh_nght_step")
-        @Positive
+        @PositiveOrZero
         private Integer brghNghtStep;
 
         @ApiModelProperty("VMS 모듈 오류 율, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("modl_err_rate")
-        @Positive
+        @PositiveOrZero
         private Integer modlErrRate;
 
         @ApiModelProperty("VMS 통신 오류 기본 값, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("cmnc_fail_rate")
-        @Positive
+        @PositiveOrZero
         private Integer cmncFailRate;
 
         @ApiModelProperty("웹카메라제조사(삼성카메라'Samsung'), Nullable = Y, VARCHAR2(50)")  // Y VARCHAR2(50)
         @JsonProperty("web_cmra_cmpy")
-        @Size(min=1, max=50)
+        @Size(max=50)
         private String webCmraCmpy;
 
         @ApiModelProperty("웹카메라모델, Nullable = Y, VARCHAR2(126)")  // Y VARCHAR2(126)
         @JsonProperty("web_cmra_mdl")
-        @Size(min=1, max=126)
+        @Size(max=126)
         private String webCmraMdl;
 
         @ApiModelProperty("설치 위치 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
         @JsonProperty("istl_lctn_addr")
-        @Size(min=1, max=200)
+        @Size(max=200)
         private String istlLctnAddr;
 
         @ApiModelProperty("스트리밍 HTTP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
         @JsonProperty("strm_http_addr")
-        @Size(min=1, max=200)
+        @Size(max=200)
         private String strmHttpAddr;
 
         @ApiModelProperty("스트리밍 RTSP 주소, Nullable = Y, VARCHAR2(200)")  // Y VARCHAR2(200)
         @JsonProperty("strm_rtsp_addr")
-        @Size(min=1, max=200)
+        @Size(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)
+        @Size(max=20)
         private String webRtcSvrIp;
 
         @ApiModelProperty("WEB RTC 서버 포트, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
@@ -403,15 +405,15 @@ public class TbVmsCtlrDto implements Serializable {
 
         @ApiModelProperty("WEB RTC ID, Nullable = Y, VARCHAR2(56)")  // Y VARCHAR2(56)
         @JsonProperty("web_rtc_id")
-        @Size(min=0, max=56)
+        @Size(max=56)
         private String webRtcId;
 
-        @ApiModelProperty("CCTV 대체 영상 이미지 번호, Nullable = Y, VARCHAR2(5)")  // Y VARCHAR2(5)
+        @ApiModelProperty("CCTV 대체 영상 이미지 번호, Nullable = Y, NUMBER(5)")  // Y NUMBER(5)
         @JsonProperty("altt_imag_nmbr")
-        @Size(min=1, max=5)
-        private String alttImagNmbr;
+        @PositiveOrZero
+        private Integer alttImagNmbr;
 
-        @ApiModelProperty("CCTV 대체 표출 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
+        @ApiModelProperty("대체 표출 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
         @JsonProperty("altt_imag_dspl_yn")
         @Size(min=1, max=1)
         @Pattern(regexp = "[YN]")
@@ -420,7 +422,7 @@ public class TbVmsCtlrDto implements Serializable {
         @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,
-                               String web_rtc_svr_ip, Integer web_rtc_svr_port, String web_rtc_id, String altt_imag_nmbr, String altt_imag_dspl_yn) {
+                               String web_rtc_svr_ip, Integer web_rtc_svr_port, String web_rtc_id, Integer altt_imag_nmbr, String altt_imag_dspl_yn) {
             this.vmsCtlrNmbr = vms_ctlr_nmbr;
             this.vmsCtlrId = vms_ctlr_id;
             this.vmsNm = vms_nm;

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

@@ -118,9 +118,9 @@ public class TbCctvCtlr implements Serializable {
     @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(5)
+    @Column(name = "ALTT_IMAG_NMBR", columnDefinition = "NUMBER", length = 5)
+    private Integer alttImagNmbr;
 
     @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
     @Column(name = "ALTT_IMAG_DSPL_YN", columnDefinition = "CHAR", length = 1)

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

@@ -191,9 +191,9 @@ public class TbVmsCtlr implements Serializable {
     @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(5)
+    @Column(name = "ALTT_IMAG_NMBR", columnDefinition = "NUMBER", length = 5)
+    private Integer alttImagNmbr;
 
     @ApiModelProperty("CCTV 대체 표출 여부")  // Y CHAR(1)
     @Column(name = "ALTT_IMAG_DSPL_YN", columnDefinition = "CHAR", length = 1)

src/main/java/com/its/utils/SysUtils.java

@@ -53,6 +53,11 @@ public final class SysUtils
 		Date dtLog = new Date();
 		return sdfDate.format(dtLog);
 	}
+	public static String getSysTimeStrMMDD() {
+		SimpleDateFormat sdfDate = new SimpleDateFormat("MM-dd HH:mm:ss");
+		Date dtLog = new Date();
+		return sdfDate.format(dtLog);
+	}
 
 	public static int gapTime(String startTm, String endTm, int calcType) {