|
@@ -485,11 +485,11 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
int forms = 0;
|
|
|
int formCnt = this.formManager.count();
|
|
|
if (formCnt == 0) {
|
|
|
- log.info("downloadScheduleForm: VMS {}, Form Data Not Found.", this.vmsCtlrNmbr);
|
|
|
+ log.info("downloadForm: VMS {}, Form Data Not Found.", this.vmsCtlrNmbr);
|
|
|
return true;
|
|
|
}
|
|
|
if (formCnt > this.maxPhaseNum) {
|
|
|
- log.error("downloadScheduleForm: VMS {}, Form Count Over: {}/{} EA.", this.vmsCtlrNmbr, formCnt, this.maxPhaseNum);
|
|
|
+ log.error("downloadForm: VMS {}, Form Count Over: {}/{} EA.", this.vmsCtlrNmbr, formCnt, this.maxPhaseNum);
|
|
|
formCnt = this.maxPhaseNum;
|
|
|
}
|
|
|
|
|
@@ -497,13 +497,13 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
for (int ii = 0; ii < formCnt; ii++) {
|
|
|
VmsForm pForm = this.formManager.getItem(ii);
|
|
|
if (!pForm.isSuccess()) {
|
|
|
- log.error("VMS {}, SEQ {}, SUCCESS {}", this.vmsCtlrNmbr, ii, pForm.isSuccess());
|
|
|
+ log.error("downloadForm: VMS {}, SEQ {}, SUCCESS {}", this.vmsCtlrNmbr, ii, pForm.isSuccess());
|
|
|
continue;
|
|
|
}
|
|
|
Integer vmsFormId = pForm.getVmsFormId();
|
|
|
TbVmsFormDto vmsForm = formService.find(vmsFormId);
|
|
|
if (vmsForm == null) {
|
|
|
- log.error("VMS {}, SEQ {}, FORM ID {} Not Found.", this.vmsCtlrNmbr, ii, vmsFormId);
|
|
|
+ log.error("downloadForm: VMS {}, SEQ {}, FORM ID {} Not Found.", this.vmsCtlrNmbr, ii, vmsFormId);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
@@ -517,7 +517,7 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
units[forms].setBkClr(pForm.getVmsFormColrCd());
|
|
|
|
|
|
VmsDownloadForm downloadForm = this.downloadFormMap.get(vmsFormId);
|
|
|
- units[forms].setBitmapId((vmsFormId % 1000) + 1000);
|
|
|
+ //units[forms].setBitmapId((vmsFormId % 1000) + 1000);
|
|
|
// 홍보폼이면서 신규폼이 아니면서 이전 다운로드 목록이 존재하는 경우에 다운로드 여부를 체크한다.
|
|
|
if (vmsForm.getVmsFormTypeCd() == eVmsFormType.eFormTp_hongbo.getValue() && !vmsForm.isNewForm() && downloadForm != null) {
|
|
|
if (downloadForm.isAlreadyDownload()) {
|
|
@@ -546,7 +546,7 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
}
|
|
|
|
|
|
for (int ii = 0; ii < forms; ii++) {
|
|
|
- log.info("VMS {}, Form schedule({}), VMS_FORM_ID: {}, FormIdx: {}, FormId: {}, BitmapId: {}, IsDownload: {}",
|
|
|
+ log.info("downloadForm: VMS {}, Form schedule({}), VMS_FORM_ID: {}, FormIdx: {}, FormId: {}, BitmapId: {}, IsDownload: {}",
|
|
|
this.vmsCtlrNmbr, ii, units[ii].getVmsFormId(), units[ii].getFormIdx(), units[ii].getFormNo(), units[ii].getBitmapId(), units[ii].isDownload());
|
|
|
}
|
|
|
|
|
@@ -587,7 +587,7 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
- //formCnt = 1;
|
|
|
+ log.info("downloadDefaultFrom: VMS {}, Form {} EA.", this.vmsCtlrNmbr, formCnt);
|
|
|
VmsFormDataDto formData = new VmsFormDataDto(0, formCnt);
|
|
|
VmsDownloadData.VmsDownloadDataInfo[] units = this.downloadData.getUnits();
|
|
|
for (int ii = 0; ii < formCnt; ii++) {
|
|
@@ -595,27 +595,27 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
List<VmsFormObject> objects = pForm.getObjects();
|
|
|
VmsFormDto formDto = formData.addForm(units[ii].getVmsFormId(), units[ii].getDisplaySec(), units[ii].getDisplayType(), units[ii].getBkClr(), objects.size());
|
|
|
for (int jj = 0; jj < objects.size(); jj++) {
|
|
|
- VmsFormObject object = objects.get(jj);
|
|
|
+ VmsFormObject formObj = objects.get(jj);
|
|
|
|
|
|
- int objSize = object.getObjectSize();
|
|
|
- int blinking = object.getBlinking();
|
|
|
- int posX = object.getPosX();
|
|
|
- int posY = object.getPosY();
|
|
|
- int bkClr = object.getBkColor();
|
|
|
+ int objSize = formObj.getObjectSize();
|
|
|
+ int blinking = formObj.getBlinking();
|
|
|
+ int posX = formObj.getPosX();
|
|
|
+ int posY = formObj.getPosY();
|
|
|
+ int bkClr = formObj.getBkColor();
|
|
|
|
|
|
VmsFormObj formObjDto;
|
|
|
if (objects.get(jj).getObjectKind() == eVmsFormObjectKind.OBJECT_TEXT) {
|
|
|
- int clrR = object.getFontClr().getRed();
|
|
|
- int clrG = object.getFontClr().getGreen();
|
|
|
- int clrB = object.getFontClr().getBlue();
|
|
|
- formObjDto = new VmsFormObjText(objSize, blinking, posX, posY, bkClr, clrR, clrG, clrB, object.getFontSize(), object.getFontNameCd(), object.getFontBold(), object.getTextData());
|
|
|
+ int clrR = formObj.getFontClr().getRed();
|
|
|
+ int clrG = formObj.getFontClr().getGreen();
|
|
|
+ int clrB = formObj.getFontClr().getBlue();
|
|
|
+ formObjDto = new VmsFormObjText(objSize, blinking, posX, posY, bkClr, clrR, clrG, clrB, formObj.getFontSize(), formObj.getFontNameCd(), formObj.getFontBold(), formObj.getTextData());
|
|
|
}
|
|
|
else if (objects.get(jj).getObjectKind() == eVmsFormObjectKind.OBJECT_BITMAP_ID) {
|
|
|
- formObjDto = new VmsFormObjBitmapId(objSize, blinking, posX, posY, bkClr, object.getDsplWidth(), object.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), units[ii].getBitmapId());
|
|
|
+ formObjDto = new VmsFormObjBitmapId(objSize, blinking, posX, posY, bkClr, formObj.getDsplWidth(), formObj.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), units[ii].getBitmapId());
|
|
|
}
|
|
|
else {
|
|
|
- formObjDto = new VmsFormObjBitmapId(objSize, blinking, posX, posY, bkClr, object.getDsplWidth(), object.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), units[ii].getBitmapId());
|
|
|
- //formObjDto = new VmsFormObjBitmap(objSize, blinking, posX, posY, bkClr, object.getDsplWidth(), object.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), object.getImageData());
|
|
|
+ //formObjDto = new VmsFormObjBitmapId(objSize, blinking, posX, posY, bkClr, object.getDsplWidth(), object.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), units[ii].getBitmapId());
|
|
|
+ formObjDto = new VmsFormObjBitmap(objSize, blinking, posX, posY, bkClr, formObj.getDsplWidth(), formObj.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), formObj.getImageData());
|
|
|
}
|
|
|
formObjDto.calSize();
|
|
|
formDto.addObject(formObjDto);
|
|
@@ -640,6 +640,7 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
return true;
|
|
|
}
|
|
|
int downloadCnt = this.downloadData.getDownloadCnt();
|
|
|
+ log.info("downloadAutoFixForm: VMS {}, Form {} EA, Download Count {} EA.", this.vmsCtlrNmbr, formCnt, downloadCnt);
|
|
|
if (downloadCnt >= formCnt) {
|
|
|
// 폼정보를 모두 다운로드 했기때문에 폼파일을 다운로드 해야 한다.
|
|
|
this.downloadData.setDownloadCnt(0); // 폼이미지파일을 다운로드해야 하기때문에 다운로드 인덱스를 다시 0으로 리셋
|
|
@@ -650,11 +651,11 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
// 폼아이디를 여기서 설정해 주어야 한다.
|
|
|
VmsDownloadData.VmsDownloadDataInfo[] units = this.downloadData.getUnits();
|
|
|
int formId = units[downloadCnt].getFormNo();
|
|
|
+ int downloadFormCnt = 1;
|
|
|
int displaySec = 1;//units[downloadCnt].getDisplaySec();
|
|
|
int displayType = units[downloadCnt].getDisplayType();
|
|
|
- int bitmapId = 11;//units[downloadCnt].getBitmapId();
|
|
|
+ int bitmapId = units[downloadCnt].getBitmapId();
|
|
|
int formIdx = units[downloadCnt].getFormIdx();
|
|
|
- int downloadFormCnt = 1;
|
|
|
VmsForm pForm = this.formManager.getItem(formIdx);
|
|
|
int objSize = 1;
|
|
|
int blinking = pForm.getVmsFormDsplMthdCd();
|
|
@@ -669,6 +670,48 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
formDto.addObject(formObjDto);
|
|
|
formData.calFormCount();
|
|
|
|
|
|
+ log.info("downloadAutoFixForm: DownloadCnt: VMS {}, IDX {}, FormId {}, BitmapId {}, VMS_FORM_ID: {}", this.vmsCtlrNmbr, formCnt, formId, bitmapId, this.downloadFormId);
|
|
|
+
|
|
|
+// VmsFormDataDto formData = new VmsFormDataDto(formId, downloadFormCnt);
|
|
|
+// int ii = downloadCnt;
|
|
|
+// VmsForm pForm = this.formManager.getItem(units[ii].getFormIdx());
|
|
|
+// List<VmsFormObject> objects = pForm.getObjects();
|
|
|
+// VmsFormDto formDto = formData.addForm(units[ii].getVmsFormId(), units[ii].getDisplaySec(), units[ii].getDisplayType(), units[ii].getBkClr(), objects.size());
|
|
|
+// for (int jj = 0; jj < objects.size(); jj++) {
|
|
|
+// VmsFormObject formObj = objects.get(jj);
|
|
|
+//
|
|
|
+// int objSize = formObj.getObjectSize();
|
|
|
+// int blinking = formObj.getBlinking();
|
|
|
+// int posX = formObj.getPosX();
|
|
|
+// int posY = formObj.getPosY();
|
|
|
+// int bkClr = formObj.getBkColor();
|
|
|
+//
|
|
|
+// String fileName = String.format("C:\\DRIVE_E\\ANDONG_VMS_FTP\\FORM\\%d_%d_%d-%d-%d-%d-%d.bmp", this.vmsCtlrNmbr, ii, jj, posX, posY, formObj.getDsplWidth(), formObj.getDsplHeight());
|
|
|
+//
|
|
|
+// VmsFormObj formObjDto;
|
|
|
+// if (objects.get(jj).getObjectKind() == eVmsFormObjectKind.OBJECT_TEXT) {
|
|
|
+// int clrR = formObj.getFontClr().getRed();
|
|
|
+// int clrG = formObj.getFontClr().getGreen();
|
|
|
+// int clrB = formObj.getFontClr().getBlue();
|
|
|
+// int fontNameCd = formObj.getFontNameCd();
|
|
|
+// formObjDto = new VmsFormObjText(objSize, blinking, posX, posY, bkClr, clrR, clrG, clrB, formObj.getFontSize(), fontNameCd, formObj.getFontBold(), formObj.getTextData());
|
|
|
+// }
|
|
|
+// else if (objects.get(jj).getObjectKind() == eVmsFormObjectKind.OBJECT_BITMAP_ID) {
|
|
|
+// //formObjDto = new VmsFormObjBitmapId(objSize, blinking, posX, posY, bkClr, object.getDsplWidth(), object.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), units[ii].getBitmapId());
|
|
|
+// ItsUtils.saveByteArrayToFile(fileName, formObj.getImageData());
|
|
|
+// formObjDto = new VmsFormObjBitmap(objSize, blinking, posX, posY, bkClr, formObj.getDsplWidth(), formObj.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), formObj.getImageData());
|
|
|
+// }
|
|
|
+// else {
|
|
|
+// //formObjDto = new VmsFormObjBitmapId(objSize, blinking, posX, posY, bkClr, object.getDsplWidth(), object.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), units[ii].getBitmapId());
|
|
|
+// ItsUtils.saveByteArrayToFile(fileName, formObj.getImageData());
|
|
|
+// formObjDto = new VmsFormObjBitmap(objSize, blinking, posX, posY, bkClr, formObj.getDsplWidth(), formObj.getDsplHeight(), eVmsImageType.VMS_IMAGE_TYPE_BMP.getValue(), formObj.getImageData());
|
|
|
+// }
|
|
|
+// formObjDto.calSize();
|
|
|
+// formDto.addObject(formObjDto);
|
|
|
+// }
|
|
|
+// formDto.calObjCount();
|
|
|
+// formData.calFormCount();
|
|
|
+
|
|
|
this.downloadData.setDownloadCnt(downloadCnt+1);
|
|
|
|
|
|
VmsReqDownloadForm downloadForm = new VmsReqDownloadForm(this, formData);
|
|
@@ -682,11 +725,12 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
public boolean downloadFile() {
|
|
|
int formCnt = this.downloadData.getMaxSchedule();
|
|
|
if (formCnt <= 0) {
|
|
|
- log.info(" downloadFile: VMS {}, Download Schedule Form Count Zero. {} EA.", this.vmsCtlrNmbr, formCnt);
|
|
|
+ log.info("downloadFile: VMS {}, Download Schedule Form Count Zero. {} EA.", this.vmsCtlrNmbr, formCnt);
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
int downloadCnt = this.downloadData.getDownloadCnt();
|
|
|
+ log.info("downloadFile: VMS {}, Form {} EA, Download Count {} EA.", this.vmsCtlrNmbr, formCnt, downloadCnt);
|
|
|
if (downloadCnt >= formCnt) {
|
|
|
// 폼파일이(폼이미지파일) 모두 다운로드 되었으므로 스케쥴 정보를 다운로드 한다.
|
|
|
return downloadFormSchedule(); // Display Schedule Form
|
|
@@ -701,7 +745,7 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
int bitmapId = units[ii].getBitmapId();
|
|
|
int formIdx = units[ii].getFormIdx();
|
|
|
VmsForm pForm = this.formManager.getItem(formIdx);
|
|
|
- if (config.isCheckNewForm() && units[ii].isDownload()) {
|
|
|
+ if (config.isCheckNewForm() && !units[ii].isDownload()) {
|
|
|
// 이미 다운로드 했기 때문에 다시 다운로드 하지 않는다.
|
|
|
log.info("downloadFile: VMS {}, IDX {}, FormId {}, BitmapId {}, already download...", this.vmsCtlrNmbr, ii, formId, bitmapId);
|
|
|
continue;
|
|
@@ -730,7 +774,7 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
int maxSchedule = VmsConstants.VMS_MIN_DOWNLOAD_FORMS;
|
|
|
int formCnt = this.downloadData.getMaxSchedule();
|
|
|
if (formCnt <= 0) {
|
|
|
- log.info(" downloadScheduleForm: VMS {}, Download Schedule Form Count Zero. {} EA.", this.vmsCtlrNmbr, formCnt);
|
|
|
+ log.info("downloadScheduleForm: VMS {}, Download Schedule Form Count Zero. {} EA.", this.vmsCtlrNmbr, formCnt);
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -741,14 +785,17 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
dispSec[ii] = 0;
|
|
|
}
|
|
|
|
|
|
+ log.info("downloadFormSchedule: VMS {}, Schedule {} EA, Default Schedule {}.", this.vmsCtlrNmbr, maxSchedule, this.downloadData.isDefault());
|
|
|
if (this.downloadData.isDefault()) {
|
|
|
formId[0] = (short)VmsConstants.DEFAULT_FORM_ID;
|
|
|
dispSec[0] = 4;
|
|
|
+ log.info("downloadFormSchedule: VMS {}, Schedule {} EA, Default Schedule {}.", this.vmsCtlrNmbr, maxSchedule, this.downloadData.isDefault());
|
|
|
}
|
|
|
else {
|
|
|
for (int ii = 0; ii < formCnt && ii < maxSchedule; ii++) {
|
|
|
formId[ii] = (short) this.downloadData.getUnits()[ii].getFormNo();
|
|
|
dispSec[ii] = (byte)(this.downloadData.getUnits()[ii].getDisplaySec() & 0xFF);
|
|
|
+ log.info("downloadFormSchedule: VMS {}, Schedule {} EA, FormId {}, DisplayTm {} .", this.vmsCtlrNmbr, maxSchedule, formId[ii], dispSec[ii]);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -761,6 +808,7 @@ public class TbVmsCtlrDto implements Serializable {
|
|
|
* @return
|
|
|
*/
|
|
|
public boolean downloadBlank() {
|
|
|
+ log.info("downloadBlank: VMS {}.", this.vmsCtlrNmbr);
|
|
|
VmsReqBlank reqBlank = new VmsReqBlank(this);
|
|
|
return sendData(reqBlank.getByteBuffer(), 10, reqBlank.getOpCodeDesc());
|
|
|
}
|