From 279895dee4f7a25e7c5051e3f1e51ca1a2c2d918 Mon Sep 17 00:00:00 2001 From: leebj Date: Mon, 4 Nov 2024 11:12:11 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B0=A8=EB=9F=89=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=EA=B8=B0=EB=8A=A5=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EC=A0=9D=ED=8A=B8=20=EC=9D=B4=EB=8F=99(app-support-java)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 28 ++++++++++------- .../piss/web/PissController.java | 4 +-- .../lvisserver/CarRegBasicInfoImpl.java | 31 ++----------------- 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index fa7d170f..7a6250c9 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ external-system-test 외부시스템 테스트 war - + 17 @@ -29,7 +29,7 @@ - + cokr.xit.base xit-foundation @@ -51,7 +51,13 @@ app-support-web 1.0.0-SNAPSHOT - + + + cokr.xit.app + app-support-java + 1.0.0-SNAPSHOT + + org.springframework.boot spring-boot-starter-web @@ -68,20 +74,20 @@ org.springframework.boot spring-boot-starter-test - + org.mybatis.spring.boot mybatis-spring-boot-starter 2.3.1 - + org.apache.tomcat.embed tomcat-embed-jasper provided - - + + org.projectlombok lombok @@ -92,20 +98,20 @@ mariadb-java-client runtime - + org.apache.cxf cxf-spring-boot-starter-jaxws 3.6.1 - + javax javaee-api 8.0 provided - + jakarta.xml.bind @@ -123,7 +129,7 @@ jakarta.activation-api 2.0.1 - + diff --git a/src/main/java/externalsystem/piss/web/PissController.java b/src/main/java/externalsystem/piss/web/PissController.java index 3d146ba4..f4b08008 100644 --- a/src/main/java/externalsystem/piss/web/PissController.java +++ b/src/main/java/externalsystem/piss/web/PissController.java @@ -15,11 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import cokr.xit.applib.AppCmmnUtil; import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.web.AbstractController; import externalsystem.car.dao.CarMapper; import externalsystem.testpool.dao.TestPoolMapper; -import testserver.wsdlserver.lvisserver.CarRegBasicInfoImpl; @Controller @RequestMapping(name="행정정보공동이용시스템 연계", value="/", method = RequestMethod.POST) @@ -49,7 +49,7 @@ public class PissController extends AbstractController { DataObject carInfo = carMapper.selectCar(vhrno); if(carInfo == null && !vhrno.equals("")) { - if(CarRegBasicInfoImpl.isValidCarNumber(vhrno)) { + if(AppCmmnUtil.isValidCarNumber(vhrno)) { DataObject randMber = testPoolMapper.selectRandomMber(); DataObject randAddr= testPoolMapper.selectRandomAddr(); DataObject randCarBasic = testPoolMapper.selectRandomCarBasic(); diff --git a/src/main/java/testserver/wsdlserver/lvisserver/CarRegBasicInfoImpl.java b/src/main/java/testserver/wsdlserver/lvisserver/CarRegBasicInfoImpl.java index b3309ad3..272618bd 100644 --- a/src/main/java/testserver/wsdlserver/lvisserver/CarRegBasicInfoImpl.java +++ b/src/main/java/testserver/wsdlserver/lvisserver/CarRegBasicInfoImpl.java @@ -21,11 +21,10 @@ package testserver.wsdlserver.lvisserver; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import javax.annotation.Resource; +import cokr.xit.applib.AppCmmnUtil; import cokr.xit.foundation.data.DataObject; import externalsystem.car.dao.CarMapper; import externalsystem.testpool.dao.TestPoolMapper; @@ -63,7 +62,7 @@ public class CarRegBasicInfoImpl implements CarRegBasicInfo { DataObject carInfo = carMapper.selectCar(vhrno); if(carInfo == null && !vhrno.equals("")) { - if(isValidCarNumber(vhrno)) { + if(AppCmmnUtil.isValidCarNumber(vhrno)) { DataObject randMber = testPoolMapper.selectRandomMber(); DataObject randAddr= testPoolMapper.selectRandomAddr(); DataObject randCarBasic = testPoolMapper.selectRandomCarBasic(); @@ -132,32 +131,6 @@ public class CarRegBasicInfoImpl implements CarRegBasicInfo { } - public static boolean isValidCarNumber(String carNum){ - boolean returnValue = false; - - try{ - String regex = "^\\d{2,3}[가|나|다|라|마|거|너|더|러|머|버|서|어|저|고|노|도|로|모|보|소|오|조|구|누|두|루|무|부|수|우|주|바|사|아|자|허|배|호|하\\x20]\\d{4}/*$"; - - Pattern p = Pattern.compile(regex); - Matcher m = p.matcher(carNum); - if (m.matches()) { - returnValue = true; - }else{ - //2번째 패턴 처리 - regex = "^[서울|부산|대구|인천|대전|광주|울산|제주|경기|강원|충남|전남|전북|경남|경북|세종]{2}\\d{2}[가|나|다|라|마|거|너|더|러|머|버|서|어|저|고|노|도|로|모|보|소|오|조|구|누|두|루|무|부|수|우|주|바|사|아|자|허|배|호|하\\x20]\\d{4}$"; - p = Pattern.compile(regex); - m = p.matcher(carNum); - if (m.matches()) { - returnValue = true; - } - } - - return returnValue; - - }catch(Exception e){ - return false; - } - } } \ No newline at end of file