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

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -33,11 +33,13 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "地址")
     private String address;
 
-    @ExcelIgnore
+
     @ApiModelProperty(value = "经度")
+    @ExcelProperty(value = "经度", index = 48)
     private Double longitude;
-    @ExcelIgnore
+
     @ApiModelProperty(value = "纬度")
+    @ExcelProperty(value = "纬度", index = 49)
     private Double latitude;
 
     @ExcelIgnore

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

@@ -46,11 +46,11 @@ public class StartLoader implements ApplicationRunner {
             emqKeeper.getMqttClient().subscribe(topic, (s, mqttMessage) -> {
                 byte[] payload = mqttMessage.getPayload();
                 try {
-                    String obj = new String(payload);
+                    String obj = new String(payload,"GB2312");
                     if (!ValidationUtil.isEmpty(obj)) {
                         JSONObject json = JSON.parseObject(obj);
-                        AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情", json.get("unitInvolvedName")+","+json.get("address")+"，发生警情，请处理。", json.get("id").toString(),  obj);
-                        emqKeeper.getMqttClient().publish(topicweb, JSONObject.toJSON(alertNewsDto).toString().getBytes(), RuleConfig.DEFAULT_QOS, true);
+                        AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情", json.get("unitInvolvedName")+","+json.get("address")+"，发生警情，请处理。", json.get("id").toString(),  json);
+                        emqKeeper.getMqttClient().publish(topicweb, JSONObject.toJSON(alertNewsDto).toString().getBytes("UTF-8"), 1, false);
                  }
                 } catch (Exception e) {
                     logger.error("系统异常", e);

amos-boot-system-jcs/src/main/resources/application.properties

@@ -63,8 +63,8 @@ mqtt.topic.command.meteorological.notice=meteorological
 
 mqtt.topic.command.power.deployment=power
 
-mqtt.topic.alert.iot=iotnews
-mqtt.topic.alert.iot.web=iotNewsWeb
+mqtt.topic.alert.iot=iot-system-alarm
+mqtt.topic.alert.iot.web=iot-system-alarm-web
 
 
 security.systemctl.name=AMOS-API-SYSTEMCTL