Merge branch 'master' of http://47.111.81.118:3000/yq/mhfire

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/TestController.java

@@ -81,6 +81,7 @@ public class TestController {
         waterAj.setEndTime(new Date());
         waterAj.setEnclosure("meid");
         waterAj.setImage("图片");
+        waterAj.setDeviceCode("1111");
         waterAjService.saveOrUpdate(waterAj);
     }
 

mhfire-model/src/main/java/com/bizmatics/mhfire/model/WaterAj.java

@@ -85,6 +85,12 @@ public class WaterAj implements Serializable {
      * 图片(非必要)
      */
     private String image;
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+
 
 
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/listener/MqttListener.java

@@ -50,8 +50,10 @@ public class MqttListener {
                 }else if (topic.equals("mh/water/alert")){
                     oneCardApi.callAlarmApi(map);
                 }else if (topic.equals("mh/water/statistics")){
+                    log.info("城运对接数据------开始");
                     WaterAj waterAj = JsonUtils.fromJson(payload, WaterAj.class);
                     waterAjService.saveOrUpdate(waterAj);
+                    log.info("城运对接数据------结束");
                 }
             }
         };