feature 1.使用兼容模式

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) ||

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;
                     }

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);
     }