设备导入修改及最新值

health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/WatchDeviceExcel.java

@@ -13,7 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 public class WatchDeviceExcel {
     private String watchNo;
-    private String idCard;
+    private String workNo;
     private String realName;
     /**
      * 绑定日期

health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchStatUserInfoDayHeartRate.java

@@ -99,4 +99,17 @@ public class WatchStatUserInfoDayHeartRate implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(title = "最后上传时间")
     private Date lastUploadTime;
+
+    /**
+     * 最新值
+     */
+    @Excel(name = "最新值", width = 15)
+    @Schema(title = "最新值")
+    private Integer newValue;
+    /**
+     * 静息心率最新值
+     */
+    @Excel(name = "静息心率最新值", width = 15)
+    @Schema(title = "静息心率最新值")
+    private Integer silenceNewValue;
 }

health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchStatUserInfoDaySpo2.java

@@ -67,4 +67,9 @@ public class WatchStatUserInfoDaySpo2 implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(title = "最后上传时间")
     private Date lastUploadTime;
+
+    /**最新值*/
+    @Excel(name = "最新值", width = 15)
+    @Schema(title = "最新值")
+    private BigDecimal newValue;
 }

health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchStatUserInfoDayStress.java

@@ -80,4 +80,10 @@ public class WatchStatUserInfoDayStress implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(title = "最后上传时间")
     private Date lastUploadTime;
+    /**
+     * 最新值
+     */
+    @Excel(name = "最新值", width = 15)
+    @Schema(title = "最新值")
+    private Integer newValue;
 }

health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchStatUserInfoDayTemp.java

@@ -81,4 +81,14 @@ public class WatchStatUserInfoDayTemp implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(title = "最后上传时间")
     private Date lastUploadTime;
+
+    /**温度最新值*/
+    @Excel(name = "温度最新值", width = 15)
+    @Schema(title = "温度最新值")
+    private BigDecimal newValue;
+
+    /**体表温度最新值*/
+    @Excel(name = "体表温度最新值", width = 15)
+    @Schema(title = "体表温度最新值")
+    private BigDecimal skinNewValue;
 }