diff --git a/src/main/java/com/palnet/PavWebsocketApplication.java b/src/main/java/com/palnet/PavWebsocketApplication.java index 7be7718..aef88ae 100644 --- a/src/main/java/com/palnet/PavWebsocketApplication.java +++ b/src/main/java/com/palnet/PavWebsocketApplication.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; +import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication diff --git a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java index ee7aafa..a16271e 100644 --- a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java @@ -13,15 +13,6 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; -import java.util.HashMap; -import java.util.Map; - @Component @Slf4j public class MessageConsumer { @@ -44,12 +35,6 @@ public class MessageConsumer { log.info("websocket message : {}", message); GPModel model = objectMapper.readValue(message, GPModel.class); - /** - * 비정상 Check - */ - boolean controlWarnCd = this.checkControlWarring(model); - model.setControlWarnCd(controlWarnCd); - CtrCntrlModel history = this.convertModel(model); // 웹 표출 model로 변환 gpHistoryShareModel.putHistory(model.getObjectId(), history); @@ -108,35 +93,4 @@ public class MessageConsumer { return model; } - - public boolean checkControlWarring(GPModel model) { - try { - HttpRequest request = HttpRequest.newBuilder() - .uri(new URI( -// "http://211.253.38.218:8080/api/ctr/cntrl/id/" + model.getObjectId() - env.getProperty("app.host") + "api/ctr/cntrl/warn/" + model.getObjectId() - + "/" + model.getLat() - + "/" + model.getLng() - - )) - .version(HttpClient.Version.HTTP_2) - .GET() - .build(); - - HttpResponse response = HttpClient - .newHttpClient() - .send(request, HttpResponse.BodyHandlers.ofString()); - - Map body = JsonUtils.fromJson(response.body(), HashMap.class); - Map data = (Map) body.get("data"); - - return "Y".equals(data.get("controlWarnCd")) ? true : false; - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } catch (IOException e) { - throw new RuntimeException(e); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - } }