diff --git a/src/main/java/com/cxx/food/controller/MomentController.java b/src/main/java/com/cxx/food/controller/MomentController.java index 1216f8a..c1981ad 100644 --- a/src/main/java/com/cxx/food/controller/MomentController.java +++ b/src/main/java/com/cxx/food/controller/MomentController.java @@ -24,6 +24,13 @@ public class MomentController { return momentService.addMoment(momentDto); } + @Operation(summary = "更新朋友圈") + @PutMapping("/{id}") + public Boolean updateMoment(@PathVariable("id") long id, + @RequestBody @JsonView(WriteView.class) @Validated MomentDto momentDto) { + return momentService.updateMoment(id, momentDto); + } + @Operation(summary = "查询朋友圈") @GetMapping("") public @JsonView(ReadView.class) List queryMoment() { @@ -32,9 +39,9 @@ public class MomentController { @Operation(summary = "新增评论") @PostMapping("/{id}/comment") - public Boolean addMoment(@PathVariable("id") long id, - @RequestBody @JsonView(WriteView.class) @Validated CommentDto commentDto) { - return momentService.addComment(id, commentDto); + public Boolean addComment(@PathVariable("id") long id, + @RequestParam String content) { + return momentService.addComment(id, content); } } \ No newline at end of file diff --git a/src/main/java/com/cxx/food/service/MomentService.java b/src/main/java/com/cxx/food/service/MomentService.java index b376bc1..dc15db9 100644 --- a/src/main/java/com/cxx/food/service/MomentService.java +++ b/src/main/java/com/cxx/food/service/MomentService.java @@ -1,16 +1,16 @@ package com.cxx.food.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.cxx.food.dto.*; -import com.cxx.food.vo.FoodQueryVo; import java.util.List; public interface MomentService { Boolean addMoment(MomentDto momentDto); + Boolean updateMoment(Long id, MomentDto momentDto); + List queryMoment(); - Boolean addComment(Long momentId, CommentDto commentDto); + Boolean addComment(Long momentId, String content); } diff --git a/src/main/java/com/cxx/food/service/impl/MomentServiceImpl.java b/src/main/java/com/cxx/food/service/impl/MomentServiceImpl.java index 0718ae4..c6eb597 100644 --- a/src/main/java/com/cxx/food/service/impl/MomentServiceImpl.java +++ b/src/main/java/com/cxx/food/service/impl/MomentServiceImpl.java @@ -33,6 +33,18 @@ public class MomentServiceImpl implements MomentService { return momentMapper.insert(moment) == 1; } + @Override + public Boolean updateMoment(Long id, MomentDto momentDto) { + if (momentMapper.selectById(id) == null) { + throw new CustomException("该朋友圈不存在"); + } + + Moment moment = new Moment(); + BeanUtils.copyProperties(momentDto, moment); + moment.setId(id); + return momentMapper.updateById(moment) == 1; + } + @Override public List queryMoment() { // TODO 只能查询好友的朋友圈 @@ -40,13 +52,13 @@ public class MomentServiceImpl implements MomentService { } @Override - public Boolean addComment(Long momentId, CommentDto commentDto) { + public Boolean addComment(Long momentId, String content) { if (momentMapper.selectById(momentId) == null) { throw new CustomException("该朋友圈不存在"); } Comment comment = new Comment(); - BeanUtils.copyProperties(commentDto, comment); + comment.setContent(content); comment.setMomentId(momentId); return commentMapper.insert(comment) == 1; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cc9b1df..9c560d5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: name: @project.artifactId@ version: @project.version@ profiles: - active: prod + active: dev # mybatis plus mapper路径 mybatis-plus: diff --git a/src/main/resources/mapper/FoodMapper.xml b/src/main/resources/mapper/FoodMapper.xml index e614206..3dbcf06 100644 --- a/src/main/resources/mapper/FoodMapper.xml +++ b/src/main/resources/mapper/FoodMapper.xml @@ -8,13 +8,13 @@ + column="id" select="queryMaterial"> + column="id" select="queryStep"> + column="id" select="queryRecordById"> @@ -52,7 +52,7 @@ - SELECT id AS id, type AS type, name AS name, @@ -61,7 +61,7 @@ WHERE food_id = #{id} - SELECT id AS id, sort AS sort, content AS content, diff --git a/src/main/resources/mapper/MomentMapper.xml b/src/main/resources/mapper/MomentMapper.xml index b3339cc..a9e16d0 100644 --- a/src/main/resources/mapper/MomentMapper.xml +++ b/src/main/resources/mapper/MomentMapper.xml @@ -39,5 +39,6 @@ a.create_time AS date FROM moment AS a LEFT JOIN user AS b ON a.create_by = b.id + ORDER BY a.update_time DESC