From 4cbf49d2a386e2b73a3283a9dab4b312d831d18c Mon Sep 17 00:00:00 2001 From: Cxx0822 <1556464090@qq.com> Date: Tue, 4 Nov 2025 22:34:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8E=BB=E9=99=A4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=81=A5=E5=BA=B7=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cxx/home/controller/HealthController.java | 19 ++-------- .../com/cxx/home/entity/ExerciseRecord.java | 23 ------------ .../com/cxx/home/entity/WeightRecord.java | 20 ----------- .../cxx/home/mapper/ExerciseRecordMapper.java | 9 ----- .../cxx/home/mapper/WeightRecordMapper.java | 9 ----- .../com/cxx/home/service/HealthService.java | 4 --- .../home/service/impl/HealthServiceImpl.java | 35 +++++++------------ 7 files changed, 16 insertions(+), 103 deletions(-) delete mode 100644 home-service/src/main/java/com/cxx/home/entity/ExerciseRecord.java delete mode 100644 home-service/src/main/java/com/cxx/home/entity/WeightRecord.java delete mode 100644 home-service/src/main/java/com/cxx/home/mapper/ExerciseRecordMapper.java delete mode 100644 home-service/src/main/java/com/cxx/home/mapper/WeightRecordMapper.java diff --git a/home-service/src/main/java/com/cxx/home/controller/HealthController.java b/home-service/src/main/java/com/cxx/home/controller/HealthController.java index 0178fb6..7d44f9c 100644 --- a/home-service/src/main/java/com/cxx/home/controller/HealthController.java +++ b/home-service/src/main/java/com/cxx/home/controller/HealthController.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -21,26 +20,14 @@ public class HealthController { @Resource private HealthService healthService; - @Operation(summary = "新增锻炼记录") - @PostMapping("") - public Boolean addExercise(@RequestBody @JsonView(WriteView.class) @Validated HealthRecordDto dto) { - return healthService.add(dto); - } - - @Operation(summary = "更新锻炼记录") + @Operation(summary = "更新健康记录") @PutMapping("/{id}") public Boolean updateExercise(@PathVariable("id") long id, - @RequestBody @JsonView(WriteView.class) HealthRecordDto dto) { + @RequestBody @JsonView(WriteView.class) HealthRecordDto dto) { return healthService.update(id, dto); } - @Operation(summary = "删除锻炼记录") - @DeleteMapping("/{id}") - public Boolean deleteExercise(@PathVariable("id") long id) { - return healthService.delete(id); - } - - @Operation(summary = "查询锻炼记录") + @Operation(summary = "查询健康记录") @GetMapping("") public @JsonView(ReadView.class) List queryExercise(HealthQueryVo queryVo) { return healthService.query(queryVo); diff --git a/home-service/src/main/java/com/cxx/home/entity/ExerciseRecord.java b/home-service/src/main/java/com/cxx/home/entity/ExerciseRecord.java deleted file mode 100644 index 20c9ae0..0000000 --- a/home-service/src/main/java/com/cxx/home/entity/ExerciseRecord.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cxx.home.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cxx.framework.data.AbstractEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.time.LocalDate; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("exercise_record") -public class ExerciseRecord extends AbstractEntity { - @TableField("project") - private String project; - - @TableField("duration") - private Integer duration; - - @TableField("date") - private LocalDate date; -} diff --git a/home-service/src/main/java/com/cxx/home/entity/WeightRecord.java b/home-service/src/main/java/com/cxx/home/entity/WeightRecord.java deleted file mode 100644 index e61a4e8..0000000 --- a/home-service/src/main/java/com/cxx/home/entity/WeightRecord.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cxx.home.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cxx.framework.data.AbstractEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.time.LocalDate; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("weight_record") -public class WeightRecord extends AbstractEntity { - @TableField("value") - private Double value; - - @TableField("date") - private LocalDate date; -} diff --git a/home-service/src/main/java/com/cxx/home/mapper/ExerciseRecordMapper.java b/home-service/src/main/java/com/cxx/home/mapper/ExerciseRecordMapper.java deleted file mode 100644 index b0fe44a..0000000 --- a/home-service/src/main/java/com/cxx/home/mapper/ExerciseRecordMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.cxx.home.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.home.entity.ExerciseRecord; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface ExerciseRecordMapper extends BaseMapper { -} \ No newline at end of file diff --git a/home-service/src/main/java/com/cxx/home/mapper/WeightRecordMapper.java b/home-service/src/main/java/com/cxx/home/mapper/WeightRecordMapper.java deleted file mode 100644 index bca7d50..0000000 --- a/home-service/src/main/java/com/cxx/home/mapper/WeightRecordMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.cxx.home.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.home.entity.WeightRecord; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface WeightRecordMapper extends BaseMapper { -} \ No newline at end of file diff --git a/home-service/src/main/java/com/cxx/home/service/HealthService.java b/home-service/src/main/java/com/cxx/home/service/HealthService.java index 300fe6d..6799f7d 100644 --- a/home-service/src/main/java/com/cxx/home/service/HealthService.java +++ b/home-service/src/main/java/com/cxx/home/service/HealthService.java @@ -9,9 +9,5 @@ import java.util.List; public interface HealthService { List query(HealthQueryVo queryVo); - Boolean add(HealthRecordDto dto); - Boolean update(Long id, HealthRecordDto dto); - - Boolean delete(Long id); } 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 68ad234..cc79d0a 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 @@ -2,7 +2,6 @@ package com.cxx.home.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.cxx.framework.web.CustomException; import com.cxx.home.converter.HealthConverter; import com.cxx.home.dto.health.HealthRecordDto; import com.cxx.home.entity.HealthRecord; @@ -37,30 +36,22 @@ public class HealthServiceImpl implements HealthService { return healthConverter.toDtos(healthRecordMapper.selectList(queryWrapper)); } - @Override - public Boolean add(HealthRecordDto dto) { - HealthRecord healthRecord = new HealthRecord(); - BeanUtils.copyProperties(dto, healthRecord); - - return healthRecordMapper.insert(healthRecord) == 1; - } - @Override public Boolean update(Long id, HealthRecordDto dto) { - if (!healthRecordMapper.exists(new LambdaQueryWrapper() - .eq(HealthRecord::getId, id))) { - throw new CustomException("记录不存在"); - } - HealthRecord healthRecord = new HealthRecord(); - BeanUtils.copyProperties(dto, healthRecord); - healthRecord.setId(id); - return healthRecordMapper.updateById(healthRecord) == 1; - } - - @Override - public Boolean delete(Long id) { - return healthRecordMapper.deleteById(id) == 1; + if (id == 0) { + BeanUtils.copyProperties(dto, healthRecord); + return healthRecordMapper.insert(healthRecord) == 1; + } else { + if ((dto.getSportProject() == null || dto.getSportProject().isEmpty()) + && dto.getSportDuration() == 0 && dto.getWeight() == 0) { + return healthRecordMapper.deleteById(id) == 1; + } else { + BeanUtils.copyProperties(dto, healthRecord); + healthRecord.setId(id); + return healthRecordMapper.updateById(healthRecord) == 1; + } + } } }