From 71aa3a8cd8c938882a7b113048bd1394d89e7e9f Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 15 Mar 2024 17:57:31 +0900
Subject: [PATCH] =?UTF-8?q?ftp=EC=A0=95=EB=B3=B4=20=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=94=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cokr/xit/fims/cmmn/ftp/FTPUtil.java   |  2 +-
 .../cokr/xit/fims/cmmn/ftp/RemoteSystemInfo.java    |  1 +
 .../cokr/xit/fims/crdn/web/Crdn05Controller.java    |  1 +
 .../sql/mapper/fims/crdn/crdn-stng-mapper.xml       |  5 +++++
 .../webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp | 13 +++++++++++--
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/cmmn/ftp/FTPUtil.java b/src/main/java/cokr/xit/fims/cmmn/ftp/FTPUtil.java
index a6ae1562..85977c41 100644
--- a/src/main/java/cokr/xit/fims/cmmn/ftp/FTPUtil.java
+++ b/src/main/java/cokr/xit/fims/cmmn/ftp/FTPUtil.java
@@ -34,7 +34,7 @@ public class FTPUtil {
 
 			client = new FTPClient();
 			client.setControlEncoding("UTF-8");
-			client.connect(rs.getIp(), 21);
+			client.connect(rs.getIp(), Integer.parseInt(rs.getPort()));
 
 			// 접속을 확인.
 		    int resultCode = client.getReplyCode();
diff --git a/src/main/java/cokr/xit/fims/cmmn/ftp/RemoteSystemInfo.java b/src/main/java/cokr/xit/fims/cmmn/ftp/RemoteSystemInfo.java
index 615cbf95..98174301 100644
--- a/src/main/java/cokr/xit/fims/cmmn/ftp/RemoteSystemInfo.java
+++ b/src/main/java/cokr/xit/fims/cmmn/ftp/RemoteSystemInfo.java
@@ -7,6 +7,7 @@ import lombok.Setter;
 @Setter
 public class RemoteSystemInfo {
 	String ip;
+	String port;
 	String id;
 	String pw;
 	String osType;
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
index a55274ad..f1fa9542 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
@@ -170,6 +170,7 @@ public class Crdn05Controller extends ApplicationController {
 
 			RemoteSystemInfo rs = new RemoteSystemInfo();
 			rs.setIp(remoteInfo.string("REMOTE_IP"));
+			rs.setPort(remoteInfo.string("REMOTE_PORT"));
 			rs.setId(remoteInfo.string("REMOTE_ID"));
 			rs.setPw(remoteInfo.string("REMOTE_PASSWORD"));
 			rs.setOsType(remoteInfo.string("REMOTE_OS"));
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-stng-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-stng-mapper.xml
index 5a3d1c4a..ec15a571 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn-stng-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn-stng-mapper.xml
@@ -96,6 +96,7 @@ SELECT A.FILE_LAYOUT_ID
      , A.INCREASE_TYPE
      , B.FILE_LAYOUT_ID
      , B.REMOTE_IP
+     , B.REMOTE_PORT
      , B.REMOTE_ID
      , B.REMOTE_PASSWORD
      , B.REMOTE_OS
@@ -175,6 +176,7 @@ INSERT
   INTO TB_FTP (
        FILE_LAYOUT_ID
      , REMOTE_IP
+     , REMOTE_PORT
      , REMOTE_ID
      , REMOTE_PASSWORD
      , REMOTE_OS
@@ -183,6 +185,7 @@ INSERT
   ) VALUES (
        #{layoutDescriptor.fileLayoutId}
      , #{remoteSystemInfo.ip}
+     , #{remoteSystemInfo.port}
      , #{remoteSystemInfo.id}
      , #{remoteSystemInfo.pw}
      , #{remoteSystemInfo.osType}
@@ -221,6 +224,7 @@ UPDATE TB_CRDN_FILE_LAYOUT
 /* 파일연계 원격지 정보 수정(crdnStngMapper.updateFtpInfo) */
 UPDATE TB_FTP
    SET REMOTE_IP        = #{remoteSystemInfo.ip}
+     , REMOTE_PORT      = #{remoteSystemInfo.port}
      , REMOTE_ID        = #{remoteSystemInfo.id}
      , REMOTE_PASSWORD  = #{remoteSystemInfo.pw}
      , REMOTE_OS        = #{remoteSystemInfo.osType}
@@ -304,6 +308,7 @@ SELECT A.FILE_LAYOUT_ID
 /* 연계파일 fpt정보 조회(crdnStngMapper.selectRemoteInfo) */
 SELECT FILE_LAYOUT_ID
      , REMOTE_IP
+     , REMOTE_PORT
      , REMOTE_ID
      , REMOTE_PASSWORD
      , REMOTE_OS
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
index b7a2ef0c..b67b8264 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
@@ -161,7 +161,7 @@
 				</div>
 				<div class="card-body">
 					<div class="row g-1">
-						<div class="col-md-6">
+						<div class="col-md-4">
 							<label for="linkEnterpriseName--${pageName}" 
 							class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">
 								업체명(연계)
@@ -170,7 +170,7 @@
 							class="form-control" maxlength="100" data-maxlengthb="100" />
 						</div>
 						
-						<div class="col-md-6">
+						<div class="col-md-4">
 							<label for="ip--${pageName}" 
 							class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">
 								아이피
@@ -179,6 +179,15 @@
 							class="form-control" maxlength="100" data-maxlengthb="100" />
 						</div>
 						
+						<div class="col-md-4">
+							<label for="port--${pageName}" 
+							class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">
+								포트
+							</label>
+							<input type="number" id="port--${pageName}" name="port" data-map="REMOTE_PORT"
+							class="form-control" min="1" max="65535" />
+						</div>
+						
 						<div class="col-md-6">
 							<label for="id--${pageName}" 
 							class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">