diff --git a/src/main/java/kr/api/controller/ApiMainController.java b/src/main/java/kr/api/controller/ApiMainController.java index beeb42e..03424b8 100644 --- a/src/main/java/kr/api/controller/ApiMainController.java +++ b/src/main/java/kr/api/controller/ApiMainController.java @@ -20,11 +20,6 @@ public class ApiMainController { @Resource(name = "apiMainService") private ApiMainService apiMainService; - @RequestMapping(value = "/sisulDefaultList", produces = "application/json; charset=utf8", method=RequestMethod.POST) - public List> sisulDefaultList(@RequestBody Map data) { - return apiMainService.sisulDefaultList(data); - } - @RequestMapping(value = "/sisulPenaltyList", produces = "application/json; charset=utf8", method=RequestMethod.POST) public List> sisulPenaltyList(@RequestBody Map data) { return apiMainService.sisulPenaltyList(data); @@ -40,4 +35,9 @@ public class ApiMainController { 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 4330392..e1e1e36 100644 --- a/src/main/java/kr/api/service/ApiMainService.java +++ b/src/main/java/kr/api/service/ApiMainService.java @@ -5,13 +5,13 @@ import java.util.Map; public interface ApiMainService { - List> sisulDefaultList(Map data); - + List> sisulPenaltyList(Map data); - + List> selectSisulDefaultResiList(Map data); - + 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 10a8cf1..544ef14 100644 --- a/src/main/java/kr/api/service/ApiMainServiceImpl.java +++ b/src/main/java/kr/api/service/ApiMainServiceImpl.java @@ -32,78 +32,6 @@ import com.ibatis.common.resources.Resources; @Transactional 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; - } - @Override public List> sisulPenaltyList(Map data) { List> result = new ArrayList>(); @@ -313,6 +241,79 @@ public class ApiMainServiceImpl implements ApiMainService { return result; } + + @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 으로 변경 * JSONObject 에 JSONArray 없어야 햠.