shjung 1 year ago
parent
commit
978f0a363e

+ 2 - 2
conf/debug.properties

@@ -1,5 +1,5 @@
 #system debug setting configuration...
-#Mon Nov 06 16:59:41 KST 2023
+#Mon Nov 06 17:48:45 KST 2023
 packet-info=1001
-packet-dump=1001
+packet-dump=x
 system-debug=false

+ 20 - 2
src/main/java/com/its/vms/dto/TbVmsCtlrDto.java

@@ -590,7 +590,10 @@ public class TbVmsCtlrDto implements Serializable {
             int formDisplaySec = units[ii].getDisplaySec();
             Integer vmsFormId = units[ii].getVmsFormId();
             if (pForm.getVmsFormTypeCd() == eVmsFormType.eFormTp_video.getValue()) {
-                //formDisplaySec = 0;
+                log.info("downloadDefaultForm: VMS {}, Video Form {} seconds.", this.vmsCtlrNmbr, formDisplaySec);
+            }
+            else if (pForm.getVmsFormTypeCd() == eVmsFormType.eFormTp_stream.getValue()) {
+                log.info("downloadDefaultForm: VMS {}, Stream Form {} seconds.", this.vmsCtlrNmbr, formDisplaySec);
             }
             else {
                 formDisplaySec = Math.max(formDisplaySec, 3);
@@ -776,7 +779,7 @@ public class TbVmsCtlrDto implements Serializable {
         ApplicationConfig config = (ApplicationConfig)AppUtils.getBean(ApplicationConfig.class);
         VmsDownloadData.VmsDownloadDataInfo[] units = this.downloadData.getUnits();
         for (int ii = downloadCnt; ii < formCnt; ii++) {
-            this.downloadData.setDownloadCnt(downloadCnt+1);
+            this.downloadData.setDownloadCnt(this.downloadData.getDownloadCnt()+1);
 
             int vmsFormId = units[ii].getVmsFormId();
             int formId    = units[ii].getFormNo();
@@ -788,6 +791,21 @@ public class TbVmsCtlrDto implements Serializable {
                 // 홈보폼인 경우 다운로드 폼 ID를 저장해 놓는다.
                 this.downloadFormId = vmsFormId;
             }
+            else if (pForm.getVmsFormTypeCd() == eVmsFormType.eFormTp_video.getValue()) {
+                log.info("downloadFile: VMS {}, IDX {}, VmsFormId {}, FormId {}, BitmapId {}, formIdx {}, DownloadFormID: {}, Video Form.",
+                        this.vmsCtlrNmbr, ii, vmsFormId, formId, bitmapId, formIdx, this.downloadFormId);
+                this.downloadFormId = 0;
+                continue;
+            }
+            else if (pForm.getVmsFormTypeCd() == eVmsFormType.eFormTp_stream.getValue()) {
+                log.info("downloadFile: VMS {}, IDX {}, VmsFormId {}, FormId {}, BitmapId {}, formIdx {}, DownloadFormID: {}, Stream Form.",
+                        this.vmsCtlrNmbr, ii, vmsFormId, formId, bitmapId, formIdx, this.downloadFormId);
+                this.downloadFormId = 0;
+                continue;
+            }
+            else {
+                this.downloadFormId = vmsFormId;
+            }
 
             if (config.isCheckNewForm() && !units[ii].isDownload()) {
                 // 이미 다운로드 했기 때문에 다시 다운로드 하지 않는다.

+ 2 - 2
src/main/java/com/its/vms/ui/MainUI.java

@@ -311,8 +311,8 @@ public class MainUI {
         CtlrSttsTableModel tableModel = (CtlrSttsTableModel) tblCtlrList.getModel();
         this.selObj = tableModel.getControllerInfo(row);
         if (this.selObj != null) {
-            this.selObj.downloadForm();
-            this.selObj.downloadAutoFixForm();
+            //this.selObj.downloadForm();
+            //this.selObj.downloadAutoFixForm();
 
             txtId.setText(this.selObj.getCtlrId());
             txtName.setText(this.selObj.getName());