Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1985,6 +1985,16 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                             log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
                         }
 //                        idxFeign.handleEquipNotScrapWhenExpired(String.valueOf(e.get("id")), String.valueOf(e.get("bizOrgCode")), String.valueOf(e.get("bizOrgName")));
+
+                        // 发送消息，message监听，转发给中心级
+                        Map<String, Object> mapZxj = new HashMap<>();
+                        mapZxj.put("topic", "equip/scrap/put");
+                        mapZxj.put("data", map);
+                        try {
+                            emqKeeper.getMqttClient().publish("equip/scrap/put/zxj", JSON.toJSONString(mapZxj).getBytes(), 1, false);
+                        } catch (MqttException exp) {
+                            log.info(String.format("发送eqm消息，message根据该消息转发为kafka消息,失败信息：%s", exp.getMessage()));
+                        }
                     }
                 }
 

amos-boot-utils/amos-boot-utils-message/src/main/resources/application-dev.properties

@@ -100,7 +100,7 @@ emqx.max-inflight=1000
 kafka.topics=JKXT2BP-XFZX-Topic
 
 #\u9700\u8981\u76D1\u542C\u5F97eqm\u6D88\u606F\u4E3B\u9898 \u6839\u636E\u662F\u5426\u662F\u4E2D\u5FC3\u6781\u548C\u7AD9\u7AEF\u9009\u62E9\u9700\u8981\u76D1\u542C\u5F97\u4E3B\u9898\u8FDB\u884C\u914D\u7F6E emq.iot.created,
-emq.topic=emq.xf.created,emq.iot.created,emq.patrol.created,emq.sign.created,emq.bussSign.created,emq.user.created,emq.risk.created,emq.mcb.zxj,emq.scrap.qrcode.put,equip/scrap/put
+emq.topic=emq.xf.created,emq.iot.created,emq.patrol.created,emq.sign.created,emq.bussSign.created,emq.user.created,emq.risk.created,emq.mcb.zxj,emq.scrap.qrcode.put,equip/scrap/put/zxj
 
 ##\u4E2D\u5FC3\u7EA7\u914D\u7F6E\u914D\u7F6E
 ##\u9700\u8981\u76D1\u542C\u5F97kafka\u6D88\u606F\u4E3B\u9898 \u6839\u636E\u662F\u5426\u662F\u4E2D\u5FC3\u6781\u548C\u7AD9\u7AEF\u9009\u62E9\u9700\u8981\u76D1\u542C\u5F97\u4E3B\u9898\u8FDB\u884C\u914D\u7F6E