|
|
@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; |
|
|
|
import com.palnet.comn.model.CtrCntrlModel; |
|
|
|
import com.palnet.comn.model.CtrCntrlModel; |
|
|
|
import com.palnet.comn.model.GPHistoryShareContext; |
|
|
|
import com.palnet.comn.model.GPHistoryShareContext; |
|
|
|
import com.palnet.comn.model.GPDatabaseModel; |
|
|
|
import com.palnet.comn.model.GPDatabaseModel; |
|
|
|
|
|
|
|
import com.palnet.comn.model.GPModel; |
|
|
|
import com.palnet.comn.utils.JsonUtils; |
|
|
|
import com.palnet.comn.utils.JsonUtils; |
|
|
|
import com.palnet.server.collection.ChannelCollection; |
|
|
|
import com.palnet.server.collection.ChannelCollection; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
@ -29,14 +30,14 @@ public class MessageConsumer { |
|
|
|
@RabbitHandler |
|
|
|
@RabbitHandler |
|
|
|
@RabbitListener(queues = {"websocket.drone.queue"}) |
|
|
|
@RabbitListener(queues = {"websocket.drone.queue"}) |
|
|
|
public void receiveDroneMessage(final String message) throws JsonProcessingException { |
|
|
|
public void receiveDroneMessage(final String message) throws JsonProcessingException { |
|
|
|
GPDatabaseModel gpDatabaseModel = objectMapper.readValue(message, GPDatabaseModel.class); |
|
|
|
GPModel model = objectMapper.readValue(message, GPModel.class); |
|
|
|
|
|
|
|
|
|
|
|
CtrCntrlModel history = this.modelConvert(gpDatabaseModel); |
|
|
|
CtrCntrlModel history = this.modelConvert(model); |
|
|
|
|
|
|
|
|
|
|
|
gpHistoryShareModel.putHistory(gpDatabaseModel.getObjectId(), history); |
|
|
|
gpHistoryShareModel.putHistory(model.getObjectId(), history); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public CtrCntrlModel modelConvert(final GPDatabaseModel dataInfo) { |
|
|
|
public CtrCntrlModel modelConvert(final GPModel dataInfo) { |
|
|
|
CtrCntrlModel model = new CtrCntrlModel(); |
|
|
|
CtrCntrlModel model = new CtrCntrlModel(); |
|
|
|
|
|
|
|
|
|
|
|
model.setObjectId(dataInfo.getObjectId()); |
|
|
|
model.setObjectId(dataInfo.getObjectId()); |
|
|
|