Browse Source

获取点位接口bug修改

丁治程 9 months ago
parent
commit
45d1dfdd52

+ 9 - 2
jeecg-module-interlock/src/main/java/org/jeecg/modules/iotedgeCollectData/service/impl/IotedgeCollectDataServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.iotedgeCollectData.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 
 import com.alibaba.fastjson.TypeReference;
@@ -69,8 +70,14 @@ public class IotedgeCollectDataServiceImpl extends ServiceImpl<IotedgeCollectDat
             for (Map<String,Object> item : items2) {
                 IotedgeTag iotedgeTag = new IotedgeTag();
                 iotedgeTag.setName(item.get("devicePropertyName").toString()); // 点位名称
-                iotedgeTag.setValue(item.get("reportValue").toString()); // 点位值
-                iotedgeTag.setInfo(item.get("devicePropertyName").toString()+"&"+item.get("reportValue").toString()); // 点位名称 & 点位值
+                if(ObjectUtil.isNotNull(item.get("reportValue"))){
+                    iotedgeTag.setValue(item.get("reportValue").toString()); // 点位值
+                    iotedgeTag.setInfo(item.get("devicePropertyName").toString()+"&"+item.get("reportValue").toString()); // 点位名称 & 点位值
+                }else {
+                    iotedgeTag.setValue("0"); // 点位值
+                    iotedgeTag.setInfo(item.get("devicePropertyName").toString()+"&"+"0"); // 点位名称 & 点位值
+                }
+
                 if (serviceMap.containsKey(item.get("deviceServiceName").toString())){
                     serviceMap.get(item.get("deviceServiceName").toString()).add(iotedgeTag);
                 }else {