给mqtt消息的处理增加一些非空判断

gyj-iot-boot/gyjiot-protocol/gyjiot-protocol-collect/src/main/java/com/gyjiot/json/JsonProtocolService.java

@@ -10,6 +10,7 @@ import com.gyjiot.common.core.thingsModel.ThingsModelSimpleItem;
 import com.gyjiot.common.core.thingsModel.ThingsModelValuesInput;
 import com.gyjiot.common.exception.ServiceException;
 import com.gyjiot.common.utils.DateUtils;
+import com.gyjiot.common.utils.json.JSONValidator;
 import com.gyjiot.iot.model.ThingsModels.ValueItem;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -33,14 +34,16 @@ public class JsonProtocolService   {
             DeviceReport reportMessage = new DeviceReport();
             // bytep[] 转String
             String data = new String(deviceData.getData(),StandardCharsets.UTF_8);
-            List<ThingsModelSimpleItem> values = JSON.parseArray(data, ThingsModelSimpleItem.class);
-            //上报数据时间
-            for (ThingsModelSimpleItem value : values) {
-                value.setTs(DateUtils.getNowDate());
+            if (JSONValidator.isValidJSONArray(data)) {
+                List<ThingsModelSimpleItem> values = JSON.parseArray(data, ThingsModelSimpleItem.class);
+                //上报数据时间
+                for (ThingsModelSimpleItem value : values) {
+                    value.setTs(DateUtils.getNowDate());
+                }
+                ThingsModelValuesInput valuesInput = new ThingsModelValuesInput();
+                valuesInput.setThingsModelValueRemarkItem(values);
+                reportMessage.setValuesInput(valuesInput);
             }
-            ThingsModelValuesInput valuesInput = new ThingsModelValuesInput();
-            valuesInput.setThingsModelValueRemarkItem(values);
-            reportMessage.setValuesInput(valuesInput);
             reportMessage.setClientId(clientId);
             reportMessage.setSerialNumber(clientId);
             return reportMessage;

gyj-iot-boot/gyjiot-server/mqtt-broker/src/main/java/com/gyjiot/mqtt/service/impl/DeviceReportMessageServiceImpl.java

@@ -127,7 +127,9 @@ public class DeviceReportMessageServiceImpl implements IDeviceReportMessageServi
         ReportDataBo report = new ReportDataBo();
         report.setSerialNumber(message.getSerialNumber());
         report.setProductId(message.getProductId());
-        report.setDataList(message.getValuesInput().getThingsModelValueRemarkItem());
+        if(null!=message.getValuesInput()) {
+            report.setDataList(message.getValuesInput().getThingsModelValueRemarkItem());
+        }
         report.setType(1);
         report.setSlaveId(message.getSlaveId());
         report.setUserId(message.getUserId());

gyj-iot-boot/gyjiot-service/gyjiot-iot-service/src/main/java/com/gyjiot/iot/service/impl/DeviceServiceImpl.java

@@ -220,73 +220,75 @@ public class DeviceServiceImpl implements IDeviceService {
         String key = RedisKeyBuilder.buildTSLVCacheKey(input.getProductId(), input.getDeviceNumber());
         Map<String, String> maps = new HashMap<String, String>();
         List<ThingsModelSimpleItem> list = new ArrayList<>();
-        for (ThingsModelSimpleItem item : input.getThingsModelValueRemarkItem()) {
-            String identity = item.getId();
-            Integer slaveId = input.getSlaveId() == null ? item.getSlaveId() : input.getSlaveId();
-            String serialNumber = slaveId == null ? input.getDeviceNumber() : input.getDeviceNumber()+"_"+ slaveId;
-            if (identity.startsWith("array_")) {
-                identity = identity.substring(9);
-            }
-            // 查询redis中物模型
-            identity = identity + (slaveId != null ? "#" + slaveId : "");
-            PropertyDto dto = thingsModelService.getSingleThingModels(input.getProductId(), identity);
-            if (null == dto) {
-                continue;
-            }
-            String id = item.getId();
-            String value = item.getValue();
+        if(input.getThingsModelValueRemarkItem()!=null) {
+            for (ThingsModelSimpleItem item : input.getThingsModelValueRemarkItem()) {
+                String identity = item.getId();
+                Integer slaveId = input.getSlaveId() == null ? item.getSlaveId() : input.getSlaveId();
+                String serialNumber = slaveId == null ? input.getDeviceNumber() : input.getDeviceNumber() + "_" + slaveId;
+                if (identity.startsWith("array_")) {
+                    identity = identity.substring(9);
+                }
+                // 查询redis中物模型
+                identity = identity + (slaveId != null ? "#" + slaveId : "");
+                PropertyDto dto = thingsModelService.getSingleThingModels(input.getProductId(), identity);
+                if (null == dto) {
+                    continue;
+                }
+                String id = item.getId();
+                String value = item.getValue();
 
 
-            /* ★★★★★★★★★★★★★★★★★★★★★★  处理数据 - 开始 ★★★★★★★★★★★★★★★★★★★★★★*/
-            String cacheValue = redisCache.getCacheMapValue(key, identity);
-            ValueItem valueItem = JSON.parseObject(cacheValue, ValueItem.class);
-            if (null == valueItem) {
-                valueItem = new ValueItem(id,dto.getTempSlaveId(),id);
-            }
-            if (id.startsWith("array_")) {
-                // 查询是否有缓存，如果没有先进行缓存
-                if (!redisCache.containsKey(key)) {
-                    Device device = this.selectDeviceBySerialNumber(input.getDeviceNumber());
-                    this.selectDeviceByDeviceId(device.getDeviceId());
+                /* ★★★★★★★★★★★★★★★★★★★★★★  处理数据 - 开始 ★★★★★★★★★★★★★★★★★★★★★★*/
+                String cacheValue = redisCache.getCacheMapValue(key, identity);
+                ValueItem valueItem = JSON.parseObject(cacheValue, ValueItem.class);
+                if (null == valueItem) {
+                    valueItem = new ValueItem(id, dto.getTempSlaveId(), id);
                 }
+                if (id.startsWith("array_")) {
+                    // 查询是否有缓存，如果没有先进行缓存
+                    if (!redisCache.containsKey(key)) {
+                        Device device = this.selectDeviceBySerialNumber(input.getDeviceNumber());
+                        this.selectDeviceByDeviceId(device.getDeviceId());
+                    }
 
-                int index = Integer.parseInt(id.substring(6, 8));
-                if (isShadow) {
-                    String[] shadows = valueItem.getShadow().split(",");
-                    shadows[index] = value;
-                    valueItem.setShadow(String.join(",", shadows));
-                } else {
-                    // 设置值，获取数组值，然后替换其中元素
-                    valueItem.setTs(DateUtils.getNowDate());
-                    String[] values = valueItem.getValue().split(",");
-                    values[index] = value;
-                    valueItem.setValue(String.join(",", values));
-
-                    String[] shadows = valueItem.getShadow().split(",");
-                    shadows[index] = value;
-                    valueItem.setShadow(String.join(",", shadows));
-                }
-                redisCache.setCacheMapValue(key,identity,JSONObject.toJSONString(valueItem));
-                //maps.put(identity, JSONObject.toJSONString(valueItem));
-            } else {
-                if (isShadow) {
-                    valueItem.setShadow(value);
+                    int index = Integer.parseInt(id.substring(6, 8));
+                    if (isShadow) {
+                        String[] shadows = valueItem.getShadow().split(",");
+                        shadows[index] = value;
+                        valueItem.setShadow(String.join(",", shadows));
+                    } else {
+                        // 设置值，获取数组值，然后替换其中元素
+                        valueItem.setTs(DateUtils.getNowDate());
+                        String[] values = valueItem.getValue().split(",");
+                        values[index] = value;
+                        valueItem.setValue(String.join(",", values));
+
+                        String[] shadows = valueItem.getShadow().split(",");
+                        shadows[index] = value;
+                        valueItem.setShadow(String.join(",", shadows));
+                    }
+                    redisCache.setCacheMapValue(key, identity, JSONObject.toJSONString(valueItem));
+                    //maps.put(identity, JSONObject.toJSONString(valueItem));
                 } else {
-                    valueItem.setValue(value);
-                    valueItem.setShadow(value);
-                    valueItem.setTs(DateUtils.getNowDate());
+                    if (isShadow) {
+                        valueItem.setShadow(value);
+                    } else {
+                        valueItem.setValue(value);
+                        valueItem.setShadow(value);
+                        valueItem.setTs(DateUtils.getNowDate());
+                    }
+                    maps.put(identity, JSONObject.toJSONString(valueItem));
                 }
-                maps.put(identity, JSONObject.toJSONString(valueItem));
-            }
-            /* ★★★★★★★★★★★★★★★★★★★★★★  处理数据 - 结束 ★★★★★★★★★★★★★★★★★★★★★★*/
+                /* ★★★★★★★★★★★★★★★★★★★★★★  处理数据 - 结束 ★★★★★★★★★★★★★★★★★★★★★★*/
 
-            /*★★★★★★★★★★★★★★★★★★★★★★  存储数据 - 开始 ★★★★★★★★★★★★★★★★★★★★★★*/
-            if (null != dto.getIsHistory()) {
+                /*★★★★★★★★★★★★★★★★★★★★★★  存储数据 - 开始 ★★★★★★★★★★★★★★★★★★★★★★*/
+                if (null != dto.getIsHistory()) {
 
+                }
+                list.add(item);
             }
-            list.add(item);
+            redisCache.hashPutAll(key, maps);
         }
-        redisCache.hashPutAll(key, maps);
         /* ★★★★★★★★★★★★★★★★★★★★★★  存储数据 - 结束 ★★★★★★★★★★★★★★★★★★★★★★*/
         return list;
     }