diff --git a/src/main/java/kr/api/controller/ApiMainController.java b/src/main/java/kr/api/controller/ApiMainController.java index ac6a1a2..cbce709 100644 --- a/src/main/java/kr/api/controller/ApiMainController.java +++ b/src/main/java/kr/api/controller/ApiMainController.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,22 +22,27 @@ public class ApiMainController { private ApiMainService apiMainService; @RequestMapping(value = "/selectSisulDefaultResiList", produces = "application/json; charset=utf8", method=RequestMethod.POST) - public List> selectSisulDefaultResiList(@RequestBody Map data) { + public List> selectSisulDefaultResiList(@RequestBody Map data, HttpServletRequest req) { + System.out.println("IP 확인"); + System.out.println(req.getRemoteAddr()); + return apiMainService.selectSisulDefaultResiList(data); } @RequestMapping(value = "/sisulPenaltyList", produces = "application/json; charset=utf8", method=RequestMethod.POST) - public List> sisulPenaltyList(@RequestBody Map data) { + public List> sisulPenaltyList(@RequestBody Map data, HttpServletRequest req) { + System.out.println("IP 확인"); + System.out.println(req.getRemoteAddr()); + return apiMainService.sisulPenaltyList(data); } @RequestMapping(value = "/selectSisulOverList", produces = "application/json; charset=utf8", method=RequestMethod.POST) - public List> selectSisulOverList(@RequestBody Map data) { + public List> selectSisulOverList(@RequestBody Map data, HttpServletRequest req) { + System.out.println("IP 확인"); + System.out.println(req.getRemoteAddr()); + return apiMainService.selectSisulOverList(data); } - @RequestMapping(value = "/sisulDefaultList", produces = "application/json; charset=utf8", method=RequestMethod.POST) - public List> sisulDefaultList(@RequestBody Map data) { - return apiMainService.sisulDefaultList(data); - } } diff --git a/src/main/java/kr/api/service/ApiMainService.java b/src/main/java/kr/api/service/ApiMainService.java index a33ff5d..96edd6b 100644 --- a/src/main/java/kr/api/service/ApiMainService.java +++ b/src/main/java/kr/api/service/ApiMainService.java @@ -10,6 +10,4 @@ public interface ApiMainService { List> selectSisulOverList(Map data); - List> sisulDefaultList(Map data); - } diff --git a/src/main/java/kr/api/service/ApiMainServiceImpl.java b/src/main/java/kr/api/service/ApiMainServiceImpl.java index 5b405b5..f91d718 100644 --- a/src/main/java/kr/api/service/ApiMainServiceImpl.java +++ b/src/main/java/kr/api/service/ApiMainServiceImpl.java @@ -36,6 +36,9 @@ public class ApiMainServiceImpl implements ApiMainService { public List> selectSisulDefaultResiList(Map data) { List> result = new ArrayList>(); + System.out.println("요청 확인"); + System.out.println(data.toString()); + try { String resource = "../api.properties"; Properties properties = new Properties(); @@ -56,6 +59,8 @@ public class ApiMainServiceImpl implements ApiMainService { param.put("carNo", data.get("carNo")); param.put("residentNo", data.get("residentNo")); + param.put("carDiv", data.get("carDiv")); + param.put("allCarCheck", data.get("allCarCheck")); OutputStreamWriter wr= new OutputStreamWriter(con.getOutputStream()); wr.write(param.toString()); @@ -79,7 +84,8 @@ public class ApiMainServiceImpl implements ApiMainService { result = getListMapFromJsonArray(jsonResult); } - + System.out.println("응답 확인"); + System.out.println(result.toString()); in.close(); con.disconnect(); @@ -105,6 +111,9 @@ public class ApiMainServiceImpl implements ApiMainService { public List> sisulPenaltyList(Map data) { List> result = new ArrayList>(); + System.out.println("요청 확인"); + System.out.println(data.toString()); + try { String resource = "../api.properties"; Properties properties = new Properties(); @@ -151,7 +160,8 @@ public class ApiMainServiceImpl implements ApiMainService { result = getListMapFromJsonArray(jsonResult); } - + System.out.println("응답 확인"); + System.out.println(result.toString()); in.close(); con.disconnect(); @@ -179,6 +189,9 @@ public class ApiMainServiceImpl implements ApiMainService { public List> selectSisulOverList(Map data) { List> result = new ArrayList>(); + System.out.println("요청 확인"); + System.out.println(data.toString()); + try { String resource = "../api.properties"; Properties properties = new Properties(); @@ -221,7 +234,8 @@ public class ApiMainServiceImpl implements ApiMainService { result = getListMapFromJsonArray(jsonResult); } - + System.out.println("응답 확인"); + System.out.println(result.toString()); in.close(); con.disconnect(); @@ -244,77 +258,7 @@ public class ApiMainServiceImpl implements ApiMainService { } - @SuppressWarnings("unchecked") - @Override - public List> sisulDefaultList(Map data) { - List> result = new ArrayList>(); - - try { - String resource = "../api.properties"; - Properties properties = new Properties(); - Reader reader = Resources.getResourceAsReader(resource); - properties.load(reader); - - URL obj = null; - obj = new URL(properties.getProperty("URL")); // API URL - - HttpURLConnection con = (HttpURLConnection)obj.openConnection(); - con.setRequestMethod("POST"); // GET, POST - con.setRequestProperty("Content-type", "application/json; charset=UTF-8"); - con.setDoOutput(true); - - // DATA - JSONObject param = new JSONObject(); - - param.put("stDate", data.get("stDate")); - param.put("edDate", data.get("edDate")); - param.put("carNo", data.get("carNo")); - - OutputStreamWriter wr= new OutputStreamWriter(con.getOutputStream()); - wr.write(param.toString()); - wr.flush(); - // API 호출 - BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8")); - String line; - StringBuffer sb = new StringBuffer(); - while((line = in.readLine()) != null){ - sb.append(line); - } - - - JSONParser parser = new JSONParser(); - JSONArray jsonResult = (JSONArray)parser.parse(sb.toString()); - - Map resCode = new HashMap<>(); - resCode.put("resCode", con.getResponseCode()); - result.add(resCode); - if(jsonResult.size() != 0) { - result = getListMapFromJsonArray(jsonResult); - } - - - - in.close(); - con.disconnect(); - - - } catch (JsonMappingException e) { - - e.printStackTrace(); - } catch (JsonProcessingException e) { - - e.printStackTrace(); - } catch (IOException e) { - - e.printStackTrace(); - } catch (ParseException e) { - - e.printStackTrace(); - } - - return result; - } /** * jsonObject --> map 으로 변경 diff --git a/src/main/webapp/WEB-INF/api.properties b/src/main/webapp/WEB-INF/api.properties index b3ee85e..b787cbc 100644 --- a/src/main/webapp/WEB-INF/api.properties +++ b/src/main/webapp/WEB-INF/api.properties @@ -2,11 +2,10 @@ #\ubbf8\ub0a9 \uc870\ud68c api DEFAULT=http://175.193.201:92/rest/cfs/selectSisulDefaultResiList.do +#DEFAULT=http://localhost:8180/rest/cfs/selectSisulDefaultResiList.do #\uacfc\ud0dc\ub8cc \uc870\ud68c api PENALTY=http://175.193.201:92/rest/cfs/sisulPenaltyNotification.do +#PENALTY=http://localhost:8180/rest/cfs/sisulPenaltyNotification.do #\uacfc\uc624\ub0a9 \uc870\ud68c api OVER=http://175.193.201:92/rest/cfs/selectSisulOverFareList.do - - -#\ubbf8\ub0a9 \uae30\uac04\uc9c0\uc815 \uc870\ud68c api -URL=http://175.193.201:92/rest/cfs/sisulDefaultNotification.do +#OVER=http://localhost:8180/rest/cfs/selectSisulOverFareList.do \ No newline at end of file