클래스명 수정

src/main/java/cokr/xit/fims/crdn/parsing/CommonLayoutParser.java

@@ -0,0 +1,7 @@
+package cokr.xit.fims.crdn.parsing;
+
+public class CommonLayoutParser {
+
+
+
+}

src/main/java/cokr/xit/fims/crdn/parsing/Eli.java

@@ -1,27 +0,0 @@
-package cokr.xit.fims.crdn.parsing;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
-
-import cokr.xit.foundation.data.DataObject;
-
-public class Eli implements EquipmentEnterprise {
-
-	@Override
-	public List<DataObject> parsing(Stream<Path> fileList) {
-
-		//TODO:
-
-		return null;
-	}
-
-	@Override
-	public boolean isChangeCrackdown(DataObject currentItem, DataObject beforeItem) {
-
-		//TODO:
-
-		return false;
-	}
-
-}

src/main/java/cokr/xit/fims/crdn/parsing/Gasan.java

@@ -1,27 +0,0 @@
-package cokr.xit.fims.crdn.parsing;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
-
-import cokr.xit.foundation.data.DataObject;
-
-public class Gasan implements EquipmentEnterprise {
-
-	@Override
-	public List<DataObject> parsing(Stream<Path> fileList) {
-
-		//TODO:
-
-		return null;
-	}
-
-	@Override
-	public boolean isChangeCrackdown(DataObject currentItem, DataObject beforeItem) {
-
-		//TODO :
-
-		return false;
-	}
-
-}

src/main/java/cokr/xit/fims/crdn/parsing/HiteComParser.java

@@ -18,7 +18,7 @@ import cokr.xit.base.file.FileInfo;
 import cokr.xit.fims.cmmn.CmmnUtil;
 import cokr.xit.foundation.data.DataObject;
 
-public class HiteCom implements EquipmentEnterprise {
+public class HiteComParser implements LayoutParser {
 
 	private int tempGroupSeq = 1;
 

src/main/java/cokr/xit/fims/crdn/parsing/InoParser.java

@@ -15,7 +15,7 @@ import org.apache.commons.io.FilenameUtils;
 import cokr.xit.foundation.data.DataObject;
 
 
-public class Ino implements EquipmentEnterprise {
+public class InoParser implements LayoutParser {
 
 	private DataObject before = new DataObject();
 	private int tempGroupSeq = 1;

src/main/java/cokr/xit/fims/crdn/parsing/Knl.java

@@ -1,27 +0,0 @@
-package cokr.xit.fims.crdn.parsing;
-
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
-
-import cokr.xit.foundation.data.DataObject;
-
-public class Knl implements EquipmentEnterprise {
-
-	@Override
-	public List<DataObject> parsing(Stream<Path> fileList) {
-
-		//TODO:
-
-		return null;
-	}
-
-	@Override
-	public boolean isChangeCrackdown(DataObject currentItem, DataObject beforeItem) {
-
-		//TODO :
-
-		return false;
-	}
-
-}

src/main/java/cokr/xit/fims/crdn/parsing/LayoutDescriptor.java

@@ -0,0 +1,40 @@
+package cokr.xit.fims.crdn.parsing;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class LayoutDescriptor {
+
+	private String fileLayoutId;
+
+	private String sggCd;
+
+	private String taskSeCd;
+
+	private String instCd;
+
+	private String deptCd;
+
+	private String linkFileLocation;
+
+	private String fileGroup;
+
+	private String countPerFileGroup;
+
+	private String fileNameLength;
+
+	private String fileNameItmes;
+
+	private String fileNameSeperator;
+
+	private String contentItems;
+
+	private String contentSeperator;
+
+	private String contentSecondSeperator;
+
+	private String secondSeperatorStarterItems;
+
+}

src/main/java/cokr/xit/fims/crdn/parsing/LayoutParser.java

@@ -6,7 +6,7 @@ import java.util.stream.Stream;
 
 import cokr.xit.foundation.data.DataObject;
 
-public interface EquipmentEnterprise {
+public interface LayoutParser {
 
 	/**장비 단속 연계 파일에서 단속정보를 추출한다.<br />
 	 * @param fileList 연계파일리스트

src/main/java/cokr/xit/fims/crdn/parsing/XitParser.java

@@ -16,7 +16,7 @@ import org.apache.commons.io.FilenameUtils;
 
 import cokr.xit.foundation.data.DataObject;
 
-public class XitRecommend implements EquipmentEnterprise{
+public class XitParser implements LayoutParser{
 
 	private DataObject before = new DataObject();
 	private int tempGroupSeq = 1;

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

@@ -19,7 +19,7 @@ import cokr.xit.base.file.service.bean.FileBean;
 import cokr.xit.base.file.web.FileInfoFactory;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.dao.GlobalStngMapper;
-import cokr.xit.fims.crdn.parsing.HiteCom;
+import cokr.xit.fims.crdn.parsing.HiteComParser;
 import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.crdn.service.ImportService;
 import cokr.xit.foundation.component.AbstractServiceBean;
@@ -222,16 +222,16 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 			//linkFileInfo.string("PLATE_HEIGHT");
 
 			try {
-				FileInfo FileInfo1 = HiteCom.base64ToFileInfo(linkFileInfo.string("CAR_IMAGE_NM"), linkFileInfo.string("CAR_IMAGE"), 1);
+				FileInfo FileInfo1 = HiteComParser.base64ToFileInfo(linkFileInfo.string("CAR_IMAGE_NM"), linkFileInfo.string("CAR_IMAGE"), 1);
 				fileInfoList.add(FileInfo1);
-				FileInfo FileInfo2 = HiteCom.base64ToFileInfo(linkFileInfo.string("PLATE_IMAGE_NM"), linkFileInfo.string("PLATE_IMAGE"), 2);
+				FileInfo FileInfo2 = HiteComParser.base64ToFileInfo(linkFileInfo.string("PLATE_IMAGE_NM"), linkFileInfo.string("PLATE_IMAGE"), 2);
 				fileInfoList.add(FileInfo2);
 
 				int otherPhotoCnt = linkFileInfo.number("PHOTO_CNT").intValue() - 2;
 				for(int i=1; i <= otherPhotoCnt; i++){
 					String fileName = linkFileInfo.string("MOVING_IMAGE"+i+"_NM");
 					String b64str = linkFileInfo.string("MOVING_IMAGE"+i);
-					FileInfo FileInfo = HiteCom.base64ToFileInfo(fileName, b64str, i + 2);
+					FileInfo FileInfo = HiteComParser.base64ToFileInfo(fileName, b64str, i + 2);
 					fileInfoList.add(FileInfo);
 				}
 

src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java

@@ -27,12 +27,11 @@ import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.dao.CrdnInstMapper;
 import cokr.xit.fims.crdn.dao.GlobalStngMapper;
-import cokr.xit.fims.crdn.parsing.EquipmentEnterprise;
-import cokr.xit.fims.crdn.parsing.HiteCom;
-import cokr.xit.fims.crdn.parsing.Ino;
-import cokr.xit.fims.crdn.parsing.Knl;
+import cokr.xit.fims.crdn.parsing.LayoutParser;
+import cokr.xit.fims.crdn.parsing.HiteComParser;
+import cokr.xit.fims.crdn.parsing.InoParser;
 import cokr.xit.fims.crdn.parsing.ParsingUtil;
-import cokr.xit.fims.crdn.parsing.XitRecommend;
+import cokr.xit.fims.crdn.parsing.XitParser;
 import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.crdn.service.CrdnStngService;
 import cokr.xit.fims.crdn.service.ImportService;
@@ -130,12 +129,12 @@ public class Crdn05Controller extends ApplicationController {
 		boolean saved = false;
 
 		String entType = hReq.getParameter("entType");
-		EquipmentEnterprise enterprise = null;
+		LayoutParser enterprise = null;
 		switch(entType){
-			case "ino": enterprise = new Ino(); break;
-			case "knl": enterprise = new Knl(); break;
-			case "hitecom": enterprise = new HiteCom(); break;
-			case "xit": enterprise = new XitRecommend(); break;
+			case "ino": enterprise = new InoParser(); break;
+			//case "knl":  break;
+			case "hitecom": enterprise = new HiteComParser(); break;
+			case "xit": enterprise = new XitParser(); break;
 			//case "": enterprise = new (); break;
 		}
 
@@ -186,12 +185,12 @@ public class Crdn05Controller extends ApplicationController {
 		boolean saved = false;
 
 		String entType = hReq.getParameter("entType");
-		EquipmentEnterprise enterprise = null;
+		LayoutParser enterprise = null;
 		switch(entType){
-			case "ino": enterprise = new Ino(); break;
-			case "knl": enterprise = new Knl(); break;
-			case "hitecom": enterprise = new HiteCom(); break;
-			case "xit": enterprise = new XitRecommend(); break;
+			case "ino": enterprise = new InoParser(); break;
+			//case "knl":  break;
+			case "hitecom": enterprise = new HiteComParser(); break;
+			case "xit": enterprise = new XitParser(); break;
 			//case "": enterprise = new (); break;
 		}
 
@@ -225,12 +224,12 @@ public class Crdn05Controller extends ApplicationController {
 		ModelAndView mav = new ModelAndView("jsonView");
 
 		String entType = hReq.getParameter("entType");
-		EquipmentEnterprise enterprise = null;
+		LayoutParser enterprise = null;
 		switch(entType){
-			case "ino": enterprise = new Ino(); break;
-			case "knl": enterprise = new Knl(); break;
-			case "hitecom": enterprise = new HiteCom(); break;
-			case "xit": enterprise = new XitRecommend(); break;
+			case "ino": enterprise = new InoParser(); break;
+			//case "knl":  break;
+			case "hitecom": enterprise = new HiteComParser(); break;
+			case "xit": enterprise = new XitParser(); break;
 			//case "": enterprise = new (); break;
 		}