手表数据修改

health-watch/health-watch-api/src/main/java/com/renkang/watch/WatchH5IndexItemNewVo.java

@@ -19,8 +19,8 @@ public class WatchH5IndexItemNewVo {
     @Schema(title = "数据类型名称")
     private String wdTypeName;
     @Schema(title = "最新数据日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date dataDate;
     /**
      * 注意 当wdType=sleep时此字段返回长睡时长
@@ -83,4 +83,11 @@ public class WatchH5IndexItemNewVo {
         this.setWdType(watchH5IndexItemVo.getWdType());
         this.setWdTypeName(watchH5IndexItemVo.getWdTypeName());
     }
+
+    public void sleepCopy(WatchH5IndexItemVo watchH5IndexItemVo){
+        this.setWarnMax(watchH5IndexItemVo.getWarnMax());
+        this.setWarnMin(watchH5IndexItemVo.getWarnMin());
+        this.setWdType(watchH5IndexItemVo.getWdType());
+        this.setWdTypeName(watchH5IndexItemVo.getWdTypeName());
+    }
 }

health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/UserData/res/UserStat.java

@@ -49,12 +49,20 @@ public class UserStat {
             default:
                 break;
         }
+        if (watchH5IndexItemNewVo.getWdType().equals("sleep")) {
+            this.latest = parseSafe(watchH5IndexItemNewVo.getDataMax());// 总时长
+            this.max = parseSafe(watchH5IndexItemNewVo.getDataMax());
+            this.min = parseSafe(watchH5IndexItemNewVo.getDataMin());
+            this.avg = parseSafe(watchH5IndexItemNewVo.getDataAvg());
+            this.latestTime = watchH5IndexItemNewVo.getDataDate();
+        }else {
             this.latest = parseSafe(watchH5IndexItemNewVo.getDataValue());
             this.max = parseSafe(watchH5IndexItemNewVo.getDataMax());
             this.min = parseSafe(watchH5IndexItemNewVo.getDataMin());
             this.avg = parseSafe(watchH5IndexItemNewVo.getDataAvg());
             this.latestTime = watchH5IndexItemNewVo.getDataDate();
         }
+    }
 
     /**
      * 安全解析字符串为 BigDecimal，入参为 null 或空串时返回 null

health-watch/health-watch-biz/src/main/java/com/renkang/watch/api/service/impl/WatchDataApiServiceImpl.java

@@ -925,6 +925,8 @@ public class WatchDataApiServiceImpl implements WatchDataApiService {
             // 睡眠数据特殊处理：dataValue 为空时补 "0"
             if ("sleep".equals(itemVo.getWdType()) && StrUtil.isEmpty(data.getDataValue())) {
                 data.setDataValue("0");
+            }else {
+
             }
             list.add(data);
         });
@@ -967,10 +969,10 @@ public class WatchDataApiServiceImpl implements WatchDataApiService {
         MPJLambdaWrapper<WatchStatUserInfoDaySleep> wrapper = new MPJLambdaWrapper<>();
         //因为睡眠详情页取的是长睡时长作为当天的睡眠时间 , 所以这里保持一致并没有取当天的睡眠总时长
         wrapper.selectAs(WatchStatUserInfoDaySleep::getLongDurationTotal,WatchH5IndexItemNewVo::getDataValue);
-        wrapper.selectAs(WatchStatUserInfoDaySleep::getLongDurationTotal,WatchH5IndexItemNewVo::getDataMax);
+        wrapper.selectAs(WatchStatUserInfoDaySleep::getDeepSleepTimes,WatchH5IndexItemNewVo::getDataMax);
-        wrapper.selectAs(WatchStatUserInfoDaySleep::getShortDurationTotal,WatchH5IndexItemNewVo::getDataMin);
+        wrapper.selectAs(WatchStatUserInfoDaySleep::getLightSleepTimes,WatchH5IndexItemNewVo::getDataMin);
         wrapper.selectAs(WatchStatUserInfoDaySleep::getSleepAvg,WatchH5IndexItemNewVo::getDataAvg);
-        wrapper.selectAs(WatchStatUserInfoDaySleep::getDataDate,WatchH5IndexItemNewVo::getDataDate);
+        wrapper.selectAs(WatchStatUserInfoDaySleep::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate);
         wrapper.eq(WatchStatUserInfoDaySleep::getUserId, userId);
         wrapper.orderByDesc(WatchStatUserInfoDaySleep::getDataDate);
         wrapper.last("limit 1");

jeecg-boot-base-core/src/main/java/org/jeecg/common/amap/service/impl/AmapServiceImpl.java

@@ -19,10 +19,10 @@ import java.nio.charset.StandardCharsets;
 @Slf4j
 public class AmapServiceImpl implements AmapService {
 
-    @Value("${amap.key}")
+//    @Value("${amap.key}")
     private String amapKey;
 
-    @Value("${amap.regeo-url}")
+//    @Value("${amap.regeo-url}")
     private String regeoUrl;
 
     // ===== 核心方法 =====