From d2f942d9945b5b323de6741cade7df934c2e641e Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 4 Dec 2023 09:23:39 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E4=BD=BF=E7=94=A8=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/order/utils/CommonUtils.java | 4 ++-- .../com/dxhy/order/invoice/config/MqttPushClientNew.java | 7 ++++--- .../module/fangge/service/impl/FangGeServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java index cf861491..80e66175 100644 --- a/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java +++ b/order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java @@ -1136,7 +1136,7 @@ public class CommonUtils { String[] fgSkKpList = fgSkKpShList.split(ConfigureConstant.STRING_POINT2); for (String fgSkKp : fgSkKpList) { if (sh.equals(fgSkKp)) { - return true; + return false; } } } @@ -1165,7 +1165,7 @@ public class CommonUtils { } } } - boolean isSkQd = false; + boolean isSkQd = true; return (OrderInfoEnum.TAX_EQUIPMENT_FGBW.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_FGHX.getKey().equals(terminalCode) || OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.getKey().equals(terminalCode) || diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/MqttPushClientNew.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/MqttPushClientNew.java index 7cf2b5f4..0f76854a 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/MqttPushClientNew.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/MqttPushClientNew.java @@ -223,14 +223,15 @@ public class MqttPushClientNew { try { //判断mqttTopic是否被订阅，如果没有订阅，则不发送消息 String emqxReqUrl = String.format(invoiceConfig.configMqttSubscriptions(), clientId); - + log.info("调用emqx地址：{}，topic：{}",emqxReqUrl,topic); String emqxMsg = getEmqxMsg(emqxReqUrl); - + log.info("获取emqx返回的信息：{}",emqxMsg); if (StringUtils.isNotBlank(emqxMsg)) { JSONArray data = JSONObject.parseArray(emqxMsg); for (Object o : data) { JSONObject jsonObject = (JSONObject) o; - if (topic.equals(jsonObject.getString("topic"))) { + String topic1 = jsonObject.getString("topic"); + if (topic.equals(topic1)) { flag = true; break; } diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java index 82acc73a..a499ab24 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/fangge/service/impl/FangGeServiceImpl.java @@ -642,7 +642,7 @@ public class FangGeServiceImpl implements FangGeService { public boolean getSubscriptions(String nsrsbh, String jqbh) { //发布消息topic String mqttTopic = String.format(RedisConstant.FG_MQTT_TOPIC_PUB_FANGGE, nsrsbh, jqbh); - String clientId = nsrsbh + ConfigureConstant.STRING_UNDERLINE + jqbh; + String clientId = nsrsbh + "_" + jqbh; return mqttPushClientNew.getSubscriptions(mqttTopic, clientId); }