From fada677d8cf736226d08d38fd6455a19cca42761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com> Date: Tue, 29 Jul 2025 11:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AuditRecordController.java | 32 ++++++++++++++++------ .../handacid/app/controller/ChannelController.java | 14 ++++++---- .../app/controller/FormulationController.java | 18 ++++++------ .../app/controller/ReceiveRecordController.java | 11 +++++++- .../common/model/entity/ReceiveRecord.java | 4 +++ src/main/resources/sql/init.sql | 2 ++ 6 files changed, 57 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java b/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java index ea49417..13a4f3a 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java @@ -1,6 +1,11 @@ package com.iflytop.handacid.app.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.iflytop.handacid.common.base.BasePageQuery; import com.iflytop.handacid.common.model.entity.AuditRecord; +import com.iflytop.handacid.common.model.entity.Formulation; +import com.iflytop.handacid.common.result.PageResult; +import com.iflytop.handacid.common.result.Result; import com.iflytop.handacid.common.service.AuditRecordService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,34 +27,43 @@ public class AuditRecordController { @Autowired private AuditRecordService auditRecordService; - @GetMapping + @GetMapping("/list") @Operation(summary = "获取list数据") public List getAll() { return auditRecordService.list(); } + @PostMapping("/page") + @Operation(summary = "获取分页数据") + public PageResult getPage(BasePageQuery query) { + return PageResult.success(auditRecordService.page(new Page<>(query.getPageNum(), query.getPageSize()))); + } + @GetMapping("/{id}") @Operation(summary = "根据ID获取记录") - public AuditRecord getById(@PathVariable Integer id) { - return auditRecordService.getById(id); + public Result getById(@PathVariable Integer id) { + return Result.success(auditRecordService.getById(id)); } @PostMapping @Operation(summary = "增加记录") - public boolean create(@RequestBody AuditRecord auditRecord) { - return auditRecordService.save(auditRecord); + public Result create(@RequestBody AuditRecord auditRecord) { + boolean flag= auditRecordService.save(auditRecord); + return flag ? Result.success("添加成功") : Result.failed("添加失败"); } @PutMapping @Operation(summary = "修改记录") - public boolean update(@RequestBody AuditRecord auditRecord) { - return auditRecordService.updateById(auditRecord); + public Result update(@RequestBody AuditRecord auditRecord) { + boolean flag = auditRecordService.updateById(auditRecord); + return flag ? Result.success("修改成功"): Result.failed("修改失败"); } @DeleteMapping("/{id}") @Operation(summary = "删除记录") - public boolean delete(@PathVariable Integer id) { - return auditRecordService.removeById(id); + public Result delete(@PathVariable Integer id) { + boolean flag = auditRecordService.removeById(id); + return flag ? Result.success("删除成功"): Result.failed("删除失败"); } } diff --git a/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java b/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java index 8880c23..caf2589 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/ChannelController.java @@ -1,6 +1,7 @@ package com.iflytop.handacid.app.controller; import com.iflytop.handacid.common.model.entity.Channel; +import com.iflytop.handacid.common.result.Result; import com.iflytop.handacid.common.service.ChannelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -24,20 +25,21 @@ public class ChannelController { @GetMapping @Operation(summary = "获取list数据") - public List getAll() { - return channelService.list(); + public Result> getAll() { + return Result.success(channelService.list()); } @GetMapping("/{id}") @Operation(summary = "根据ID获取记录") - public Channel getById(@PathVariable Integer id) { - return channelService.getById(id); + public Result getById(@PathVariable Integer id) { + return Result.success(channelService.getById(id)); } @PutMapping @Operation(summary = "修改记录") - public boolean update(@RequestBody Channel channel) { - return channelService.updateById(channel); + public Result update(@RequestBody Channel channel) { + boolean success = channelService.updateById(channel); + return success? Result.success("修改成功"): Result.failed("修改失败"); } } diff --git a/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java b/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java index 23dce21..b1eadf3 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java @@ -27,13 +27,13 @@ public class FormulationController { @Autowired private FormulationService formulationService; - @PostMapping + @PostMapping("/page") @Operation(summary = "获取分页数据") public PageResult getPage( BasePageQuery query) { return PageResult.success(formulationService.page(new Page<>(query.getPageNum(), query.getPageSize()))); } - @GetMapping + @GetMapping("/list") @Operation(summary = "获取List数据") public Result> getList( @RequestParam Integer solutionId, @RequestParam String concentration) { List formulations=formulationService.list(new LambdaQueryWrapper().eq(Formulation::getSolutionId, solutionId).eq(Formulation::getConcentration,concentration)); @@ -42,19 +42,21 @@ public class FormulationController { @GetMapping("/{id}") @Operation(summary = "根据ID获取") - public Formulation getById(@PathVariable Integer id) { - return formulationService.getById(id); + public Result getById(@PathVariable Integer id) { + return Result.success(formulationService.getById(id)); } @PostMapping @Operation(summary = "创建配方") - public boolean create(@RequestBody Formulation formulation) { - return formulationService.save(formulation); + public Result create(@RequestBody Formulation formulation) { + boolean flag = formulationService.save(formulation); + return flag? Result.success("添加成功") : Result.failed("添加失败"); } @DeleteMapping("/{id}") @Operation(summary = "删除配方") - public boolean delete(@PathVariable Integer id) { - return formulationService.removeById(id); + public Result delete(@PathVariable Integer id) { + boolean flag = formulationService.removeById(id); + return flag? Result.success("删除成功") : Result.failed("删除失败"); } } diff --git a/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java b/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java index 21f7409..ea590eb 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java @@ -1,6 +1,9 @@ package com.iflytop.handacid.app.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.iflytop.handacid.common.base.BasePageQuery; import com.iflytop.handacid.common.model.entity.ReceiveRecord; +import com.iflytop.handacid.common.result.PageResult; import com.iflytop.handacid.common.service.ReceiveRecordService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,12 +25,18 @@ public class ReceiveRecordController { @Autowired private ReceiveRecordService receiveRecordService; - @GetMapping + @GetMapping("/list") @Operation(summary = "获取List数据") public List getAll() { return receiveRecordService.list(); } + @PostMapping("/page") + @Operation(summary = "获取分页数据") + public PageResult getPage(@RequestBody BasePageQuery query) { + return PageResult.success(receiveRecordService.page(new Page<>(query.getPageNum(), query.getPageSize()))); + } + @GetMapping("/{id}") @Operation(summary = "根据ID获取") public ReceiveRecord getById(@PathVariable Integer id) { diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java b/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java index c254a61..b38763e 100644 --- a/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java +++ b/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java @@ -12,6 +12,10 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Schema(description = "领取记录") public class ReceiveRecord extends BaseEntity { + @Schema(description = "领取人") + private String receiver; + @Schema(description = "领取人Id") + private Long receiverId; @Schema(description = "用户ID") private Long userId; @Schema(description = "用户名称") diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql index 72c6265..32c95dc 100644 --- a/src/main/resources/sql/init.sql +++ b/src/main/resources/sql/init.sql @@ -87,6 +87,8 @@ CREATE TABLE "receive_record" ( "id" INTEGER NOT NULL, "user_id" INTEGER, "user_name" TEXT, + "receiver" TEXT, + "receiverId" INTEGER, "solution_id" INTEGER, "solution_name" TEXT, "concentration" TEXT,