Browse Source

vms stts, dspl prst update

shjung 3 năm trước cách đây
mục cha
commit
53c64f32a2

+ 13 - 4
src/main/java/com/its/api/its/model/dto/common/MonitoringInfoDto.java

@@ -5,7 +5,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.Positive;
 import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 
@@ -13,19 +15,19 @@ import java.io.Serializable;
  * VMS 모니터링 화면 DTO Class
  */
 @Data
-@Builder
-@ApiModel("MonitoringUpdateInfoDto(모니터링 화면 정보)")
+@NoArgsConstructor
+@ApiModel("MonitoringInfoDto(모니터링 화면 정보)")
 public class MonitoringInfoDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("모니터링순서, Nullable = N, NUMBER(3)")  // N NUMBER(3)
     @JsonProperty("monitoring_seq")
-    @PositiveOrZero
+    @Positive
     private Integer monitoringSeq;
 
     @ApiModelProperty("제어기번호, Nullable = N, NUMBER(10)")  // N NUMBER(10)
     @JsonProperty("ctlr_nmbr")
-    @PositiveOrZero
+    @Positive
     private Long ctlrNmbr;
 
     @ApiModelProperty("화면에 보여지는 방식(0:기본,1:화면맞춤)), Nullable = Y, NUMBER(1)")  // Y NUMBER(1)
@@ -34,4 +36,11 @@ public class MonitoringInfoDto implements Serializable {
     //@JsonIgnore
     private Integer viewMode = 0;
 
+    @Builder
+    public MonitoringInfoDto(Integer monitoring_seq, Long ctlr_nmbr, Integer view_mode) {
+        this.monitoringSeq = monitoring_seq;
+        this.ctlrNmbr = ctlr_nmbr;
+        this.viewMode = view_mode;
+    }
+
 }

+ 2 - 1
src/main/java/com/its/api/its/model/entity/cctv/TbCctvMonitoring.java

@@ -4,6 +4,7 @@ import com.its.api.its.model.dto.cctv.TbCctvMonitoringDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
+import lombok.extern.slf4j.Slf4j;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -13,6 +14,7 @@ import java.io.Serializable;
 /**
  * 웹카메라 모니터링 화면 Entity Class
  */
+@Slf4j
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Builder
@@ -75,7 +77,6 @@ public class TbCctvMonitoring implements Serializable {
             dto.setIstlLctnNm("?");
             dto.setStrmRtmpAddr("");
         }
-
         return dto;
     }
 

+ 2 - 0
src/main/resources/application.yml

@@ -31,7 +31,9 @@ spring:
       enabled: always
   resources:
     static-locations: file:src/main/resources/static/
+
   mvc:
+    #static-path-pattern: /static/**
     view:
       prefix: /WEB-INF/jsp/
       suffix: .jsp