|
@@ -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()) {
|
|
|
// 이미 다운로드 했기 때문에 다시 다운로드 하지 않는다.
|