소스 정리

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

@@ -38,22 +38,23 @@ public class XitRecommend implements EquipmentEnterprise{
         	dataObject.put("FILE_NAME", fileName);
 
         	//TODO:
+        	boolean isMetaData = FilenameUtils.getExtension(fileName).toUpperCase().equals("TXT");
+        	String[] fileNameSplit = FilenameUtils.removeExtension(fileName).split(Matcher.quoteReplacement("_"));
 
-        	String[] fileNameSplit = fileName.split(Matcher.quoteReplacement("_"));
+        	String crdnTiemstamp = fileNameSplit[0];
-
+        	dataObject.put("CRDN_YMD", crdnTiemstamp.substring(0, 8));
+        	dataObject.put("CRDN_HM", crdnTiemstamp.substring(8, 14));
 
-        	//dataObject.put("", );
+        	dataObject.put("ENT_CD", fileNameSplit[1]);
-        	//dataObject.put("", );
+        	dataObject.put("EQM_CD", fileNameSplit[2]);
-        	//dataObject.put("", );
+        	dataObject.put("FILE_SN", fileNameSplit[3]);
-        	//dataObject.put("", );
-        	//dataObject.put("", );
 
-        	boolean isMetaData = FilenameUtils.getExtension(fileName).toUpperCase().equals("TXT");
         	if(isMetaData) {
 
         		BufferedReader br = null;
         		try {
 					br = new BufferedReader(new InputStreamReader(new FileInputStream(file),Charset.forName("EUC-KR")));
+
 				} catch (FileNotFoundException e) {
 
 				}

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

@@ -353,7 +353,7 @@ public class CrdnBean extends AbstractComponent {
 	public boolean removeEquipmentLinkFile(String entType, String fileName) {
 		boolean saved = false;
 
-		if(entType.equals("이노")) {
+		if(entType.equals("INO")) {
 
 			try {
 

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

@@ -86,7 +86,7 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 
 		List<FileInfo> fileInfoList = new ArrayList<FileInfo>();
 
-		if(entType.equals("이노")) {
+		if(entType.equals("INO")) {
 			crdn.setCrdnInptSeCd("11");
 
 			crdn.setVltnCd("01");

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

@@ -124,8 +124,8 @@ public class Crdn05Controller extends ApplicationController {
 		String entType = hReq.getParameter("entType");
 		EquipmentEnterprise enterprise = null;
 		switch(entType){
-			case "이노": enterprise = new Ino(); break;
+			case "INO": enterprise = new Ino(); break;
-			case "knl": enterprise = new Knl(); break;
+			case "KNL": enterprise = new Knl(); break;
 			//case "": enterprise = new (); break;
 			//case "": enterprise = new (); break;
 			//case "": enterprise = new (); break;
@@ -137,12 +137,12 @@ public class Crdn05Controller extends ApplicationController {
 
 		String downloadRoot = ""; //ftp나 usb에서 다운받는 파일 경로
 
-		if(entType.equals("이노") || entType.equals("knl")) {
+		if(entType.equals("INO") || entType.equals("KNL")) {
 			//ftp G클라우드
 
 			try {
 
-				if(entType.equals("이노")) {
+				if(entType.equals("INO")) {
 
 					//RemoteSystemInfo rs = new RemoteSystemInfo();
 					//rs.setIp("211.119.124.9");
@@ -157,7 +157,7 @@ public class Crdn05Controller extends ApplicationController {
 
 					downloadRoot = "files"+File.separator+"tempForIno";
 				}
-				if(entType.equals("knl")) {
+				if(entType.equals("KNL")) {
 
 
 

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp

@@ -23,10 +23,11 @@
 						<select id="entType--${pageName}" name="entType" class="form-select">
 							<option value="">선택하세요</option>
 							<option value="KNL">KNL</option>
-							<option value="이노">이노</option>
+							<option value="INO">이노</option>
-							<option value="가산정보통신">가산정보통신</option>
+							<option value="GASAN">가산정보통신</option>
-							<option value="앨리소프트">엘리소프트</option>
+							<option value="ELISOFT">엘리소프트</option>
-							<option value="하이테콤">하이테콤</option>
+							<option value="HITECOM">하이테콤</option>
+							<option value="XIT">XIT권장포맷</option>
 						</select>
 					</div>
 					<c:if test="${taskSeCd == 'PVS' or taskSeCd == 'BPV'}">
@@ -143,9 +144,9 @@
 			<img id="img--${pageName}" src="" style="object-fit:contain;" />
 		</div>
 		
-		<div class="card my-4 px-2" style="width:100px;height:600px;min-width:100px;">
+		<div class="card my-4 px-2" style="width:120px;height:600px;min-width:120px;">
 			<div class="d-flex my-2" style="flex-flow:column">
-				<button type="button" id="btnInsertCrdn--${pageName}" class="btn btn-primary my-2">부과등록</button>
+				<button type="button" id="btnInsertCrdn--${pageName}" class="btn btn-primary my-2">단속등록</button>
 				<button type="button" id="btnDelete--${pageName}" class="btn btn-primary my-2">삭제</button>
 			</div>
 		</div>
@@ -214,7 +215,7 @@ $(document).ready(function(){
 			return;
 		}
 		
-		if($("#entType--${pageName}").val() != "KNL" && $("#entType--${pageName}").val() != "이노"){
+		if($("#entType--${pageName}").val() != "KNL" && $("#entType--${pageName}").val() != "INO"){
 			dialog.alert("해당 과태료 업무와 관련된 장비업체가 아닙니다.");
 			return;
 		}
@@ -243,6 +244,7 @@ $(document).ready(function(){
 		if($("#entType--${pageName}").val() != "가산정보통신" 
 				&& $("#entType--${pageName}").val() != "엘리소프트"
 				&& $("#entType--${pageName}").val() != "하이테콤"
+				&& $("#entType--${pageName}").val() != "XIT"
 				){
 			dialog.alert("해당 과태료 업무와 관련된 장비업체가 아닙니다.");
 			return;