diff --git a/src/main/java/cokr/xit/fims/crdn/parsing/LayoutParser.java b/src/main/java/cokr/xit/fims/crdn/parsing/LayoutParser.java index a90f64ff..47e131b7 100644 --- a/src/main/java/cokr/xit/fims/crdn/parsing/LayoutParser.java +++ b/src/main/java/cokr/xit/fims/crdn/parsing/LayoutParser.java @@ -17,7 +17,7 @@ import net.minidev.json.parser.ParseException; abstract public class LayoutParser { String[] allItem = { - "FILE_GROUP_TYPE","FILE_PATH","FILE_NAME","FILE_LAST_MODIFIED","FILE_SIZE","FILE_EXTENSION","LINK_ENT_NM","ENT_NM", + "FILE_GROUP_TYPE","FILE_PATH","FILE_NAME","FILE_LAST_MODIFIED","FILE_SIZE","FILE_EXTENSION","LINK_ENT_NM", "FILE_SEQ","PHOTO_CNT","PHOTO_TYPE_CD","PHOTO_TYPE_NM","FILE_STATUS_CD","FILE_STATUS_NM", "VHRNO", "CRDN_TIMESTAMP","CRDN_YMD_TM","CRDN_YMD","CRDN_TM","CRDN_END_TM","CRDN_BGNG_TM", diff --git a/src/main/java/cokr/xit/fims/crdn/parsing/OnlyImageParser.java b/src/main/java/cokr/xit/fims/crdn/parsing/OnlyImageParser.java index 7f780436..aa7e6d7c 100644 --- a/src/main/java/cokr/xit/fims/crdn/parsing/OnlyImageParser.java +++ b/src/main/java/cokr/xit/fims/crdn/parsing/OnlyImageParser.java @@ -6,7 +6,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.regex.Matcher; import java.util.stream.Collectors; import org.apache.commons.io.FilenameUtils; @@ -57,27 +56,6 @@ public class OnlyImageParser extends LayoutParser { this.refineValue(dataObject); - - String[] fileNameSplit = noExtensionName.split(Matcher.quoteReplacement(descriptor.getFileNameSeperator())); - - dataObject.put("EQPMNT_CD", fileNameSplit[0]); - dataObject.put("CRDN_TIMESTAMP", fileNameSplit[1]); - dataObject.put("VHRNO", fileNameSplit[2]); - dataObject.put("PHOTO_CNT", fileNameSplit[3]); - dataObject.put("PHOTO_TYPE_CD", fileNameSplit[4]); - dataObject.put("GPS_X", fileNameSplit[5]); - dataObject.put("GPS_Y", fileNameSplit[6]); - dataObject.put("FILE_STATUS_CD", fileNameSplit[7]); - dataObject.put("CRDN_PLC", fileNameSplit[8]); - dataObject.put("CRDN_ROAD_NM", fileNameSplit[9]); - dataObject.put("CRDN_STDG_NM", fileNameSplit[10]); - - if(fileNameSplit.length >= 12) { - String crdnCn = fileNameSplit[11]; - dataObject.put("CRDN_CN_CD", crdnCn); - } - - if(!before.isEmpty()) { boolean isChangeTempGroup = this.isChangeCrackdown(dataObject, before); if(isChangeTempGroup) {