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

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

@@ -125,7 +125,7 @@ public class Base64decrypt {
         Map<String, Object> mongoMap = findMongo(jsonDataDto.getTableFiels());
         Map<String, Object> mongoMap = findMongo(jsonDataDto.getTableFiels());
         mongoMap.forEach((key,value)->{
         mongoMap.forEach((key,value)->{
             if(key.equals("Status")){
             if(key.equals("Status")){
-                if(EmptyUtil.isEmpty(value) || "0".equals(value)){
+                if(EmptyUtil.isEmpty(value) || "0".equals(value) || "".equals(value)){
                     mongoMap.put(key,4);
                     mongoMap.put(key,4);
                 }
                 }
             }
             }
@@ -141,13 +141,7 @@ public class Base64decrypt {
                 return reportDto;
                 return reportDto;
             }
             }
         }
         }
-        /*mongoMap.forEach((key,value)->{
-            if(key.equals("Status") && value.equals("4")){
-                Map<String, Object> map = new HashMap<>();
-                map.put("Status","4");
-                return map;
-            }
-        });*/
+
         mongoMap.putAll(objectMap);
         mongoMap.putAll(objectMap);
          millis = Calendar.getInstance().getTimeInMillis();
          millis = Calendar.getInstance().getTimeInMillis();
         //处理实体类在每个字段加上时间
         //处理实体类在每个字段加上时间

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

 package com.jln.system.web.action.mqtt;
 package com.jln.system.web.action.mqtt;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.google.gson.Gson;
+import com.jln.common.utils.EmptyUtil;
 import com.jln.system.web.action.mqtt.pojo.dto.*;
 import com.jln.system.web.action.mqtt.pojo.dto.*;
 import com.jln.system.web.action.mqtt.pojo.vo.StaticData;
 import com.jln.system.web.action.mqtt.pojo.vo.StaticData;
 import com.jln.system.web.action.mqtt.server.EoStatisticsService;
 import com.jln.system.web.action.mqtt.server.EoStatisticsService;
@@ -188,8 +189,34 @@ public class MqttStartClient {
             if (separate == 1) {
             if (separate == 1) {
                 //TODO 同时MQTT上报和推送前端数据
                 //TODO 同时MQTT上报和推送前端数据
                 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);
-                String str = JSONObject.toJSONString(objectMap, SerializerFeature.WriteMapNullValue);
+                Map<String,Object> re = new HashMap<>();
+                objectMap.forEach((key,value)->{
+
+                    if(key.equals("reported")){
+
+                        List<Map<String,Object>> jk = new ArrayList<>();
+                        String json = JSONObject.toJSONString(value);
+                        JSONArray objects = JSONArray.parseArray(json);
+
+                        for (Object object : objects) {
+                            JSONObject jsonObject = JSONObject.parseObject(object.toString());
+                            Map<String,Object> map = new HashMap<>();
+                            jsonObject.forEach((k,v)->{
+                                if(EmptyUtil.isEmpty(v)){
+                                    map.put(k,"");
+                                }else {
+                                    map.put(k,v);
+                                }
+                            });
+                            jk.add(map);
+                        }
+                        re.put(key,jk);
+                    }else {
+                        re.put(key,value);
+                    }
+                });
+                StaticData.data.put(jsonDataDto.getMongdbTableb(), re);
+                String str = JSONObject.toJSONString(re, SerializerFeature.WriteMapNullValue);
                 System.out.println("IOT上报数据："+str);
                 System.out.println("IOT上报数据："+str);
                 xbMqttDataUtil.publish( str);
                 xbMqttDataUtil.publish( str);
             } else if (separate == 2) {
             } else if (separate == 2) {