diff --git a/src/main/java/com/ALGo/ALGo_server/message/controller/MessageController.java b/src/main/java/com/ALGo/ALGo_server/message/controller/MessageController.java index bea7743..863589b 100644 --- a/src/main/java/com/ALGo/ALGo_server/message/controller/MessageController.java +++ b/src/main/java/com/ALGo/ALGo_server/message/controller/MessageController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController; import java.io.IOException; +import java.util.List; @RestController @RequestMapping("/disaster") @@ -24,7 +25,7 @@ public MessageController(MessageService messageService) { } @GetMapping("/message") - public MessageResponse getMessage(@AuthenticationPrincipal User user) throws IOException, ParseException { + public List getMessage(@AuthenticationPrincipal User user) throws IOException, ParseException { return messageService.message(user); } diff --git a/src/main/java/com/ALGo/ALGo_server/message/service/MessageService.java b/src/main/java/com/ALGo/ALGo_server/message/service/MessageService.java index a24dc16..ed62dbd 100644 --- a/src/main/java/com/ALGo/ALGo_server/message/service/MessageService.java +++ b/src/main/java/com/ALGo/ALGo_server/message/service/MessageService.java @@ -17,6 +17,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -29,14 +30,14 @@ public class MessageService { private final NaverTransService naverTransService; - public MessageResponse message(User user) throws IOException, ParseException { + public List message(User user) throws IOException, ParseException { StringBuilder urlBuilder = new StringBuilder("https://www.safetydata.go.kr/openApi"); urlBuilder.append("/" + URLEncoder.encode("행정안전부_긴급재난문자","UTF-8")); urlBuilder.append("?serviceKey=" + secretKey); urlBuilder.append("&returnType=json"); urlBuilder.append("&pageNum=1"); - urlBuilder.append("&numRowsPerPage=1"); + urlBuilder.append("&numRowsPerPage=4"); URL url = new URL(urlBuilder.toString()); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); @@ -69,9 +70,41 @@ public MessageResponse message(User user) throws IOException, ParseException { JSONObject jsonObject = (JSONObject) jsonParser.parse(responseBody); JSONObject responseData = (JSONObject) jsonObject.get("responseData"); - JSONArray data = (JSONArray) responseData.get("data"); + JSONArray dataArr = (JSONArray) responseData.get("data"); - JSONObject dataObject = (JSONObject) data.get(0); + List msgResArr = new ArrayList<>(); + + for(int i=0; i areaIdArr = Arrays.stream(RCV_AREA_ID.split(",")).toList(); + for(int j=0;j areaNmArr = Arrays.stream(RCV_AREA_NM.split(",")).toList(); + for(int j=0;j