["20220810003-ZY20220810004"]:对于从mongo取到的null值，上报都作空字符串上报“”

mqttservice/src/main/java/com/jln/system/web/action/mqtt/Base64decrypt.java

@@ -57,7 +57,8 @@ public class Base64decrypt {
             //mongdb最新数据时间
             //mongdb最新数据时间
             Map<String ,Object> map1 = objectList.get(0).toJavaObject(Map.class);
             Map<String ,Object> map1 = objectList.get(0).toJavaObject(Map.class);
             for (Map.Entry<String, Object> stringObjectEntry : map1.entrySet()) {
             for (Map.Entry<String, Object> stringObjectEntry : map1.entrySet()) {
-                map.put(mapper.get(stringObjectEntry.getKey()),stringObjectEntry.getValue());
+                Object value = stringObjectEntry.getValue()==null?"":stringObjectEntry.getValue();
+                map.put(mapper.get(stringObjectEntry.getKey()),value);
             }
             }
         }
         }
         map.remove(null);
         map.remove(null);
@@ -131,9 +132,13 @@ public class Base64decrypt {
         });
         });
         for (String key : mongoMap.keySet()) {
         for (String key : mongoMap.keySet()) {
             if(key.equals("Status") && mongoMap.get(key).equals("4")){
             if(key.equals("Status") && mongoMap.get(key).equals("4")){
-                Map<String, Object> map = new HashMap<>();
+                List<Map<String,Object>> list = new ArrayList<>();
+                Map<String,Object> map = new HashMap<>();
                 map.put("Status","4");
                 map.put("Status","4");
-                return map;
+                map.put("ts",millis);
+                list.add(map);
+                reportDto.put("reported",list);
+                return reportDto;
             }
             }
         }
         }
         /*mongoMap.forEach((key,value)->{
         /*mongoMap.forEach((key,value)->{

mqttservice/src/main/java/com/jln/system/web/action/mqtt/MqttStartClient.java

@@ -190,6 +190,7 @@ public class MqttStartClient {
                 Map<String, Object> objectMap = base64decrypt.jqrSendString( jsonDataDto,sites, millis ,reportDto);
                 Map<String, Object> objectMap = base64decrypt.jqrSendString( jsonDataDto,sites, millis ,reportDto);
                 StaticData.data.put(jsonDataDto.getMongdbTableb(), objectMap);
                 StaticData.data.put(jsonDataDto.getMongdbTableb(), objectMap);
                 String str = JSONObject.toJSONString(objectMap, SerializerFeature.WriteMapNullValue);
                 String str = JSONObject.toJSONString(objectMap, SerializerFeature.WriteMapNullValue);
+                System.out.println("IOT上报数据："+str);
                 xbMqttDataUtil.publish( str);
                 xbMqttDataUtil.publish( str);
             } else if (separate == 2) {
             } else if (separate == 2) {
                 // TODO  只推送前端数据
                 // TODO  只推送前端数据