소스 정리

src/main/java/cokr/xit/base/file/etc/OutsourcingFileWriter.java

@@ -96,7 +96,7 @@ public class OutsourcingFileWriter {
 					File modifiedFile = new File(modifiedFilePath);
 
 					if(dataObject.get("MOS"+fileKey) != null) {
-						CmmnUtil.createMaskedImage(orgnFileInputStream, modifiedFile, (List<DataObject>)dataObject.get("MOS"+fileKey));
+						CmmnUtil.createMaskedImage(orgnFileInputStream, modifiedFile, CmmnUtil.getDataObjectListFromMap(dataObject,"MOS"+fileKey));
 					} else {
 						Files.copy(orgnFileInputStream, modifiedFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
 					}

src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java

@@ -14,6 +14,7 @@ import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.format.TextStyle;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Comparator;
 import java.util.Date;
@@ -41,6 +42,22 @@ import cokr.xit.foundation.data.DataObject;
 
 public class CmmnUtil {
 
+	public static List<DataObject> getDataObjectListFromMap(Map<String,?> map, String key) {
+		ArrayList<DataObject> dataObjectList = new ArrayList<>();
+		Object list = map.get(key);
+		if(list == null) {
+			return null;
+		}
+		if(list instanceof ArrayList<?>) {
+			for(Object o : (ArrayList<?>) list) {
+				if(o instanceof DataObject) {
+					dataObjectList.add((DataObject)o);
+				}
+			}
+		}
+		return dataObjectList;
+	}
+
 	/**
      * HTML엔티티코드 문자열을 특수문자로 치환한다.
      * @param HTML엔티티코드 문자열

src/main/java/cokr/xit/fims/cmmn/pdf/print/format/PDFPrintFormat.java

@@ -3,6 +3,7 @@ package cokr.xit.fims.cmmn.pdf.print.format;
 import java.util.ArrayList;
 import java.util.List;
 
+import cokr.xit.fims.cmmn.CmmnUtil;
 import cokr.xit.fims.cmmn.Print;
 import cokr.xit.fims.cmmn.PrintOption;
 import cokr.xit.fims.cmmn.pdf.print.DefaultOtptArtclStng;
@@ -113,8 +114,10 @@ public abstract class PDFPrintFormat {
 	public abstract DataObject createSampleData();
 
 	public List<DataObject> getMosSet(String imageKey, DataObject dataObject) {
-		if((List<DataObject>)dataObject.get("MOS"+imageKey) != null) {
-			return (List<DataObject>)dataObject.get("MOS"+imageKey);
+		List<DataObject> list = CmmnUtil.getDataObjectListFromMap(dataObject,"MOS"+imageKey);
+
+		if(list != null) {
+			return list;
 		} else {
 			return null;
 		}

src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java

@@ -19,6 +19,7 @@ import cokr.xit.base.file.service.bean.FileBean;
 import cokr.xit.base.file.web.FileInfoFactory;
 import cokr.xit.base.user.ManagedUser;
 import cokr.xit.base.user.dao.UserMapper;
+import cokr.xit.fims.cmmn.CmmnUtil;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.Team;
 import cokr.xit.fims.crdn.dao.CrdnTeamMapper;
@@ -100,7 +101,7 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 		Map<String, Object> dividedInfo = this.divideInformation(linkFileInfoList, fileGroupType);
 
 		DataObject metaFileInfo = (DataObject) dividedInfo.get("metaInfo");
-		List<DataObject> imageFileInfoList = (List<DataObject>) dividedInfo.get("imageInfo");
+		List<DataObject> imageFileInfoList = CmmnUtil.getDataObjectListFromMap(dividedInfo,"imageInfo");
 		DataObject bgngData = (DataObject) dividedInfo.get("bgngData");
 		DataObject endData = (DataObject) dividedInfo.get("endData");
 

src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java

@@ -12,6 +12,7 @@ import cokr.xit.base.code.CommonCode;
 import cokr.xit.base.user.ManagedUser;
 import cokr.xit.base.user.dao.UserMapper;
 import cokr.xit.base.web.ApplicationController;
+import cokr.xit.fims.cmmn.CmmnUtil;
 import cokr.xit.fims.cmmn.service.bean.StngBean;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.cvlc.CrdnCvlcpt;
@@ -77,9 +78,9 @@ public class Cvlc05Controller extends ApplicationController {
 		Map<String, Object> info = crdnCvlcptService.getCvlcptAnswerWordsInfo(crdnQuery);
 
 		DataObject basicInfo = (DataObject) info.get("basic");
-		List<DataObject> levyCaseList = (List<DataObject>) info.get("levyCaseList");
-		List<DataObject> warningCaseList = (List<DataObject>) info.get("warningCaseList");
-		List<DataObject> nonlevyCaseList = (List<DataObject>) info.get("nonlevyCaseList");
+		List<DataObject> levyCaseList = CmmnUtil.getDataObjectListFromMap(info,"levyCaseList");
+		List<DataObject> warningCaseList = CmmnUtil.getDataObjectListFromMap(info,"warningCaseList");
+		List<DataObject> nonlevyCaseList = CmmnUtil.getDataObjectListFromMap(info,"nonlevyCaseList");
 
 		if(basicInfo == null){
 			mav.addObject("headerCn", "");