diff --git a/home-service/logs/home-service/log_error.log b/home-service/logs/home-service/log_error.log new file mode 100644 index 0000000..e69de29 diff --git a/home-service/logs/home-service/log_info.log b/home-service/logs/home-service/log_info.log new file mode 100644 index 0000000..44136ea --- /dev/null +++ b/home-service/logs/home-service/log_info.log @@ -0,0 +1,81 @@ +2026-02-12 21:05:39 |INFO |background-preinit |Version.java:21 |org.hibernate.validator.internal.util.Version |HV000001: Hibernate Validator 8.0.2.Final +2026-02-12 21:05:39 |INFO |main |StartupInfoLogger.java:53 |com.cxx.home.HomeServiceApplication |Starting HomeServiceApplication v2.0.0 using Java 17.0.12 with PID 33264 (D:\Projects\GithubProjects\sweet-hut-service\home-service\target\classes started by Administrator in D:\Projects\GithubProjects\sweet-hut-service\home-service) +2026-02-12 21:05:39 |INFO |main |SpringApplication.java:658 |com.cxx.home.HomeServiceApplication |The following 1 profile is active: "prod" +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.common.mapper.AccountMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/AccountMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.common.mapper.UserMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/UserMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.AnniversaryMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/AnniversaryMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.AssetMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/AssetMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.BillBookMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/BillBookMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.BillCategoryMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/BillCategoryMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.BillImageMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/BillImageMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.BillPayMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/BillPayMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.BillRecordMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/BillRecordMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.FileRecordMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/FileRecordMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.FoodMaterialMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/FoodMaterialMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.FoodRecipeMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/FoodRecipeMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.FoodRecordMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/FoodRecordMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.FoodStepMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/FoodStepMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.HealthRecordMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/HealthRecordMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.JournalMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/JournalMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.KpiMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/KpiMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.LedgerMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/LedgerMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.PasswordMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/PasswordMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.PeriodDayMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/PeriodDayMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.PeriodSettingMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/PeriodSettingMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.PlanMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/PlanMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.ProductMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/ProductMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.TaskMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/TaskMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.TravelImageMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/TravelImageMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.TravelRecordMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/TravelRecordMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.TravelSpotMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/TravelSpotMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.mapper.TravelVideoMapper +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/TravelVideoMapper.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.AnniversaryDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/AnniversaryDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.AssetDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/AssetDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.BillDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/BillDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.FoodDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/FoodDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.JournalDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/JournalDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.LedgerDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/LedgerDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.PasswordDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/PasswordDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.PeriodDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/PeriodDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.PlanDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/PlanDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.ProductDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/ProductDao.xml +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:204 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper interface: com.cxx.home.dao.TravelDao +2026-02-12 21:05:41 |INFO |main |MyBatisNativeConfiguration.java:210 |com.cxx.autoconfigure.data.MyBatisNativeConfiguration$MyBatisBeanFactoryInitializationAotProcessor |Registering MyBatis mapper xml: mapper/TravelDao.xml diff --git a/home-service/logs/home-service/log_warn.log b/home-service/logs/home-service/log_warn.log new file mode 100644 index 0000000..e69de29 diff --git a/home-service/src/main/java/com/cxx/home/dto/health/HealthRecordDto.java b/home-service/src/main/java/com/cxx/home/dto/health/HealthRecordDto.java index 20860ae..6acd908 100644 --- a/home-service/src/main/java/com/cxx/home/dto/health/HealthRecordDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/health/HealthRecordDto.java @@ -10,6 +10,7 @@ import lombok.Setter; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; @Getter @Setter @@ -29,12 +30,12 @@ public class HealthRecordDto { private Double weight; @Schema(description = "睡眠开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime sleepStartTime; + @JsonFormat(pattern = "HH:mm", timezone = "GMT+8") + private LocalTime sleepStartTime; @Schema(description = "睡眠结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime sleepEndTime; + @JsonFormat(pattern = "HH:mm", timezone = "GMT+8") + private LocalTime sleepEndTime; @Schema(description = "睡眠时长") private Double sleepDuration; diff --git a/home-service/src/main/java/com/cxx/home/entity/HealthRecord.java b/home-service/src/main/java/com/cxx/home/entity/HealthRecord.java index 0026776..dcf035c 100644 --- a/home-service/src/main/java/com/cxx/home/entity/HealthRecord.java +++ b/home-service/src/main/java/com/cxx/home/entity/HealthRecord.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; @Data @EqualsAndHashCode(callSuper = true) @@ -23,10 +24,10 @@ public class HealthRecord extends AbstractEntity { private Double weight; @TableField("sleep_start_time") - private LocalDateTime sleepStartTime; + private LocalTime sleepStartTime; @TableField("sleep_end_time") - private LocalDateTime sleepEndTime; + private LocalTime sleepEndTime; @TableField("sleep_duration") private Double sleepDuration; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/HealthServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/HealthServiceImpl.java index ee68edb..a9f256f 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/HealthServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/HealthServiceImpl.java @@ -40,7 +40,6 @@ public class HealthServiceImpl implements HealthService { @Override public Boolean update(Long id, HealthRecordDto dto) { if (id == 0) { - setSleepDuration(dto); return healthRecordMapper.insert(healthConverter.toEntity(dto)) == 1; } else { if ((dto.getSportProject() == null || dto.getSportProject().isEmpty()) @@ -48,19 +47,10 @@ public class HealthServiceImpl implements HealthService { && dto.getSportDuration() == 0 && dto.getWeight() == 0) { return healthRecordMapper.deleteById(id) == 1; } else { - setSleepDuration(dto); HealthRecord healthRecord = healthConverter.toEntity(dto); healthRecord.setId(id); return healthRecordMapper.updateById(healthRecord) == 1; } } } - - private void setSleepDuration(HealthRecordDto dto) { - LocalDateTime startTime = dto.getSleepStartTime(); - LocalDateTime endTime = dto.getSleepEndTime(); - if (startTime != null && endTime != null) { - dto.setSleepDuration(Duration.between(startTime, endTime).toMinutes() / 60.0); - } - } }