Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RepairConsultServiceImpl.java

@@ -267,10 +267,9 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
         if(flag) {
             // 记录处置记录后修改 案件状态
             alertCalledServiceImpl.updateAlertStage(alertCalledVo,CZHJ);
-            // 警情伤亡消息 矩阵 消息
+                // 警情伤亡消息 矩阵 消息
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("userId",user.getUserId());
-            jsonObject.put("alertId",alertCalledVo.getSequenceNbr());
+            jsonObject.put("alertId",String.valueOf(alertCalledVo.getSequenceNbr()));
             try {
                 emqKeeper.getMqttClient().publish(alertHeartpushTopic, jsonObject.toString().getBytes("UTF-8"), 1, false);
                 emqKeeper.getMqttClient().publish(alertMatrixpushTopic, jsonObject.toString().getBytes("UTF-8"), 1, false);
@@ -280,6 +279,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             } catch (UnsupportedEncodingException e) {
                 logger.error("mqtt发送失败" +jsonObject );
             }
+
         }
         return flag;
     }