Browse Source

remove rabbit server and socket

feature/remove-rabbit
지대한 1 year ago
parent
commit
6c12365a23
  1. 27
      src/main/java/com/palnet/server/controller/SocketReceiverController.java

27
src/main/java/com/palnet/server/controller/WebSocketReceiverController.java → src/main/java/com/palnet/server/controller/SocketReceiverController.java

@ -8,8 +8,7 @@ import com.palnet.comn.model.GPModel;
import com.palnet.server.task.ctr.service.CtrCntrlTaskService; import com.palnet.server.task.ctr.service.CtrCntrlTaskService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller; import org.springframework.http.ResponseEntity;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
@ -27,28 +26,30 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping("/api/ws") @RequestMapping("/api/ws")
public class WebSocketReceiverController { public class SocketReceiverController {
private final CtrCntrlTaskService service; private final CtrCntrlTaskService service;
private final CtrHistoryShareContext historyShareContext; private final CtrHistoryShareContext historyShareContext;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
@PostMapping("/receiver") @PostMapping("/receiver")
public String receiver(@RequestBody String message) { public ResponseEntity<?> receiver(@RequestBody GPModel model) {
log.info("websocket message : {}", message); log.info("websocket message : {}", model);
GPModel model = null; // log.info("websocket message : {}", message);
try { // GPModel model = null;
model = objectMapper.readValue(message, GPModel.class); // try {
} catch (JsonProcessingException e) { // model = objectMapper.readValue(message, GPModel.class);
log.error("ERROR : {}\n{}", e.getMessage(), e.getStackTrace()); // } catch (JsonProcessingException e) {
throw new RuntimeException(e); // log.error("ERROR : {}\n{}", e.getMessage(), e.getStackTrace());
} // throw new RuntimeException(e);
// }
CtrCntrlModel history = service.modelConvert(model); CtrCntrlModel history = service.modelConvert(model);
// DRON의 대한 식별정보만 이력 관리 // DRON의 대한 식별정보만 이력 관리
historyShareContext.putHistory(model.getObjectId(), history); historyShareContext.putHistory(model.getObjectId(), history);
return "SUCCESS";
return ResponseEntity.ok().build();
} }
} }
Loading…
Cancel
Save