dev

src/main/java/com/its/vms/api/dto/VmsControlDto.java

@@ -58,7 +58,7 @@ public class VmsControlDto implements Serializable {
         }
     }
 
-    @ApiModel("VmsControlResetReq(VMS 제어기 리셋)")
+    @ApiModel("VmsControlPanlOnOfReq(VMS 전광판 On/Off 제어)")
     @Getter
     @Setter
     @ToString

src/main/java/com/its/vms/dto/TbVmsCtlrDto.java

@@ -589,7 +589,12 @@ public class TbVmsCtlrDto implements Serializable {
             int formDisplayType = units[ii].getDisplayType();
             int formDisplaySec = units[ii].getDisplaySec();
             Integer vmsFormId = units[ii].getVmsFormId();
-
+            if (pForm.getVmsFormTypeCd() == eVmsFormType.eFormTp_video.getValue()) {
+                //formDisplaySec = 0;
+            }
+            else {
+                formDisplaySec = Math.max(formDisplaySec, 3);
+            }
             if (pForm.isObjectDownload()) {
                 // 모든 객체를 추가해 줘야 한다.
                 List<VmsFormObject> objects = pForm.getObjects();
@@ -629,6 +634,7 @@ public class TbVmsCtlrDto implements Serializable {
                 }
             }
             else {
+                formDisplaySec = Math.max(formDisplaySec, 3);
                 // 이미지를 통째로 다운로드 한다.
                 VmsFormDto formDto = formData.addForm(vmsFormId, formDisplaySec, formDisplayType, formBkClr, 1);
                 VmsFormObj formObjDto = new VmsFormObjBitmapId(1, formBlinking, 0, 0, formBkClr, this.vmsWidth, this.vmsHeight, eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), formBitmapId);
@@ -681,6 +687,12 @@ public class TbVmsCtlrDto implements Serializable {
 
         if (pForm.isObjectDownload()) {
             // 모든 객체를 추가해 줘야 한다.
+            if (pForm.getVmsFormTypeCd() == eVmsFormType.eFormTp_video.getValue()) {
+                //formDisplaySec = 0;
+            }
+            else {
+                formDisplaySec = Math.max(formDisplaySec, 3);
+            }
             List<VmsFormObject> objects = pForm.getObjects();
             VmsFormDto formDto = formData.addForm(vmsFormId, formDisplaySec, formDisplayType, formBkClr, objects.size());
             for (int jj = 0; jj < objects.size(); jj++) {
@@ -718,6 +730,7 @@ public class TbVmsCtlrDto implements Serializable {
             }
         }
         else {
+            formDisplaySec = Math.max(formDisplaySec, 3);
             VmsFormDto formDto = formData.addForm(vmsFormId, formDisplaySec, formDisplayType, formBkClr, 1);
             VmsFormObj formObjDto = new VmsFormObjBitmapId(1, formBlinking, 0, 0, formBkClr, this.vmsWidth, this.vmsHeight, eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), formBitmapId);
             formObjDto.calSize();