[20240315007-ZY20240401006]MES端实现设备MQ定向订阅和推送

client/src/main/java/org/gidea/scada/monitor/rabbit/listener/MonitorRabbitListener.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.rabbitmq.client.BuiltinExchangeType;
 import com.rabbitmq.client.BuiltinExchangeType;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import lombok.extern.log4j.Log4j2;
+import org.gidea.scada.monitor.rabbit.entity.MonitorMessage;
 import org.gidea.scada.monitor.rabbit.handler.RabbitMessageHandler;
 import org.gidea.scada.monitor.rabbit.handler.RabbitMessageHandler;
 import org.gidea.scada.monitor.utils.EmptyUtil;
 import org.gidea.scada.monitor.utils.EmptyUtil;
 import org.gidea.scada.monitor.utils.MonitorUtils;
 import org.gidea.scada.monitor.utils.MonitorUtils;
@@ -46,9 +47,8 @@ public class MonitorRabbitListener {
             public void onMessage(Message message, Channel channel) {
             public void onMessage(Message message, Channel channel) {
                 String messageStr = new String(message.getBody());
                 String messageStr = new String(message.getBody());
                 if (messageStr.startsWith("{") && messageStr.endsWith("}")) {
                 if (messageStr.startsWith("{") && messageStr.endsWith("}")) {
-                    JSONObject data = JSONObject.parseObject(messageStr);
-                    String client = data.getString("Client");
-                    if (EmptyUtil.isEmpty(client) || client.equals(monitorName)) {
+                    MonitorMessage data = JSONObject.parseObject(messageStr, MonitorMessage.class);
+                    if (EmptyUtil.isEmpty(data.getClientId()) || monitorName.equals(data.getClientId())) {
                         messageHandler.handleMessage(deviceId, messageStr);
                         messageHandler.handleMessage(deviceId, messageStr);
                     }
                     }
                     return;
                     return;