浏览代码

新增 获取云飞气象站24小时数据接口

zhaiyifei 1 年之前
父节点
当前提交
b745fd8197

+ 3 - 1
src/main/java/com/yunfeiyun/agmp/iot/common/constant/device/ElementFactorUtil.java

@@ -192,7 +192,9 @@ public class ElementFactorUtil {
             IotQxzDataListRseVo iotQxzDataListRseVo = new IotQxzDataListRseVo();
             iotQxzDataListRseVo.setFactorCode(dataitem.getENum());
             iotQxzDataListRseVo.setNumber(dataitem.getEValue());
-            iotQxzDataListRseVo.setTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, dataitem.getTime()));
+            if(dataitem.getTime() != null){
+                iotQxzDataListRseVo.setTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, dataitem.getTime()));
+            }
             iotQxzDataListRseVo.setDevBid(dataitem.getDevBid());
 
             /* 设置要素名称 用于联合唯一 和前端区分显示 */

+ 5 - 0
src/main/java/com/yunfeiyun/agmp/iot/common/domain/IotQxzDataListRseVo.java

@@ -70,4 +70,9 @@ public class IotQxzDataListRseVo {
     public String time;
 
     public List<JSONObject> datalist;
+
+    public String minVal;
+    public String minValdate;
+    public String maxVal;
+    public String maxValdate;
 }