From 41d0f974ba0891f954234afcf83804f3d7a84c34 Mon Sep 17 00:00:00 2001 From: leebj Date: Wed, 6 Aug 2025 09:21:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/api/controller/ApiMainController.java | 11 +++---- .../java/kr/api/service/ApiMainService.java | 4 +-- .../kr/api/service/ApiMainServiceImpl.java | 30 ++++++++++--------- src/main/webapp/WEB-INF/api.properties | 12 ++++---- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/main/java/kr/api/controller/ApiMainController.java b/src/main/java/kr/api/controller/ApiMainController.java index 03424b8..92c5eef 100644 --- a/src/main/java/kr/api/controller/ApiMainController.java +++ b/src/main/java/kr/api/controller/ApiMainController.java @@ -20,21 +20,22 @@ public class ApiMainController { @Resource(name = "apiMainService") private ApiMainService apiMainService; - @RequestMapping(value = "/sisulPenaltyList", produces = "application/json; charset=utf8", method=RequestMethod.POST) - public List> sisulPenaltyList(@RequestBody Map data) { - return apiMainService.sisulPenaltyList(data); - } - @RequestMapping(value = "/selectSisulDefaultResiList", produces = "application/json; charset=utf8", method=RequestMethod.POST) public List> selectSisulDefaultResiList(@RequestBody Map data) { return apiMainService.selectSisulDefaultResiList(data); } + @RequestMapping(value = "/sisulPenaltyList", produces = "application/json; charset=utf8", method=RequestMethod.POST) + public List> sisulPenaltyList(@RequestBody Map data) { + return apiMainService.sisulPenaltyList(data); + } + @RequestMapping(value = "/selectSisulOverList", produces = "application/json; charset=utf8", method=RequestMethod.POST) public List> selectSisulOverList(@RequestBody Map data) { 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 e1e1e36..d95670f 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> selectSisulDefaultResiList(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 544ef14..5b405b5 100644 --- a/src/main/java/kr/api/service/ApiMainServiceImpl.java +++ b/src/main/java/kr/api/service/ApiMainServiceImpl.java @@ -32,8 +32,8 @@ import com.ibatis.common.resources.Resources; @Transactional public class ApiMainServiceImpl implements ApiMainService { - @Override - public List> sisulPenaltyList(Map data) { + @Override + public List> selectSisulDefaultResiList(Map data) { List> result = new ArrayList>(); try { @@ -43,7 +43,7 @@ public class ApiMainServiceImpl implements ApiMainService { properties.load(reader); URL obj = null; - obj = new URL(properties.getProperty("PENALTY")); // API URL + obj = new URL(properties.getProperty("DEFAULT")); // API URL HttpURLConnection con = (HttpURLConnection)obj.openConnection(); con.setRequestMethod("POST"); // GET, POST @@ -54,12 +54,8 @@ public class ApiMainServiceImpl implements ApiMainService { // DATA JSONObject param = new JSONObject(); - param.put("workerId", data.get("workerId")); - param.put("fareOfficeId", data.get("fareOfficeId")); - param.put("boothId", data.get("boothId")); - param.put("passDate", data.get("passDate")); - param.put("workTimes", data.get("workTimes")); - param.put("seqno", data.get("seqno")); + param.put("carNo", data.get("carNo")); + param.put("residentNo", data.get("residentNo")); OutputStreamWriter wr= new OutputStreamWriter(con.getOutputStream()); wr.write(param.toString()); @@ -78,6 +74,7 @@ public class ApiMainServiceImpl implements ApiMainService { Map resCode = new HashMap<>(); resCode.put("resCode", con.getResponseCode()); result.add(resCode); + if(jsonResult.size() != 0) { result = getListMapFromJsonArray(jsonResult); } @@ -105,7 +102,7 @@ public class ApiMainServiceImpl implements ApiMainService { } @Override - public List> selectSisulDefaultResiList(Map data) { + public List> sisulPenaltyList(Map data) { List> result = new ArrayList>(); try { @@ -115,7 +112,7 @@ public class ApiMainServiceImpl implements ApiMainService { properties.load(reader); URL obj = null; - obj = new URL(properties.getProperty("DEFAULT")); // API URL + obj = new URL(properties.getProperty("PENALTY")); // API URL HttpURLConnection con = (HttpURLConnection)obj.openConnection(); con.setRequestMethod("POST"); // GET, POST @@ -126,8 +123,12 @@ public class ApiMainServiceImpl implements ApiMainService { // DATA JSONObject param = new JSONObject(); - param.put("carNo", data.get("carNo")); - param.put("residentNo", data.get("residentNo")); + param.put("workerId", data.get("workerId")); + param.put("fareOfficeId", data.get("fareOfficeId")); + param.put("boothId", data.get("boothId")); + param.put("passDate", data.get("passDate")); + param.put("workTimes", data.get("workTimes")); + param.put("seqno", data.get("seqno")); OutputStreamWriter wr= new OutputStreamWriter(con.getOutputStream()); wr.write(param.toString()); @@ -146,7 +147,6 @@ public class ApiMainServiceImpl implements ApiMainService { Map resCode = new HashMap<>(); resCode.put("resCode", con.getResponseCode()); result.add(resCode); - if(jsonResult.size() != 0) { result = getListMapFromJsonArray(jsonResult); } @@ -173,6 +173,8 @@ public class ApiMainServiceImpl implements ApiMainService { return result; } + + @Override public List> selectSisulOverList(Map data) { List> result = new ArrayList>(); diff --git a/src/main/webapp/WEB-INF/api.properties b/src/main/webapp/WEB-INF/api.properties index 8f18689..b3ee85e 100644 --- a/src/main/webapp/WEB-INF/api.properties +++ b/src/main/webapp/WEB-INF/api.properties @@ -1,12 +1,12 @@ #\uc5f0\uacc4 \uc11c\ube44\uc2a4 URL -#\ubbf8\ub0a9 \uae30\uac04\uc9c0\uc815 \uc870\ud68c api -URL=http://175.193.201:92/rest/cfs/sisulDefaultNotification.do - -#\uacfc\ud0dc\ub8cc \uc870\ud68c api -PENALTY=http://175.193.201:92/rest/cfs/sisulPenaltyNotification.do #\ubbf8\ub0a9 \uc870\ud68c api DEFAULT=http://175.193.201:92/rest/cfs/selectSisulDefaultResiList.do - +#\uacfc\ud0dc\ub8cc \uc870\ud68c api +PENALTY=http://175.193.201:92/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