error;
+
+ /**자동차 기본정보(연료제원 포함)조회 결과 상세
+ * @author mjkhan
+ */
+ @Getter
+ @Setter
+ public static class ExtInfo extends BasicInfoResponse.BasicInfo {
+ private static final long serialVersionUID = 1L;
+ /** 사용본거지전체주소 */
+ private String usgsrhld_adres_full;
+ /** 연료소비율 */
+ private String fuel_cnsmp_rt;
+ /** 전기복합연료소비율 */
+ private String elcty_cmpnd_fuel_cnsmp_rt;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/cokr/xit/interfaces/lvis/web/ApiController.java b/src/main/java/cokr/xit/interfaces/lvis/web/ApiController.java
index 6541059..6e5d28e 100644
--- a/src/main/java/cokr/xit/interfaces/lvis/web/ApiController.java
+++ b/src/main/java/cokr/xit/interfaces/lvis/web/ApiController.java
@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
import cokr.xit.foundation.web.AbstractController;
import cokr.xit.interfaces.lvis.service.VehicleInfoService;
+import cokr.xit.interfaces.lvis.service.reg.BasicInfoExtRequest;
+import cokr.xit.interfaces.lvis.service.reg.BasicInfoExtResponse;
import cokr.xit.interfaces.lvis.service.reg.BasicInfoRequest;
import cokr.xit.interfaces.lvis.service.reg.BasicInfoResponse;
import cokr.xit.interfaces.lvis.service.reg.CustodyTrgetRequest;
@@ -50,11 +52,25 @@ public class ApiController extends AbstractController {
* }
* @return 자동차 기본사항
*/
- @RequestMapping(value = "/basicInfo", name = "자동차 기본사항 조회")
+ @PostMapping(value = "/basicInfo", name = "자동차 기본사항 조회")
public BasicInfoResponse getBasicInfo(@RequestBody BasicInfoRequest req) {
return service.getBasicInfo(req);
}
+ /**자동차 기본사항을 조회한다.
+ * @param req 자동차 기본사항 조회를 위한 조건
+ * {
+ * "VIN": "차대번호",
+ * "VHRNO": "차량번호",
+ * "LEVY_STDDE": "부과기준일자"
+ * }
+ * @return 자동차 기본사항
+ */
+ @PostMapping(value = "/basicInfoExt", name = "자동차 기본사항 조회")
+ public BasicInfoExtResponse getBasicInfo(@RequestBody BasicInfoExtRequest req) {
+ return service.getBasicInfo(req);
+ }
+
/**자동차 등록원부(갑)를 조회한다.
* @param req 자동차 등록원부(갑) 조회를 위한 조건
* {
@@ -69,7 +85,7 @@ public class ApiController extends AbstractController {
* }
* @return 자동차 등록원부(갑)
*/
- @RequestMapping(value = "/frmrWlthReadng", name = "자동차 등록원부(갑) 조회")
+ @PostMapping(value = "/frmrWlthReadng", name = "자동차 등록원부(갑) 조회")
public FrmrWlthReadngResponse getFrmrWlthReadng(@RequestBody FrmrWlthReadngRequest req) {
return service.getFrmrWlthReadng(req);
}
@@ -87,7 +103,7 @@ public class ApiController extends AbstractController {
* }
* @return 자동차 등록원부(을)
*/
- @RequestMapping(value = "/scldgrReadng", name = "자동차 등록원부(을) 조회")
+ @PostMapping(value = "/scldgrReadng", name = "자동차 등록원부(을) 조회")
public ScldgrReadngResponse getScldgrReadng(@RequestBody ScldgrReadngRequest req) {
return service.getScldgrReadng(req);
}
@@ -102,7 +118,7 @@ public class ApiController extends AbstractController {
* }
* @return 압류내역
*/
- @RequestMapping(value = "/seizureByVhrNo", name = "압류내역 조회")
+ @PostMapping(value = "/seizureByVhrNo", name = "압류내역 조회")
public SeizureByVhrNoResponse getSeizureByVhrNo(@RequestBody SeizureByVhrNoRequest req) {
return service.getSeizureByVhrNo(req);
}
@@ -152,7 +168,7 @@ public class ApiController extends AbstractController {
* }
* @return 대체 압류차량 정보
*/
- @RequestMapping(value = "/altrtvSeizureVhrno", name = "대체 압류차량 조회")
+ @PostMapping(value = "/altrtvSeizureVhrno", name = "대체 압류차량 조회")
public AltrtvSeizureVhrnoResponse getAltrtvSeizureVhrno(@RequestBody AltrtvSeizureVhrnoRequest req) {
return service.getAltrtvSeizureVhrno(req);
}
@@ -164,7 +180,7 @@ public class ApiController extends AbstractController {
* }
* @return 대체 번호판 영치대상 정보
*/
- @RequestMapping(value = "/custodyTrget", name = "번호판 영치대상 조회")
+ @PostMapping(value = "/custodyTrget", name = "번호판 영치대상 조회")
public CustodyTrgetResponse getCustodyTrget(@RequestBody CustodyTrgetRequest req) {
return service.getCustodyTrget(req);
}
@@ -179,7 +195,12 @@ public class ApiController extends AbstractController {
map.put("messageId", "MSG50560");
map.put("messageName", "제공기관 구간 시스템 오류");
map.put("messageReason", "제공기관 구간 시스템 오류 : 기타 시스템 오류");
- map.put("exceptionStackTrace", ExceptionUtils.getStackTrace(rootCause(t)));
+
+ Throwable cause = rootCause(t);
+ map.put("exceptionStackTrace", ExceptionUtils.getStackTrace(cause));
+
+ cause.printStackTrace();
+
return map;
}
}
\ No newline at end of file
diff --git a/src/main/resources/intf-conf/gpki.conf b/src/main/resources/intf-conf/gpki.conf
new file mode 100644
index 0000000..c0c18cb
--- /dev/null
+++ b/src/main/resources/intf-conf/gpki.conf
@@ -0,0 +1,25 @@
+{
+ "license": "C:\\GPKI\\Lic", /* 이용기관 GPKI API 라이센스 디렉토리 */
+
+ "charset": "UTF-8", /* 문자셋 */
+
+ "server": {
+ "local": "SVR1311000030", /* 이용기관 서버 CN */
+ "targets": "SVR1500000015" /* 대상기관 서버인증서 아이디, 여러 개일 경우 컴마(,)로 구분 */
+ },
+
+ "ldapUrl": "ldap://10.1.7.118:389/cn=", /* 대상기관 인증서 다운로드를 위한 행정망 LDAP URL */
+ /*"ldapUrl": "ldap://152.99.57.127:389/cn=", 대상기관 인증서 다운로드를 위한 인터넷망 LDAP URL */
+ "certDir": "C:\\GPKI\\Certificate\\class1", /* 서버 인증서, 키 저장 디렉토리 */
+
+ "env": { /* 이용기관 서버 인증서 */
+ "certFile": "SVR1311000030_env.cer",
+ "privateKeyFile": "SVR1311000030_env.key",
+ "privateKeyPassword": "기후대기3395!"
+ },
+ "sig": { /* 이용기관 서버 전자서명 */
+ "certFile": "SVR1311000030_sig.cer",
+ "privateKeyFile": "SVR1311000030_sig.key",
+ "privateKeyPassword": "기후대기3395!"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/intf-conf/public-info.conf b/src/main/resources/intf-conf/public-info.conf
new file mode 100644
index 0000000..2341a09
--- /dev/null
+++ b/src/main/resources/intf-conf/public-info.conf
@@ -0,0 +1,12 @@
+{
+ "basic-info-ext": { /* 자동차 기본정보(연료제원 포함) 조회 설정 이름 */
+ "apiKey": "59f26bf09ed196bfbd98210388c4c6ea9dd0f77bde3f35526f082647a305325b", /* 행정정보 공동이용 서비스가 발급한 api key */
+ "apiUrl": "http://10.188.225.94:29001/piss/api/molit/SignguCarBassMatterInqireService", /* 서비스 api url */
+
+ "userServerId": "SVR1311000030", /* 이용기관 gpki server id */
+ "providerServerId": "SVR1500000015", /* 보유기관 gpki server id */
+
+ "gpki": true, /* 데이터 암복호화 사용 여부 */
+ "mock": false /* 보유기관 가상 데이터 사용 여부 */
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/intf-conf/xit-lvis.properties b/src/main/resources/intf-conf/xit-lvis.properties
new file mode 100644
index 0000000..5e5cefa
--- /dev/null
+++ b/src/main/resources/intf-conf/xit-lvis.properties
@@ -0,0 +1,34 @@
+#시군구코드(필수)
+lvis.sigungu.code=28000
+#담당자 주민등록번호
+lvis.charger.ihinum=
+#담당자 IP 어드레스
+lvis.charger.ip_adres=
+#담당자명
+lvis.charger.nm=이광진
+#담당자 연락처
+lvis.charger.wrc_telno=032-440-3963
+
+#정보시스템 ID(필수)
+lvis.info_sys.id=28-230
+#정보시스템 IP(필수)
+lvis.info_sys.ip=101.0.115.13
+#정보시스템 MAC 어드레스
+lvis.info_sys.macaddress=EC:EB:B8:97:F2:14
+
+#암호화키
+lvis.enc.key=0BCE7F19897CEA91
+#암호화키 그룹
+lvis.enc.key_group=1
+#암호화키 번호
+lvis.enc.key_no=1
+
+#lvis 사용 서비스 (production || test || local)
+lvis.host.active=local
+#lvis 운영 서비스 주소
+lvis.host.production=http://auto.car.go.kr:39700/lvis/services/WsFrontController
+#lvis 테스트 서비스 주소
+lvis.host.test=http://10.98.198.199:9700/lvis/services/WsFrontController
+
+#자동차 기본사항 조회 로그 저장 여부(true || false)
+lvis.log.basicInfo=true
\ No newline at end of file
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
deleted file mode 100644
index e2e2826..0000000
--- a/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 0000000..d48c1d4
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
+
+ ${LOG_PATTERN}
+
+
+
+
+ ${LOG_PATH}/${LOG_FILE_NAME}.log
+
+ ${LOG_PATTERN}
+
+
+
+
+ ${LOG_PATH}/${LOG_FILE_NAME}.%d{yyyy-MM-dd}_%i.log
+
+ 10MB
+
+
+ 30
+
+
+
+
+
+
+ error
+ ACCEPT
+ DENY
+
+
+ ${LOG_PATH}/${ERR_LOG_FILE_NAME}.log
+
+ ${LOG_PATTERN}
+
+
+
+
+ ${LOG_PATH}/${ERR_LOG_FILE_NAME}.%d{yyyy-MM-dd}_%i.log
+
+
+ 10MB
+
+
+ 60
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/properties/xit-lvis.properties b/src/main/resources/properties/xit-lvis.properties
deleted file mode 100644
index ce124c2..0000000
--- a/src/main/resources/properties/xit-lvis.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#\uc2dc\uad70\uad6c\ucf54\ub4dc(\ud544\uc218)
-lvis.sigungu.code=28000
-#\ub2f4\ub2f9\uc790 \uc8fc\ubbfc\ub4f1\ub85d\ubc88\ud638
-lvis.charger.ihinum=
-#\ub2f4\ub2f9\uc790 IP \uc5b4\ub4dc\ub808\uc2a4
-lvis.charger.ip_adres=
-#\ub2f4\ub2f9\uc790\uba85
-lvis.charger.nm=\uc774\uad11\uc9c4
-#\ub2f4\ub2f9\uc790 \uc5f0\ub77d\ucc98
-lvis.charger.wrc_telno=032-440-3963
-
-#\uc815\ubcf4\uc2dc\uc2a4\ud15c ID(\ud544\uc218)
-lvis.info_sys.id=28-230
-#\uc815\ubcf4\uc2dc\uc2a4\ud15c IP(\ud544\uc218)
-lvis.info_sys.ip=101.0.115.13
-#\uc815\ubcf4\uc2dc\uc2a4\ud15c MAC \uc5b4\ub4dc\ub808\uc2a4
-lvis.info_sys.macaddress=EC:EB:B8:97:F2:14
-
-#\uc554\ud638\ud654\ud0a4
-lvis.enc.key=0BCE7F19897CEA91
-#\uc554\ud638\ud654\ud0a4 \uadf8\ub8f9
-lvis.enc.key_group=1
-#\uc554\ud638\ud654\ud0a4 \ubc88\ud638
-lvis.enc.key_no=1
-
-#lvis \uc0ac\uc6a9 \uc11c\ube44\uc2a4 (production || test || local)
-lvis.host.active=local
-#lvis \uc6b4\uc601 \uc11c\ube44\uc2a4 \uc8fc\uc18c
-lvis.host.production=http://auto.car.go.kr:39700/lvis/services/WsFrontController
-#lvis \ud14c\uc2a4\ud2b8 \uc11c\ube44\uc2a4 \uc8fc\uc18c
-lvis.host.test=http://10.98.198.199:9700/lvis/services/WsFrontController
-
-#\uc790\ub3d9\ucc28 \uae30\ubcf8\uc0ac\ud56d \uc870\ud68c \ub85c\uadf8 \uc800\uc7a5 \uc5ec\ubd80(true || false)
-lvis.log.basicInfo=true
\ No newline at end of file
diff --git a/src/main/resources/spring/context-common.xml b/src/main/resources/spring/context-common.xml
index 11e55da..d1dec5c 100644
--- a/src/main/resources/spring/context-common.xml
+++ b/src/main/resources/spring/context-common.xml
@@ -56,7 +56,7 @@
diff --git a/src/main/resources/sql/mapper/lvis/vehicleInfo-mapper.xml b/src/main/resources/sql/mapper/lvis/vehicleInfo-mapper.xml
index 3c0c580..9be4f6a 100644
--- a/src/main/resources/sql/mapper/lvis/vehicleInfo-mapper.xml
+++ b/src/main/resources/sql/mapper/lvis/vehicleInfo-mapper.xml
@@ -182,11 +182,12 @@ SELECT PRYE
, FRST_MXMM_LDG
, PROCESS_IMPRTY_RESN_CODE
, PROCESS_IMPRTY_RESN_DTLS
- FROM TB_CAR_BSC_MTTR
+ FROM TB_CAR_BSC_MTTR
+ WHERE CNTC_INFO_CODE = 'A01'
AND MBER_SE_NO = #{owner_mber_no}
- AND VIN = #{vin}
- AND VHRNO = #{vhrno}
-
+ AND DMND_VIN = #{vin}
+ AND DMND_VHRNO = #{vhrno}
+