update 添加属性上传时间

coffee-system/src/main/java/com/coffee/aliyun/AliyunConsumerGroupService.java

@@ -169,9 +169,10 @@ public class AliyunConsumerGroupService {
                     // 创建设备
                     BusDeviceEntity device = new BusDeviceEntity();
                     device.setDeviceId(deviceName);
+                    device.setCreateTime(now);
                     device.setCreateBy(Constants.DefaultCreateBy);
-                    device.setUpdateBy(Constants.DefaultUpdateBy);
                     device.setUpdateTime(now);
+                    device.setUpdateBy(Constants.DefaultUpdateBy);
                     device.setTenantId(Constants.DefaultHospital);
 
                     // 配置信息

coffee-system/src/main/java/com/coffee/aliyun/utils/Items.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @Author 龙三郎
@@ -15,6 +16,7 @@ import java.math.BigDecimal;
 @AllArgsConstructor
 public class Items {
     public static final String VALUE = "value";
+    public static final String TIME = "time";
 
     private JSONObject items;
 
@@ -26,6 +28,11 @@ public class Items {
         return items.getJSONObject(param.getParam()).getInteger(VALUE);
     }
 
+    public Date getDate(){
+        long time = items.getJSONObject(PumpParams.patientCode.getParam()).getLong(TIME);
+        return new Date(time);
+    }
+
     public BigDecimal getBigDecimal(PumpParams param){
         return items.getJSONObject(param.getParam()).getBigDecimal(VALUE);
     }

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceAlarmEntity.java

@@ -13,7 +13,6 @@ import com.coffee.common.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import jdk.nashorn.internal.ir.EmptyNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceRunningEntity.java

@@ -99,6 +99,9 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
      * @param items
      */
     public void setFiledsByItems(String deviceName, Items items) {
+        // 属性上传时间
+        this.setUploadTime(items.getDate());
+
         this.setDeviceId(deviceName);
         this.setClassification( items.getString(PumpParams.classification));
         this.setDataNumber(items.getInteger(PumpParams.dataNumber));