From 9c400127b1ba4fa3f8bbabf0c41fc5797c3ba164 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Thu, 30 May 2024 23:57:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF=E5=88=B0=E5=B7=A5=E5=8E=82=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factorydata/util/FactoryDataMessageSender.java | 5 +++-- .../java/com/logpm/factorydata/util/FactoryDataUtil.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataMessageSender.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataMessageSender.java index a07e72020..843f91dd1 100644 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataMessageSender.java +++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataMessageSender.java @@ -1,5 +1,7 @@ package com.logpm.factorydata.util; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.logpm.factorydata.feign.IFactoryDataClient; import com.logpm.factorydata.vo.NodePushMsg; @@ -31,14 +33,13 @@ public class FactoryDataMessageSender { public void sendNodeDataByBrand(NodePushMsg data) { try{ String routingKeyByName = FactoryDataUtil.findRoutingKeyByName(data.getBrand()); - if(routingKeyByName == null){ + if(StrUtil.isEmpty(routingKeyByName)){ return ; } SendMsg build = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.NODE_DATA_PUSH).routingKey(routingKeyByName).message(JSONUtil.toJsonStr(data, HutoolConfigUtil.jsonConfigByDataTimeFormat())).build(); factoryDataClient.sendMessage(build); }catch (Exception e){ log.error("sendNodeDataByBrand >>>>" ,e); - } } diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java index f269eee84..8e3935afb 100644 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java +++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java @@ -35,7 +35,7 @@ public class FactoryDataUtil { * @return 指定路由key */ public static String findRoutingKeyByName(BrandEnums brand) { - if (ObjectUtil.isAllEmpty(brand, brand.getValue(),factorys.get(brand.getValue()))) { + if (ObjectUtil.isEmpty(brand) || ObjectUtil.isEmpty(factorys.get(brand.getValue()))) { // TODO 业务调用不规范，特殊处理 return null; }