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-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -1066,9 +1066,6 @@ public class CommandController extends BaseController {
             if (e.get("carState").equals("在位")){
                 e.put("carState",FireCarStatusEnum.执勤.getName());
             }
-
-            e.put("longitude",116.423762);
-            e.put("latitude",39.511552);
             String sequenceNbr = e.get("sequenceNbr").toString();
             //同步力量调派车辆任务状态
             alertFormValue.stream().forEach(v->{

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/config/StartLoader.java

@@ -49,7 +49,12 @@ public class StartLoader implements ApplicationRunner {
                     String obj = new String(payload);
                     if (!ValidationUtil.isEmpty(obj)) {
                         JSONObject json = JSON.parseObject(obj);
-                        AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情", json.get("unitInvolvedName")+","+json.get("address")+"，发生警情，请处理。", json.get("id").toString(),  json);
+                        AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情",
+                                  "物联设备发生警情，发生位置:"+json.get("address")!=null?json.get("address").toString():""+
+                                        ",事发单位:"+json.get("unitInvolvedName")!=null?json.get("unitInvolvedName").toString():""
+                                        +",联系人:"+json.get("contactUser")!=null?json.get("contactUser").toString():""
+                                        +",联系电话:"+json.get("contactPhone")!=null?json.get("contactPhone").toString():""+".请尽快处理！",
+                                   json.get("id").toString(),  json);
                         emqKeeper.getMqttClient().publish(topicweb, JSONObject.toJSON(alertNewsDto).toString().getBytes("UTF-8"), 1, false);
                  }
                 } catch (Exception e) {